From 7fa788c59f10ca11309923ae3c3f26820abcdf81 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Mon, 10 Feb 2025 18:10:36 +0100 Subject: [PATCH 1/2] console.log removal because gary scares us --- src/components/CippComponents/CippApiDialog.jsx | 2 -- src/components/CippTable/CippGraphExplorerFilter.js | 1 - src/pages/endpoint/applications/list/add.jsx | 1 - src/pages/identity/administration/users/user/edit.jsx | 1 - src/pages/tenant/standards/template.jsx | 1 - 5 files changed, 6 deletions(-) diff --git a/src/components/CippComponents/CippApiDialog.jsx b/src/components/CippComponents/CippApiDialog.jsx index 653c69541dca..0a23dc3cb982 100644 --- a/src/components/CippComponents/CippApiDialog.jsx +++ b/src/components/CippComponents/CippApiDialog.jsx @@ -221,7 +221,6 @@ export const CippApiDialog = (props) => { useEffect(() => { if (api?.setDefaultValues && createDialog.open) { fields.map((field) => { - console.log(field.name, row[field.name]); if ( ((typeof row[field.name] === "string" && field.type === "textField") || (typeof row[field.name] === "boolean" && field.type === "switch")) && @@ -308,7 +307,6 @@ export const CippApiDialog = (props) => { } else if (Array.isArray(row) && row.length > 1) { confirmText = api.confirmText.replace(/\[([^\]]+)\]/g, "the selected rows"); } else if (Array.isArray(row) && row.length === 1) { - console.log("single row in array"); confirmText = api.confirmText.replace(/\[([^\]]+)\]/g, (_, key) => { return getNestedValue(row[0], key) || `[${key}]`; }); diff --git a/src/components/CippTable/CippGraphExplorerFilter.js b/src/components/CippTable/CippGraphExplorerFilter.js index c5db1458b11e..11a1d487efc9 100644 --- a/src/components/CippTable/CippGraphExplorerFilter.js +++ b/src/components/CippTable/CippGraphExplorerFilter.js @@ -371,7 +371,6 @@ const CippGraphExplorerFilter = ({ function getPresetProps(values) { var newvals = Object.assign({}, values); - console.log(values); if (newvals?.$select !== undefined && Array.isArray(newvals?.$select)) { newvals.$select = newvals?.$select.map((p) => p.value).join(","); } diff --git a/src/pages/endpoint/applications/list/add.jsx b/src/pages/endpoint/applications/list/add.jsx index 7bceb2e69857..254162f48e4b 100644 --- a/src/pages/endpoint/applications/list/add.jsx +++ b/src/pages/endpoint/applications/list/add.jsx @@ -176,7 +176,6 @@ const ApplicationDeploymentForm = () => { {selectedTenants?.map((tenant, index) => ( - {console.log(tenant)} { defaultAttributes[attribute.label] = { Value: user?.[attribute.label] }; }); } - console.log(defaultAttributes); formControl.reset({ ...user, defaultAttributes: defaultAttributes, diff --git a/src/pages/tenant/standards/template.jsx b/src/pages/tenant/standards/template.jsx index e9319bd742b8..959530865f0e 100644 --- a/src/pages/tenant/standards/template.jsx +++ b/src/pages/tenant/standards/template.jsx @@ -101,7 +101,6 @@ const Page = () => { if (match) { standardName = match[1]; } - console.log("Adding multiple", standardName); setSelectedStandards((prev) => { const existingInstances = Object.keys(prev).filter((name) => name.startsWith(standardName)); From b024c96146828d76cc9daeff17a85fd6b2de914b Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 10 Feb 2025 14:04:39 -0500 Subject: [PATCH 2/2] simpleColumns update handling also remove more console.log to appease gary --- src/components/CippComponents/CippAutocomplete.jsx | 1 - src/components/CippTable/CIPPTableToptoolbar.js | 6 +++++- src/components/CippTable/CippDataTable.js | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/CippComponents/CippAutocomplete.jsx b/src/components/CippComponents/CippAutocomplete.jsx index 6bc938b1bf81..3569bdaf3376 100644 --- a/src/components/CippComponents/CippAutocomplete.jsx +++ b/src/components/CippComponents/CippAutocomplete.jsx @@ -210,7 +210,6 @@ export const CippAutoComplete = (props) => { options.some( (option) => params.inputValue === option.value || params.inputValue === option.label ); - console.log(removeOptions); if (params.inputValue !== "" && creatable && !isExisting) { filtered.push({ label: `Add option: "${params.inputValue}"`, diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js index 17274fd9b775..75df1edacdf1 100644 --- a/src/components/CippTable/CIPPTableToptoolbar.js +++ b/src/components/CippTable/CIPPTableToptoolbar.js @@ -81,6 +81,10 @@ export const CIPPTableToptoolbar = ({ } }, [settings?.columnDefaults?.[pageName], router, usedColumns]); + useEffect(() => { + setOriginalSimpleColumns(simpleColumns); + }, [simpleColumns]); + const presetList = ApiGetCall({ url: "/api/ListGraphExplorerPresets", queryKey: `ListGraphExplorerPresets${api?.data?.Endpoint ?? ""}`, @@ -254,7 +258,7 @@ export const CIPPTableToptoolbar = ({ // update filters to include graph explorer presets setFilterList([...filters, ...graphPresetList]); } - }, [presetList?.isSuccess]); + }, [presetList?.isSuccess, simpleColumns]); return ( <> diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js index bd95a9baa393..a81830221b58 100644 --- a/src/components/CippTable/CippDataTable.js +++ b/src/components/CippTable/CippDataTable.js @@ -291,6 +291,10 @@ export const CippDataTable = (props) => { } }, [table.getSelectedRowModel().rows]); + useEffect(() => { + setConfiguredSimpleColumns(simpleColumns); + }, [simpleColumns]); + return ( <> {noCard ? (