From 89e44d4fab3bbd6e358a0a8f3f22be77a6309914 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Thu, 11 Jun 2026 20:32:39 +0100
Subject: [PATCH] fix(newsfeed): load saved content when reopening the edit
 modal

Sync modal editor state from the updated feed on open, clear editFeed
on reset, and remount TextEditor so a second edit shows the latest HTML
instead of stale content.
---
 .../components/newsfeed/card/card.svelte      |  7 +-
 .../components/newsfeed/new-feed-modal.svelte | 36 ++++++---
 .../components/newsfeed/new-feed-modal.svelte | 26 ++++---
 lefthook.yml                                  |  2 +-
 package.json                                  |  3 +-
 scripts/format-changed.mjs                    | 73 +++++++++++++++++++
 6 files changed, 116 insertions(+), 31 deletions(-)
 create mode 100644 scripts/format-changed.mjs

diff --git a/apps/dashboard/src/lib/features/course/components/newsfeed/card/card.svelte b/apps/dashboard/src/lib/features/course/components/newsfeed/card/card.svelte
index ce6e99ee..e56799cb 100644
--- a/apps/dashboard/src/lib/features/course/components/newsfeed/card/card.svelte
+++ b/apps/dashboard/src/lib/features/course/components/newsfeed/card/card.svelte
@@ -51,12 +51,9 @@
   let isDeleteFeedModal = $state(false);
 
   const openEditFeed = () => {
-    newsfeedApi.openNewFeedModal();
+    editFeed = feed;
     edit = true;
-
-    if (edit === true) {
-      editFeed = feed;
-    }
+    newsfeedApi.openNewFeedModal();
   };
 
   const handleReact = (reactionType: string) => addNewReaction(reactionType, feed.id, author.id);
diff --git a/apps/dashboard/src/lib/features/course/components/newsfeed/new-feed-modal.svelte b/apps/dashboard/src/lib/features/course/components/newsfeed/new-feed-modal.svelte
index 194b22bd..583269eb 100644
--- a/apps/dashboard/src/lib/features/course/components/newsfeed/new-feed-modal.svelte
+++ b/apps/dashboard/src/lib/features/course/components/newsfeed/new-feed-modal.svelte
@@ -21,7 +21,18 @@
     newPost: ''
   });
 
-  let newPost = $state(edit === true ? editFeed?.content : '');
+  let newPost = $state('');
+
+  $effect(() => {
+    if (!newsfeedApi.isNewFeedModalOpen) {
+      newPost = '';
+      return;
+    }
+
+    if (edit && editFeed) {
+      newPost = editFeed.content || '';
+    }
+  });
 
   const onPost = async () => {
     isLoading = true;
@@ -31,9 +42,7 @@
         await newsfeedApi.update(courseId, editFeed.id, { content: newPost ?? '' });
 
         if (newsfeedApi.success) {
-          edit = false;
-          newPost = '';
-          newsfeedApi.closeNewFeedModal();
+          resetEditor();
         }
       } else {
         await newsfeedApi.create(courseId, {
@@ -59,6 +68,7 @@
   const resetEditor = () => {
     newPost = '';
     edit = false;
+    editFeed = null;
     newsfeedApi.closeNewFeedModal();
   };
 </script>
@@ -81,14 +91,16 @@
       </Dialog.Title>
     </Dialog.Header>
     <section class="max-w-lg">
-      <TextEditor
-        content={newPost || editFeed?.content || ''}
-        onChange={(text) => {
-          newPost = text;
-        }}
-        editorClass="max-h-[400px]"
-        placeholder={$t('course.navItem.news_feed.heading_button.placeholder')}
-      />
+      {#key edit ? editFeed?.id : 'new'}
+        <TextEditor
+          content={newPost}
+          onChange={(text) => {
+            newPost = text;
+          }}
+          editorClass="max-h-[400px]"
+          placeholder={$t('course.navItem.news_feed.heading_button.placeholder')}
+        />
+      {/key}
       {#if errors.newPost}
         <p class="text-sm text-red-500">{errors.newPost}</p>
       {/if}
diff --git a/apps/dashboard/src/lib/features/program/components/newsfeed/new-feed-modal.svelte b/apps/dashboard/src/lib/features/program/components/newsfeed/new-feed-modal.svelte
index 660d7f4d..3be647ad 100644
--- a/apps/dashboard/src/lib/features/program/components/newsfeed/new-feed-modal.svelte
+++ b/apps/dashboard/src/lib/features/program/components/newsfeed/new-feed-modal.svelte
@@ -20,13 +20,13 @@
   let newPost = $state('');
 
   $effect(() => {
-    if (edit && editFeed) {
-      newPost = editFeed.content || '';
+    if (!programNewsfeedApi.isNewFeedModalOpen) {
+      newPost = '';
       return;
     }
 
-    if (!programNewsfeedApi.isNewFeedModalOpen) {
-      newPost = '';
+    if (edit && editFeed) {
+      newPost = editFeed.content || '';
     }
   });
 
@@ -84,14 +84,16 @@
       </Dialog.Title>
     </Dialog.Header>
     <section class="max-w-lg">
-      <TextEditor
-        content={newPost || editFeed?.content || ''}
-        onChange={(text) => {
-          newPost = text;
-        }}
-        editorClass="max-h-[400px]"
-        placeholder={$t('programs.newsfeed.editor_placeholder')}
-      />
+      {#key edit ? editFeed?.id : 'new'}
+        <TextEditor
+          content={newPost}
+          onChange={(text) => {
+            newPost = text;
+          }}
+          editorClass="max-h-[400px]"
+          placeholder={$t('programs.newsfeed.editor_placeholder')}
+        />
+      {/key}
     </section>
     <Dialog.Footer>
       <Button variant="outline" onclick={resetEditor}>
diff --git a/lefthook.yml b/lefthook.yml
index 337b9730..e207bc08 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -8,4 +8,4 @@ pre-commit:
       run: pnpm format:check
       fail_text: |
         ❌ Prettier formatting check failed!
-        Please run 'pnpm format' to fix formatting issues and try again.
+        Please run 'pnpm format:changed' or 'pnpm format' to fix formatting issues and try again.
diff --git a/package.json b/package.json
index abc88aff..05a585b8 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "clean": "turbo clean && find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
     "clean:pnpm": "pnpm clean && pnpm store prune",
     "format": "turbo run format",
-    "format:check": "git diff --name-only -z --diff-filter=d HEAD~1 | xargs -0 -I{} sh -c '[ ! -L \"{}\" ] && printf \"%s\\0\" \"{}\"' | xargs -0 prettier --check --ignore-unknown",
+    "format:changed": "node scripts/format-changed.mjs --write",
+    "format:check": "node scripts/format-changed.mjs --staged --check",
     "postinstall": "test -d .git && lefthook install || true",
     "release": "standard-version",
     "db:reset": "pnpm --filter @cio/db db:reset",
diff --git a/scripts/format-changed.mjs b/scripts/format-changed.mjs
new file mode 100644
index 00000000..964e3393
--- /dev/null
+++ b/scripts/format-changed.mjs
@@ -0,0 +1,73 @@
+import { lstatSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+
+const prettierMode = process.argv.includes('--check') ? '--check' : '--write';
+const stagedOnly = process.argv.includes('--staged');
+
+function runGitCommand(args) {
+  const result = spawnSync('git', args, {
+    cwd: process.cwd(),
+    encoding: 'utf8'
+  });
+
+  if (result.status !== 0) {
+    const errorOutput = result.stderr || result.stdout || `git ${args.join(' ')} failed`;
+    throw new Error(errorOutput.trim());
+  }
+
+  return result.stdout;
+}
+
+function getChangedFiles() {
+  const commands = stagedOnly
+    ? [['diff', '--name-only', '-z', '--cached', '--diff-filter=ACMR']]
+    : [
+        ['diff', '--name-only', '-z', '--diff-filter=d'],
+        ['diff', '--name-only', '-z', '--cached', '--diff-filter=d'],
+        ['ls-files', '--others', '--exclude-standard', '-z']
+      ];
+
+  const filePaths = new Set();
+
+  for (const args of commands) {
+    const output = runGitCommand(args);
+    const paths = output.split('\0').filter(Boolean);
+
+    for (const filePath of paths) {
+      filePaths.add(filePath);
+    }
+  }
+
+  return [...filePaths].filter((filePath) => {
+    try {
+      return !lstatSync(filePath).isSymbolicLink();
+    } catch {
+      return false;
+    }
+  });
+}
+
+function runPrettier(filePaths) {
+  const chunkSize = 200;
+
+  for (let index = 0; index < filePaths.length; index += chunkSize) {
+    const chunk = filePaths.slice(index, index + chunkSize);
+    const result = spawnSync('prettier', [prettierMode, '--ignore-unknown', ...chunk], {
+      cwd: process.cwd(),
+      stdio: 'inherit'
+    });
+
+    if (result.status !== 0) {
+      process.exit(result.status ?? 1);
+    }
+  }
+}
+
+const changedFiles = getChangedFiles();
+
+if (changedFiles.length === 0) {
+  console.log('No changed files to format.');
+  process.exit(0);
+}
+
+runPrettier(changedFiles);