hale-commenting-system 3.3.1 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "3.3.1",
+  "version": "3.4.1",
   "description": "A commenting system for PatternFly React applications that allows designers and developers to add comments directly on design pages, sync with GitHub Issues, and link Jira tickets.",
   "homepage": "https://www.npmjs.com/package/hale-commenting-system",
   "license": "MIT",

package/scripts/integrate.js

@@ -409,15 +409,34 @@ VITE_JIRA_BASE_URL=
 `;
   }
 
-  // Check if .env exists and append or create
+  // Check if .env exists and update or create
   if (fs.existsSync(envPath)) {
-    const existing = fs.readFileSync(envPath, 'utf-8');
-    // Only add if not already present
-    if (!existing.includes('VITE_GITHUB_CLIENT_ID')) {
-      fs.appendFileSync(envPath, '\n' + envContent);
+    let existing = fs.readFileSync(envPath, 'utf-8');
+
+    if (existing.includes('VITE_GITHUB_CLIENT_ID')) {
+      // Update existing values
+      const lines = existing.split('\n');
+      const updatedLines = lines.map(line => {
+        if (line.startsWith('VITE_GITHUB_CLIENT_ID=')) {
+          return `VITE_GITHUB_CLIENT_ID=${config.github?.clientId || ''}`;
+        }
+        if (line.startsWith('VITE_GITHUB_OWNER=')) {
+          return `VITE_GITHUB_OWNER=${config.owner || ''}`;
+        }
+        if (line.startsWith('VITE_GITHUB_REPO=')) {
+          return `VITE_GITHUB_REPO=${config.repo || ''}`;
+        }
+        if (line.startsWith('VITE_JIRA_BASE_URL=')) {
+          return `VITE_JIRA_BASE_URL=${config.jira?.baseUrl || ''}`;
+        }
+        return line;
+      });
+      fs.writeFileSync(envPath, updatedLines.join('\n'));
       console.log('   ✅ Updated .env file');
     } else {
-      console.log('   ⚠️  .env already contains commenting system config');
+      // Append if commenting system config not present
+      fs.appendFileSync(envPath, '\n' + envContent);
+      console.log('   ✅ Updated .env file');
     }
   } else {
     fs.writeFileSync(envPath, envContent);
@@ -481,12 +500,29 @@ JIRA_API_TOKEN=
   }
 
   if (fs.existsSync(envServerPath)) {
-    const existing = fs.readFileSync(envServerPath, 'utf-8');
-    if (!existing.includes('GITHUB_CLIENT_SECRET')) {
-      fs.appendFileSync(envServerPath, '\n' + envServerContent);
+    let existing = fs.readFileSync(envServerPath, 'utf-8');
+
+    if (existing.includes('GITHUB_CLIENT_SECRET')) {
+      // Update existing values
+      const lines = existing.split('\n');
+      const updatedLines = lines.map(line => {
+        if (line.startsWith('GITHUB_CLIENT_SECRET=')) {
+          return `GITHUB_CLIENT_SECRET=${config.github?.clientSecret || ''}`;
+        }
+        if (line.startsWith('JIRA_API_TOKEN=')) {
+          return `JIRA_API_TOKEN=${config.jira?.apiToken || ''}`;
+        }
+        if (line.startsWith('JIRA_EMAIL=')) {
+          return `JIRA_EMAIL=${config.jira?.email || ''}`;
+        }
+        return line;
+      });
+      fs.writeFileSync(envServerPath, updatedLines.join('\n'));
       console.log('   ✅ Updated .env.server file');
     } else {
-      console.log('   ⚠️  .env.server already contains commenting system config');
+      // Append if commenting system config not present
+      fs.appendFileSync(envServerPath, '\n' + envServerContent);
+      console.log('   ✅ Updated .env.server file');
     }
   } else {
     fs.writeFileSync(envServerPath, envServerContent);

package/src/app/commenting-system/components/CommentOverlay.tsx

@@ -72,10 +72,13 @@ export const CommentOverlay: React.FunctionComponent = () => {
         position: 'absolute',
         top: 0,
         left: 0,
+        right: 0,
+        bottom: 0,
         width: '100%',
         height: '100%',
         pointerEvents: 'none',
         zIndex: 999,
+        overflow: 'visible', // Ensure pins can be visible even if slightly outside
       }}
     >
       {currentThreads.map((thread) => (

package/src/app/commenting-system/contexts/CommentContext.tsx

@@ -463,14 +463,18 @@ export const CommentProvider: React.FunctionComponent<{ children: React.ReactNod
             };
           });
 
+          // Track which issue numbers were returned from GitHub
+          const githubIssueNumbers = new Set(ghThreads.map(gt => gt.issueNumber).filter((n): n is number => !!n));
+
           // Keep local threads on this route/version that:
           // 1. Don't have an issueNumber yet, OR
-          // 2. Are actively syncing (prevents race condition where issue was created but GitHub API hasn't returned it yet)
+          // 2. Are actively syncing (prevents race condition where issue was created but GitHub API hasn't returned it yet), OR
+          // 3. Have an issueNumber but GitHub didn't return it (preserve existing threads even if GitHub API fails or issue is hidden)
           const localUnlinked = prev.filter(
             (t) =>
               t.route === route &&
               (t.version ?? '1') === (version ?? '1') &&
-              (!t.issueNumber || t.syncStatus === 'syncing'),
+              (!t.issueNumber || t.syncStatus === 'syncing' || !githubIssueNumbers.has(t.issueNumber)),
           );
 
           // Remove duplicates: if a thread is both in localUnlinked and merged, prefer the merged version