Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

JohnDuprey · Jul 5, 2024 · 8336548 · 8336548
2 parents 340d09b + 1723b26
commit 8336548
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 51 deletions.
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
@@ -4,14 +4,10 @@ on:
   push:
     branches:
       - dev
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - dev
 
 jobs:
   build_and_deploy_job:
-    if: github.event.repository.fork == false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    if: github.event.repository.fork == false && github.event_name == 'push'
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,6 +5,7 @@
     "eg2.vscode-npm-script",
     "christian-kohler.npm-intellisense",
     "esbenp.prettier-vscode",
-    "stylelint.vscode-stylelint"
+    "stylelint.vscode-stylelint",
+    "editorconfig.editorconfig"
   ]
 }
diff --git a/src/views/cipp/ExtensionMappings.jsx b/src/views/cipp/ExtensionMappings.jsx
@@ -40,20 +40,6 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
       setMappingValue({})
     })
   }
-  /*const onNinjaOrgsSubmit = () => {
-    const originalFormat = ninjaMappingsArray.reduce((acc, item) => {
-      acc[item.Tenant?.customerId] = { label: item.ninjaName, value: item.ninjaId }
-      return acc
-    }, {})
-
-    setNinjaOrgsExtensionconfig({
-      path: 'api/ExecExtensionMapping?AddMapping=NinjaOrgs',
-      values: { mappings: originalFormat },
-    }).then(() => {
-      listNinjaOrgsBackend({ path: 'api/ExecExtensionMapping?List=NinjaOrgs' })
-      setMappingValue({})
-    })
-  }*/
 
   const onOrgsAutomap = async (values) => {
     if (autoMapSyncApi) {
@@ -66,16 +52,17 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
       })
     }
 
-    const newMappings = listMappingBackendResult.data?.Tenants.map((tenant) => {
+    var newMappings = []
+    listMappingBackendResult.data?.Tenants.map((tenant) => {
       const company = listMappingBackendResult.data?.Companies.find(
         (client) => client.name === tenant.displayName,
       )
-      if (company) {
-        return {
+      if (company !== undefined && !mappingArray.find((item) => item.companyId === company.value)) {
+        newMappings.push({
           Tenant: tenant,
           companyName: company.name,
           companyId: company.value,
-        }
+        })
       }
     })
     setMappingArray((currentMappings) => [...currentMappings, ...newMappings])
@@ -89,32 +76,6 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
     })
   }
 
-  /*const onHaloAutomap = () => {
-    const newMappings = listBackendHaloResult.data?.Tenants.map(
-      (tenant) => {
-        const haloClient = listBackendHaloResult.data?.HaloClients.find(
-          (client) => client.name === tenant.displayName,
-        )
-        if (haloClient) {
-          console.log(haloClient)
-          console.log(tenant)
-          return {
-            Tenant: tenant,
-            haloName: haloClient.name,
-            haloId: haloClient.value,
-          }
-        }
-      },
-      //filter out any undefined values
-    ).filter((item) => item !== undefined)
-    setHaloMappingsArray((currentHaloMappings) => [...currentHaloMappings, ...newMappings]).then(
-      () => {
-        listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })
-      },
-    )
-    setHaloAutoMap(true)
-  }*/
-
   useEffect(() => {
     if (listMappingBackendResult.isSuccess) {
       setMappingArray(
@@ -127,7 +88,7 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
         })),
       )
     }
-  }, [listMappingBackendResult])
+  }, [listMappingBackendResult, setMappingArray])
 
   const Actions = (row, rowIndex, formatExtraData) => {
     return (
@@ -232,6 +193,9 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
                             columns={columns}
                             data={mappingArray}
                             isModal={true}
+                            refreshFunction={() =>
+                              listMappingBackend({ path: `api/ExecExtensionMapping?List=${type}` })
+                            }
                           />
                         )
                       }