From 52b2126955ef0d283bce778c830dbeca2b9a2f03 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:25:45 +0100 Subject: [PATCH 1/6] fixes regression bug for tenant selector --- src/components/CippComponents/CippAutocomplete.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/CippComponents/CippAutocomplete.jsx b/src/components/CippComponents/CippAutocomplete.jsx index b87f571b4d38..94b71886d005 100644 --- a/src/components/CippComponents/CippAutocomplete.jsx +++ b/src/components/CippComponents/CippAutocomplete.jsx @@ -27,7 +27,6 @@ const MemoTextField = React.memo(function MemoTextField({ {...otherParams} label={label} placeholder={placeholder} - variant="outlined" {...otherProps} slotProps={{ inputLabel: { @@ -275,7 +274,13 @@ export const CippAutoComplete = (props) => { sx={sx} renderInput={(params) => ( - + {api?.url && api?.showRefresh && ( Date: Thu, 13 Feb 2025 11:44:41 +0100 Subject: [PATCH 2/6] fix old method of proplistcard --- .../CippCards/CippPropertyListCard.jsx | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/CippCards/CippPropertyListCard.jsx b/src/components/CippCards/CippPropertyListCard.jsx index 136d77e61635..f6bd1a78b7a3 100644 --- a/src/components/CippCards/CippPropertyListCard.jsx +++ b/src/components/CippCards/CippPropertyListCard.jsx @@ -152,22 +152,18 @@ export const CippPropertyListCard = (props) => { key={`${item.label}-${index}-ActionList-OffCanvas`} icon={{item.icon}} label={item.label} - onClick={ - item.link - ? () => window.open(item.link, "_blank") - : () => { - setActionData({ - data: data, - action: item, - ready: true, - }); - if (item?.noConfirm) { - item.customFunction(item, data, {}); - } else { - createDialog.handleOpen(); - } - } - } + onClick={() => { + setActionData({ + data: data, + action: item, + ready: true, + }); + if (item?.noConfirm) { + item.customFunction(item, data, {}); + } else { + createDialog.handleOpen(); + } + }} disabled={handleActionDisabled(data, item)} /> ))} From 4ab49bd47a52f569559170a499ed60df26091373 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 13 Feb 2025 12:00:53 +0100 Subject: [PATCH 3/6] deselect when data changes --- src/components/CippTable/CIPPTableToptoolbar.js | 4 ++++ src/components/CippTable/CippDataTable.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js index fd15416b9082..7a135e9335d5 100644 --- a/src/components/CippTable/CIPPTableToptoolbar.js +++ b/src/components/CippTable/CIPPTableToptoolbar.js @@ -64,6 +64,10 @@ export const CIPPTableToptoolbar = ({ const pageName = router.pathname.split("/").slice(1).join("/"); const currentTenant = useSettings()?.currentTenant; + useEffect(() => { + //if usedData changes, deselect all rows + table.toggleAllRowsSelected(false); + }, [usedData]); //if the currentTenant Switches, remove Graph filters useEffect(() => { if (currentTenant) { diff --git a/src/components/CippTable/CippDataTable.js b/src/components/CippTable/CippDataTable.js index a81830221b58..3a040dd4c1eb 100644 --- a/src/components/CippTable/CippDataTable.js +++ b/src/components/CippTable/CippDataTable.js @@ -274,7 +274,7 @@ export const CippDataTable = (props) => { refreshFunction={refreshFunction} setColumnVisibility={setColumnVisibility} filters={filters} - queryKeys={queryKey} + queryKeys={queryKey ? queryKey : title} graphFilterData={graphFilterData} setGraphFilterData={setGraphFilterData} setConfiguredSimpleColumns={setConfiguredSimpleColumns} From 7c7dcb32fdfac3450bd9a9a90210f175588e7d96 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 13 Feb 2025 12:30:15 +0100 Subject: [PATCH 4/6] fixes odata policy --- src/pages/endpoint/MEM/list-policies/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/endpoint/MEM/list-policies/index.js b/src/pages/endpoint/MEM/list-policies/index.js index 6447d63a14fc..21c2f1962a24 100644 --- a/src/pages/endpoint/MEM/list-policies/index.js +++ b/src/pages/endpoint/MEM/list-policies/index.js @@ -13,7 +13,7 @@ const Page = () => { url: "/api/AddIntuneTemplate", data: { ID: "id", - ODataType: "@odata.type", + URLName: "URLName", }, confirmText: "Are you sure you want to create a template based on this policy?", icon: , From 92bbbdc20f7944a2d674ab592ff4505e2e40fb84 Mon Sep 17 00:00:00 2001 From: Esco Date: Thu, 13 Feb 2025 12:43:11 +0100 Subject: [PATCH 5/6] CippDevEmulatorsWithKitty only use yarn --- Tools/Start-CippDevEmulatorsWithKitty.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/Start-CippDevEmulatorsWithKitty.ps1 b/Tools/Start-CippDevEmulatorsWithKitty.ps1 index 39666bdcb05c..7013c054f375 100644 --- a/Tools/Start-CippDevEmulatorsWithKitty.ps1 +++ b/Tools/Start-CippDevEmulatorsWithKitty.ps1 @@ -15,7 +15,7 @@ if ($Process -eq 'y') { kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ; kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start; kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ; - kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa; + kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- yarn run start-swa; kitty @new-window --new-tab --tab-title `"CIPP-API-Processor`" --cwd (Join-Path $Path `"CIPP-API-Processor`") -- func start --port 7072" } else { @@ -23,5 +23,5 @@ if ($Process -eq 'y') { kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ; kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start; kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ; - kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa" + kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- yarn run start-swa" } From fae5bf58347df1514db7e0c5924e0f5d7c692cdf Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:05:45 +0100 Subject: [PATCH 6/6] allow deeper json objects by stacking --- src/components/CippFormPages/CippJSONView.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx index e90fc8732c13..11f6afa0c389 100644 --- a/src/components/CippFormPages/CippJSONView.jsx +++ b/src/components/CippFormPages/CippJSONView.jsx @@ -238,14 +238,17 @@ function CippJsonView({ ) : ( - {drilldownData.slice(0, 4).map((data, index) => ( + {drilldownData?.map((data, index) => ( 4, and add spacing between the top and bottom items + paddingTop: index === 0 ? 0 : 2, + borderTop: index >= 4 && type !== "intune" ? "1px solid lightgrey" : "none", + borderRight: index < drilldownData.length - 1 ? "1px solid lightgrey" : "none", overflowWrap: "anywhere", whiteSpace: "pre-line", paddingRight: 2,