Merge branch 'KelvinTegelaar:dev' into dev

bmsimp · Feb 13, 2025 · 14820a4 · 14820a4
2 parents ea79083 + fae5bf5
commit 14820a4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 24 deletions.
diff --git a/Tools/Start-CippDevEmulatorsWithKitty.ps1 b/Tools/Start-CippDevEmulatorsWithKitty.ps1
@@ -15,13 +15,13 @@ 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 {
   kitty --detach --title 'CIPP' -o allow_remote_control=yes -- pwsh -c "
   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"
 }
diff --git 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={<SvgIcon fontSize="small">{item.icon}</SvgIcon>}
                 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)}
               />
             ))}

diff --git 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) => (
         <Stack direction="row" spacing={1}>
-          <MemoTextField params={params} label={label} placeholder={placeholder} required={required} {...other} />
+          <MemoTextField
+            params={params}
+            label={label}
+            placeholder={placeholder}
+            required={required}
+            {...other}
+          />
           {api?.url && api?.showRefresh && (
             <IconButton
               size="small"

diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx
@@ -238,14 +238,17 @@ function CippJsonView({
           <CippCodeBlock type="editor" code={JSON.stringify(cleanObject(object), null, 2)} />
         ) : (
           <Grid container spacing={2}>
-            {drilldownData.slice(0, 4).map((data, index) => (
+            {drilldownData?.map((data, index) => (
               <Grid
                 item
                 xs={12}
                 sm={type === "intune" ? 12 : 3}
                 key={index}
                 sx={{
-                  borderRight: index < 3 && type !== "intune" ? "1px solid lightgrey" : "none",
+                  //give a top border if the item is > 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,

diff --git 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
@@ -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}

diff --git 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: <Book />,