Merge pull request #690 from dreamteamprod/dev

Release 0.17.4

Author: Tim020

client/package-lock.json

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

client/package.json

@@ -242,6 +242,12 @@
           >
             This is a required field.
           </b-form-invalid-feedback>
+          <b-form-text
+            v-if="isDuplicateCue"
+            class="text-warning"
+          >
+            ⚠️ A cue with this identifier already exists for this cue type
+          </b-form-text>
         </b-form-group>
       </b-form>
     </b-modal>
@@ -386,6 +392,16 @@ export default {
       }, this);
       return count;
     },
+    flatScriptCues() {
+      return Object.keys(this.SCRIPT_CUES).map((key) => this.SCRIPT_CUES[key]).flat();
+    },
+    isDuplicateCue() {
+      if (!this.newCueFormState.ident || !this.newCueFormState.cueType) {
+        return false;
+      }
+      return this.flatScriptCues.some((cue) => cue.cue_type_id === this.newCueFormState.cueType
+        && cue.ident === this.newCueFormState.ident);
+    },
     ...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',

client/src/views/show/ShowLiveView.vue

@@ -133,6 +133,12 @@
           >
             This is a required field.
           </b-form-invalid-feedback>
+          <b-form-text
+            v-if="isDuplicateNewCue"
+            class="text-warning"
+          >
+            ⚠️ A cue with this identifier already exists for this cue type
+          </b-form-text>
         </b-form-group>
       </b-form>
     </b-modal>
@@ -182,6 +188,12 @@
           >
             This is a required field.
           </b-form-invalid-feedback>
+          <b-form-text
+            v-if="isDuplicateEditCue"
+            class="text-warning"
+          >
+            ⚠️ A cue with this identifier already exists for this cue type
+          </b-form-text>
         </b-form-group>
       </b-form>
       <template #modal-footer="{ ok, cancel }">
@@ -308,7 +320,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['IS_CUE_EDITOR', 'RBAC_ROLES', 'CURRENT_USER_RBAC', 'IS_ADMIN_USER']),
+    ...mapGetters(['IS_CUE_EDITOR', 'RBAC_ROLES', 'CURRENT_USER_RBAC', 'IS_ADMIN_USER', 'SCRIPT_CUES']),
     cueTypeOptions() {
       if (this.IS_ADMIN_USER) {
         return [
@@ -385,6 +397,24 @@ export default {
       }
       return style;
     },
+    flatScriptCues() {
+      return Object.keys(this.SCRIPT_CUES).map((key) => this.SCRIPT_CUES[key]).flat();
+    },
+    isDuplicateNewCue() {
+      if (this.newFormState.ident == null || this.newFormState.cueType == null) {
+        return false;
+      }
+      return this.flatScriptCues.some((cue) => cue.cue_type_id === this.newFormState.cueType
+        && cue.ident === this.newFormState.ident);
+    },
+    isDuplicateEditCue() {
+      if (this.editFormState.ident == null || this.editFormState.cueType == null) {
+        return false;
+      }
+      return this.flatScriptCues.some((cue) => cue.cue_type_id === this.editFormState.cueType
+        && cue.ident === this.editFormState.ident
+        && cue.id !== this.editFormState.cueId);
+    },
   },
   methods: {
     contrastColor,