Merge pull request #19 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 40996cf4e4d4 · 2026-04-07T09:57:33.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/src/components/CippComponents/CippAppTemplateDrawer.jsx b/src/components/CippComponents/CippAppTemplateDrawer.jsx
@@ -614,6 +614,7 @@ export const CippAppTemplateDrawer = ({
                   { value: "oneNote", label: "OneNote" },
                   { value: "outlook", label: "Outlook" },
                   { value: "powerPoint", label: "PowerPoint" },
+                  { value: "publisher", label: "Publisher" },
                   { value: "teams", label: "Teams" },
                   { value: "word", label: "Word" },
                   { value: "lync", label: "Skype For Business" },
@@ -835,4 +836,4 @@ export const CippAppTemplateDrawer = ({
       </CippOffCanvas>
     </>
   );
-};
+};
diff --git a/src/components/CippComponents/CippApplicationDeployDrawer.jsx b/src/components/CippComponents/CippApplicationDeployDrawer.jsx
@@ -689,6 +689,7 @@ export const CippApplicationDeployDrawer = ({
                   { value: "oneNote", label: "OneNote" },
                   { value: "outlook", label: "Outlook" },
                   { value: "powerPoint", label: "PowerPoint" },
+                  { value: "publisher", label: "Publisher" },
                   { value: "teams", label: "Teams" },
                   { value: "word", label: "Word" },
                   { value: "lync", label: "Skype For Business" },
diff --git a/src/components/CippWizard/CippWizardVacationActions.jsx b/src/components/CippWizard/CippWizardVacationActions.jsx
@@ -16,6 +16,7 @@ import { CippFormCondition } from '../CippComponents/CippFormCondition'
 import { CippFormUserSelector } from '../CippComponents/CippFormUserSelector'
 import { useWatch } from 'react-hook-form'
 import { ApiGetCall } from '../../api/ApiCall'
+import { getCippValidator } from '../../utils/get-cipp-validator'
 
 export const CippWizardVacationActions = (props) => {
   const { postUrl, formControl, onPreviousStep, onNextStep, currentStep, lastStep } = props
@@ -25,12 +26,14 @@ export const CippWizardVacationActions = (props) => {
 
   const enableCA = useWatch({ control: formControl.control, name: 'enableCAExclusion' })
   const enableMailbox = useWatch({ control: formControl.control, name: 'enableMailboxPermissions' })
+  const enableForwarding = useWatch({ control: formControl.control, name: 'enableForwarding' })
   const enableOOO = useWatch({ control: formControl.control, name: 'enableOOO' })
-  const atLeastOneEnabled = enableCA || enableMailbox || enableOOO
+  const atLeastOneEnabled = enableCA || enableMailbox || enableForwarding || enableOOO
 
   const users = useWatch({ control: formControl.control, name: 'Users' })
   const firstUser = Array.isArray(users) && users.length > 0 ? users[0] : null
   const firstUserUpn = firstUser?.addedFields?.userPrincipalName || firstUser?.value || null
+  const forwardOption = useWatch({ control: formControl.control, name: 'forwardOption' })
 
   const oooData = ApiGetCall({
     url: '/api/ListOoO',
@@ -41,6 +44,41 @@ export const CippWizardVacationActions = (props) => {
 
   const isFetchingOOO = oooData.isFetching
 
+  const forwardingUsers = ApiGetCall({
+    url: '/api/ListGraphRequest',
+    data: {
+      Endpoint: 'users',
+      tenantFilter: tenantDomain,
+      $select: 'id,displayName,userPrincipalName,mail',
+      $top: 999,
+    },
+    queryKey: `VacationForwardingUsers-${tenantDomain}`,
+    waiting: !!(enableForwarding && tenantDomain),
+  })
+
+  const forwardingContacts = ApiGetCall({
+    url: '/api/ListGraphRequest',
+    data: {
+      Endpoint: 'contacts',
+      tenantFilter: tenantDomain,
+      $select: 'displayName,mail,mailNickname',
+      $top: 999,
+    },
+    queryKey: `VacationForwardingContacts-${tenantDomain}`,
+    waiting: !!(enableForwarding && tenantDomain),
+  })
+
+  const internalAddressOptions = [
+    ...((forwardingUsers.data?.Results || []).map((user) => ({
+      value: user.userPrincipalName,
+      label: `${user.displayName} (${user.userPrincipalName}) - User`,
+    })) || []),
+    ...((forwardingContacts.data?.Results || []).map((contact) => ({
+      value: contact.mail || contact.emailAddress,
+      label: `${contact.displayName} (${contact.mail || contact.emailAddress}) - Contact`,
+    })) || []),
+  ]
+
   useEffect(() => {
     if (oooData.isSuccess && oooData.data) {
       const currentInternal = formControl.getValues('oooInternalMessage')
@@ -71,7 +109,13 @@ export const CippWizardVacationActions = (props) => {
         formControl.setValue('oooDeclineMeetingMessage', oooData.data.DeclineMeetingMessage)
       }
     }
-  }, [oooData.isSuccess, oooData.data])
+  }, [oooData.isSuccess, oooData.data, formControl])
+
+  useEffect(() => {
+    if (enableForwarding && !forwardOption) {
+      formControl.setValue('forwardOption', 'internalAddress')
+    }
+  }, [enableForwarding, forwardOption, formControl])
 
   return (
     <Stack spacing={4}>
@@ -318,6 +362,120 @@ export const CippWizardVacationActions = (props) => {
         </CardContent>
       </Card>
 
+      {/* Mail Forwarding Section */}
+      <Card variant="outlined">
+        <CardHeader
+          title="Mail Forwarding"
+          subheader="Forward email to another recipient during the vacation period"
+        />
+        <Divider />
+        <CardContent>
+          <Stack spacing={2}>
+            <CippFormComponent
+              type="switch"
+              name="enableForwarding"
+              label="Enable Mail Forwarding"
+              formControl={formControl}
+            />
+
+            <CippFormCondition
+              formControl={formControl}
+              field="enableForwarding"
+              compareType="is"
+              compareValue={true}
+              clearOnHide={false}
+            >
+              <Grid container spacing={2}>
+                <Grid size={{ xs: 12 }}>
+                  <Alert severity="info" sx={{ mb: 1 }}>
+                    Vacation mode will enable forwarding at the start date and disable forwarding
+                    again at the end date. Existing forwarding settings are not restored after the
+                    vacation ends.
+                  </Alert>
+                </Grid>
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="radio"
+                    name="forwardOption"
+                    formControl={formControl}
+                    options={[
+                      { label: 'Forward to Internal Address', value: 'internalAddress' },
+                      {
+                        label: 'Forward to External Address (Tenant must allow this)',
+                        value: 'ExternalAddress',
+                      },
+                    ]}
+                  />
+                </Grid>
+
+                <CippFormCondition
+                  formControl={formControl}
+                  field="forwardOption"
+                  compareType="is"
+                  compareValue="internalAddress"
+                >
+                  <Grid size={{ xs: 12 }}>
+                    <CippFormComponent
+                      type="autoComplete"
+                      label={
+                        tenantDomain
+                          ? `Forward to user or contact in ${tenantDomain}`
+                          : 'Select a tenant first'
+                      }
+                      name="forwardInternal"
+                      multiple={false}
+                      options={internalAddressOptions}
+                      formControl={formControl}
+                      creatable={false}
+                      disabled={!tenantDomain}
+                      validators={{
+                        validate: (option) => {
+                          if (!option?.value && !option) {
+                            return 'Forwarding target is required'
+                          }
+                          return true
+                        },
+                      }}
+                      required={true}
+                    />
+                  </Grid>
+                </CippFormCondition>
+
+                <CippFormCondition
+                  formControl={formControl}
+                  field="forwardOption"
+                  compareType="is"
+                  compareValue="ExternalAddress"
+                >
+                  <Grid size={{ xs: 12 }}>
+                    <CippFormComponent
+                      type="textField"
+                      label="External Email Address"
+                      name="forwardExternal"
+                      formControl={formControl}
+                      validators={{
+                        required: 'Email is required',
+                        validate: (value) => getCippValidator(value, 'email'),
+                      }}
+                      required={true}
+                    />
+                  </Grid>
+                </CippFormCondition>
+
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="switch"
+                    label="Keep a Copy of the Forwarded Mail in the Source Mailbox"
+                    name="forwardKeepCopy"
+                    formControl={formControl}
+                  />
+                </Grid>
+              </Grid>
+            </CippFormCondition>
+          </Stack>
+        </CardContent>
+      </Card>
+
       {/* Out of Office Section */}
       <Card variant="outlined">
         <CardHeader
diff --git a/src/components/CippWizard/CippWizardVacationConfirmation.jsx b/src/components/CippWizard/CippWizardVacationConfirmation.jsx
@@ -13,11 +13,20 @@ export const CippWizardVacationConfirmation = (props) => {
 
   const caExclusion = ApiPostCall({ relatedQueryKeys: ["VacationMode"] });
   const mailboxVacation = ApiPostCall({ relatedQueryKeys: ["VacationMode"] });
+  const forwardingVacation = ApiPostCall({ relatedQueryKeys: ["VacationMode"] });
   const oooVacation = ApiPostCall({ relatedQueryKeys: ["VacationMode"] });
 
   const tenantFilter = values.tenantFilter?.value || values.tenantFilter;
-  const isSubmitting = caExclusion.isPending || mailboxVacation.isPending || oooVacation.isPending;
-  const hasSubmitted = caExclusion.isSuccess || mailboxVacation.isSuccess || oooVacation.isSuccess;
+  const isSubmitting =
+    caExclusion.isPending ||
+    mailboxVacation.isPending ||
+    forwardingVacation.isPending ||
+    oooVacation.isPending;
+  const hasSubmitted =
+    caExclusion.isSuccess ||
+    mailboxVacation.isSuccess ||
+    forwardingVacation.isSuccess ||
+    oooVacation.isSuccess;
 
   const handleSubmit = () => {
     if (values.enableCAExclusion) {
@@ -57,6 +66,32 @@ export const CippWizardVacationConfirmation = (props) => {
       });
     }
 
+    if (values.enableForwarding) {
+      const forwardingData = {
+        tenantFilter,
+        Users: values.Users,
+        forwardOption: values.forwardOption,
+        KeepCopy: values.forwardKeepCopy || false,
+        startDate: values.startDate,
+        endDate: values.endDate,
+        reference: values.reference || null,
+        postExecution: values.postExecution || [],
+      };
+
+      if (values.forwardOption === "internalAddress") {
+        forwardingData.ForwardInternal = values.forwardInternal;
+      }
+
+      if (values.forwardOption === "ExternalAddress") {
+        forwardingData.ForwardExternal = values.forwardExternal;
+      }
+
+      forwardingVacation.mutate({
+        url: "/api/ExecScheduleForwardingVacation",
+        data: forwardingData,
+      });
+    }
+
     if (values.enableOOO) {
       const oooData = {
         tenantFilter,
@@ -97,6 +132,18 @@ export const CippWizardVacationConfirmation = (props) => {
     return users.map((u) => u.label || u.value || u).join(", ");
   };
 
+  const formatForwardingTarget = () => {
+    if (values.forwardOption === "internalAddress") {
+      return values.forwardInternal?.label || values.forwardInternal?.value || values.forwardInternal || "Not set";
+    }
+
+    if (values.forwardOption === "ExternalAddress") {
+      return values.forwardExternal || "Not set";
+    }
+
+    return "Not set";
+  };
+
   return (
     <Stack spacing={3}>
       {/* Summary */}
@@ -148,8 +195,13 @@ export const CippWizardVacationConfirmation = (props) => {
 
       {/* Enabled Actions */}
       {(() => {
-        const enabledCount = [values.enableCAExclusion, values.enableMailboxPermissions, values.enableOOO].filter(Boolean).length;
-        const mdSize = enabledCount >= 3 ? 4 : enabledCount === 2 ? 6 : 12;
+        const enabledCount = [
+          values.enableCAExclusion,
+          values.enableMailboxPermissions,
+          values.enableForwarding,
+          values.enableOOO,
+        ].filter(Boolean).length;
+        const mdSize = enabledCount >= 4 ? 3 : enabledCount === 3 ? 4 : enabledCount === 2 ? 6 : 12;
         return (
           <Grid container spacing={3}>
             {values.enableCAExclusion && (
@@ -225,6 +277,42 @@ export const CippWizardVacationConfirmation = (props) => {
               </Grid>
             )}
 
+            {values.enableForwarding && (
+              <Grid size={{ md: mdSize, xs: 12 }}>
+                <Card variant="outlined" sx={{ height: "100%" }}>
+                  <CardHeader
+                    title="Mail Forwarding"
+                    action={<Chip label="Enabled" color="primary" size="small" />}
+                  />
+                  <Divider />
+                  <CardContent>
+                    <Stack spacing={1}>
+                      <div>
+                        <Typography variant="subtitle2" color="text.secondary">
+                          Destination
+                        </Typography>
+                        <Typography variant="body2">{formatForwardingTarget()}</Typography>
+                      </div>
+                      <div>
+                        <Typography variant="subtitle2" color="text.secondary">
+                          Forwarding Type
+                        </Typography>
+                        <Typography variant="body2">
+                          {values.forwardOption === "ExternalAddress" ? "External Address" : "Internal Address"}
+                        </Typography>
+                      </div>
+                      <div>
+                        <Typography variant="subtitle2" color="text.secondary">
+                          Keep Copy
+                        </Typography>
+                        <Typography variant="body2">{values.forwardKeepCopy ? "Yes" : "No"}</Typography>
+                      </div>
+                    </Stack>
+                  </CardContent>
+                </Card>
+              </Grid>
+            )}
+
             {values.enableOOO && (
               <Grid size={{ md: mdSize, xs: 12 }}>
                 <Card variant="outlined" sx={{ height: "100%" }}>
@@ -287,6 +375,7 @@ export const CippWizardVacationConfirmation = (props) => {
       {/* API Results */}
       {values.enableCAExclusion && <CippApiResults apiObject={caExclusion} />}
       {values.enableMailboxPermissions && <CippApiResults apiObject={mailboxVacation} />}
+      {values.enableForwarding && <CippApiResults apiObject={forwardingVacation} />}
       {values.enableOOO && <CippApiResults apiObject={oooVacation} />}
 
       {/* Navigation + Custom Submit */}
diff --git a/src/pages/identity/administration/vacation-mode/add/index.js b/src/pages/identity/administration/vacation-mode/add/index.js
@@ -76,6 +76,11 @@ const Page = () => {
     includeCalendar: false,
     calendarPermission: null,
     canViewPrivateItems: false,
+    enableForwarding: false,
+    forwardOption: 'internalAddress',
+    forwardInternal: null,
+    forwardExternal: '',
+    forwardKeepCopy: false,
     enableOOO: false,
     oooInternalMessage: null,
     oooExternalMessage: null,
diff --git a/src/pages/identity/administration/vacation-mode/index.js b/src/pages/identity/administration/vacation-mode/index.js
@@ -60,6 +60,11 @@ const Page = () => {
       value: [{ id: "Name", value: "Mailbox Vacation" }],
       type: "column",
     },
+    {
+      filterName: "Mail Forwarding",
+      value: [{ id: "Name", value: "Forwarding Vacation" }],
+      type: "column",
+    },
     {
       filterName: "Out of Office",
       value: [{ id: "Name", value: "OOO Vacation" }],
