Merge pull request #3316 from JohnDuprey/dev

bugfixes
KelvinTegelaar · Jan 16, 2025 · 904baa0 · 904baa0
2 parents 2864974 + 51e77b5
commit 904baa0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/components/CippComponents/CippFormLicenseSelector.jsx b/src/components/CippComponents/CippFormLicenseSelector.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { CippFormComponent } from "./CippFormComponent";
-import { useWatch } from "react-hook-form";
 import { getCippLicenseTranslation } from "../../utils/get-cipp-license-translation";
+import { useSettings } from "../../hooks/use-settings";
 
 export const CippFormLicenseSelector = ({
   formControl,
@@ -12,25 +12,26 @@ export const CippFormLicenseSelector = ({
   addedField,
   ...other
 }) => {
-  const currentTenant = useWatch({ control: formControl.control, name: "tenantFilter" });
+  const userSettingsDefaults = useSettings();
   return (
     <CippFormComponent
       name={name}
       label={label}
       type="autoComplete"
       formControl={formControl}
       multiple={multiple}
+      creatable={false}
       api={{
         addedField: addedField,
-        tenantFilter: currentTenant ? currentTenant.value : undefined,
+        tenantFilter: userSettingsDefaults.currentTenant ?? undefined,
         url: "/api/ListGraphRequest",
         dataKey: "Results",
         labelField: (option) =>
           `${getCippLicenseTranslation([option])} (${
             option.prepaidUnits.enabled - option.consumedUnits
           } available)`,
         valueField: "skuId",
-        queryKey: `ListLicenses-${currentTenant?.value}`,
+        queryKey: `ListLicenses-${userSettingsDefaults.currentTenant ?? undefined}`,
         data: {
           Endpoint: "subscribedSkus",
           $count: true,

diff --git a/src/pages/tenant/gdap-management/roles/index.js b/src/pages/tenant/gdap-management/roles/index.js
@@ -41,9 +41,12 @@ const actions = [
   {
     label: "Delete Mapping",
     icon: <TrashIcon />,
-    modal: true,
-    modalUrl: "/api/ExecDeleteGDAPRoleMapping?&GroupId=[GroupId]",
-    modalMessage:
+    type: "POST",
+    url: "/api/ExecDeleteGDAPRoleMapping",
+    body: {
+      GroupId: "GroupId",
+    },
+    confirmText:
       "Are you sure you want to delete this role mapping? (Note: This does not delete the associated security groups or modify any GDAP relationships.)",
   },
 ];