Merge branch 'main' into hack-setup-scripts

Author: sjd78

Dockerfile

@@ -15,7 +15,7 @@ COPY --chown=1001 . .
 RUN npm clean-install --ignore-scripts && npm run build && npm run dist
 
 # Runner image
-FROM registry.access.redhat.com/ubi9/nodejs-18-minimal:1-113.1717076360
+FROM registry.access.redhat.com/ubi9/nodejs-18-minimal:1-117
 
 # Add ps package to allow liveness probe for k8s cluster
 # Add tar package to allow copying files with kubectl scp

client/src/app/hooks/table-controls/column/useColumnState.ts

@@ -1,28 +1,58 @@
 import { useLocalStorage } from "@migtools/lib-ui";
+import { ColumnSetting } from "../types";
+import { useEffect } from "react";
 
 export interface ColumnState<TColumnKey extends string> {
   id: TColumnKey;
   label: string;
   isVisible: boolean;
+  isIdentity?: boolean;
 }
 
 export interface IColumnState<TColumnKey extends string> {
   columns: ColumnState<TColumnKey>[];
+  defaultColumns: ColumnState<TColumnKey>[];
   setColumns: (newColumns: ColumnState<TColumnKey>[]) => void;
 }
 
 interface IColumnStateArgs<TColumnKey extends string> {
-  initialColumns: ColumnState<TColumnKey>[];
+  initialColumns?: Partial<Record<TColumnKey, ColumnSetting>>;
   columnsKey: string;
+  supportedColumns: Record<TColumnKey, string>;
 }
 
-export const useColumnState = <TColumnKey extends string>(
-  args: IColumnStateArgs<TColumnKey>
-): IColumnState<TColumnKey> => {
+export const useColumnState = <TColumnKey extends string>({
+  initialColumns,
+  supportedColumns,
+  columnsKey,
+}: IColumnStateArgs<TColumnKey>): IColumnState<TColumnKey> => {
+  const defaultColumns = (
+    Object.entries(supportedColumns) as [TColumnKey, string][]
+  ).map(([id, label]) => ({
+    id,
+    label,
+    isVisible: initialColumns?.[id]?.isVisible ?? true,
+    isIdentity: initialColumns?.[id]?.isIdentity,
+  }));
   const [columns, setColumns] = useLocalStorage<ColumnState<TColumnKey>[]>({
-    key: args.columnsKey,
-    defaultValue: args.initialColumns,
+    key: columnsKey,
+    defaultValue: defaultColumns,
   });
 
-  return { columns, setColumns };
+  useEffect(() => {
+    const valid = columns.filter(({ id }) =>
+      defaultColumns.find((it) => id === it.id)
+    );
+    if (valid.length !== defaultColumns.length) {
+      setColumns(
+        defaultColumns.map((it) => ({
+          ...it,
+          isVisible:
+            valid.find(({ id }) => id === it.id)?.isVisible ?? it.isVisible,
+        }))
+      );
+    }
+  }, [defaultColumns, columns, setColumns]);
+
+  return { columns, setColumns, defaultColumns };
 };

client/src/app/hooks/table-controls/sorting/useSortState.ts

@@ -73,9 +73,11 @@ export const useSortState = <
 ): ISortState<TSortableColumnKey> => {
   const { isSortEnabled, persistTo = "state", persistenceKeyPrefix } = args;
   const sortableColumns = (isSortEnabled && args.sortableColumns) || [];
-  const initialSort: IActiveSort<TSortableColumnKey> | null = sortableColumns[0]
-    ? { columnKey: sortableColumns[0], direction: "asc" }
-    : null;
+  const initialSort = (isSortEnabled && args.initialSort) || null;
+  const defaultInitialSort: IActiveSort<TSortableColumnKey> | null =
+    sortableColumns[0]
+      ? { columnKey: sortableColumns[0], direction: "asc" }
+      : null;
 
   // We won't need to pass the latter two type params here if TS adds support for partial inference.
   // See https://github.com/konveyor/tackle2-ui/issues/1456
@@ -85,7 +87,7 @@ export const useSortState = <
     "sortColumn" | "sortDirection"
   >({
     isEnabled: !!isSortEnabled,
-    defaultValue: initialSort,
+    defaultValue: initialSort ?? defaultInitialSort,
     persistenceKeyPrefix,
     // Note: For the discriminated union here to work without TypeScript getting confused
     //       (e.g. require the urlParams-specific options when persistTo === "urlParams"),

client/src/app/hooks/table-controls/types.ts

@@ -104,6 +104,14 @@ export type IFeaturePersistenceArgs<
    */
   persistTo?: PersistTarget;
 };
+
+export interface ColumnSetting {
+  // visibility status, can change in time
+  isVisible?: boolean;
+  // column is always visible because it's needed to uniquely identify the row
+  isIdentity?: boolean;
+}
+
 /**
  * Table-level persistence-specific args
  * - Extra args needed for persisting state at the table level.
@@ -151,6 +159,7 @@ export type IUseTableControlStateArgs<
   /**
    * Initial state for the columns feature. If omitted, all columns are enabled by default.
    */
+  initialColumns?: Partial<Record<TColumnKey, ColumnSetting>>;
 } & IFilterStateArgs<TItem, TFilterCategoryKey> &
   ISortStateArgs<TSortableColumnKey> &
   IPaginationStateArgs & {

client/src/app/hooks/table-controls/useTableControlState.ts

@@ -68,17 +68,11 @@ export const useTableControlState = <
     persistTo: getPersistTo("activeItem"),
   });
 
-  const { columnNames, tableName } = args;
-
-  const initialColumns = Object.entries(columnNames).map(([id, label]) => ({
-    id: id as TColumnKey,
-    label: label as string,
-    isVisible: true,
-  }));
-
+  const { columnNames, tableName, initialColumns } = args;
   const columnState = useColumnState<TColumnKey>({
     columnsKey: tableName,
     initialColumns,
+    supportedColumns: columnNames,
   });
   return {
     ...args,

client/src/app/pages/applications/applications-table/applications-table.tsx

@@ -325,6 +325,9 @@ export const ApplicationsTable: React.FC = () => {
     isLoading: isFetchingApplications,
     sortableColumns: ["name", "businessService", "tags", "effort"],
     initialSort: { columnKey: "name", direction: "asc" },
+    initialColumns: {
+      name: { isIdentity: true },
+    },
     initialFilterValues: deserializedFilterValues,
     getSortValues: (app) => ({
       name: app.name,
@@ -804,6 +807,7 @@ export const ApplicationsTable: React.FC = () => {
               <ManageColumnsToolbar
                 columns={columnState.columns}
                 setColumns={columnState.setColumns}
+                defaultColumns={columnState.defaultColumns}
               />
             </ToolbarGroup>
 

client/src/app/pages/applications/applications-table/components/manage-columns-modal.tsx

@@ -25,6 +25,8 @@ export interface ManagedColumnsProps<TColumnKey extends string> {
   saveLabel?: string;
   cancelLabel?: string;
   title?: string;
+  restoreLabel?: string;
+  defaultColumns: ColumnState<TColumnKey>[];
 }
 
 export const ManageColumnsModal = <TColumnKey extends string>({
@@ -35,6 +37,8 @@ export const ManageColumnsModal = <TColumnKey extends string>({
   saveLabel = "Save",
   cancelLabel = "Cancel",
   title = "Manage Columns",
+  restoreLabel = "Restore defaults",
+  defaultColumns,
 }: ManagedColumnsProps<TColumnKey>) => {
   const [editedColumns, setEditedColumns] =
     useState<ColumnState<TColumnKey>[]>(columns);
@@ -47,6 +51,7 @@ export const ManageColumnsModal = <TColumnKey extends string>({
       }))
     );
   };
+  const restoreDefaults = () => setEditedColumns([...defaultColumns]);
 
   const onSave = () => {
     // If ordering is implemented, update accordingly
@@ -72,19 +77,20 @@ export const ManageColumnsModal = <TColumnKey extends string>({
         <Button key="cancel" variant="secondary" onClick={onClose}>
           {cancelLabel}
         </Button>,
+        <Button key="restore" variant="link" onClick={restoreDefaults}>
+          {restoreLabel}
+        </Button>,
       ]}
     >
       <DataList aria-label={title} id="table-column-management" isCompact>
-        {editedColumns.map(({ id, label, isVisible }, index) => (
+        {editedColumns.map(({ id, label, isVisible, isIdentity }, index) => (
           <DataListItem key={index}>
             <DataListItemRow className="custom-data-list-item-row">
               <DataListControl>
                 <DataListCheck
                   aria-labelledby={`check-${id}`}
-                  checked={isVisible}
-                  //TODO: Dynamic disable logic based on idProperty definition in useTableControlState.
-                  // Currently, any column whose name is 'name' will not be allowed to be hidden
-                  isDisabled={id === "name"}
+                  checked={isVisible || isIdentity}
+                  isDisabled={isIdentity}
                   onChange={(e, checked) => onSelect(id, checked)}
                 />
               </DataListControl>

client/src/app/pages/applications/applications-table/components/manage-columns-toolbar.tsx

@@ -13,12 +13,14 @@ import { ColumnsIcon } from "@patternfly/react-icons";
 
 interface ManageColumnsToolbarProps<TColumnKey extends string> {
   columns: ColumnState<TColumnKey>[];
+  defaultColumns: ColumnState<TColumnKey>[];
   setColumns: (newColumns: ColumnState<TColumnKey>[]) => void;
 }
 
 export const ManageColumnsToolbar = <TColumnKey extends string>({
   columns,
   setColumns,
+  defaultColumns,
 }: ManageColumnsToolbarProps<TColumnKey>) => {
   const { t } = useTranslation();
   const [isOpen, setIsOpen] = useState(false);
@@ -46,6 +48,7 @@ export const ManageColumnsToolbar = <TColumnKey extends string>({
           saveLabel={t("actions.save")}
           cancelLabel={t("actions.cancel")}
           title={t("dialog.title.manageColumns")}
+          defaultColumns={defaultColumns}
         />
       )}
     </>