[pull] dev from KelvinTegelaar:dev

src/components/CippComponents/CippApiResults.jsx

@@ -244,7 +244,7 @@ export const CippApiResults = (props) => {
 
   const hasVisibleResults = finalResults.some((r) => r.visible);
   return (
-    <Stack spacing={2}>
+    <Stack spacing={2} sx={{ minWidth: 0 }}>
       {/* Loading alert */}
       {!errorsOnly && (
         <Collapse in={fetchingVisible} unmountOnExit>

src/components/CippComponents/CippApplicationDeployDrawer.jsx

@@ -869,22 +869,55 @@ export const CippApplicationDeployDrawer = ({
                 rows={6}
               />
             </Grid>
-            <Grid size={{ md: 6, xs: 12 }}>
-              <CippFormComponent
-                type="textField"
-                label="Detection Path (e.g., C:\Program Files\MyApp or %ProgramData%\MyApp)"
-                name="detectionPath"
-                formControl={formControl}
-              />
-            </Grid>
-            <Grid size={{ md: 6, xs: 12 }}>
+            <Grid size={{ xs: 12 }}>
               <CippFormComponent
-                type="textField"
-                label="Detection File/Folder Name (Optional, e.g., app.exe)"
-                name="detectionFile"
+                type="switch"
+                label="Use Detection Script instead of file/path detection"
+                name="useDetectionScript"
                 formControl={formControl}
               />
             </Grid>
+            <CippFormCondition
+              formControl={formControl}
+              field="useDetectionScript"
+              compareType="is"
+              compareValue={true}
+            >
+              <Grid size={{ xs: 12 }}>
+                <CippFormComponent
+                  type="textField"
+                  label="Detection Script (PowerShell — exit 0 with STDOUT = detected)"
+                  name="detectionScript"
+                  formControl={formControl}
+                  multiline
+                  rows={6}
+                  validators={{ required: "Detection script is required when using script detection" }}
+                />
+              </Grid>
+            </CippFormCondition>
+            <CippFormCondition
+              formControl={formControl}
+              field="useDetectionScript"
+              compareType="is"
+              compareValue={false}
+            >
+              <Grid size={{ md: 6, xs: 12 }}>
+                <CippFormComponent
+                  type="textField"
+                  label="Detection Path (e.g., C:\Program Files\MyApp or %ProgramData%\MyApp)"
+                  name="detectionPath"
+                  formControl={formControl}
+                />
+              </Grid>
+              <Grid size={{ md: 6, xs: 12 }}>
+                <CippFormComponent
+                  type="textField"
+                  label="Detection File/Folder Name (Optional, e.g., app.exe)"
+                  name="detectionFile"
+                  formControl={formControl}
+                />
+              </Grid>
+            </CippFormCondition>
             <Grid size={{ xs: 12 }}>
               <CippFormComponent
                 type="switch"

src/components/CippComponents/CippUserActions.jsx

@@ -23,8 +23,9 @@ import {
 import { getCippLicenseTranslation } from "../../utils/get-cipp-license-translation";
 import { useSettings } from "../../hooks/use-settings.js";
 import { usePermissions } from "../../hooks/use-permissions";
-import { Tooltip, Box } from "@mui/material";
+import { Tooltip, Box, Divider, Typography } from "@mui/material";
 import CippFormComponent from "./CippFormComponent";
+import { CippFormCondition } from "./CippFormCondition";
 import { useWatch } from "react-hook-form";
 
 // Separate component for Manage Licenses form to avoid hook issues
@@ -257,6 +258,62 @@ const OutOfOfficeForm = ({ formControl }) => {
         multiline
         rows={4}
       />
+
+      {!areDateFieldsDisabled && (
+        <>
+          <Divider sx={{ my: 1 }} />
+          <Typography variant="subtitle2">Calendar Options</Typography>
+
+          <CippFormComponent
+            type="switch"
+            name="CreateOOFEvent"
+            label="Block my calendar for this period"
+            formControl={formControl}
+          />
+          <CippFormCondition
+            formControl={formControl}
+            field="CreateOOFEvent"
+            compareType="is"
+            compareValue={true}
+          >
+            <CippFormComponent
+              type="textField"
+              name="OOFEventSubject"
+              label="Calendar Event Subject"
+              formControl={formControl}
+            />
+          </CippFormCondition>
+
+          <CippFormComponent
+            type="switch"
+            name="AutoDeclineFutureRequestsWhenOOF"
+            label="Automatically decline new invitations during this period"
+            formControl={formControl}
+          />
+
+          <CippFormComponent
+            type="switch"
+            name="DeclineEventsForScheduledOOF"
+            label="Decline and cancel my meetings during this period"
+            formControl={formControl}
+          />
+          <CippFormCondition
+            formControl={formControl}
+            field="DeclineEventsForScheduledOOF"
+            compareType="is"
+            compareValue={true}
+          >
+            <CippFormComponent
+              type="richText"
+              name="DeclineMeetingMessage"
+              label="Decline Message"
+              formControl={formControl}
+              multiline
+              rows={3}
+            />
+          </CippFormCondition>
+        </>
+      )}
     </>
   );
 };

src/components/CippFormPages/CippExchangeSettingsForm.jsx

@@ -14,6 +14,7 @@ import {
 } from "@mui/material";
 import { Check, Error, Sync } from "@mui/icons-material";
 import CippFormComponent from "../CippComponents/CippFormComponent";
+import { CippFormCondition } from "../CippComponents/CippFormCondition";
 import { ApiGetCall, ApiPostCall } from "../../api/ApiCall";
 import { useSettings } from "../../hooks/use-settings";
 import { Grid } from "@mui/system";
@@ -81,6 +82,11 @@ const CippExchangeSettingsForm = (props) => {
           "ExternalMessage",
           "StartTime",
           "EndTime",
+          "CreateOOFEvent",
+          "OOFEventSubject",
+          "AutoDeclineFutureRequestsWhenOOF",
+          "DeclineEventsForScheduledOOF",
+          "DeclineMeetingMessage",
         ];
 
         // Reset the form
@@ -266,6 +272,72 @@ const CippExchangeSettingsForm = (props) => {
                 rows={4}
               />
             </Grid>
+            {!areDateFieldsDisabled && (
+              <>
+                <Grid size={12}>
+                  <Divider sx={{ my: 1 }} />
+                  <Typography variant="subtitle2" sx={{ mt: 1 }}>
+                    Calendar Options
+                  </Typography>
+                </Grid>
+                <Grid size={12}>
+                  <CippFormComponent
+                    type="switch"
+                    name="ooo.CreateOOFEvent"
+                    label="Block my calendar for this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <CippFormCondition
+                  formControl={formControl}
+                  field="ooo.CreateOOFEvent"
+                  compareType="is"
+                  compareValue={true}
+                >
+                  <Grid size={12}>
+                    <CippFormComponent
+                      type="textField"
+                      name="ooo.OOFEventSubject"
+                      label="Calendar Event Subject"
+                      formControl={formControl}
+                    />
+                  </Grid>
+                </CippFormCondition>
+                <Grid size={12}>
+                  <CippFormComponent
+                    type="switch"
+                    name="ooo.AutoDeclineFutureRequestsWhenOOF"
+                    label="Automatically decline new invitations during this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <Grid size={12}>
+                  <CippFormComponent
+                    type="switch"
+                    name="ooo.DeclineEventsForScheduledOOF"
+                    label="Decline and cancel my meetings during this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <CippFormCondition
+                  formControl={formControl}
+                  field="ooo.DeclineEventsForScheduledOOF"
+                  compareType="is"
+                  compareValue={true}
+                >
+                  <Grid size={12}>
+                    <CippFormComponent
+                      type="richText"
+                      name="ooo.DeclineMeetingMessage"
+                      label="Decline Message"
+                      formControl={formControl}
+                      multiline
+                      rows={3}
+                    />
+                  </Grid>
+                </CippFormCondition>
+              </>
+            )}
             <Grid size={12}>
               <CippApiResults apiObject={postRequest} />
             </Grid>

src/components/CippWizard/CippWizardVacationActions.jsx

@@ -42,6 +42,22 @@ export const CippWizardVacationActions = (props) => {
       if (!currentExternal) {
         formControl.setValue("oooExternalMessage", oooData.data.ExternalMessage || "");
       }
+      // Pre-populate calendar options from existing config
+      if (oooData.data.CreateOOFEvent != null) {
+        formControl.setValue("oooCreateOOFEvent", !!oooData.data.CreateOOFEvent);
+      }
+      if (oooData.data.OOFEventSubject) {
+        formControl.setValue("oooOOFEventSubject", oooData.data.OOFEventSubject);
+      }
+      if (oooData.data.AutoDeclineFutureRequestsWhenOOF != null) {
+        formControl.setValue("oooAutoDeclineFutureRequests", !!oooData.data.AutoDeclineFutureRequestsWhenOOF);
+      }
+      if (oooData.data.DeclineEventsForScheduledOOF != null) {
+        formControl.setValue("oooDeclineEvents", !!oooData.data.DeclineEventsForScheduledOOF);
+      }
+      if (oooData.data.DeclineMeetingMessage) {
+        formControl.setValue("oooDeclineMeetingMessage", oooData.data.DeclineMeetingMessage);
+      }
     }
   }, [oooData.isSuccess, oooData.data]);
 
@@ -359,6 +375,70 @@ export const CippWizardVacationActions = (props) => {
                     />
                   )}
                 </Grid>
+
+                {/* Calendar Options */}
+                <Grid size={{ xs: 12 }}>
+                  <Divider sx={{ my: 1 }} />
+                  <Typography variant="subtitle2" sx={{ mt: 1 }}>
+                    Calendar Options
+                  </Typography>
+                </Grid>
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="switch"
+                    name="oooCreateOOFEvent"
+                    label="Block my calendar for this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <CippFormCondition
+                  formControl={formControl}
+                  field="oooCreateOOFEvent"
+                  compareType="is"
+                  compareValue={true}
+                >
+                  <Grid size={{ xs: 12 }}>
+                    <CippFormComponent
+                      type="textField"
+                      name="oooOOFEventSubject"
+                      label="Calendar Event Subject"
+                      formControl={formControl}
+                    />
+                  </Grid>
+                </CippFormCondition>
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="switch"
+                    name="oooAutoDeclineFutureRequests"
+                    label="Automatically decline new invitations during this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="switch"
+                    name="oooDeclineEvents"
+                    label="Decline and cancel my meetings during this period"
+                    formControl={formControl}
+                  />
+                </Grid>
+                <CippFormCondition
+                  formControl={formControl}
+                  field="oooDeclineEvents"
+                  compareType="is"
+                  compareValue={true}
+                >
+                  <Grid size={{ xs: 12 }}>
+                    <CippFormComponent
+                      type="richText"
+                      name="oooDeclineMeetingMessage"
+                      label="Decline Message"
+                      formControl={formControl}
+                      multiline
+                      rows={3}
+                    />
+                  </Grid>
+                </CippFormCondition>
               </Grid>
             </CippFormCondition>
           </Stack>