Merge pull request #660 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippComponents/CippAddUserDrawer.jsx

@@ -3,7 +3,6 @@ import { Button, Box } from "@mui/material";
 import { useForm, useWatch, useFormState } from "react-hook-form";
 import { PersonAdd } from "@mui/icons-material";
 import { CippOffCanvas } from "./CippOffCanvas";
-import { CippFormUserSelector } from "./CippFormUserSelector";
 import { CippApiResults } from "./CippApiResults";
 import { useSettings } from "../../hooks/use-settings";
 import { ApiPostCall } from "../../api/ApiCall";

src/components/CippComponents/CippAddVacationModeDrawer.jsx

@@ -28,6 +28,8 @@ export const CippAddVacationModeDrawer = ({
       PolicyId: null,
       startDate: null,
       endDate: null,
+      reference: null,
+      postExecution: [],
       excludeLocationAuditAlerts: false,
     },
   });
@@ -85,6 +87,8 @@ export const CippAddVacationModeDrawer = ({
         PolicyId: null,
         startDate: null,
         endDate: null,
+        reference: null,
+        postExecution: [],
         excludeLocationAuditAlerts: false,
       });
     }
@@ -105,6 +109,8 @@ export const CippAddVacationModeDrawer = ({
       StartDate: formData.startDate,
       EndDate: formData.endDate,
       vacation: true,
+      reference: formData.reference || null,
+      postExecution: formData.postExecution || [],
       excludeLocationAuditAlerts: formData.excludeLocationAuditAlerts || false,
     };
 
@@ -124,6 +130,8 @@ export const CippAddVacationModeDrawer = ({
       PolicyId: null,
       startDate: null,
       endDate: null,
+      reference: null,
+      postExecution: [],
     });
   };
 
@@ -295,6 +303,33 @@ export const CippAddVacationModeDrawer = ({
                 }}
               />
             </Grid>
+
+            {/* Post Execution Actions */}
+            <Grid size={{ md: 12, xs: 12 }}>
+              <CippFormComponent
+                type="autoComplete"
+                name="postExecution"
+                label="Post Execution Actions"
+                formControl={formControl}
+                multiple
+                creatable={false}
+                options={[
+                  { label: "Webhook", value: "Webhook" },
+                  { label: "Email", value: "Email" },
+                  { label: "PSA", value: "PSA" },
+                ]}
+              />
+            </Grid>
+
+            <Grid size={{ xs: 12 }}>
+              <CippFormComponent
+                type="textField"
+                label="Reference"
+                name="reference"
+                formControl={formControl}
+                placeholder="Optional note to help identify this vacation schedule, this is also added to notification titles."
+              />
+            </Grid>
             {policyHasLocationTarget && (
               <Grid size={{ xs: 12 }}>
                 <CippFormComponent

src/components/CippFormPages/CippAddEditUser.jsx

@@ -717,6 +717,14 @@ const CippAddEditUser = (props) => {
                   name="postExecution.psa"
                   formControl={formControl}
                 />
+                <CippFormComponent
+                  type="textField"
+                  fullWidth
+                  label="Reference"
+                  name="reference"
+                  placeholder="Enter a reference that will be added to the notification title"
+                  formControl={formControl}
+                />
               </Grid>
             </CippFormCondition>
           </Grid>

src/components/CippFormPages/CippSchedulerForm.jsx

@@ -568,6 +568,16 @@ const CippSchedulerForm = (props) => {
           />
         </Grid>
 
+        <Grid size={{ md: 12, xs: 12 }}>
+          <CippFormComponent
+            type="textField"
+            name="reference"
+            label="Reference"
+            formControl={formControl}
+            placeholder="Optional note to identify this task, this is also added to notification titles"
+          />
+        </Grid>
+
         {/* Divider */}
         <Grid size={{ md: 12, xs: 12 }}>
           <Divider sx={{ my: 2 }} />

src/components/CippWizard/CippWizardOffboarding.jsx

@@ -383,6 +383,17 @@ export const CippWizardOffboarding = (props) => {
                   formControl={formControl}
                 />
               </Grid>
+
+              <Grid size={{ sm: 12, xs: 12 }}>
+                <CippFormComponent
+                  type="textField"
+                  fullWidth
+                  label="Reference"
+                  name="reference"
+                  placeholder="Enter a reference that will be added to the notification title and scheduled task"
+                  formControl={formControl}
+                />
+              </Grid>
             </CippFormCondition>
           </Grid>
         </CardContent>

src/pages/cipp/scheduler/index.js

@@ -77,6 +77,7 @@ const Page = () => {
           "Command",
           "Parameters",
           "PostExecution",
+          "Reference",
           "Recurrence",
           "Results",
         ]}

src/pages/tenant/conditional/deploy-vacation/index.js

@@ -62,6 +62,7 @@ const Page = () => {
         "Tenant",
         "Name",
         "Parameters.Member",
+        "Reference",
         "TaskState",
         "ScheduledTime",
         "ExecutedTime",
@@ -73,6 +74,7 @@ const Page = () => {
           "TaskState",
           "ScheduledTime",
           "Parameters.Member",
+          "Reference",
           "Parameters.PolicyId",
           "Tenant",
           "ExecutedTime",