apply coderabbit's review comments && cleanup

Signed-off-by: Atif Ali <atali@redhat.com>

Author: aali309

src/gitops/components/shared/ApplicationList.tsx

@@ -41,6 +41,10 @@ import {
   ShowOperandsInAllNamespacesRadioGroup,
   useShowOperandsInAllNamespaces,
 } from './AllNamespaces';
+import {
+  APPLICATION_LIST_COLUMN_MANAGEMENT_ID,
+  getApplicationManagedColumns,
+} from './applicationListColumns';
 import {
   APPLICATION_HEALTH_FILTER_PARAM,
   APPLICATION_SYNC_FILTER_PARAM,
@@ -49,10 +53,6 @@ import {
   parseRowFilterParam,
 } from './applicationListFilters';
 import ApplicationSetApplicationsView from './ApplicationSetApplicationsView';
-import {
-  APPLICATION_LIST_COLUMN_MANAGEMENT_ID,
-  getApplicationManagedColumns,
-} from './applicationListColumns';
 import {
   type GitOpsManagedColumn,
   NAMESPACE_COLUMN_ID,
@@ -126,10 +126,7 @@ const ApplicationList: React.FC<ApplicationProps> = ({
 
   const { t } = useTranslation('plugin__gitops-plugin');
   const includeNamespaceColumn = !namespace;
-  const managedColumns = React.useMemo(
-    () => getApplicationManagedColumns(includeNamespaceColumn, t),
-    [includeNamespaceColumn, t],
-  );
+  const managedColumns = React.useMemo(() => getApplicationManagedColumns(true, t), [t]);
 
   const { activeColumnIds, columnManagement, filterDataView } = useGitOpsColumnManagement({
     columnManagementID: APPLICATION_LIST_COLUMN_MANAGEMENT_ID,

src/gitops/components/shared/ColumnManagement/GitOpsColumnManagementModal.tsx

@@ -63,9 +63,6 @@ const ColumnRow: React.FC<{
   );
 };
 
-/**
- * Manage columns modal with Default / Additional sections (console list-page layout).
- */
 export const GitOpsColumnManagementModal: React.FC<GitOpsColumnManagementModalProps> = ({
   isOpen,
   onClose,

src/gitops/components/shared/ColumnManagement/columnManagementUtils.test.ts

@@ -169,24 +169,39 @@ describe('getSavableColumnIds', () => {
   });
 
   it('keeps previously saved ids that the current modal does not manage', () => {
-    const projectScopedColumns = baseColumns.filter(
-      (column) => column.id !== NAMESPACE_COLUMN_ID,
-    );
     const modalColumns = toColumnManagementModalColumns(
-      projectScopedColumns,
+      baseColumns,
       new Set(['name', 'status', 'actions']),
       false,
     );
 
     expect(
-      getSavableColumnIds(projectScopedColumns, modalColumns, [
-        'name',
-        'namespace',
-        'labels',
-        'extra',
-      ]),
+      getSavableColumnIds(baseColumns, modalColumns, ['name', 'namespace', 'labels', 'extra']),
     ).toEqual(['namespace', 'name', 'status']);
   });
+
+  it('preserves Namespace after a first save in a project-scoped view', () => {
+    const defaultIds = getDefaultActiveColumnIds(baseColumns);
+    expect(defaultIds).toContain('namespace');
+
+    const projectModalColumns = toColumnManagementModalColumns(
+      baseColumns,
+      new Set(['name', 'status', 'labels', 'actions']),
+      false,
+    );
+    expect(projectModalColumns.map((column) => column.id)).not.toContain('namespace');
+
+    const savedAfterProjectEdit = getSavableColumnIds(baseColumns, projectModalColumns, defaultIds);
+    expect(savedAfterProjectEdit).toContain('namespace');
+
+    expect(
+      resolveActiveColumnIds({
+        columns: baseColumns,
+        savedColumnIds: savedAfterProjectEdit,
+        includeNamespaceColumn: true,
+      }),
+    ).toContain('namespace');
+  });
 });
 
 describe('filterDataViewColumnsAndRows', () => {

src/gitops/components/shared/ColumnManagement/columnManagementUtils.ts

@@ -83,9 +83,7 @@ export const getSavableColumnIds = (
     modalColumns.filter((column) => column.isShown).map((column) => column.id),
   );
 
-  // Keep prefs for columns this modal did not offer (e.g. namespace while project-scoped).
-  const preserved =
-    previouslySavedIds?.filter((id) => !managedByModal.has(id)) ?? [];
+  const preserved = previouslySavedIds?.filter((id) => !managedByModal.has(id)) ?? [];
 
   const fromModal = getManageableColumns(columns)
     .map((column) => column.id)

src/gitops/components/shared/ColumnManagement/index.ts

@@ -15,14 +15,12 @@ export type {
   GitOpsColumnManagementModalColumn,
   GitOpsManagedColumn,
   ResolveActiveColumnIdsOptions,
+  UseGitOpsColumnManagementOptions,
 } from './types';
 export {
   getGitOpsColumnManagementSettingKey,
   GITOPS_COLUMN_MANAGEMENT_SETTING_PREFIX,
   NAMESPACE_COLUMN_ID,
 } from './types';
-export type {
-  UseGitOpsColumnManagementOptions,
-  UseGitOpsColumnManagementResult,
-} from './useGitOpsColumnManagement';
+export type { UseGitOpsColumnManagementResult } from './useGitOpsColumnManagement';
 export { useGitOpsColumnManagement } from './useGitOpsColumnManagement';

src/gitops/components/shared/ColumnManagement/types.ts

@@ -31,3 +31,12 @@ export type ResolveActiveColumnIdsOptions = {
   /** When false, omit the namespace column (project-scoped views). */
   includeNamespaceColumn?: boolean;
 };
+
+export type UseGitOpsColumnManagementOptions = {
+  columnManagementID: string;
+  /** Full catalog for prefs; use includeNamespaceColumn to hide Namespace in project views. */
+  columns: GitOpsManagedColumn[];
+  resourceType: string;
+  includeNamespaceColumn?: boolean;
+  showNamespaceHelp?: boolean;
+};

src/gitops/components/shared/ColumnManagement/useGitOpsColumnManagement.tsx

@@ -13,16 +13,11 @@ import { GitOpsColumnManagementControl } from './GitOpsColumnManagementControl';
 import {
   type GitOpsColumnManagementModalColumn,
   type GitOpsManagedColumn,
+  type UseGitOpsColumnManagementOptions,
   getGitOpsColumnManagementSettingKey,
 } from './types';
 
-export type UseGitOpsColumnManagementOptions = {
-  columnManagementID: string;
-  columns: GitOpsManagedColumn[];
-  resourceType: string;
-  includeNamespaceColumn?: boolean;
-  showNamespaceHelp?: boolean;
-};
+export type { UseGitOpsColumnManagementOptions };
 
 export type UseGitOpsColumnManagementResult = {
   loaded: boolean;

src/gitops/components/shared/GitOpsListPageToolbar.tsx

@@ -8,7 +8,6 @@ export type GitOpsListPageToolbarProps = {
   actions?: React.ReactNode;
 };
 
-/** Filters + manage-columns control on one row; optional trailing actions. */
 export const GitOpsListPageToolbar: React.FC<GitOpsListPageToolbarProps> = ({
   filters,
   columnManagement,

src/gitops/components/shared/applicationListColumns.test.ts

@@ -1,9 +1,8 @@
-import { getDefaultActiveColumnIds } from './ColumnManagement';
-
 import {
   APPLICATION_LIST_COLUMN_MANAGEMENT_ID,
   getApplicationManagedColumns,
 } from './applicationListColumns';
+import { getDefaultActiveColumnIds } from './ColumnManagement';
 
 const t = (key: string) => key;
 

src/gitops/components/shared/applicationListColumns.ts

@@ -1,9 +1,7 @@
-import type { GitOpsManagedColumn } from './ColumnManagement';
-import { NAMESPACE_COLUMN_ID } from './ColumnManagement';
+import { type GitOpsManagedColumn, NAMESPACE_COLUMN_ID } from './ColumnManagement/types';
 
 export const APPLICATION_LIST_COLUMN_MANAGEMENT_ID = 'gitops.applications';
 
-/** Column management metadata for the Applications list (and shared AppSet/Project app tables). */
 export const getApplicationManagedColumns = (
   includeNamespaceColumn: boolean,
   t: (key: string) => string,