Merge branch 'KelvinTegelaar:main' into main

Author: luke255

.github/workflows/Close_Stale_Issues_and_PRs.yml

@@ -13,6 +13,6 @@ jobs:
           stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://docs.cipp.app/dev-documentation/contributing-to-the-code . Please notify the team if you are working on this yourself.'
           close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
           stale-issue-label: 'no-activity'
-          exempt-issue-labels: 'planned,bug'
+          exempt-issue-labels: 'planned,bug,roadmap'
           days-before-stale: 9
           days-before-close: 5

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.5.1"
+  "version": "7.5.3"
 }

src/components/CippCards/CippExchangeInfoCard.jsx

@@ -29,6 +29,17 @@ export const CippExchangeInfoCard = (props) => {
     { name: "ActiveSync", enabled: exchangeData?.MailboxActiveSyncEnabled },
   ];
 
+  // Define mailbox hold types array
+  const holds = [
+    { name: "Compliance Tag Hold", enabled: exchangeData?.ComplianceTagHold },
+    { name: "Retention Hold", enabled: exchangeData?.RetentionHold },
+    { name: "Litigation Hold", enabled: exchangeData?.LitigationHold },
+    { name: "In-Place Hold", enabled: exchangeData?.InPlaceHold },
+    { name: "eDiscovery Hold", enabled: exchangeData?.EDiscoveryHold },
+    { name: "Purview Retention Hold", enabled: exchangeData?.PurviewRetentionHold },
+    { name: "Excluded from Org-Wide Hold", enabled: exchangeData?.ExcludedFromOrgWideHold },
+  ];
+
   return (
     <Card {...other}>
       <CardHeader
@@ -164,14 +175,27 @@ export const CippExchangeInfoCard = (props) => {
             )
           }
         />
+        {/* Combine all mailbox hold types into a single PropertyListItem */}
         <PropertyListItem
           divider
-          label="Litigation Hold"
+          label="Mailbox Holds"
           value={
             isLoading ? (
-              <Skeleton variant="text" width={60} />
+              <Skeleton variant="text" width={200} />
             ) : (
-              getCippFormatting(exchangeData?.LitigationHold, "LitigationHold")
+              <div>
+                {holds.map((hold) => (
+                  <Chip
+                    key={hold.name}
+                    label={hold.name}
+                    icon={hold.enabled ? <CheckIcon /> : <CloseIcon />}
+                    color={hold.enabled ? "success" : "default"}
+                    variant="outlined"
+                    size="small"
+                    sx={{ mr: 1, mb: 1 }}
+                  />
+                ))}
+              </div>
             )
           }
         />

src/components/CippCards/CippUniversalSearch.jsx

@@ -67,15 +67,60 @@ export const CippUniversalSearch = React.forwardRef(
 
 CippUniversalSearch.displayName = "CippUniversalSearch";
 
-const Results = ({ items = [], searchValue }) => (
-  <Grid container spacing={2} mt={2}>
-    {items.slice(0, 9).map((item, key) => (
-      <Grid item xs={12} sm={6} md={4} key={key}>
-        <ResultsRow match={item} searchValue={searchValue} />
+const Results = ({ items = [], searchValue }) => {
+  const [currentPage, setCurrentPage] = useState(1);
+  const resultsPerPage = 9; // Number of results per page
+  const totalResults = items.length; // Total number of results
+  const totalPages = Math.ceil(totalResults / resultsPerPage); // Total pages
+
+  // Calculate the results to display for the current page
+  const startIndex = (currentPage - 1) * resultsPerPage;
+  const endIndex = startIndex + resultsPerPage;
+  const displayedResults = items.slice(startIndex, endIndex);
+
+  const handleNextPage = () => {
+    if (currentPage < totalPages) {
+      setCurrentPage(currentPage + 1);
+    }
+  };
+
+  const handlePreviousPage = () => {
+    if (currentPage > 1) {
+      setCurrentPage(currentPage - 1);
+    }
+  };
+
+  return (
+    <>
+      <Typography variant="body2" color="textSecondary" mt={2}>
+        {totalResults} results (Page {currentPage} of {totalPages})
+      </Typography>
+      <Grid container spacing={2} mt={2}>
+        {displayedResults.map((item, key) => (
+          <Grid item xs={12} sm={6} md={4} key={key}>
+            <ResultsRow match={item} searchValue={searchValue} />
+          </Grid>
+        ))}
       </Grid>
-    ))}
-  </Grid>
-);
+      <Box display="flex" justifyContent="space-between" mt={2}>
+        <Button
+          variant="outlined"
+          disabled={currentPage === 1}
+          onClick={handlePreviousPage}
+        >
+          Previous
+        </Button>
+        <Button
+          variant="outlined"
+          disabled={currentPage === totalPages}
+          onClick={handleNextPage}
+        >
+          Next
+        </Button>
+      </Box>
+    </>
+  );
+};
 
 const ResultsRow = ({ match, searchValue }) => {
   const highlightMatch = (text) => {
@@ -118,7 +163,7 @@ const ResultsRow = ({ match, searchValue }) => {
               href={`identity/administration/users/user?tenantFilter=${
                 currentTenantInfo.data?.find((tenant) => tenant.customerId === match._tenantId)
                   ?.defaultDomainName || match._tenantId
-              }&userId=${match.userPrincipalName}`}
+              }&userId=${match.id}`}
               variant="outlined"
               color="primary"
               size="small"

src/components/CippComponents/CippApiDialog.jsx

@@ -295,7 +295,7 @@ export const CippApiDialog = (props) => {
           return getNestedValue(row, key) || `[${key}]`;
         });
 
-        if (linkWithRowData.startsWith("/")) {
+        if (linkWithRowData.startsWith("/") && !api?.external) {
           // Internal link navigation
           setLinkClicked(true);
           router.push(linkWithRowData, undefined, { shallow: true });

src/components/CippComponents/CippCentralSearch.jsx

@@ -96,6 +96,12 @@ export const CippCentralSearch = ({ handleClose, open }) => {
             label="Search any menu item or page in CIPP"
             onChange={handleChange}
             onKeyDown={handleKeyDown}
+            onFocus={(event) => {
+              // Select all text on focus if there's content
+              if (event.target.value) {
+                event.target.select();
+              }
+            }}
             value={searchValue}
             autoFocus
           />
@@ -106,10 +112,7 @@ export const CippCentralSearch = ({ handleClose, open }) => {
               <Grid container spacing={2} mt={2}>
                 {filteredItems.map((item, index) => (
                   <Grid item xs={12} sm={12} md={12} key={index}>
-                    <Card
-                      variant="outlined"
-                      sx={{ height: "100%" }}
-                    >
+                    <Card variant="outlined" sx={{ height: "100%" }}>
                       <CardActionArea
                         onClick={() => handleCardClick(item.path)}
                         aria-label={`Navigate to ${item.title}`}

src/components/CippComponents/CippCustomVariables.jsx

@@ -64,7 +64,7 @@ const CippCustomVariables = ({ id }) => {
       url: "/api/ExecCippReplacemap",
       data: {
         Action: "!AddEdit",
-        customerId: id,
+        tenantId: id,
       },
       relatedQueryKeys: [`CustomVariables_${id}`],
     },
@@ -77,7 +77,7 @@ const CippCustomVariables = ({ id }) => {
       data: {
         Action: "Delete",
         RowKey: "RowKey",
-        customerId: id,
+        tenantId: id,
       },
       relatedQueryKeys: [`CustomVariables_${id}`],
       multiPost: false,
@@ -100,7 +100,7 @@ const CippCustomVariables = ({ id }) => {
         title={id === "AllTenants" ? "Global Variables" : "Custom Variables"}
         actions={actions}
         api={{
-          url: `/api/ExecCippReplacemap?Action=List&customerId=${id}`,
+          url: `/api/ExecCippReplacemap?Action=List&tenantId=${id}`,
           dataKey: "Results",
         }}
         simpleColumns={["RowKey", "Value"]}
@@ -147,7 +147,7 @@ const CippCustomVariables = ({ id }) => {
         api={{
           type: "POST",
           url: "/api/ExecCippReplacemap",
-          data: { Action: "AddEdit", customerId: id },
+          data: { Action: "AddEdit", tenantId: id },
           relatedQueryKeys: [`CustomVariables_${id}`],
         }}
       />

src/components/CippComponents/CippExchangeActions.jsx

@@ -14,6 +14,7 @@ import {
   Outbox,
   NotificationImportant,
   DataUsage,
+  MailLock,
 } from "@mui/icons-material";
 
 export const CippExchangeActions = () => {
@@ -187,6 +188,21 @@ export const CippExchangeActions = () => {
         },
       ],
     },
+    {
+      label: "Set Retention Hold",
+      type: "POST",
+      url: "/api/ExecSetRetentionHold",
+      data: { UPN: "UPN", Identity: "Id" },
+      confirmText: "What do you want to set Retention Hold to?",
+      icon: <MailLock />,
+      fields: [
+        {
+          type: "switch",
+          name: "disable",
+          label: "Disable Retention Hold",
+        },
+      ],
+    },
     {
       label: "Set Mailbox Locale",
       type: "POST",

src/components/CippComponents/CippTenantSelector.jsx

@@ -66,7 +66,7 @@ export const CippTenantSelector = (props) => {
   }, [currentTenant?.value]);
 
   useEffect(() => {
-    if (tenant && currentTenant?.value && currentTenant?.value !== 'AllTenants') {
+    if (tenant && currentTenant?.value && currentTenant?.value !== "AllTenants") {
       tenantDetails.refetch();
     }
   }, [tenant, offcanvasVisible]);
@@ -85,6 +85,7 @@ export const CippTenantSelector = (props) => {
                 defaultDomainName: matchingTenant.defaultDomainName,
                 displayName: matchingTenant.displayName,
                 customerId: matchingTenant.customerId,
+                initialDomainName: matchingTenant.initialDomainName,
               },
             }
           : {
@@ -192,12 +193,12 @@ export const CippTenantSelector = (props) => {
         actions={[
           {
             label: "M365 Admin Portal",
-            link: `https://admin.microsoft.com/Partner/BeginClientSession.aspx?CTID=${currentTenant?.addedFields?.customerId}&CSDEST=o365admincenter`,
+            link: `https://admin.cloud.microsoft/?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
             icon: <GlobeAltIcon />,
           },
           {
             label: "Exchange Portal",
-            link: `https://admin.exchange.microsoft.com/?landingpage=homepage&form=mac_sidebar&delegatedOrg=${currentTenant?.value}`,
+            link: `https://admin.cloud.microsoft/exchange?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
             icon: <Mail />,
           },
           {
@@ -207,7 +208,7 @@ export const CippTenantSelector = (props) => {
           },
           {
             label: "Teams Portal",
-            link: `https://admin.teams.microsoft.com/?delegatedOrg=${currentTenant?.value}`,
+            link: `https://admin.teams.microsoft.com/?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
             icon: <FilePresent />,
           },
           {
@@ -222,8 +223,9 @@ export const CippTenantSelector = (props) => {
           },
           {
             label: "SharePoint Portal",
-            link: `https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=${currentTenant?.addedFields?.customerId}&CSDEST=SharePoint`,
+            link: `/api/ListSharePointAdminUrl?tenantFilter=${currentTenant?.value}`,
             icon: <Share />,
+            external: true,
           },
           {
             label: "Security Portal",

src/components/CippComponents/CollapsibleChipList.js

@@ -0,0 +1,29 @@
+import React, { useState } from "react";
+import { Box, Link } from "@mui/material";
+
+export const CollapsibleChipList = ({ children, maxItems = 4 }) => {
+  const [expanded, setExpanded] = useState(false);
+  const childArray = React.Children.toArray(children);
+  const hasMoreItems = childArray.length > maxItems;
+
+  const toggleExpanded = (e) => {
+    e.preventDefault();
+    setExpanded(!expanded);
+  };
+
+  return (
+    <Box sx={{ display: "flex", flexWrap: "wrap", gap: 0.5, alignItems: "center" }}>
+      {expanded ? childArray : childArray.slice(0, maxItems)}
+
+      {hasMoreItems && (
+        <Link
+          href="#"
+          onClick={toggleExpanded}
+          sx={{ ml: 0.5, fontSize: "0.8rem", whiteSpace: "nowrap" }}
+        >
+          {expanded ? "Show less" : `+${childArray.length - maxItems} more`}
+        </Link>
+      )}
+    </Box>
+  );
+};