Merge branch 'KelvinTegelaar:main' into main

public/version_latest.txt

@@ -1 +1 @@
-4.3.0
+4.3.1

src/components/tables/CippDatatable.js

@@ -13,30 +13,23 @@ export default function CippDatatable({ path, params, ...rest }) {
     isFetching,
     error,
   } = useListDatatableQuery({ path, params: { refreshGuid, $filter: graphFilter, ...params } })
+
+  var defaultFilterText = ''
+  if (params?.Parameters?.$filter) {
+    defaultFilterText = 'Graph: ' + params?.Parameters?.$filter
+  }
   return (
     <>
-      {data[0]?.Queued ? (
-        <>
-          <CCallout color="info">{data[0]?.QueueMessage}</CCallout>
-          <CippTable
-            {...rest}
-            data={[]}
-            isFetching={isFetching}
-            error={error}
-            refreshFunction={setRefreshGuid}
-            graphFilterFunction={setGraphFilter}
-          />
-        </>
-      ) : (
-        <CippTable
-          {...rest}
-          data={data}
-          isFetching={isFetching}
-          error={error}
-          refreshFunction={setRefreshGuid}
-          graphFilterFunction={setGraphFilter}
-        />
-      )}
+      {data[0]?.Queued && <CCallout color="info">{data[0]?.QueueMessage}</CCallout>}
+      <CippTable
+        {...rest}
+        data={data[0]?.Queued ? [] : data}
+        isFetching={isFetching}
+        error={error}
+        defaultFilterText={defaultFilterText}
+        refreshFunction={setRefreshGuid}
+        graphFilterFunction={setGraphFilter}
+      />
     </>
   )
 }

src/components/tables/CippTable.js

@@ -111,6 +111,8 @@ export default function CippTable({
   graphFilterFunction = null,
   columns = [],
   dynamicColumns = true,
+  defaultFilterText = '',
+  isModal = false,
   filterlist,
   tableProps: {
     keyField = 'id',
@@ -137,7 +139,7 @@ export default function CippTable({
   const inputRef = useRef('')
   const [loopRunning, setLoopRunning] = React.useState(false)
   const [massResults, setMassResults] = React.useState([])
-  const [filterText, setFilterText] = React.useState('')
+  const [filterText, setFilterText] = React.useState(defaultFilterText)
   const [filterviaURL, setFilterviaURL] = React.useState(false)
   const [updatedColumns, setUpdatedColumns] = React.useState(columns)
   const [selectedRows, setSelectedRows] = React.useState(false)
@@ -147,7 +149,7 @@ export default function CippTable({
   const [modalContent, setModalContent] = useState(null)
   //get the search params called "tableFilter" and set the filter to that.
   const [searchParams, setSearchParams] = useSearchParams()
-  if (searchParams.get('tableFilter') && !filterviaURL) {
+  if (searchParams.get('tableFilter') && !filterviaURL && !isModal) {
     setFilterText(searchParams.get('tableFilter'))
     setFilterviaURL(true)
   }
@@ -219,8 +221,10 @@ export default function CippTable({
   }, [filterText])
 
   const filterData = (data, filterText) => {
-    const debouncedSetSearchParams = debounce(debounceSetSearchParams, 1000)
-    debouncedSetSearchParams()
+    if (!isModal) {
+      const debouncedSetSearchParams = debounce(debounceSetSearchParams, 1000)
+      debouncedSetSearchParams()
+    }
     if (filterText.startsWith('Graph:')) {
       var query = filterText.slice(6).trim()
       debounceSetGraphFilter(query)

src/components/utilities/SharedModal.js

@@ -13,7 +13,7 @@ import { CippTable } from 'src/components/tables'
 function mapBodyComponent({ componentType, data, componentProps }) {
   switch (componentType) {
     case 'table':
-      return <CippTable data={data || []} {...componentProps} />
+      return <CippTable data={data || []} isModal={true} {...componentProps} />
     case 'list':
       return <div>{Array.isArray(data) && data.map((el, idx) => <div key={idx}>{el}</div>)}</div>
     case 'text':

src/data/Extensions.json

@@ -4,7 +4,7 @@
     "type": "CIPP-API",
     "cat": "API",
     "forceSyncButton": false,
-    "helpText": "This integration allows you to use to enable API access outside of CIPP usage. Requires Global Administrator permissions inside your tenant for activation of the API. These credentials will only be shown once.",
+    "helpText": "This integration allows you to enable CIPP-API access outside of CIPP. Requires Global Administrator permissions inside your tenant for activation of the API. The API credentials will only be shown once.",
     "SettingOptions": [
       {
         "type": "checkbox",

src/views/cipp/CIPPSettings.js

@@ -1577,8 +1577,8 @@ const ExtensionsTab = () => {
 }
 
 const MappingsTab = () => {
-  const [listHaloBackend, listBackendHaloResult] = useLazyGenericGetRequestQuery()
-  const [setHaloExtensionconfig, extensionHaloConfigResult] = useLazyGenericPostRequestQuery()
+  const [listHaloBackend, listBackendHaloResult = []] = useLazyGenericGetRequestQuery()
+  const [setHaloExtensionconfig, extensionHaloConfigResult = []] = useLazyGenericPostRequestQuery()
 
   const onHaloSubmit = (values) => {
     setHaloExtensionconfig({
@@ -1608,7 +1608,7 @@ const MappingsTab = () => {
                       <CCardText>
                         Use the table below to map your client to the correct PSA client
                         {listBackendHaloResult.isSuccess &&
-                          listBackendHaloResult.data.Tenants.map((tenant) => (
+                          listBackendHaloResult.data.Tenants?.map((tenant) => (
                             <RFFSelectSearch
                               key={tenant.customerId}
                               name={tenant.customerId}

src/views/identity/administration/EditGroup.js

@@ -32,9 +32,8 @@ const EditGroup = () => {
   let query = useQuery()
   const groupId = query.get('groupId')
   const tenantDomain = query.get('tenantDomain')
-
   const [queryError, setQueryError] = useState(false)
-
+  const [refreshToken, setRefresh] = useState('')
   const {
     data: group = {},
     isFetching,
@@ -47,14 +46,14 @@ const EditGroup = () => {
     isFetching: membersisFetching,
     error: membersError,
     isSuccess: membersIsSuccess,
-  } = useListGroupMembersQuery({ tenantDomain, groupId })
+  } = useListGroupMembersQuery({ tenantDomain, groupId, refreshToken })
 
   const {
     data: owners = [],
     isFetching: ownersisFetching,
     error: ownersError,
     isSuccess: ownersIsSuccess,
-  } = useListGroupOwnersQuery({ tenantDomain, groupId })
+  } = useListGroupOwnersQuery({ tenantDomain, groupId, refreshToken })
   const {
     data: users = [],
     isFetching: usersIsFetching,
@@ -66,6 +65,7 @@ const EditGroup = () => {
     isFetching: contactsIsFetching,
     error: contactsError,
   } = useListContactsQuery({ tenantDomain })
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
 
   const [roleInfo, setroleInfo] = React.useState([])
   useEffect(() => {
@@ -86,7 +86,7 @@ const EditGroup = () => {
       })
       setroleInfo(ownerWithRole.concat(memberwithRole))
     }
-  }, [owners, members, ownersIsSuccess, membersIsSuccess])
+  }, [owners, members, ownersIsSuccess, membersIsSuccess, postResults])
 
   useEffect(() => {
     if (!groupId || !tenantDomain) {
@@ -97,7 +97,6 @@ const EditGroup = () => {
       setQueryError(true)
     }
   }, [groupId, tenantDomain, dispatch])
-  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const onSubmit = (values) => {
     const shippedValues = {
       tenantID: tenantDomain,
@@ -114,7 +113,9 @@ const EditGroup = () => {
       mail: group[0].mail,
     }
     //window.alert(JSON.stringify(shippedValues))
-    genericPostRequest({ path: '/api/EditGroup', values: shippedValues })
+    genericPostRequest({ path: '/api/EditGroup', values: shippedValues }).then((res) => {
+      setRefresh(postResults.requestId)
+    })
   }
   const tableColumns = [
     {

src/views/tenant/administration/ListAlertsQueue.js

@@ -286,7 +286,7 @@ const ListAlertsQueue = () => {
                   label: 'Delete webhook',
                   color: 'info',
                   modal: true,
-                  modalUrl: `/api/RemoveWebhookAlert?CIPPID=!CIPPID&tenantfilter=!tenantName`,
+                  modalUrl: `/api/RemoveWebhookAlert?CIPPID=!RowKey&tenantfilter=!PartitionKey`,
                   modalMessage: 'Are you sure you want to delete this webhook alert?',
                 },
               ],

version_latest.txt

@@ -0,0 +1 @@
+4.3.1