datajunction-ui 0.0.59 → 0.0.61

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

@@ -11,18 +11,28 @@ describe('<GitSettingsModal />', () => {
     jest.clearAllMocks();
     // Mock window.confirm
     global.confirm = jest.fn(() => true);
+    // Mock fetch for parent config fetching
+    global.fetch = jest.fn(() =>
+      Promise.resolve({
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            github_repo_path: 'test/repo',
+            git_path: 'nodes/',
+          }),
+      }),
+    );
   });
 
   afterEach(() => {
     jest.restoreAllMocks();
   });
 
-  it('should render with existing config', () => {
+  it('should render with existing git root config', () => {
     const currentConfig = {
       github_repo_path: 'test/repo',
-      git_branch: 'main',
       git_path: 'nodes/',
-      git_only: false,
+      default_branch: 'main',
     };
 
     render(
@@ -37,16 +47,41 @@ describe('<GitSettingsModal />', () => {
     );
 
     expect(screen.getByDisplayValue('test/repo')).toBeInTheDocument();
-    expect(screen.getByDisplayValue('main')).toBeInTheDocument();
     expect(screen.getByDisplayValue('nodes/')).toBeInTheDocument();
+    // Default branch field should be present in git root mode
+    expect(screen.getByLabelText(/Default Branch/)).toBeInTheDocument();
+    expect(screen.getByDisplayValue('main')).toBeInTheDocument();
+  });
+
+  it('should render with existing branch namespace config', () => {
+    const currentConfig = {
+      parent_namespace: 'test',
+      git_branch: 'main',
+      git_only: false,
+    };
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={currentConfig}
+        namespace="test.feature"
+      />,
+    );
+
+    expect(screen.getByDisplayValue('main')).toBeInTheDocument();
+    expect(screen.getByText('test')).toBeInTheDocument(); // Parent shown as read-only
+    // git_only is false, so checkbox should not be checked
+    const checkbox = screen.getByRole('checkbox');
+    expect(checkbox).not.toBeChecked();
   });
 
   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 });
@@ -85,9 +120,7 @@ describe('<GitSettingsModal />', () => {
 
     const currentConfig = {
       github_repo_path: 'test/repo',
-      git_branch: 'main',
       git_path: 'nodes/',
-      git_only: false,
     };
 
     render(
@@ -111,9 +144,7 @@ describe('<GitSettingsModal />', () => {
   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({
@@ -150,9 +181,7 @@ describe('<GitSettingsModal />', () => {
 
     const currentConfig = {
       github_repo_path: 'test/repo',
-      git_branch: 'main',
       git_path: 'nodes/',
-      git_only: false,
     };
 
     mockOnRemove.mockResolvedValue({ success: true });
@@ -195,9 +224,7 @@ describe('<GitSettingsModal />', () => {
   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'));
@@ -224,9 +251,7 @@ describe('<GitSettingsModal />', () => {
   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
@@ -266,7 +291,7 @@ describe('<GitSettingsModal />', () => {
     });
   });
 
-  it('should call onSave when Save Settings is clicked', async () => {
+  it('should call onSave when Save Settings is clicked in git root mode', async () => {
     mockOnSave.mockResolvedValue({ success: true });
 
     render(
@@ -280,22 +305,188 @@ describe('<GitSettingsModal />', () => {
       />,
     );
 
-    fireEvent.change(screen.getByLabelText('Repository'), {
+    // Default mode is git root
+    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({
+        github_repo_path: 'myorg/repo',
+        git_path: 'nodes/', // Default value
+        default_branch: 'main', // Default value for git roots
+      });
+    });
+  });
+
+  it('should call onSave when Save Settings is clicked in branch mode', async () => {
+    mockOnSave.mockResolvedValue({ success: true });
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="test.feature"
+      />,
+    );
+
+    // Switch to branch mode
+    fireEvent.click(screen.getByText('Branch Namespace'));
+
+    // Fill in branch name
+    fireEvent.change(screen.getByLabelText(/Branch/), {
+      target: { value: 'feature-x' },
     });
 
     fireEvent.click(screen.getByText('Save Settings'));
 
     await waitFor(() => {
-      expect(mockOnSave).toHaveBeenCalledWith(
-        expect.objectContaining({
-          github_repo_path: 'myorg/repo',
+      expect(mockOnSave).toHaveBeenCalledWith({
+        git_branch: 'feature-x',
+        parent_namespace: 'test',
+        git_only: true, // Default for branch mode
+      });
+    });
+  });
+
+  it('should show error when branch name is empty in branch mode', async () => {
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="test.feature"
+      />,
+    );
+
+    // Switch to branch mode
+    fireEvent.click(screen.getByText('Branch Namespace'));
+
+    // Try to save without entering a branch name
+    fireEvent.click(screen.getByText('Save Settings'));
+
+    await waitFor(() => {
+      expect(
+        screen.getByText('Git branch is required for branch mode'),
+      ).toBeInTheDocument();
+    });
+
+    expect(mockOnSave).not.toHaveBeenCalled();
+  });
+
+  it('should show error when namespace has no parent in branch mode', async () => {
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="toplevel"
+      />,
+    );
+
+    // Switch to branch mode (should fail because namespace has no parent)
+    fireEvent.click(screen.getByText('Branch Namespace'));
+
+    // Try to save
+    fireEvent.click(screen.getByText('Save Settings'));
+
+    await waitFor(() => {
+      expect(
+        screen.getByText(
+          /Cannot configure as branch namespace: namespace has no parent/,
+        ),
+      ).toBeInTheDocument();
+    });
+
+    expect(mockOnSave).not.toHaveBeenCalled();
+  });
+
+  it('should show error when repository is empty in git root mode', async () => {
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="test.namespace"
+      />,
+    );
+
+    // Default is git root mode
+    // Clear the repository field if it has any default value
+    const repoInput = screen.getByLabelText(/Repository/);
+    fireEvent.change(repoInput, { target: { value: '' } });
+
+    // Try to save without entering a repository
+    fireEvent.click(screen.getByText('Save Settings'));
+
+    await waitFor(() => {
+      expect(screen.getByText('Repository is required')).toBeInTheDocument();
+    });
+
+    expect(mockOnSave).not.toHaveBeenCalled();
+  });
+
+  it('should handle parent config fetch failure gracefully', async () => {
+    // Mock fetch to fail
+    global.fetch = jest.fn(() => Promise.reject(new Error('Network error')));
+
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={{
+          parent_namespace: 'test',
           git_branch: 'main',
-        }),
-      );
+        }}
+        namespace="test.feature"
+      />,
+    );
+
+    // Wait for the component to attempt fetching parent config
+    await waitFor(() => {
+      // Should still render even if parent config fetch fails
+      expect(screen.getByDisplayValue('main')).toBeInTheDocument();
     });
+
+    // Parent config should not be shown (fetch failed)
+    expect(screen.queryByText('test/repo')).not.toBeInTheDocument();
+  });
+
+  it('should allow switching from branch mode to root mode', async () => {
+    render(
+      <GitSettingsModal
+        isOpen={true}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+        onRemove={mockOnRemove}
+        currentConfig={null}
+        namespace="test.feature"
+      />,
+    );
+
+    // Start in branch mode
+    fireEvent.click(screen.getByText('Branch Namespace'));
+    expect(screen.getByLabelText('Branch *')).toBeInTheDocument();
+
+    // Switch to root mode
+    fireEvent.click(screen.getByText('Git Root'));
+
+    // Should show repository and default branch fields instead of branch field
+    expect(screen.getByLabelText(/Repository/)).toBeInTheDocument();
+    expect(screen.getByLabelText(/Default Branch/)).toBeInTheDocument();
+    expect(screen.queryByLabelText('Branch *')).not.toBeInTheDocument();
   });
 });