Merge pull request #29 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: isgq-github01

.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'
+          exempt-issue-labels: 'planned,bug,roadmap'
           days-before-stale: 9
-          days-before-close: 14
+          days-before-close: 5

.github/workflows/Label_Issues.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Label Issues
         uses: andymckay/labeler@5c59dabdfd4dd5bd9c6e6d255b01b9d764af4414
         with:
-          add-labels: 'unconfirmed-by-user'
+          add-labels: 'not-assigned'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
   label_issues_frs:
     if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Feature')
@@ -25,5 +25,5 @@ jobs:
       - name: Label Issues
         uses: andymckay/labeler@5c59dabdfd4dd5bd9c6e6d255b01b9d764af4414
         with:
-          add-labels: 'enhancement, no-priority'
+          add-labels: 'enhancement, not-assigned'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dev_deploy.yml

@@ -25,7 +25,7 @@ jobs:
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
           app_location: '/' # App source code path
           api_location: '' # Api source code path - optional
-          output_location: 'out' # Built app content directory - optional
+          output_location: '/out' # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "editorconfig.editorconfig",
+        "streetsidesoftware.code-spell-checker",
+    ]
+}

cspell.json

@@ -0,0 +1,64 @@
+{
+    "version": "0.2",
+    "ignorePaths": [],
+    "dictionaryDefinitions": [],
+    "dictionaries": [],
+    "words": [
+        "ADMS",
+        "AITM",
+        "Augmentt",
+        "Autotask",
+        "Choco",
+        "CIPP",
+        "CIPP-API",
+        "Datto",
+        "Entra",
+        "ESET",
+        "GDAP",
+        "HIBP",
+        "Hudu",
+        "ImmyBot",
+        "Intune",
+        "LCID",
+        "OBEE",
+        "Passwordless",
+        "pwpush",
+        "Rewst",
+        "Sherweb",
+        "Syncro",
+        "Yubikey"
+    ],
+    "ignoreWords": [
+        "Addins",
+        "CIPPAPI",
+        "PSTN",
+        "TNEF",
+        "exo_individualsharing",
+        "exo_mailboxaudit",
+        "exo_mailtipsenabled",
+        "exo_outlookaddins",
+        "exo_storageproviderrestricted",
+        "locationcipp",
+        "mdo_antiphishingpolicies",
+        "mdo_autoforwardingmode",
+        "mdo_blockmailforward",
+        "mdo_commonattachmentsfilter",
+        "mdo_highconfidencephishaction",
+        "mdo_highconfidencespamaction",
+        "mdo_phishthresholdlevel",
+        "mdo_phisspamacation",
+        "mdo_safeattachmentpolicy",
+        "mdo_safeattachments",
+        "mdo_safedocuments",
+        "mdo_safelinksforOfficeApps",
+        "mdo_safelinksforemail",
+        "mdo_spam_notifications_only_for_admins",
+        "mdo_zapmalware",
+        "mdo_zapphish",
+        "mdo_zapspam",
+        "microsoftonline",
+        "mip_search_auditlog",
+        "winmail"
+    ],
+    "import": []
+}

next.config.js

@@ -15,7 +15,7 @@ const config = {
     return [];
   },
   output: "export",
-  distDir: "/out",
+  distDir: "./out",
 };
 
 module.exports = config;

package.json

@@ -8,15 +8,15 @@
   },
   "license": "AGPL-3.0",
   "engines": {
-    "node": "^20.18.3"
+    "node": "^22.13.0"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:KelvinTegelaar/CIPP.git"
   },
   "scripts": {
     "dev": "next -H 127.0.0.1",
-    "build": "next build",
+    "build": "next build && rm -rf package.json yarn.lock",
     "start": "next start",
     "export": "next export",
     "lint": "next lint",
@@ -71,6 +71,7 @@
     "nprogress": "0.2.0",
     "numeral": "2.0.6",
     "prop-types": "15.8.1",
+    "punycode": "^2.3.1",
     "react": "19.0.0",
     "react-apexcharts": "1.7.0",
     "react-beautiful-dnd": "13.1.1",

public/version.json

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

src/components/CippCards/CippDomainCards.jsx

@@ -28,6 +28,7 @@ import { CippCodeBlock } from "/src/components/CippComponents/CippCodeBlock";
 import { CippOffCanvas } from "../CippComponents/CippOffCanvas";
 import { CippPropertyListCard } from "./CippPropertyListCard";
 import { getCippFormatting } from "../../utils/get-cipp-formatting";
+import punycode from "punycode";
 
 const ResultList = ({ passes = [], warns = [], fails = [] }) => (
   <Stack direction="column" sx={{ mt: 1 }}>
@@ -395,7 +396,8 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
   }, [propDomain, setValue]);
 
   const onSubmit = (values) => {
-    setDomain(values.domain);
+    const punycodedDomain = punycode.toASCII(values.domain);
+    setDomain(punycodedDomain);
     setSelector(values.dkimSelector);
     setSpfRecord(values.spfRecord);
     setSubdomains(values.subdomains);

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
@@ -71,7 +82,7 @@ export const CippExchangeInfoCard = (props) => {
               <LinearProgressWithLabel
                 sx={{ width: "100%" }}
                 variant="determinate"
-                addedLabel={`(${Math.round(exchangeData.TotalItemSize)}/${Math.round(
+                addedLabel={`(${Math.round(exchangeData.TotalItemSize)} GB of ${Math.round(
                   exchangeData?.ProhibitSendReceiveQuota
                 )}GB)`}
                 value={
@@ -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>
             )
           }
         />