From a85b9b7deddc84b465296c31e09e289a74524641 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Mon, 27 Jan 2025 12:17:18 +0100 Subject: [PATCH 1/5] querykey confusion --- src/pages/tenant/gdap-management/invites/add.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/tenant/gdap-management/invites/add.js b/src/pages/tenant/gdap-management/invites/add.js index 22d72810f0c8..b470cde23584 100644 --- a/src/pages/tenant/gdap-management/invites/add.js +++ b/src/pages/tenant/gdap-management/invites/add.js @@ -40,12 +40,12 @@ const Page = () => { const createCippDefaults = ApiPostCall({ urlFromData: true, - relatedQueryKeys: ["ListGDAPRoleTemplatesAutocomplete"], + relatedQueryKeys: ["ListGDAPRoleTemplatesAutocomplete", "ListGDAPRoleTemplates"], }); const templateList = ApiGetCall({ url: "/api/ExecGDAPRoleTemplate", - queryKey: "ListGDAPRoleTemplatesAutocomplete", + queryKey: "ListGDAPRoleTemplates", }); const selectedTemplate = useWatch({ control: formControl.control, name: "roleMappings" }); From ba54a291d04f2af520ac4a1cc47fc0766c9562c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= <31723128+kris6673@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:23:21 +0100 Subject: [PATCH 2/5] FIX space typo --- src/data/alerts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/alerts.json b/src/data/alerts.json index d027afab9869..1e2b8bdc0fc8 100644 --- a/src/data/alerts.json +++ b/src/data/alerts.json @@ -92,7 +92,7 @@ "recommendedRunInterval": "30d" }, { - "name": "AppCertificateExpiry ", + "name": "AppCertificateExpiry", "label": "Alert on expiring application certificates", "recommendedRunInterval": "1d" }, From 5c84a91be79f82fba487aa6eec56c229240809b3 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 10:48:10 -0500 Subject: [PATCH 3/5] set tenantfilter on table action if tenant filter is all tenants --- src/components/CippTable/CippDataTable.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js index 914c0d7675c5..005678d16998 100644 --- a/src/components/CippTable/CippDataTable.js +++ b/src/components/CippTable/CippDataTable.js @@ -17,11 +17,13 @@ import { ApiGetCallWithPagination } from "../../api/ApiCall"; import { utilTableMode } from "./util-tablemode"; import { utilColumnsFromAPI } from "./util-columnsFromAPI"; import { CIPPTableToptoolbar } from "./CIPPTableToptoolbar"; -import { More, MoreHoriz } from "@mui/icons-material"; +import { Info, More, MoreHoriz } from "@mui/icons-material"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; import { useDialog } from "../../hooks/use-dialog"; import { CippApiDialog } from "../CippComponents/CippApiDialog"; import { getCippError } from "../../utils/get-cipp-error"; +import { Box } from "@mui/system"; +import { useSettings } from "../../hooks/use-settings"; export const CippDataTable = (props) => { const { @@ -61,6 +63,9 @@ export const CippDataTable = (props) => { const [actionData, setActionData] = useState({ data: {}, action: {}, ready: false }); const [graphFilterData, setGraphFilterData] = useState({}); const waitingBool = api?.url ? true : false; + + const settings = useSettings(); + const getRequestData = ApiGetCallWithPagination({ url: api.url, data: { ...api.data }, @@ -177,7 +182,11 @@ export const CippDataTable = (props) => { }, renderEmptyRowsFallback: ({ table }) => getRequestData.data?.pages?.[0].Metadata?.QueueMessage ? ( -
{getRequestData.data?.pages?.[0].Metadata?.QueueMessage}
+ +
+ {getRequestData.data?.pages?.[0].Metadata?.QueueMessage} +
+ ) : undefined, onColumnVisibilityChange: setColumnVisibility, ...modeInfo, @@ -188,6 +197,11 @@ export const CippDataTable = (props) => { sx={{ color: action.color }} key={`actions-list-row-${index}`} onClick={() => { + if (settings.currentTenant === "AllTenants" && row.original?.Tenant) { + settings.handleUpdate({ + currentTenant: row.original.Tenant, + }); + } setActionData({ data: row.original, action: action, From 3510fc233e352b32b7c34e2ec388c658dd2880b1 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 10:49:11 -0500 Subject: [PATCH 4/5] Update ApiCall.jsx --- src/api/ApiCall.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/api/ApiCall.jsx b/src/api/ApiCall.jsx index c9c62c1f8048..fa953247204c 100644 --- a/src/api/ApiCall.jsx +++ b/src/api/ApiCall.jsx @@ -190,7 +190,11 @@ export function ApiGetCallWithPagination({ return response.data; }, getNextPageParam: (lastPage) => { - if (data?.noPagination || data?.manualPagination === false) { + if ( + data?.noPagination || + data?.manualPagination === false || + data?.tenantFilter === "AllTenants" + ) { return undefined; } return lastPage?.Metadata?.nextLink ? { nextLink: lastPage.Metadata.nextLink } : undefined; From 77ec401b5ee29e5247aeb3b29f2fe04ec07deabe Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 13:44:22 -0500 Subject: [PATCH 5/5] fix button sizes --- src/pages/cipp/integrations/configure.js | 81 ++++++++++++++---------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/src/pages/cipp/integrations/configure.js b/src/pages/cipp/integrations/configure.js index 52d4766d9c09..2861a241edad 100644 --- a/src/pages/cipp/integrations/configure.js +++ b/src/pages/cipp/integrations/configure.js @@ -120,51 +120,62 @@ const Page = () => { {extension.alertText} )} - + {extension?.hideTestButton !== true && ( - + + + )} {extension?.forceSyncButton && ( - + + + )} {extension?.links && ( <> {extension.links.map((link, index) => ( - + + + ))} )} +