Modify git commit modal (#9607)

Author: yaoweiprc

packages/insomnia/src/common/get-workspace-label.ts

@@ -1,6 +1,49 @@
-import { isDesign, isEnvironment, isMcp, isMockServer, type Workspace } from '../models/workspace';
+import type { IconProp } from '@fortawesome/fontawesome-svg-core';
+
+import { isDesign, isEnvironment, isMcp, isMockServer, type Workspace, type WorkspaceScope } from '../models/workspace';
 import { strings } from './strings';
 
+export type ProjectScopeKeys = WorkspaceScope | 'unsynced';
+
+export const scopeToLabelMap: Record<
+  ProjectScopeKeys,
+  'Document' | 'Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client'
+> = {
+  'design': 'Document',
+  'collection': 'Collection',
+  'mock-server': 'Mock Server',
+  'unsynced': 'Unsynced',
+  'environment': 'Environment',
+  'mcp': 'MCP Client',
+};
+
+export const scopeToIconMap: Record<ProjectScopeKeys, IconProp> = {
+  'design': 'file',
+  'collection': 'bars',
+  'mock-server': 'server',
+  'unsynced': 'cloud-download',
+  'environment': 'code',
+  'mcp': ['fac', 'mcp'] as unknown as IconProp,
+};
+
+export const scopeToBgColorMap: Record<ProjectScopeKeys, string> = {
+  'design': 'bg-(--color-info)',
+  'collection': 'bg-(--color-surprise)',
+  'mock-server': 'bg-(--color-warning)',
+  'unsynced': 'bg-(--hl-md)',
+  'environment': 'bg-(--color-font)',
+  'mcp': 'bg-(--color-danger)',
+};
+
+export const scopeToTextColorMap: Record<ProjectScopeKeys, string> = {
+  'design': 'text-(--color-font-info)',
+  'collection': 'text-(--color-font-surprise)',
+  'mock-server': 'text-(--color-font-warning)',
+  'unsynced': 'text-(--color-font)',
+  'environment': 'text-(--color-bg)',
+  'mcp': 'text-(--color-font-danger)',
+};
+
 export const getWorkspaceLabel = (workspace: Workspace) => {
   if (isDesign(workspace)) {
     return strings.document;

packages/insomnia/src/common/significant-diff-detection.ts

@@ -1,5 +1,6 @@
 import path from 'node:path';
 
+import { diffLines } from 'diff';
 import { parse } from 'yaml';
 
 import { normalizeScripts } from '~/common/insomnia-schema-migrations/v5.1';
@@ -181,3 +182,85 @@ export function hasSignificantChanges(
     return originalContent !== modifiedContent;
   }
 }
+
+/**
+ * Find lines that represent "system changes" - lines that were modified (not added/deleted)
+ * and contain the "modified" property.
+ *
+ * A "modification" is detected by finding adjacent removed and added chunks in the diff.
+ * For each such pair, we check if any line contains "modified" and mark those lines.
+ */
+export function findSystemChangeLines(
+  original: string,
+  modified: string,
+): {
+  originalLines: number[];
+  modifiedLines: number[];
+} {
+  const originalLines: number[] = [];
+  const modifiedLines: number[] = [];
+
+  try {
+    const changes = diffLines(original, modified);
+
+    let originalLineNumber = 1;
+    let modifiedLineNumber = 1;
+
+    for (let i = 0; i < changes.length; i++) {
+      const change = changes[i];
+      const lines = change.value.split('\n');
+      // diffLines includes trailing newline, so remove empty last element
+      if (lines[lines.length - 1] === '') {
+        lines.pop();
+      }
+      const lineCount = lines.length;
+
+      if (!change.added && !change.removed) {
+        // Unchanged lines - advance both line counters
+        originalLineNumber += lineCount;
+        modifiedLineNumber += lineCount;
+      } else if (change.removed && !change.added) {
+        // Check if next change is an addition (which would make this a modification)
+        const nextChange = changes[i + 1];
+        if (nextChange && nextChange.added && !nextChange.removed) {
+          // This is a modification: removed lines followed by added lines
+          const addedLines = nextChange.value.split('\n');
+          if (addedLines[addedLines.length - 1] === '') {
+            addedLines.pop();
+          }
+
+          // Check each line pair for "modified" property
+          // For modifications, we consider lines that contain "modified:" in either version
+          lines.forEach((originalLine, j) => {
+            if (originalLine && /\bmodified\b/.test(originalLine)) {
+              originalLines.push(originalLineNumber + j);
+            }
+          });
+
+          addedLines.forEach((modifiedLine, j) => {
+            if (modifiedLine && /\bmodified\b/.test(modifiedLine)) {
+              modifiedLines.push(modifiedLineNumber + j);
+            }
+          });
+
+          // Advance original line counter for removed lines
+          originalLineNumber += lineCount;
+          // Advance modified line counter for added lines
+          modifiedLineNumber += addedLines.length;
+          // Skip the next change since we've processed it
+          i++;
+        } else {
+          // Pure deletion - just advance original line counter
+          originalLineNumber += lineCount;
+        }
+      } else if (change.added && !change.removed) {
+        // Pure addition - just advance modified line counter
+        modifiedLineNumber += lineCount;
+      }
+    }
+  } catch (error) {
+    console.error('Error finding system change lines:', error);
+  }
+
+  return { originalLines, modifiedLines };
+}

packages/insomnia/src/main/git-service.ts

@@ -2144,16 +2144,22 @@ export const unstageChangesAction = async ({
   }
 };
 
-function getPreviewItemName(previewDiffItem: { before: string; after: string }) {
+function getPreviewItemNameAndScope(previewDiffItem: { before: string; after: string }) {
   let prevName = '';
   let nextName = '';
 
+  let prevScope: WorkspaceScope = 'collection';
+  let nextScope: WorkspaceScope = 'collection';
+
   try {
     const prev = parse(previewDiffItem.before);
 
     if ((prev && 'fileName' in prev) || 'name' in prev) {
       prevName = prev.fileName || prev.name;
     }
+    if ('type' in prev) {
+      prevScope = insomniaSchemaTypeToScope(prev.type);
+    }
   } catch {
     // Nothing to do
   }
@@ -2163,11 +2169,17 @@ function getPreviewItemName(previewDiffItem: { before: string; after: string })
     if ((next && 'fileName' in next) || 'name' in next) {
       nextName = next.fileName || next.name;
     }
+    if ('type' in next) {
+      nextScope = insomniaSchemaTypeToScope(next.type);
+    }
   } catch {
     // Nothing to do
   }
 
-  return nextName || prevName;
+  return {
+    name: nextName || prevName,
+    scope: nextScope || prevScope,
+  };
 }
 
 export type GitDiffResult =
@@ -2177,6 +2189,9 @@ export type GitDiffResult =
         before: string;
         after: string;
       };
+      filepath: string;
+      scope: WorkspaceScope;
+      staged: boolean;
     }
   | {
       errors: string[];
@@ -2207,9 +2222,14 @@ export const diffFileLoader = async ({
           after: fileStatus.workdir,
         };
 
+    const { name, scope } = getPreviewItemNameAndScope(diff);
+
     return {
-      name: getPreviewItemName(diff) || filepath,
+      name: name || filepath,
       diff,
+      filepath,
+      scope,
+      staged,
     };
   } catch (e) {
     const errorMessage = e instanceof Error ? e.message : 'Error while unstaging changes';

packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx

@@ -32,6 +32,7 @@ import {
   getAppWebsiteBaseURL,
 } from '~/common/constants';
 import { database } from '~/common/database';
+import { scopeToBgColorMap, scopeToIconMap, scopeToLabelMap, scopeToTextColorMap } from '~/common/get-workspace-label';
 import { fuzzyMatchAll, isNotNullOrUndefined } from '~/common/misc';
 import { descendingNumberSort, sortMethodMap } from '~/common/sorting';
 import * as models from '~/models';
@@ -85,46 +86,6 @@ import { trackTempProjectOpened } from '~/ui/temp-segment-tracking';
 import { isPrimaryClickModifier } from '~/ui/utils';
 import { invariant } from '~/utils/invariant';
 
-export type ProjectScopeKeys = WorkspaceScope | 'unsynced';
-export const scopeToLabelMap: Record<
-  ProjectScopeKeys,
-  'Document' | 'Collection' | 'Mock Server' | 'Unsynced' | 'Environment' | 'MCP Client'
-> = {
-  'design': 'Document',
-  'collection': 'Collection',
-  'mock-server': 'Mock Server',
-  'unsynced': 'Unsynced',
-  'environment': 'Environment',
-  'mcp': 'MCP Client',
-};
-
-export const scopeToIconMap: Record<ProjectScopeKeys, IconProp> = {
-  'design': 'file',
-  'collection': 'bars',
-  'mock-server': 'server',
-  'unsynced': 'cloud-download',
-  'environment': 'code',
-  'mcp': ['fac', 'mcp'] as unknown as IconProp,
-};
-
-export const scopeToBgColorMap: Record<ProjectScopeKeys, string> = {
-  'design': 'bg-(--color-info)',
-  'collection': 'bg-(--color-surprise)',
-  'mock-server': 'bg-(--color-warning)',
-  'unsynced': 'bg-(--hl-md)',
-  'environment': 'bg-(--color-font)',
-  'mcp': 'bg-(--color-danger)',
-};
-
-export const scopeToTextColorMap: Record<ProjectScopeKeys, string> = {
-  'design': 'text-(--color-font-info)',
-  'collection': 'text-(--color-font-surprise)',
-  'mock-server': 'text-(--color-font-warning)',
-  'unsynced': 'text-(--color-font)',
-  'environment': 'text-(--color-bg)',
-  'mcp': 'text-(--color-font-danger)',
-};
-
 export interface InsomniaFile {
   id: string;
   name: string;

packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx

@@ -2,6 +2,7 @@ import { href } from 'react-router';
 
 import { parseApiSpec, type ParsedApiSpec } from '~/common/api-specs';
 import { database } from '~/common/database';
+import { scopeToLabelMap } from '~/common/get-workspace-label';
 import { isNotNullOrUndefined } from '~/common/misc';
 import { descendingNumberSort } from '~/common/sorting';
 import * as models from '~/models';
@@ -16,7 +17,7 @@ import { invariant } from '~/utils/invariant';
 import { createFetcherLoadHook } from '~/utils/router';
 
 import type { Route } from './+types/organization.$organizationId.project.$projectId.list-workspaces';
-import { type InsomniaFile, scopeToLabelMap } from './organization.$organizationId.project.$projectId._index';
+import { type InsomniaFile } from './organization.$organizationId.project.$projectId._index';
 
 async function getAllLocalFiles({ projectId }: { projectId: string }) {
   const projectWorkspaces = await models.workspace.findByParentId(projectId);