Merge pull request #85 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Feb 10, 2025 · 6d2b2ba · 6d2b2ba
2 parents 5b37bd3 + b024c96
commit 6d2b2ba
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git 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/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
@@ -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
@@ -291,6 +291,10 @@ export const CippDataTable = (props) => {
     }
   }, [table.getSelectedRowModel().rows]);
 
+  useEffect(() => {
+    setConfiguredSimpleColumns(simpleColumns);
+  }, [simpleColumns]);
+
   return (
     <>
       {noCard ? (

diff --git 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
@@ -176,7 +176,6 @@ const ApplicationDeploymentForm = () => {
             </Grid>
             {selectedTenants?.map((tenant, index) => (
               <Grid item xs={12} md={6} key={tenant.addedFields.customerId || index}>
-                {console.log(tenant)}
                 <CippFormComponent
                   type="textField"
                   label={`Datto ID for ${tenant.label}`}

diff --git a/src/pages/identity/administration/users/user/edit.jsx b/src/pages/identity/administration/users/user/edit.jsx
@@ -43,7 +43,6 @@ const Page = () => {
           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
@@ -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));