convert to string

jenny-s51 · Aug 15, 2024 · dd604c5 · dd604c5
1 parent eb295d2
commit dd604c5
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 3 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -55,6 +55,7 @@
     "@monaco-editor/react": "^4.6.0",
     "@openshift/dynamic-plugin-sdk": "^4.0.0",
     "@openshift/dynamic-plugin-sdk-utils": "^4.0.1",
+<<<<<<< Updated upstream
     "@patternfly/patternfly": "5.4.0-prerelease.8",
     "@patternfly/quickstarts": "5.4.0-prerelease.4",
     "@patternfly/react-catalog-view-extension": "5.0.0",
@@ -70,6 +71,22 @@
     "@patternfly/react-topology": "5.4.0-prerelease.10",
     "@patternfly/react-virtualized-extension": "5.1.0",
     "@segment/analytics-next": "^1.72.0",
+=======
+    "@patternfly/patternfly": "^5.4.0-prerelease.8",
+    "@patternfly/quickstarts": "^5.4.0-prerelease.4",
+    "@patternfly/react-catalog-view-extension": "^5.0.0",
+    "@patternfly/react-charts": "^7.4.0-prerelease.17",
+    "@patternfly/react-code-editor": "^5.4.0-prerelease.33",
+    "@patternfly/react-core": "^5.4.0-prerelease.31",
+    "@patternfly/react-drag-drop": "^5.4.0-prerelease.32",
+    "@patternfly/react-icons": "^5.4.0-prerelease.10",
+    "@patternfly/react-log-viewer": "^5.2.0-prerelease.2",
+    "@patternfly/react-styles": "^5.4.0-prerelease.11",
+    "@patternfly/react-table": "^5.4.0-prerelease.34",
+    "@patternfly/react-tokens": "^5.4.0-prerelease.10",
+    "@patternfly/react-topology": "^5.4.0-prerelease.10",
+    "@patternfly/react-virtualized-extension": "^5.1.0",
+>>>>>>> Stashed changes
     "@types/classnames": "^2.3.1",
     "axios": "^1.6.4",
     "classnames": "^2.2.6",
@@ -200,11 +217,27 @@
     "@patternfly/react-topology": {
       "react": "^18.2.0"
     },
+<<<<<<< Updated upstream
     "@patternfly/quickstarts": "5.4.0-prerelease.4",
     "@patternfly/react-core": "5.4.0-prerelease.33",
     "@patternfly/react-table": "5.4.0-prerelease.34",
     "@patternfly/react-icons": "5.4.0-prerelease.10",
     "@patternfly/react-styles": "5.4.0-prerelease.11",
     "ws": "^8.17.1"
+=======
+    "ws": "^8.17.1",
+    "@patternfly/patternfly": "^5.4.0-prerelease.8",
+    "@patternfly/quickstarts": "^5.4.0-prerelease.4",
+    "@patternfly/react-catalog-view-extension": "^5.0.0",
+    "@patternfly/react-charts": "^7.4.0-prerelease.17",
+    "@patternfly/react-code-editor": "^5.4.0-prerelease.33",
+    "@patternfly/react-core": "^5.4.0-prerelease.31",
+    "@patternfly/react-drag-drop": "^5.4.0-prerelease.32",
+    "@patternfly/react-icons": "^5.4.0-prerelease.10",
+    "@patternfly/react-log-viewer": "^5.2.0-prerelease.2",
+    "@patternfly/react-styles": "^5.4.0-prerelease.11",
+    "@patternfly/react-table": "^5.4.0-prerelease.34",
+    "@patternfly/react-tokens": "^5.4.0-prerelease.10"
+>>>>>>> Stashed changes
   }
 }
diff --git a/frontend/src/concepts/pipelines/content/tables/pipelineRun/CustomMetricsColumnsModal.tsx b/frontend/src/concepts/pipelines/content/tables/pipelineRun/CustomMetricsColumnsModal.tsx
@@ -32,7 +32,7 @@ export const CustomMetricsColumnsModal: React.FC<CustomMetricsColumnsModalProps>
   const metricsColumnsLocalStorageKey = getMetricsColumnsLocalStorageKey(experimentId ?? '');
   const selectedColumnNames = Object.values(columns).reduce((acc: string[], column) => {
     if (column.props.checked) {
-      acc.push(column.id as string);
+      acc.push(String(column.id));
     }
     return acc;
   }, []);
@@ -66,7 +66,7 @@ export const CustomMetricsColumnsModal: React.FC<CustomMetricsColumnsModalProps>
 
                 if (searchText) {
                   newColumns = defaultColumns.filter((column) =>
-                    (column.id as string).toLowerCase().includes(searchText.toLowerCase()),
+                    String(column.id).toLowerCase().includes(searchText.toLowerCase()),
                   );
                 }
 
@@ -110,7 +110,7 @@ export const CustomMetricsColumnsModal: React.FC<CustomMetricsColumnsModalProps>
 
             const columnCheckbox = (
               <Checkbox
-                id={id as string}
+                id={String(id)}
                 isChecked={checked}
                 isDisabled={isDisabled}
                 onChange={(_, isChecked) =>