Release 0.20.0

Merge pull request #764 from dreamteamprod/dev

Author: Tim020

client/package-lock.json

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

client/package.json

@@ -276,12 +276,12 @@ export default {
     return {
       elapsedTime: 0,
       elapsedTimer: null,
-      currentLoadedPage: 0,
-      currentMaxPage: 0,
+      currentLoadedPage: 0, // Last loaded page number (1-based)
+      currentMaxPage: 0, // Total number of pages in script (1-based)
       stoppingSession: false,
       initialLoad: false,
-      currentFirstPage: 1,
-      currentLastPage: 1,
+      currentFirstPage: 1, // First visible page (1-based, initialized to page 1)
+      currentLastPage: 1, // Last visible page (1-based, initialized to page 1)
       pageBatchSize: 3,
       startTime: null,
       previousFirstPage: 1,
@@ -328,7 +328,8 @@ export default {
   },
   computed: {
     pageIter() {
-      return [...Array(this.currentMaxPage).keys()];
+      // Generate 1-based page indices (DigiScript pages are numbered starting from 1, not 0)
+      return [...Array(this.currentMaxPage).keys()].map((i) => i + 1);
     },
     isScriptFollowing() {
       if (this.loadedSessionData) {

client/src/views/show/ShowLiveView.vue

@@ -100,6 +100,7 @@
               v-if="editPages.includes(`page_${currentEditPage}_line_${index}`)"
               :key="`page_${currentEditPage}_line_${index}`"
               :line-index="index"
+              :current-edit-page="currentEditPage"
               :acts="ACT_LIST"
               :scenes="SCENE_LIST"
               :characters="CHARACTER_LIST"
@@ -587,9 +588,14 @@ export default {
       }
     },
     async getPreviousLineForIndex(lineIndex) {
-      if (lineIndex > 0) {
-        return this.TMP_SCRIPT[this.currentEditPage][lineIndex - 1];
+      // Search backwards from lineIndex - 1 on the current page, skipping deleted lines
+      for (let i = lineIndex - 1; i >= 0; i--) {
+        if (!this.DELETED_LINES(this.currentEditPage).includes(i)) {
+          return this.TMP_SCRIPT[this.currentEditPage][i];
+        }
       }
+
+      // No non-deleted lines before this index on current page, check previous pages
       if (this.currentEditPage > 1) {
         let loopPageNo = this.currentEditPage - 1;
         /* eslint-disable no-await-in-loop */
@@ -601,8 +607,12 @@ export default {
             await this.LOAD_SCRIPT_PAGE(loopPageNo);
             loopPage = this.GET_SCRIPT_PAGE(loopPageNo);
           }
-          if (loopPage.length > 0) {
-            return loopPage[loopPage.length - 1];
+          // Find the last non-deleted line on this page
+          const deletedLines = this.DELETED_LINES(loopPageNo);
+          for (let i = loopPage.length - 1; i >= 0; i--) {
+            if (!deletedLines.includes(i)) {
+              return loopPage[i];
+            }
           }
           loopPageNo -= 1;
         }
@@ -611,31 +621,43 @@ export default {
       return null;
     },
     async getNextLineForIndex(lineIndex) {
-      // If there are lines after this one on the page, return the next line from the page
-      if (lineIndex < this.TMP_SCRIPT[this.currentEditPage].length - 1) {
-        return this.TMP_SCRIPT[this.currentEditPage][lineIndex + 1];
+      // Search forwards from lineIndex + 1 on the current page, skipping deleted lines
+      const currentPageLines = this.TMP_SCRIPT[this.currentEditPage];
+      const deletedLines = this.DELETED_LINES(this.currentEditPage);
+      for (let i = lineIndex + 1; i < currentPageLines.length; i++) {
+        if (!deletedLines.includes(i)) {
+          return currentPageLines[i];
+        }
       }
-      // See if there are any edit pages loaded which are after this page, and if so, return the
-      // first line from the first page which contains lines
+
+      // No non-deleted lines after this index on current page, check next pages
+      // See if there are any edit pages loaded which are after this page
       const editPages = Object.keys(this.TMP_SCRIPT).map((x) => parseInt(x, 10)).sort();
       for (let i = 0; i < editPages.length; i++) {
         const editPage = editPages[i];
-        if (editPage <= this.currentEditPage) {
-          break;
-        }
-        const pageContent = this.TMP_SCRIPT[editPage.toString()];
-        if (pageContent.length > 0) {
-          return pageContent[0];
+        if (editPage > this.currentEditPage) {
+          const pageContent = this.TMP_SCRIPT[editPage.toString()];
+          const pageDeletedLines = this.DELETED_LINES(editPage);
+          // Find the first non-deleted line on this page
+          for (let j = 0; j < pageContent.length; j++) {
+            if (!pageDeletedLines.includes(j)) {
+              return pageContent[j];
+            }
+          }
         }
       }
-      // Edit pages do not have any lines we can use, so try loading script pages up to the max
-      // page that is saved
+
+      // Edit pages do not have any non-deleted lines, try loading script pages up to the max
       /* eslint-disable no-await-in-loop */
       for (let i = this.currentEditPage + 1; i <= this.currentMaxPage; i++) {
         await this.LOAD_SCRIPT_PAGE(i);
         const loopPage = this.GET_SCRIPT_PAGE(i);
-        if (loopPage.length > 0) {
-          return loopPage[0];
+        const loopPageDeletedLines = this.DELETED_LINES(i);
+        // Find the first non-deleted line on this page
+        for (let j = 0; j < loopPage.length; j++) {
+          if (!loopPageDeletedLines.includes(j)) {
+            return loopPage[j];
+          }
         }
       }
       /* eslint-enable no-await-in-loop */

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

@@ -117,6 +117,10 @@ export default {
       required: true,
       type: Number,
     },
+    currentEditPage: {
+      required: true,
+      type: Number,
+    },
     acts: {
       required: true,
       type: Array,
@@ -167,6 +171,8 @@ export default {
       },
       previousLine: null,
       nextLine: null,
+      recalculationTimeout: null,
+      abortController: null,
     };
   },
   validations: {
@@ -205,7 +211,13 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['SCENE_BY_ID', 'ACT_BY_ID']),
+    ...mapGetters(['SCENE_BY_ID', 'ACT_BY_ID', 'TMP_SCRIPT', 'ALL_DELETED_LINES']),
+    currentPageScript() {
+      return this.TMP_SCRIPT[this.currentEditPage.toString()] || [];
+    },
+    currentPageDeletedLines() {
+      return this.ALL_DELETED_LINES[this.currentEditPage.toString()] || [];
+    },
     nextActs() {
       // Start act is either the first act for the show, or the act of the previous line if there
       // is one
@@ -273,6 +285,29 @@ export default {
       ];
     },
   },
+  watch: {
+    currentPageScript: {
+      handler() {
+        this.scheduleRecalculation();
+      },
+      deep: true,
+    },
+    currentPageDeletedLines: {
+      handler() {
+        this.scheduleRecalculation();
+      },
+      deep: true,
+    },
+    lineIndex() {
+      this.scheduleRecalculation();
+    },
+    ALL_DELETED_LINES: {
+      handler() {
+        this.scheduleRecalculation();
+      },
+      deep: true,
+    },
+  },
   async created() {
     this.previousLine = await this.previousLineFn(this.lineIndex);
     this.nextLine = await this.nextLineFn(this.lineIndex);
@@ -283,7 +318,51 @@ export default {
   mounted() {
     this.$v.state.$touch();
   },
+  beforeDestroy() {
+    if (this.recalculationTimeout) {
+      clearTimeout(this.recalculationTimeout);
+    }
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+  },
   methods: {
+    scheduleRecalculation() {
+      // Cancel any pending recalculation
+      if (this.recalculationTimeout) {
+        clearTimeout(this.recalculationTimeout);
+      }
+
+      // Debounce recalculation by 100ms
+      this.recalculationTimeout = setTimeout(() => {
+        this.recalculatePreviousNextLines();
+      }, 100);
+    },
+    async recalculatePreviousNextLines() {
+      // Cancel any in-flight async operations
+      if (this.abortController) {
+        this.abortController.abort();
+      }
+
+      // Create new abort controller for this operation
+      this.abortController = new AbortController();
+      const { signal } = this.abortController;
+
+      try {
+        const prevLine = await this.previousLineFn(this.lineIndex);
+        if (signal.aborted) return;
+        this.previousLine = prevLine;
+
+        const nxtLine = await this.nextLineFn(this.lineIndex);
+        if (signal.aborted) return;
+        this.nextLine = nxtLine;
+      } catch (error) {
+        if (error.name !== 'AbortError') {
+          // eslint-disable-next-line no-console
+          console.error('Error recalculating previous/next lines:', error);
+        }
+      }
+    },
     validateState(name) {
       const { $dirty, $error } = this.$v.state[name];
       return $dirty ? !$error : null;

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

@@ -0,0 +1,86 @@
+"""cleanup_orphaned_script_objects
+
+Revision ID: 42d0eaa5d07e
+Revises: e1a2b3c4d5e6
+Create Date: 2025-12-12 09:54:39.096643
+
+This migration cleans up orphaned script objects that were left behind due to
+bug #768. Orphaned objects include:
+- ScriptLine objects with no FK references
+- ScriptLinePart objects (cascade deleted with ScriptLine)
+- ScriptCuts objects (cascade deleted with ScriptLinePart)
+- Cue objects with no FK references
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "42d0eaa5d07e"
+down_revision: Union[str, None] = "e1a2b3c4d5e6"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Get database connection
+    conn = op.get_bind()
+
+    # 1. Find and delete orphaned Cue objects
+    # Cues are orphaned if they have no references in script_cue_association
+    orphaned_cues = conn.execute(
+        sa.text("""
+        SELECT c.id
+        FROM cue c
+        LEFT JOIN script_cue_association sca ON c.id = sca.cue_id
+        WHERE sca.cue_id IS NULL
+    """)
+    ).fetchall()
+
+    if orphaned_cues:
+        orphaned_cue_ids = [row[0] for row in orphaned_cues]
+        print(f"Found {len(orphaned_cue_ids)} orphaned cue(s): {orphaned_cue_ids}")
+        for cue_id in orphaned_cue_ids:
+            conn.execute(sa.text("DELETE FROM cue WHERE id = :id"), {"id": cue_id})
+
+    # 2. Find and delete orphaned ScriptLine objects
+    # Lines are orphaned if they have no references in:
+    # - script_line_revision_association.line_id
+    # - script_line_revision_association.next_line_id
+    # - script_line_revision_association.previous_line_id
+    # - script_cue_association.line_id
+    orphaned_lines = conn.execute(
+        sa.text("""
+        SELECT sl.id
+        FROM script_lines sl
+        LEFT JOIN script_line_revision_association slra_line ON sl.id = slra_line.line_id
+        LEFT JOIN script_line_revision_association slra_next ON sl.id = slra_next.next_line_id
+        LEFT JOIN script_line_revision_association slra_prev ON sl.id = slra_prev.previous_line_id
+        LEFT JOIN script_cue_association sca ON sl.id = sca.line_id
+        WHERE slra_line.line_id IS NULL
+          AND slra_next.next_line_id IS NULL
+          AND slra_prev.previous_line_id IS NULL
+          AND sca.line_id IS NULL
+    """)
+    ).fetchall()
+
+    if orphaned_lines:
+        orphaned_line_ids = [row[0] for row in orphaned_lines]
+        print(
+            f"Found {len(orphaned_line_ids)} orphaned script_line(s): {orphaned_line_ids}"
+        )
+        # ScriptLinePart and ScriptCuts will cascade delete via SQLAlchemy relationships
+        for line_id in orphaned_line_ids:
+            conn.execute(
+                sa.text("DELETE FROM script_lines WHERE id = :id"), {"id": line_id}
+            )
+
+
+def downgrade() -> None:
+    # This migration only deletes orphaned data, so there's no meaningful downgrade
+    # The orphaned data is already gone from the database by definition
+    pass

server/alembic_config/versions/42d0eaa5d07e_cleanup_orphaned_script_objects.py

@@ -160,7 +160,7 @@ async def delete(self):
 
 
 @ApiRoute("show/cast/stats", ApiVersion.V1)
-class CharacterStatsController(BaseAPIController):
+class CastStatsController(BaseAPIController):
     async def get(self):
         current_show = self.get_current_show()
         show_id = current_show["id"]

server/controllers/api/show/cast.py

@@ -563,7 +563,31 @@ async def patch(self):
                             )
                             prev_association.next_line = None
                             session.flush()
+
+                        # Store line_id before deleting association for orphan cleanup
+                        line_id_to_cleanup = curr_association.line_id
+
+                        # Delete any cue associations for this (revision, line) before deleting the line association
+                        # CueAssociation is revision-scoped, so we need to explicitly clean it up
+                        cue_assocs = session.scalars(
+                            select(CueAssociation).where(
+                                CueAssociation.revision_id == revision.id,
+                                CueAssociation.line_id == line_id_to_cleanup,
+                            )
+                        ).all()
+                        cue_ids_to_cleanup = [ca.cue_id for ca in cue_assocs]
+                        for cue_assoc in cue_assocs:
+                            session.delete(cue_assoc)
+
                         session.delete(curr_association)
+
+                        # Explicitly cleanup orphaned objects after deletion
+                        # This ensures immediate cleanup in PATCH operations
+                        ScriptLineRevisionAssociation.cleanup_orphaned_line(
+                            session, line_id_to_cleanup
+                        )
+                        for cue_id in cue_ids_to_cleanup:
+                            CueAssociation.cleanup_orphaned_cue(session, cue_id)
                     elif index in status["updated"]:
                         # Validate the line
                         valid_status, valid_reason = self._validate_line(line)