[pull] main from KelvinTegelaar:main

.github/workflows/pr_check.yml

@@ -22,7 +22,7 @@ jobs:
         # Only process fork PRs with specific branch conditions
         # Must be a fork AND (source is main/master OR target is main/master)
         if: |
-          github.event.pull_request.head.repo.fork == true && 
+          github.event.pull_request.head.repo.fork == true &&
           ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
           (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
         uses: actions/github-script@v9
@@ -31,7 +31,31 @@ jobs:
           script: |
             let message = '';
 
+            // Check if the fork has open PRs (indicates pull bot or similar is active)
+            const forkOwner = context.payload.pull_request.head.repo.owner.login;
+            const forkRepo = context.payload.pull_request.head.repo.name;
+            const forkPullsUrl = context.payload.pull_request.head.repo.html_url + '/pulls';
+
+            let openPRs = [];
+            try {
+              const { data: prs } = await github.rest.pulls.list({
+                owner: forkOwner,
+                repo: forkRepo,
+                state: 'open',
+                per_page: 5
+              });
+              openPRs = prs;
+            } catch (e) {
+              // Can't read fork PRs — skip
+            }
+
             message += '🔄 If you are attempting to update your CIPP repo please follow the instructions at: https://docs.cipp.app/setup/self-hosting-guide/updating. Are you a sponsor? Contact the helpdesk for direct assistance with updating to the latest version.';
+
+            if (openPRs.length > 0) {
+              message += ` It looks like you may already have a pending update PR on your fork — check your [open pull requests](${forkPullsUrl}) to accept it.`;
+            } else {
+              message += ` You can enable [Pull Bot](https://github.com/apps/pull) or [Repo Sync](https://github.com/apps/repo-sync) to automatically keep your fork up to date.`;
+            }
             message += '\n\n';
 
             // Check if PR is targeting main/master
@@ -40,7 +64,7 @@ jobs:
             }
 
             // Check if PR is from a fork's main/master branch
-            if (context.payload.pull_request.head.repo.fork && 
+            if (context.payload.pull_request.head.repo.fork &&
                 (context.payload.pull_request.head.ref === 'main' || context.payload.pull_request.head.ref === 'master')) {
               message += '⚠️ This PR cannot be merged because it originates from your fork\'s main/master branch. If you are attempting to contribute code please PR from your dev branch or another non-main/master branch.\n\n';
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.4.3",
+  "version": "10.4.4",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {

public/languageList.json

@@ -160,6 +160,13 @@
     "languageTag": "Danish (da-DK)",
     "LCID": "1030"
   },
+  {
+    "language": "Dutch",
+    "Geographic area": "Belgium",
+    "tag": "nl-BE",
+    "languageTag": "Dutch (nl-BE)",
+    "LCID": "2067"
+  },
   {
     "language": "Dutch",
     "Geographic area": "Netherlands",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "10.4.3"
+  "version": "10.4.4"
 }

src/components/CippCards/CippDomainCards.jsx

@@ -470,6 +470,13 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
     waiting: !!domain,
   });
 
+  const { data: autoDiscoverData, isFetching: autoDiscoverLoading } = ApiGetCall({
+    url: "/api/ListDomainHealth",
+    queryKey: `autodiscover-${domain}`,
+    data: { Domain: domain, Action: "ReadAutoDiscover" },
+    waiting: !!domain,
+  });
+
   const { data: httpsData, isFetching: httpsLoading } = ApiGetCall({
     url: "/api/ListDomainHealth",
     queryKey: `https-${domain}-${subdomains}`,
@@ -684,6 +691,26 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
+            <Grid size={{ md: gridItemSize, xs: 12 }}>
+              <DomainResultCard
+                title="AutoDiscover"
+                data={autoDiscoverData}
+                isFetching={autoDiscoverLoading}
+                info={
+                  <div>
+                    <p>
+                      AutoDiscover ({autoDiscoverData?.RecordType || "None"}):
+                    </p>
+                    <CippCodeBlock code={autoDiscoverData?.Record || "No record found"} />
+                    <ResultList
+                      passes={autoDiscoverData?.ValidationPasses}
+                      warns={autoDiscoverData?.ValidationWarns}
+                      fails={autoDiscoverData?.ValidationFails}
+                    />
+                  </div>
+                }
+              />
+            </Grid>
             {enableHttps && (
               <Grid size={{ md: gridItemSize, xs: 12 }}>
                 <DomainResultCard

src/components/CippComponents/CippBulkUserDrawer.jsx

@@ -94,7 +94,9 @@ export const CippBulkUserDrawer = ({
   const handleRemoveItem = (row) => {
     if (row === undefined) return false;
     const currentData = formControl.getValues("bulkUser") || [];
-    const index = currentData.findIndex((item) => item === row);
+    const rowKey = JSON.stringify(row);
+    const index = currentData.findIndex((item) => JSON.stringify(item) === rowKey);
+    if (index === -1) return false;
     const newData = [...currentData];
     newData.splice(index, 1);
     formControl.setValue("bulkUser", newData, { shouldValidate: true });

src/components/CippComponents/CippDeployCompliancePolicyDrawer.jsx

@@ -0,0 +1,259 @@
+import React, { useEffect, useState } from "react";
+import { Button, Divider, Stack } from "@mui/material";
+import { Grid } from "@mui/system";
+import { useForm, useFormState, useWatch } from "react-hook-form";
+import { RocketLaunch } from "@mui/icons-material";
+import { CippOffCanvas } from "./CippOffCanvas";
+import CippFormComponent from "./CippFormComponent";
+import { CippFormTenantSelector } from "./CippFormTenantSelector";
+import { CippApiResults } from "./CippApiResults";
+import { ApiPostCall } from "../../api/ApiCall";
+
+const MODE_CONFIG = {
+  DlpCompliancePolicy: {
+    title: "Deploy DLP Compliance Policy",
+    buttonLabel: "Deploy DLP Policy",
+    postUrl: "/api/AddDlpCompliancePolicy",
+    listTemplatesUrl: "/api/ListDlpCompliancePolicyTemplates",
+    templateQueryKey: "TemplateListDlpCompliancePolicy",
+    relatedQueryKeys: ["ListDlpCompliancePolicy", "ListDlpCompliancePolicyTemplates"],
+    placeholder: `{
+  "Name": "Block Credit Card data",
+  "Comment": "Blocks documents containing credit card numbers",
+  "Mode": "Enable",
+  "ExchangeLocation": "All",
+  "SharePointLocation": "All",
+  "OneDriveLocation": "All",
+  "RuleParams": {
+    "Name": "Block Credit Card data Rule",
+    "ContentContainsSensitiveInformation": [{ "name": "Credit Card Number", "minCount": "1" }],
+    "BlockAccess": true
+  }
+}`,
+  },
+  RetentionCompliancePolicy: {
+    title: "Deploy Retention Compliance Policy",
+    buttonLabel: "Deploy Retention Policy",
+    postUrl: "/api/AddRetentionCompliancePolicy",
+    listTemplatesUrl: "/api/ListRetentionCompliancePolicyTemplates",
+    templateQueryKey: "TemplateListRetentionCompliancePolicy",
+    relatedQueryKeys: [
+      "ListRetentionCompliancePolicy",
+      "ListRetentionCompliancePolicyTemplates",
+    ],
+    placeholder: `{
+  "Name": "7-year Email Retention",
+  "Comment": "Retain Exchange mail for 7 years",
+  "ExchangeLocation": "All",
+  "Enabled": true,
+  "RuleParams": {
+    "Name": "7-year Email Retention Rule",
+    "RetentionDuration": 2555,
+    "RetentionComplianceAction": "Keep",
+    "ExpirationDateOption": "ModificationAgeInDays"
+  }
+}`,
+  },
+  SensitivityLabel: {
+    title: "Deploy Sensitivity Label",
+    buttonLabel: "Deploy Sensitivity Label",
+    postUrl: "/api/AddSensitivityLabel",
+    listTemplatesUrl: "/api/ListSensitivityLabelTemplates",
+    templateQueryKey: "TemplateListSensitivityLabel",
+    relatedQueryKeys: ["ListSensitivityLabel", "ListSensitivityLabelTemplates"],
+    placeholder: `{
+  "Name": "Confidential",
+  "DisplayName": "Confidential",
+  "Tooltip": "Confidential data, do not share externally",
+  "Comment": "Internal-only confidential classification",
+  "ContentType": "File, Email",
+  "EncryptionEnabled": true,
+  "EncryptionProtectionType": "Template",
+  "ContentMarkingHeaderEnabled": true,
+  "ContentMarkingHeaderText": "Confidential - Internal Use Only",
+  "PolicyParams": {
+    "Name": "Confidential Label Policy",
+    "ExchangeLocation": "All",
+    "Settings": [
+      ["mandatory", "false"],
+      ["disablemandatoryinoutlook", "true"]
+    ]
+  }
+}`,
+  },
+  SensitiveInfoType: {
+    title: "Deploy Sensitive Information Type",
+    buttonLabel: "Deploy SIT",
+    postUrl: "/api/AddSensitiveInfoType",
+    listTemplatesUrl: "/api/ListSensitiveInfoTypeTemplates",
+    templateQueryKey: "TemplateListSensitiveInfoType",
+    relatedQueryKeys: ["ListSensitiveInfoType", "ListSensitiveInfoTypeTemplates"],
+    placeholder: `{
+  "Name": "Custom Employee ID",
+  "Description": "Internal Employee ID format EMP-NNNNN",
+  "Pattern": "EMP-\\\\d{5}",
+  "Confidence": "High",
+  "Recommended": true
+}
+
+// Or with a base64-encoded XML rule pack:
+// {
+//   "Name": "Custom Rule Pack",
+//   "FileDataBase64": "<BASE64 encoded XML rule pack>"
+// }`,
+  },
+};
+
+export const CippDeployCompliancePolicyDrawer = ({
+  mode,
+  buttonText,
+  requiredPermissions = [],
+  PermissionButton = Button,
+}) => {
+  const config = MODE_CONFIG[mode];
+
+  const [drawerVisible, setDrawerVisible] = useState(false);
+
+  const formControl = useForm({
+    mode: "onChange",
+    defaultValues: {
+      selectedTenants: [],
+      TemplateList: null,
+      PowerShellCommand: "",
+    },
+  });
+
+  const { isValid } = useFormState({ control: formControl.control });
+
+  const templateListVal = useWatch({ control: formControl.control, name: "TemplateList" });
+
+  useEffect(() => {
+    if (templateListVal?.value) {
+      formControl.setValue("PowerShellCommand", JSON.stringify(templateListVal.value));
+    }
+  }, [templateListVal, formControl]);
+
+  const deployPolicy = ApiPostCall({
+    urlFromData: true,
+    relatedQueryKeys: config?.relatedQueryKeys ?? [],
+  });
+
+  useEffect(() => {
+    if (deployPolicy.isSuccess) {
+      formControl.reset({
+        selectedTenants: [],
+        TemplateList: null,
+        PowerShellCommand: "",
+      });
+    }
+  }, [deployPolicy.isSuccess, formControl]);
+
+  if (!config) {
+    return null;
+  }
+
+  const handleSubmit = () => {
+    formControl.trigger();
+    if (!isValid) return;
+    deployPolicy.mutate({
+      url: config.postUrl,
+      data: formControl.getValues(),
+    });
+  };
+
+  const handleCloseDrawer = () => {
+    setDrawerVisible(false);
+    formControl.reset({
+      selectedTenants: [],
+      TemplateList: null,
+      PowerShellCommand: "",
+    });
+  };
+
+  return (
+    <>
+      <PermissionButton
+        requiredPermissions={requiredPermissions}
+        onClick={() => setDrawerVisible(true)}
+        startIcon={<RocketLaunch />}
+      >
+        {buttonText ?? config.buttonLabel}
+      </PermissionButton>
+      <CippOffCanvas
+        title={config.title}
+        visible={drawerVisible}
+        onClose={handleCloseDrawer}
+        size="lg"
+        footer={
+          <Stack direction="row" spacing={2} justifyContent="flex-start">
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={handleSubmit}
+              disabled={deployPolicy.isLoading || !isValid}
+            >
+              {deployPolicy.isLoading
+                ? "Deploying..."
+                : deployPolicy.isSuccess
+                ? "Deploy Another"
+                : "Deploy"}
+            </Button>
+            <Button variant="outlined" onClick={handleCloseDrawer}>
+              Close
+            </Button>
+          </Stack>
+        }
+      >
+        <Grid container spacing={2} sx={{ mb: 2 }}>
+          <Grid size={{ xs: 12 }}>
+            <CippFormTenantSelector
+              label="Select Tenants"
+              formControl={formControl}
+              name="selectedTenants"
+              type="multiple"
+              allTenants={true}
+              preselectedEnabled={true}
+              validators={{ required: "At least one tenant must be selected" }}
+            />
+          </Grid>
+
+          <Divider sx={{ my: 1, width: "100%" }} />
+
+          <Grid size={{ xs: 12 }}>
+            <CippFormComponent
+              type="autoComplete"
+              label="Select a template (optional)"
+              name="TemplateList"
+              formControl={formControl}
+              multiple={false}
+              api={{
+                queryKey: config.templateQueryKey,
+                labelField: "name",
+                valueField: (option) => option,
+                url: config.listTemplatesUrl,
+              }}
+              placeholder="Select a template or enter PowerShell JSON manually"
+            />
+          </Grid>
+
+          <Divider sx={{ my: 1, width: "100%" }} />
+
+          <Grid size={{ xs: 12 }}>
+            <CippFormComponent
+              type="textField"
+              label="Parameters (JSON)"
+              name="PowerShellCommand"
+              formControl={formControl}
+              multiline
+              rows={12}
+              validators={{ required: "Please enter the PowerShell parameters as JSON." }}
+              placeholder={config.placeholder}
+            />
+          </Grid>
+
+          <CippApiResults apiObject={deployPolicy} />
+        </Grid>
+      </CippOffCanvas>
+    </>
+  );
+};