diff --git a/package.json b/package.json
index ac17d5b76536..bdcffddcdf11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cipp",
- "version": "10.0.1",
+ "version": "10.0.3",
"author": "CIPP Contributors",
"homepage": "https://cipp.app/",
"bugs": {
diff --git a/public/version.json b/public/version.json
index 028831b26807..c05615499486 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
{
- "version": "10.0.2"
+ "version": "10.0.3"
}
diff --git a/src/pages/cipp/settings/licenses.js b/src/pages/cipp/settings/licenses.js
index f59032fbcba5..89abb862d188 100644
--- a/src/pages/cipp/settings/licenses.js
+++ b/src/pages/cipp/settings/licenses.js
@@ -2,25 +2,25 @@ import tabOptions from "./tabOptions";
import { TabbedLayout } from "/src/layouts/TabbedLayout";
import { Layout as DashboardLayout } from "/src/layouts/index.js";
import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
-import { Button, SvgIcon } from "@mui/material";
+import { Button, SvgIcon, Stack } from "@mui/material";
import { TrashIcon } from "@heroicons/react/24/outline";
-import { Add } from "@mui/icons-material";
+import { Add, RestartAlt } from "@mui/icons-material";
import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog";
import { useDialog } from "../../../hooks/use-dialog";
const Page = () => {
const pageTitle = "Excluded Licenses";
- const apiUrl = "/api/ExecExcludeLicenses";
- const apiData = { List: true };
+ const apiUrl = "/api/ListExcludedLicenses";
const createDialog = useDialog();
+ const resetDialog = useDialog();
const simpleColumns = ["Product_Display_Name", "GUID"];
const actions = [
{
label: "Delete Exclusion",
type: "POST",
- url: "/api/ExecExcludeLicenses?RemoveExclusion=true",
- data: { GUID: "GUID" },
+ url: "/api/ExecExcludeLicenses",
+ data: { Action: "!RemoveExclusion", GUID: "GUID" },
confirmText: "Do you want to delete this exclusion?",
color: "error",
icon: (
@@ -31,21 +31,32 @@ const Page = () => {
},
];
- const AddExcludedLicense = () => {
+ const CardButtons = () => {
return (
-
+
+
+ }
+ >
+ Restore Defaults
+
+
);
};
@@ -60,9 +71,9 @@ const Page = () => {
title={pageTitle}
queryKey="ExcludedLicenses"
apiUrl={apiUrl}
- cardButton={}
- apiData={apiData}
+ cardButton={}
actions={actions}
+ apiDataKey="Results"
offCanvas={offCanvas}
simpleColumns={simpleColumns}
tenantInTitle={false}
@@ -85,15 +96,34 @@ const Page = () => {
},
]}
api={{
- url: "/api/ExecExcludeLicenses?AddExclusion=true",
+ url: "/api/ExecExcludeLicenses",
confirmText:
"Add a license to the exclusion table, make sure to enter the correct GUID and SKU Name",
type: "POST",
- data: {},
+ data: { Action: "!AddExclusion" },
replacementBehaviour: "removeNulls",
relatedQueryKeys: ["ExcludedLicenses"],
}}
/>
+
>
);
};