Merge pull request #129 from KelvinTegelaar/dev

pull[bot] · web-flow · commit ecfa093654ca · 2025-02-28T21:17:06.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/src/components/CippCards/CippPageCard.jsx b/src/components/CippCards/CippPageCard.jsx
@@ -2,6 +2,7 @@ import { useRouter } from "next/router";
 import { Box, Container, Stack, Button, SvgIcon, Typography, Card } from "@mui/material";
 import ArrowLeftIcon from "@mui/icons-material/ArrowLeft";
 import Head from "next/head";
+import { CippHead } from "../CippComponents/CippHead";
 const CippPageCard = (props) => {
   const {
     title,
@@ -20,9 +21,7 @@ const CippPageCard = (props) => {
 
   return (
     <>
-      <Head>
-        <title>{title}</title>
-      </Head>
+      <CippHead title={title} />
       <Box
         sx={{
           flexGrow: 1,
diff --git a/src/components/CippComponents/CippHead.jsx b/src/components/CippComponents/CippHead.jsx
@@ -0,0 +1,11 @@
+import Head from "next/head";
+import { useSettings } from "../../hooks/use-settings";
+
+export const CippHead = ({ title }) => {
+  const tenant = useSettings().currentTenant;
+  return (
+    <Head>
+      <title>{tenant ? `${tenant} - ${title}` : title}</title>
+    </Head>
+  );
+};
diff --git a/src/components/CippComponents/CippTablePage.jsx b/src/components/CippComponents/CippTablePage.jsx
@@ -3,6 +3,7 @@ import { Box, Container, Stack } from "@mui/system";
 import Head from "next/head";
 import { CippDataTable } from "../CippTable/CippDataTable";
 import { useSettings } from "../../hooks/use-settings";
+import { CippHead } from "./CippHead";
 
 export const CippTablePage = (props) => {
   const {
@@ -28,9 +29,7 @@ export const CippTablePage = (props) => {
   const tenant = useSettings().currentTenant;
   return (
     <>
-      <Head>
-        <title>{title}</title>
-      </Head>
+      <CippHead title={title} />
       <Box sx={sx}>
         <Container maxWidth={false} sx={{ height: "100%" }}>
           <Stack spacing={2} sx={{ height: "100%" }}>
diff --git a/src/components/CippComponents/CippTenantSelector.jsx b/src/components/CippComponents/CippTenantSelector.jsx
@@ -58,6 +58,7 @@ export const CippTenantSelector = (props) => {
       settings.handleUpdate({
         currentTenant: currentTenant.value,
       });
+      //if we have a tenantfilter, we add the tenantfilter to the title of the tab/page so its "Tenant - original title".
     }
   }, [currentTenant?.value]);
 
diff --git a/src/components/CippFormPages/CippFormPage.jsx b/src/components/CippFormPages/CippFormPage.jsx
@@ -16,6 +16,7 @@ import { ApiPostCall } from "../../api/ApiCall";
 import { CippApiResults } from "../CippComponents/CippApiResults";
 import { useEffect } from "react";
 import { useFormState } from "react-hook-form";
+import { CippHead } from "../CippComponents/CippHead";
 
 const CippFormPage = (props) => {
   const {
@@ -86,9 +87,7 @@ const CippFormPage = (props) => {
   };
   return (
     <>
-      <Head>
-        <title>{title}</title>
-      </Head>
+      <CippHead title={title} />
       <Box
         sx={{
           flexGrow: 1,
@@ -134,7 +133,7 @@ const CippFormPage = (props) => {
                   <Stack spacing={2} direction="row">
                     {addedButtons && addedButtons}
                     <Button
-                      disabled={postCall.isPending || !isValid || (!allowResubmit && (!isDirty))}
+                      disabled={postCall.isPending || !isValid || (!allowResubmit && !isDirty)}
                       onClick={formControl.handleSubmit(handleSubmit)}
                       type="submit"
                       variant="contained"
diff --git a/src/components/CippWizard/CippWizardPage.jsx b/src/components/CippWizard/CippWizardPage.jsx
@@ -3,6 +3,7 @@ import { Box, Button, Container, Stack, SvgIcon } from "@mui/material";
 import { CippWizard } from "./CippWizard";
 import { useRouter } from "next/router";
 import { ArrowLeftIcon } from "@mui/x-date-pickers";
+import { CippHead } from "../CippComponents/CippHead";
 
 const CippWizardPage = (props) => {
   const router = useRouter();
@@ -17,9 +18,7 @@ const CippWizardPage = (props) => {
   } = props;
   return (
     <>
-      <Head>
-        <title>{wizardTitle}</title>
-      </Head>
+      <CippHead title={wizardTitle} />
       <Box
         sx={{
           backgroundColor: "background.default",
diff --git a/src/pages/email/administration/mailboxes/index.js b/src/pages/email/administration/mailboxes/index.js
@@ -121,14 +121,15 @@ const Page = () => {
       url: "/api/ExecStartManagedFolderAssistant",
       icon: <PlayCircleIcon />,
       data: {
-        ID: "UPN",
+        ID: "ExchangeGuid",
+        UserPrincipalName: "UPN",
       },
       confirmText: "Are you sure you want to start the managed folder assistant for this user?",
     },
     {
       label: "Delete Mailbox",
       type: "POST",
-      icon: <TrashIcon />, // Added
+      icon: <TrashIcon />,
       url: "/api/RemoveUser",
       data: { ID: "UPN" },
       confirmText: "Are you sure you want to delete this mailbox?",
diff --git a/src/pages/identity/administration/devices/index.js b/src/pages/identity/administration/devices/index.js
@@ -46,7 +46,7 @@ const Page = () => {
       type: "POST",
       url: "/api/ExecGetRecoveryKey",
       data: {
-        GUID: "id",
+        GUID: "deviceId",
       },
       confirmText: "Are you sure you want to retrieve the BitLocker keys?",
       multiPost: false,
diff --git a/src/pages/tenant/gdap-management/onboarding/start.js b/src/pages/tenant/gdap-management/onboarding/start.js
@@ -53,12 +53,9 @@ const Page = () => {
     data: {
       TenantFilter: "",
       Endpoint: "tenantRelationships/delegatedAdminRelationships",
-      $filter:
-        "(status eq 'active' or status eq 'approvalPending') and not startsWith(displayName,'MLT_')",
     },
     queryKey: "GDAPRelationshipOnboarding",
   });
-
   const onboardingList = ApiGetCallWithPagination({
     url: "/api/ListTenantOnboarding",
     queryKey: "ListTenantOnboarding",
@@ -108,7 +105,11 @@ const Page = () => {
           (relationship) => relationship?.id === queryId
         );
 
-        if (relationship) {
+        if (
+          relationship &&
+          (relationship?.status === "active" || relationship?.status === "approvalPending") &&
+          !relationship?.customer?.displayName.startsWith("MLT_")
+        ) {
           formValue = {
             label:
               (relationship?.customer?.displayName ?? "Pending Invite") +
diff --git a/src/pages/tenant/standards/bpa-report/builder.js b/src/pages/tenant/standards/bpa-report/builder.js
@@ -24,6 +24,7 @@ import { useRouter } from "next/router";
 import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition";
 import { ApiGetCall, ApiPostCall } from "../../../../api/ApiCall";
 import { CippApiResults } from "../../../../components/CippComponents/CippApiResults";
+import { CippHead } from "../../../../components/CippComponents/CippHead";
 
 const Page = () => {
   const router = useRouter();
@@ -177,9 +178,7 @@ const Page = () => {
   const onSubmit = (data) => {};
   return (
     <>
-      <Head>
-        <title>{pageTitle}</title>
-      </Head>
+      <CippHead title={pageTitle} />
       <Box
         sx={{
           flexGrow: 1,

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ export const CippTenantSelector = (props) => {`
`58`	`58`	`settings.handleUpdate({`
`59`	`59`	`currentTenant: currentTenant.value,`
`60`	`60`	`});`
	`61`	`+ //if we have a tenantfilter, we add the tenantfilter to the title of the tab/page so its "Tenant - original title".`
`61`	`62`	`}`
`62`	`63`	`}, [currentTenant?.value]);`
`63`	`64`