Show stage direction overrides on script lines

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "private": true,
   "scripts": {
     "build": "vite build",

client/src/views/show/ShowLiveView.vue

@@ -74,6 +74,7 @@
               :cues="getCuesForLine(line)"
               :cuts="SCRIPT_CUTS"
               :stage-direction-styles="STAGE_DIRECTION_STYLES"
+              :stage-direction-style-overrides="STAGE_DIRECTION_STYLE_OVERRIDES"
               @last-line-change="handleLastLineChange"
               @first-line-change="handleFirstLineChange"
             />
@@ -143,6 +144,14 @@
       this.$toast.warning('No live session started!');
       await this.$router.replace('/');
     } else {
+      // Get the current user
+      await this.GET_CURRENT_USER();
+
+      // User related stuff
+      if (this.CURRENT_USER != null) {
+        await this.GET_STAGE_DIRECTION_STYLE_OVERRIDES();
+      }
+
       await this.GET_ACT_LIST();
       await this.GET_SCENE_LIST();
       await this.GET_CHARACTER_LIST();
@@ -250,7 +259,7 @@
       const cutoffBottom = scriptContainer.offset().top + scriptContainer.outerHeight();
       const scriptSelector = $('.script-item');
 
       scriptSelector.each(function () {
         if ($(this).offset().top >= cutoffTop) {
           if (!$(this).attr('class').split(/\s+/).includes('first-script-element')) {
             scriptSelector.removeClass('first-script-element');
@@ -263,7 +272,7 @@
 
       let assignedLastScript = false;
       let lastObject = null;
       scriptSelector.each(function () {
         if (lastObject == null) {
           lastObject = this;
         } else if ($(this).offset().top > $(lastObject).offset().top
@@ -417,9 +426,9 @@
     },
     ...mapActions(['GET_SHOW_SESSION_DATA', 'LOAD_SCRIPT_PAGE', 'GET_ACT_LIST', 'GET_SCENE_LIST',
       'GET_CHARACTER_LIST', 'GET_CHARACTER_GROUP_LIST', 'LOAD_CUES', 'GET_CUE_TYPES',
-      'GET_CUTS', 'GET_STAGE_DIRECTION_STYLES']),
+      'GET_CUTS', 'GET_STAGE_DIRECTION_STYLES', 'GET_CURRENT_USER', 'GET_STAGE_DIRECTION_STYLE_OVERRIDES']),
   },
   computed: {
     pageIter() {
       if (this.SETTINGS.enable_live_batching) {
         return [...Array(this.currentLoadedPage).keys()].map((x) => (x + 1)).filter((x) => (
@@ -442,9 +451,10 @@
     },
     ...mapGetters(['CURRENT_SHOW_SESSION', 'GET_SCRIPT_PAGE', 'ACT_LIST', 'SCENE_LIST',
       'CHARACTER_LIST', 'CHARACTER_GROUP_LIST', 'CURRENT_SHOW', 'CUE_TYPES', 'SCRIPT_CUES',
-      'INTERNAL_UUID', 'SESSION_FOLLOW_DATA', 'SCRIPT_CUTS', 'SETTINGS', 'STAGE_DIRECTION_STYLES']),
+      'INTERNAL_UUID', 'SESSION_FOLLOW_DATA', 'SCRIPT_CUTS', 'SETTINGS', 'STAGE_DIRECTION_STYLES',
+      'CURRENT_USER', 'STAGE_DIRECTION_STYLE_OVERRIDES']),
   },
   watch: {
     SESSION_FOLLOW_DATA() {
       if (this.isScriptFollowing) {
         let scrollToLine;

client/src/vue_components/show/config/cues/CueEditor.vue

@@ -63,6 +63,7 @@
             :cues="getCuesForLine(line)"
             :line-part-cuts="SCRIPT_CUTS"
             :stage-direction-styles="STAGE_DIRECTION_STYLES"
+            :stage-direction-style-overrides="STAGE_DIRECTION_STYLE_OVERRIDES"
           />
         </template>
       </b-col>
@@ -176,6 +177,8 @@ export default {
     },
   },
   async beforeMount() {
+    // Get the current user
+    await this.GET_CURRENT_USER();
     // Config status
     await this.GET_SCRIPT_CONFIG_STATUS();
     // Show details
@@ -188,6 +191,11 @@ export default {
     await this.GET_CUTS();
     await this.GET_STAGE_DIRECTION_STYLES();
 
+    // User related stuff
+    if (this.CURRENT_USER != null) {
+      await this.GET_STAGE_DIRECTION_STYLE_OVERRIDES();
+    }
+
     // Get the max page of the saved version of the script
     await this.getMaxScriptPage();
 
@@ -263,7 +271,7 @@ export default {
     ...mapActions(['GET_SCENE_LIST', 'GET_ACT_LIST', 'GET_CHARACTER_LIST',
       'GET_CHARACTER_GROUP_LIST', 'LOAD_SCRIPT_PAGE', 'ADD_BLANK_PAGE', 'GET_SCRIPT_CONFIG_STATUS',
       'RESET_TO_SAVED', 'SAVE_NEW_PAGE', 'SAVE_CHANGED_PAGE', 'GET_CUE_TYPES', 'LOAD_CUES',
-      'GET_CUTS', 'GET_STAGE_DIRECTION_STYLES']),
+      'GET_CUTS', 'GET_STAGE_DIRECTION_STYLES', 'GET_STAGE_DIRECTION_STYLE_OVERRIDES', 'GET_CURRENT_USER']),
   },
   computed: {
     currentEditPageKey() {
@@ -278,7 +286,7 @@ export default {
     ...mapGetters(['CURRENT_SHOW', 'ACT_LIST', 'SCENE_LIST', 'CHARACTER_LIST',
       'CHARACTER_GROUP_LIST', 'CAN_REQUEST_EDIT', 'CURRENT_EDITOR', 'INTERNAL_UUID',
       'GET_SCRIPT_PAGE', 'DEBUG_MODE_ENABLED', 'CUE_TYPES', 'SCRIPT_CUES', 'SCRIPT_CUTS',
-      'STAGE_DIRECTION_STYLES']),
+      'STAGE_DIRECTION_STYLES', 'STAGE_DIRECTION_STYLE_OVERRIDES', 'CURRENT_USER']),
   },
   watch: {
     currentEditPage(val) {

client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue

@@ -250,6 +250,10 @@ export default {
       required: true,
       type: Array,
     },
+    stageDirectionStyleOverrides: {
+      required: true,
+      type: Array,
+    },
   },
   data() {
     return {
@@ -431,8 +435,10 @@ export default {
       const sdStyle = this.stageDirectionStyles.find(
         (style) => (style.id === this.line.stage_direction_style_id),
       );
+      const override = this.stageDirectionStyleOverrides
+        .find((elem) => elem.settings.id === sdStyle.id);
       if (this.line.stage_direction) {
-        return sdStyle;
+        return override ? override.settings : sdStyle;
       }
       return null;
     },

client/src/vue_components/show/config/script/ScriptEditor.vue

@@ -122,6 +122,7 @@
               :line-part-cuts="linePartCuts"
               :insert-mode="insertMode"
               :stage-direction-styles="STAGE_DIRECTION_STYLES"
+              :stage-direction-style-overrides="STAGE_DIRECTION_STYLE_OVERRIDES"
               @editLine="beginEditingLine(currentEditPage, index)"
               @cutLinePart="cutLinePart"
               @insertLine="insertLineAt(currentEditPage, index)"
@@ -348,6 +349,8 @@ export default {
     },
   },
   async beforeMount() {
+    // Get the current user
+    await this.GET_CURRENT_USER();
     // Config status
     await this.GET_SCRIPT_CONFIG_STATUS();
     // Show details
@@ -357,6 +360,10 @@ export default {
     await this.GET_CHARACTER_GROUP_LIST();
     // Stage direction styles
     await this.GET_STAGE_DIRECTION_STYLES();
+    // User related stuff
+    if (this.CURRENT_USER != null) {
+      await this.GET_STAGE_DIRECTION_STYLE_OVERRIDES();
+    }
     // Handle script cuts
     await this.GET_CUTS();
     this.resetCutsToSaved();
@@ -790,7 +797,8 @@ export default {
       'SET_CUT_MODE', 'INSERT_BLANK_LINE', 'RESET_INSERTED']),
     ...mapActions(['GET_SCENE_LIST', 'GET_ACT_LIST', 'GET_CHARACTER_LIST',
       'GET_CHARACTER_GROUP_LIST', 'LOAD_SCRIPT_PAGE', 'ADD_BLANK_PAGE', 'GET_SCRIPT_CONFIG_STATUS',
-      'RESET_TO_SAVED', 'SAVE_NEW_PAGE', 'SAVE_CHANGED_PAGE', 'GET_CUTS', 'SAVE_SCRIPT_CUTS', 'GET_STAGE_DIRECTION_STYLES']),
+      'RESET_TO_SAVED', 'SAVE_NEW_PAGE', 'SAVE_CHANGED_PAGE', 'GET_CUTS', 'SAVE_SCRIPT_CUTS',
+      'GET_STAGE_DIRECTION_STYLES', 'GET_CURRENT_USER', 'GET_STAGE_DIRECTION_STYLE_OVERRIDES']),
   },
   computed: {
     canGenerateDebugScript() {
@@ -831,7 +839,8 @@ export default {
     ...mapGetters(['CURRENT_SHOW', 'TMP_SCRIPT', 'ACT_LIST', 'SCENE_LIST', 'CHARACTER_LIST',
       'CHARACTER_GROUP_LIST', 'CAN_REQUEST_EDIT', 'CURRENT_EDITOR', 'INTERNAL_UUID',
       'GET_SCRIPT_PAGE', 'DEBUG_MODE_ENABLED', 'DELETED_LINES', 'SCENE_BY_ID', 'ACT_BY_ID',
-      'IS_CUT_MODE', 'SCRIPT_CUTS', 'INSERTED_LINES', 'STAGE_DIRECTION_STYLES']),
+      'IS_CUT_MODE', 'SCRIPT_CUTS', 'INSERTED_LINES', 'STAGE_DIRECTION_STYLES', 'CURRENT_USER',
+      'STAGE_DIRECTION_STYLE_OVERRIDES']),
   },
   watch: {
     currentEditPage(val) {

client/src/vue_components/show/config/script/ScriptLineViewer.vue

@@ -162,6 +162,10 @@ export default {
       required: true,
       type: Array,
     },
+    stageDirectionStyleOverrides: {
+      required: true,
+      type: Array,
+    },
   },
   computed: {
     needsHeadings() {
@@ -216,8 +220,10 @@ export default {
       const sdStyle = this.stageDirectionStyles.find(
         (style) => (style.id === this.line.stage_direction_style_id),
       );
+      const override = this.stageDirectionStyleOverrides
+        .find((elem) => elem.settings.id === sdStyle.id);
       if (this.line.stage_direction) {
-        return sdStyle;
+        return override ? override.settings : sdStyle;
       }
       return null;
     },

client/src/vue_components/show/live/ScriptLineViewer.vue

@@ -149,6 +149,10 @@ export default {
       required: true,
       type: Array,
     },
+    stageDirectionStyleOverrides: {
+      required: true,
+      type: Array,
+    },
   },
   data() {
     return {
@@ -267,8 +271,10 @@ export default {
       const sdStyle = this.stageDirectionStyles.find(
         (style) => (style.id === this.line.stage_direction_style_id),
       );
+      const override = this.stageDirectionStyleOverrides
+        .find((elem) => elem.settings.id === sdStyle.id);
       if (this.line.stage_direction) {
-        return sdStyle;
+        return override ? override.settings : sdStyle;
       }
       return null;
     },