refactor: Update columnType check in FilterField component

feat: Introduce special characters as separators in removeColumnTypePrefix function
determined-ai · Oct 31, 2024 · 9529b4b · 9529b4b
1 parent b7187bc
commit 9529b4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/webui/react/src/components/FilterForm/components/FilterField.tsx b/webui/react/src/components/FilterForm/components/FilterField.tsx
@@ -72,8 +72,8 @@ const FilterField = ({
   const users = Loadable.getOrElse([], useObservable(userStore.getUsers()));
   const resourcePools = Loadable.getOrElse([], useObservable(clusterStore.resourcePools));
   const currentColumn = useMemo(
-    () => columns.find((c) => c.column === field.columnName),
-    [columns, field.columnName],
+    () => columns.find((c) => c.type === field.type && c.column === field.columnName),
+    [columns, field.columnName, field.type],
   );
 
   const columnType = useMemo(() => {

diff --git a/webui/react/src/utils/flatRun.ts b/webui/react/src/utils/flatRun.ts
@@ -122,7 +122,8 @@ export const removeColumnTypePrefix = (columnName: V1ColumnType): string => {
   return columnName.replace('COLUMN_TYPE_', '');
 };
 
-/// wanna know why this separator is used? see https://hpe-aiatscale.atlassian.net/browse/ET-785
+/// we want to use special characters as "separators" to prevent user input to match with such when creating the arbitrary metadata
+export const COLUMN_SEPARATOR = '␟';
 export const METADATA_SEPARATOR = '\u241F' as const; // TODO: unify after merging PR 10052
 
 export const formatColumnKey = (col: ProjectColumn, required = false): string => {