datajunction-ui 0.0.56 → 0.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datajunction-ui",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "description": "DataJunction UI",
   "module": "src/index.tsx",
   "repository": {

package/src/app/components/NamespaceHeader.jsx

@@ -21,6 +21,7 @@ export default function NamespaceHeader({
 
   // Git config state
   const [gitConfig, setGitConfig] = useState(null);
+  const [gitConfigLoading, setGitConfigLoading] = useState(true);
   const [parentGitConfig, setParentGitConfig] = useState(null);
   const [existingPR, setExistingPR] = useState(null);
 
@@ -32,6 +33,9 @@ export default function NamespaceHeader({
   const [showDeleteBranch, setShowDeleteBranch] = useState(false);
 
   useEffect(() => {
+    // Reset loading state when namespace changes
+    setGitConfigLoading(true);
+
     const fetchData = async () => {
       if (namespace) {
         // Fetch deployment sources
@@ -84,6 +88,8 @@ export default function NamespaceHeader({
           if (onGitConfigLoaded) {
             onGitConfigLoaded(null);
           }
+        } finally {
+          setGitConfigLoading(false);
         }
       }
     };
@@ -114,6 +120,12 @@ export default function NamespaceHeader({
     }
     return result;
   };
+  const handleRemoveGitConfig = async () => {
+    const result = await djClient.deleteNamespaceGitConfig(namespace);
+    if (!result?._error) {
+      setGitConfig(null);
+    }
+  };
 
   const handleCreateBranch = async branchName => {
     return await djClient.createBranch(namespace, branchName);
@@ -368,7 +380,7 @@ export default function NamespaceHeader({
                     <circle cx="6" cy="18" r="3"></circle>
                     <path d="M18 9a9 9 0 0 1-9 9"></path>
                   </svg>
-                  Git Managed
+                  Deployed from Git
                 </>
               ) : (
                 <>
@@ -642,55 +654,33 @@ export default function NamespaceHeader({
       {/* Right side: git actions + children */}
       <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
         {/* Git controls for non-branch namespaces */}
-        {namespace && !isBranchNamespace && (
+        {namespace && !isBranchNamespace && !gitConfigLoading && (
           <>
+            <button
+              style={buttonStyle}
+              onClick={() => setShowGitSettings(true)}
+              title="Git Settings"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="14"
+                height="14"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                strokeWidth="2"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              >
+                <circle cx="12" cy="12" r="3" />
+                <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" />
+              </svg>
+              Git Settings
+            </button>
             {hasGitConfig ? (
-              <>
-                <button
-                  style={buttonStyle}
-                  onClick={() => setShowGitSettings(true)}
-                  title="Git Settings"
-                >
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    width="14"
-                    height="14"
-                    viewBox="0 0 24 24"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="2"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  >
-                    <circle cx="12" cy="12" r="3" />
-                    <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" />
-                  </svg>
-                </button>
-                <button
-                  style={primaryButtonStyle}
-                  onClick={() => setShowCreateBranch(true)}
-                >
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    width="14"
-                    height="14"
-                    viewBox="0 0 24 24"
-                    fill="none"
-                    stroke="currentColor"
-                    strokeWidth="2"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                  >
-                    <line x1="12" y1="5" x2="12" y2="19" />
-                    <line x1="5" y1="12" x2="19" y2="12" />
-                  </svg>
-                  New Branch
-                </button>
-              </>
-            ) : (
               <button
-                style={buttonStyle}
-                onClick={() => setShowGitSettings(true)}
+                style={primaryButtonStyle}
+                onClick={() => setShowCreateBranch(true)}
               >
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
@@ -703,13 +693,13 @@ export default function NamespaceHeader({
                   strokeLinecap="round"
                   strokeLinejoin="round"
                 >
-                  <line x1="6" y1="3" x2="6" y2="15" />
-                  <circle cx="18" cy="6" r="3" />
-                  <circle cx="6" cy="18" r="3" />
-                  <path d="M18 9a9 9 0 0 1-9 9" />
+                  <line x1="12" y1="5" x2="12" y2="19" />
+                  <line x1="5" y1="12" x2="19" y2="12" />
                 </svg>
-                Configure Git
+                New Branch
               </button>
+            ) : (
+              <></>
             )}
           </>
         )}
@@ -824,6 +814,7 @@ export default function NamespaceHeader({
         isOpen={showGitSettings}
         onClose={() => setShowGitSettings(false)}
         onSave={handleSaveGitConfig}
+        onRemove={handleRemoveGitConfig}
         currentConfig={gitConfig}
         namespace={namespace}
       />

package/src/app/components/__tests__/NamespaceHeader.test.jsx

@@ -42,8 +42,8 @@ describe('<NamespaceHeader />', () => {
       );
     });
 
-    // Should render Git Managed badge for git source
-    expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+    // Should render Deployed from Git badge for git source
+    expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
   });
 
   it('should render git source badge when source type is git without branch', async () => {
@@ -73,8 +73,8 @@ describe('<NamespaceHeader />', () => {
       );
     });
 
-    // Should render Git Managed badge for git source even without branch
-    expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+    // Should render Deployed from Git badge for git source even without branch
+    expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
   });
 
   it('should render local source badge when source type is local', async () => {
@@ -131,7 +131,7 @@ describe('<NamespaceHeader />', () => {
     });
 
     // Should not render any source badge
-    expect(screen.queryByText(/Git Managed/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Deployed from Git/)).not.toBeInTheDocument();
     expect(screen.queryByText(/Local Deploy/)).not.toBeInTheDocument();
   });
 
@@ -158,7 +158,7 @@ describe('<NamespaceHeader />', () => {
     // Should still render breadcrumb without badge
     expect(screen.getByText('test')).toBeInTheDocument();
     expect(screen.getByText('namespace')).toBeInTheDocument();
-    expect(screen.queryByText(/Git Managed/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Deployed from Git/)).not.toBeInTheDocument();
   });
 
   it('should open dropdown when clicking the git managed button', async () => {
@@ -195,11 +195,11 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+      expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
     });
 
     // Click the dropdown button
-    fireEvent.click(screen.getByText(/Git Managed/));
+    fireEvent.click(screen.getByText(/Deployed from Git/));
 
     // Should show repository link in dropdown
     await waitFor(() => {
@@ -297,10 +297,10 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+      expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
     });
 
-    fireEvent.click(screen.getByText(/Git Managed/));
+    fireEvent.click(screen.getByText(/Deployed from Git/));
 
     // Should show branch names in deployment list
     await waitFor(() => {
@@ -375,11 +375,11 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+      expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
     });
 
     // Open dropdown
-    fireEvent.click(screen.getByText(/Git Managed/));
+    fireEvent.click(screen.getByText(/Deployed from Git/));
 
     await waitFor(() => {
       expect(screen.getByText(/github.com\/test\/repo/)).toBeInTheDocument();
@@ -418,14 +418,14 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+      expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
     });
 
     // Initially shows down arrow
     expect(screen.getByText('▼')).toBeInTheDocument();
 
     // Click to open
-    fireEvent.click(screen.getByText(/Git Managed/));
+    fireEvent.click(screen.getByText(/Deployed from Git/));
 
     // Should show up arrow when open
     await waitFor(() => {
@@ -455,10 +455,10 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText(/Git Managed/)).toBeInTheDocument();
+      expect(screen.getByText(/Deployed from Git/)).toBeInTheDocument();
     });
 
-    fireEvent.click(screen.getByText(/Git Managed/));
+    fireEvent.click(screen.getByText(/Deployed from Git/));
 
     await waitFor(() => {
       // Find link by its text content (repository URL)
@@ -509,7 +509,7 @@ describe('<NamespaceHeader />', () => {
     });
   });
 
-  it('should show Configure Git button and open modal', async () => {
+  it('should show Git Settings button and open modal', async () => {
     const mockDjClient = {
       namespaceSources: jest.fn().mockResolvedValue({
         total_deployments: 0,
@@ -528,10 +528,10 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText('Configure Git')).toBeInTheDocument();
+      expect(screen.getByText('Git Settings')).toBeInTheDocument();
     });
 
-    fireEvent.click(screen.getByText('Configure Git'));
+    fireEvent.click(screen.getByText('Git Settings'));
 
     await waitFor(() => {
       expect(screen.getByText('Git Configuration')).toBeInTheDocument();
@@ -725,10 +725,10 @@ describe('<NamespaceHeader />', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText('Configure Git')).toBeInTheDocument();
+      expect(screen.getByText('Git Settings')).toBeInTheDocument();
     });
 
-    fireEvent.click(screen.getByText('Configure Git'));
+    fireEvent.click(screen.getByText('Git Settings'));
 
     await waitFor(() => {
       expect(screen.getByLabelText('Repository')).toBeInTheDocument();
@@ -1272,4 +1272,129 @@ describe('<NamespaceHeader />', () => {
       expect(onGitConfigLoaded).toHaveBeenCalledWith(null);
     });
   });
+
+  it('should call deleteNamespaceGitConfig when removing git settings', async () => {
+    // Mock window.confirm for this test
+    global.confirm = jest.fn(() => true);
+
+    const mockDjClient = {
+      namespaceSources: jest.fn().mockResolvedValue({
+        total_deployments: 0,
+        primary_source: null,
+      }),
+      listDeployments: jest.fn().mockResolvedValue([]),
+      getNamespaceGitConfig: jest.fn().mockResolvedValue({
+        github_repo_path: 'test/repo',
+        git_branch: 'main',
+        git_path: 'nodes/',
+        git_only: false,
+      }),
+      deleteNamespaceGitConfig: jest.fn().mockResolvedValue({ success: true }),
+    };
+
+    render(
+      <MemoryRouter>
+        <DJClientContext.Provider value={{ DataJunctionAPI: mockDjClient }}>
+          <NamespaceHeader namespace="test.namespace" />
+        </DJClientContext.Provider>
+      </MemoryRouter>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('Git Settings')).toBeInTheDocument();
+    });
+
+    fireEvent.click(screen.getByText('Git Settings'));
+
+    await waitFor(() => {
+      expect(screen.getByText('Git Configuration')).toBeInTheDocument();
+    });
+
+    // Click reset button in the modal (button text is "Reset")
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(mockDjClient.deleteNamespaceGitConfig).toHaveBeenCalledWith(
+        'test.namespace',
+      );
+    });
+
+    // Clean up mock
+    jest.restoreAllMocks();
+  });
+
+  it('should handle sync error in handleCreatePR', async () => {
+    const mockDjClient = {
+      namespaceSources: jest.fn().mockResolvedValue({
+        total_deployments: 1,
+        primary_source: {
+          type: 'git',
+          repository: 'test/repo',
+          branch: 'feature',
+        },
+      }),
+      listDeployments: jest.fn().mockResolvedValue([]),
+      getNamespaceGitConfig: jest
+        .fn()
+        .mockResolvedValueOnce({
+          github_repo_path: 'test/repo',
+          git_branch: 'feature',
+          git_path: 'nodes/',
+          git_only: false,
+          parent_namespace: 'test.main',
+        })
+        .mockResolvedValueOnce({
+          github_repo_path: 'test/repo',
+          git_branch: 'main',
+          git_path: 'nodes/',
+        }),
+      getPullRequest: jest.fn().mockResolvedValue(null),
+      syncNamespaceToGit: jest.fn().mockResolvedValue({
+        _error: true,
+        message: 'Sync failed: merge conflict',
+      }),
+    };
+
+    render(
+      <MemoryRouter>
+        <DJClientContext.Provider value={{ DataJunctionAPI: mockDjClient }}>
+          <NamespaceHeader namespace="test.feature" />
+        </DJClientContext.Provider>
+      </MemoryRouter>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('Create PR')).toBeInTheDocument();
+    });
+
+    fireEvent.click(screen.getByText('Create PR'));
+
+    await waitFor(() => {
+      expect(screen.getByLabelText(/Title/)).toBeInTheDocument();
+    });
+
+    fireEvent.change(screen.getByLabelText(/Title/), {
+      target: { value: 'My PR Title' },
+    });
+
+    const createPRButtons = screen.getAllByRole('button', {
+      name: 'Create PR',
+    });
+    fireEvent.click(createPRButtons[createPRButtons.length - 1]);
+
+    await waitFor(() => {
+      expect(mockDjClient.syncNamespaceToGit).toHaveBeenCalledWith(
+        'test.feature',
+        'My PR Title',
+      );
+    });
+
+    // Should show error message from sync failure
+    await waitFor(() => {
+      expect(
+        screen.getByText(/Sync failed: merge conflict/),
+      ).toBeInTheDocument();
+    });
+  });
 });

package/src/app/components/__tests__/__snapshots__/NamespaceHeader.test.jsx.snap

@@ -156,67 +156,13 @@ exports[`<NamespaceHeader /> should render and match the snapshot 1`] = `
         "gap": "8px",
       }
     }
-  >
-    <React.Fragment>
-      <button
-        onClick={[Function]}
-        style={
-          Object {
-            "alignItems": "center",
-            "backgroundColor": "#ffffff",
-            "border": "1px solid #e2e8f0",
-            "borderRadius": "4px",
-            "color": "#475569",
-            "cursor": "pointer",
-            "display": "flex",
-            "fontSize": "12px",
-            "gap": "4px",
-            "height": "28px",
-            "padding": "0 10px",
-            "whiteSpace": "nowrap",
-          }
-        }
-      >
-        <svg
-          fill="none"
-          height="14"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="2"
-          viewBox="0 0 24 24"
-          width="14"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="6"
-            x2="6"
-            y1="3"
-            y2="15"
-          />
-          <circle
-            cx="18"
-            cy="6"
-            r="3"
-          />
-          <circle
-            cx="6"
-            cy="18"
-            r="3"
-          />
-          <path
-            d="M18 9a9 9 0 0 1-9 9"
-          />
-        </svg>
-        Configure Git
-      </button>
-    </React.Fragment>
-  </div>
+  />
   <GitSettingsModal
     currentConfig={null}
     isOpen={false}
     namespace="shared.dimensions.accounts"
     onClose={[Function]}
+    onRemove={[Function]}
     onSave={[Function]}
   />
   <CreateBranchModal

package/src/app/components/git/GitSettingsModal.jsx

@@ -7,6 +7,7 @@ export function GitSettingsModal({
   isOpen,
   onClose,
   onSave,
+  onRemove,
   currentConfig,
   namespace,
 }) {
@@ -15,8 +16,10 @@ export function GitSettingsModal({
   const [path, setPath] = useState('');
   const [gitOnly, setGitOnly] = useState(true);
   const [saving, setSaving] = useState(false);
+  const [removing, setRemoving] = useState(false);
   const [error, setError] = useState(null);
   const [success, setSuccess] = useState(false);
+  const [wasRemoved, setWasRemoved] = useState(false);
 
   useEffect(() => {
     if (currentConfig) {
@@ -32,14 +35,17 @@ export function GitSettingsModal({
       setPath('nodes/');
       setGitOnly(true);
     }
-    setSuccess(false);
+    // Don't reset success here - it gets reset when modal closes
+    // Otherwise the success banner disappears when currentConfig updates after save
     setError(null);
+    setWasRemoved(false);
   }, [currentConfig]);
 
   const handleSubmit = async e => {
     e.preventDefault();
     setError(null);
     setSuccess(false);
+    setWasRemoved(false);
     setSaving(true);
 
     try {
@@ -65,9 +71,50 @@ export function GitSettingsModal({
     }
   };
 
+  const handleRemove = async () => {
+    if (
+      !window.confirm(
+        'Remove git configuration? This will disconnect this namespace from git but will not delete any files.',
+      )
+    ) {
+      return;
+    }
+
+    setError(null);
+    setSuccess(false);
+    setWasRemoved(false);
+    setRemoving(true);
+
+    try {
+      const config = {
+        github_repo_path: null,
+        git_branch: null,
+        git_path: null,
+        git_only: false,
+      };
+
+      const result = await onRemove(config);
+      if (result?._error) {
+        setError(result.message);
+      } else {
+        setSuccess(true);
+        setWasRemoved(true);
+        // Close modal after successful removal
+        setTimeout(() => {
+          onClose();
+        }, 1500);
+      }
+    } catch (err) {
+      setError(err.message || 'Failed to remove git settings');
+    } finally {
+      setRemoving(false);
+    }
+  };
+
   const handleClose = () => {
     setError(null);
     setSuccess(false);
+    setWasRemoved(false);
     onClose();
   };
 
@@ -250,38 +297,74 @@ export function GitSettingsModal({
                   <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14" />
                   <polyline points="22 4 12 14.01 9 11.01" />
                 </svg>
-                Git configuration saved successfully!
+                {wasRemoved
+                  ? 'Git configuration removed successfully!'
+                  : 'Git configuration saved successfully!'}
               </div>
             )}
           </div>
 
-          <div className="modal-actions">
-            <button
-              type="button"
-              className="btn-secondary"
-              onClick={handleClose}
-              disabled={saving}
-            >
-              {success ? 'Close' : 'Cancel'}
-            </button>
-            {!success && (
+          <div
+            className="modal-actions"
+            style={{
+              display: 'flex',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+            }}
+          >
+            {/* Left side: Remove button (only show if git is configured) */}
+            <div>
+              {currentConfig?.github_repo_path && !success && (
+                <button
+                  type="button"
+                  onClick={handleRemove}
+                  disabled={saving || removing}
+                  style={{
+                    padding: '8px 16px',
+                    fontSize: '13px',
+                    fontWeight: 500,
+                    border: '1px solid #fca5a5',
+                    borderRadius: '6px',
+                    backgroundColor: removing ? '#fee2e2' : '#ffffff',
+                    color: removing ? '#991b1b' : '#dc2626',
+                    cursor: saving || removing ? 'not-allowed' : 'pointer',
+                    opacity: saving || removing ? 0.6 : 1,
+                  }}
+                >
+                  {removing ? 'Removing...' : 'Reset'}
+                </button>
+              )}
+            </div>
+
+            {/* Right side: Save/Cancel buttons */}
+            <div style={{ display: 'flex', gap: '8px' }}>
               <button
-                type="submit"
-                className="btn-primary"
-                disabled={saving}
-                style={
-                  saving
-                    ? {
-                        opacity: 0.7,
-                        cursor: 'wait',
-                        backgroundColor: '#9ca3af',
-                      }
-                    : {}
-                }
+                type="button"
+                className="btn-secondary"
+                onClick={handleClose}
+                disabled={saving || removing}
               >
-                {saving ? 'Saving...' : 'Save Settings'}
+                {success ? 'Close' : 'Cancel'}
               </button>
-            )}
+              {!success && (
+                <button
+                  type="submit"
+                  className="btn-primary"
+                  disabled={saving || removing}
+                  style={
+                    saving
+                      ? {
+                          opacity: 0.7,
+                          cursor: 'wait',
+                          backgroundColor: '#9ca3af',
+                        }
+                      : {}
+                  }
+                >
+                  {saving ? 'Saving...' : 'Save Settings'}
+                </button>
+              )}
+            </div>
           </div>
         </form>
       </div>

package/src/app/components/git/__tests__/GitSettingsModal.test.jsx

@@ -0,0 +1,301 @@
+import * as React from 'react';
+import { render, screen, waitFor, fireEvent } from '@testing-library/react';
+import GitSettingsModal from '../GitSettingsModal';
+
+describe('<GitSettingsModal />', () => {
+  const mockOnClose = jest.fn();
+  const mockOnSave = jest.fn();
+  const mockOnRemove = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Mock window.confirm
+    global.confirm = jest.fn(() => true);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('should render with existing config', () => {
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    expect(screen.getByDisplayValue('test/repo')).toBeInTheDocument();
+    expect(screen.getByDisplayValue('main')).toBeInTheDocument();
+    expect(screen.getByDisplayValue('nodes/')).toBeInTheDocument();
+  });
+
+  it('should call onRemove when Reset button is clicked and confirmed', async () => {
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    mockOnRemove.mockResolvedValue({ success: true });
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    // Verify confirmation dialog was shown
+    expect(global.confirm).toHaveBeenCalledWith(
+      expect.stringContaining('Remove git configuration?'),
+    );
+
+    await waitFor(() => {
+      expect(mockOnRemove).toHaveBeenCalledWith({
+        github_repo_path: null,
+        git_branch: null,
+        git_path: null,
+        git_only: false,
+      });
+    });
+  });
+
+  it('should not call onRemove when user cancels confirmation', async () => {
+    global.confirm = jest.fn(() => false);
+
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    expect(global.confirm).toHaveBeenCalled();
+    expect(mockOnRemove).not.toHaveBeenCalled();
+  });
+
+  it('should show error message when remove fails', async () => {
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    mockOnRemove.mockResolvedValue({
+      _error: true,
+      message: 'Failed to remove git configuration',
+    });
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText(/Failed to remove git configuration/),
+      ).toBeInTheDocument();
+    });
+
+    // Modal should stay open on error
+    expect(mockOnClose).not.toHaveBeenCalled();
+  });
+
+  it('should show success message and close modal after successful removal', async () => {
+    jest.useFakeTimers();
+
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    mockOnRemove.mockResolvedValue({ success: true });
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(mockOnRemove).toHaveBeenCalled();
+    });
+
+    // Success message should appear
+    await waitFor(() => {
+      expect(
+        screen.getByText(/Git configuration removed successfully/),
+      ).toBeInTheDocument();
+    });
+
+    // Fast-forward time to trigger modal close
+    jest.advanceTimersByTime(1500);
+
+    await waitFor(() => {
+      expect(mockOnClose).toHaveBeenCalled();
+    });
+
+    jest.useRealTimers();
+  });
+
+  it('should handle exception during remove', async () => {
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    mockOnRemove.mockRejectedValue(new Error('Network error'));
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(screen.getByText(/Network error/)).toBeInTheDocument();
+    });
+  });
+
+  it('should show removing state while operation is in progress', async () => {
+    const currentConfig = {
+      github_repo_path: 'test/repo',
+      git_branch: 'main',
+      git_path: 'nodes/',
+      git_only: false,
+    };
+
+    // Create a promise that we can control
+    let resolveRemove;
+    const removePromise = new Promise(resolve => {
+      resolveRemove = resolve;
+    });
+    mockOnRemove.mockReturnValue(removePromise);
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.namespace"
+      />,
+    );
+
+    const removeButton = screen.getByText('Reset');
+    fireEvent.click(removeButton);
+
+    // Button text should change to "Removing..." and be disabled
+    await waitFor(() => {
+      expect(screen.getByText('Removing...')).toBeInTheDocument();
+      expect(screen.getByText('Removing...')).toBeDisabled();
+    });
+
+    // Resolve the promise
+    resolveRemove({ success: true });
+
+    // Button should disappear after success (replaced by success message)
+    await waitFor(() => {
+      expect(screen.queryByText('Reset')).not.toBeInTheDocument();
+      expect(screen.queryByText('Removing...')).not.toBeInTheDocument();
+    });
+  });
+
+  it('should call onSave when Save Settings is clicked', async () => {
+    mockOnSave.mockResolvedValue({ success: true });
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="test.namespace"
+      />,
+    );
+
+    fireEvent.change(screen.getByLabelText('Repository'), {
+      target: { value: 'myorg/repo' },
+    });
+    fireEvent.change(screen.getByLabelText('Branch'), {
+      target: { value: 'main' },
+    });
+
+    fireEvent.click(screen.getByText('Save Settings'));
+
+    await waitFor(() => {
+      expect(mockOnSave).toHaveBeenCalledWith(
+        expect.objectContaining({
+          github_repo_path: 'myorg/repo',
+          git_branch: 'main',
+        }),
+      );
+    });
+  });
+});

package/src/app/services/DJService.js

@@ -2275,6 +2275,26 @@ export const DataJunctionAPI = {
     return result;
   },
 
+  // Delete git configuration for a namespace
+  deleteNamespaceGitConfig: async function (namespace) {
+    const response = await fetch(`${DJ_URL}/namespaces/${namespace}/git`, {
+      method: 'DELETE',
+      credentials: 'include',
+    });
+    // DELETE returns 204 No Content on success, so no JSON body
+    if (!response.ok) {
+      const result = await response.json().catch(() => ({}));
+      return {
+        ...result,
+        _error: true,
+        _status: response.status,
+        message: result.message || 'Failed to delete git config',
+      };
+    }
+    // Success - return empty object since 204 has no body
+    return {};
+  },
+
   // List branch namespaces for a parent namespace
   listBranches: async function (namespace) {
     const response = await fetch(`${DJ_URL}/namespaces/${namespace}/branches`, {