-
-
-
-
- {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.CAPTION")}
-
-
- {/* Render table containing general information */}
-
+ // initialize form
+
handleSubmit(values)}
+ >
+ {(formik) => (
+ <>
+
+
+
+
+ {/*
+
{t("LIFECYCLE.POLICIES.DETAILS.GENERAL.CAPTION")} */}
+
+ {/* Render fields */}
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.NOTE.TITLE")}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.NOTE.MESSAGE")}
+
+
+
+ {formik.dirty && (
+ <>
+ {/* Render buttons for updating metadata */}
+
+ formik.handleSubmit()}
+ disabled={!checkValidity(formik)}
+ className={cn("submit", {
+ active: checkValidity(formik),
+ inactive: !checkValidity(formik),
+ })}
+ >
+ {t("SAVE")}
+
+ formik.resetForm()}
+ >
+ {t("CANCEL")}
+
+
+
+
+
+ )}
+ {/*
*/}
+
-
-
+
+ )}
+
);
};
diff --git a/src/components/events/partials/ModalTabsAndPages/NewLifeCyclePolicyGeneralPage.tsx b/src/components/events/partials/ModalTabsAndPages/NewLifeCyclePolicyGeneralPage.tsx
new file mode 100644
index 0000000000..532abdf59b
--- /dev/null
+++ b/src/components/events/partials/ModalTabsAndPages/NewLifeCyclePolicyGeneralPage.tsx
@@ -0,0 +1,40 @@
+import React from "react";
+import { FormikProps } from "formik";
+import WizardNavigationButtons from "../../../shared/wizard/WizardNavigationButtons";
+import LifeCyclePolicyGeneralFields from "../wizards/LifeCyclePolicyGeneralFields";
+import { LifeCyclePolicy, TargetFilter } from "../../../../slices/lifeCycleSlice";
+
+/**
+ * This component renders the metadata page for new events and series in the wizards.
+ */
+const NewLifeCyclePolicyGeneralPage =
({
+ formik,
+ nextPage,
+ header
+}: {
+ formik: FormikProps,
+ nextPage: (values: T) => void,
+ header: string
+}) => {
+
+ return (
+ <>
+
+
+
+ {/* Table view containing input fields for metadata */}
+
+
+
false}
+ policyChanged={policyChanged}
+ setPolicyChanged={setPolicyChanged}
/>
}
diff --git a/src/components/events/partials/wizards/LifeCyclePolicyGeneralFields.tsx b/src/components/events/partials/wizards/LifeCyclePolicyGeneralFields.tsx
new file mode 100644
index 0000000000..042f2046f0
--- /dev/null
+++ b/src/components/events/partials/wizards/LifeCyclePolicyGeneralFields.tsx
@@ -0,0 +1,475 @@
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { FieldArray, FieldProps, FormikProps } from "formik";
+import { Field } from "../../../shared/Field";
+import RenderField from "../../../shared/wizard/RenderField";
+import { ALL_TARGET_FILTER_TYPES, LifeCyclePolicy, TargetFilter } from "../../../../slices/lifeCycleSlice";
+import { useAppDispatch, useAppSelector } from "../../../../store";
+import { getLifeCyclePolicyActions, getLifeCyclePolicyTargetTypes, getLifeCyclePolicyTimings } from "../../../../selectors/lifeCycleDetailsSelectors";
+import DropDown from "../../../shared/DropDown";
+import { getEventMetadata } from "../../../../selectors/eventSelectors";
+import { fetchEventMetadata } from "../../../../slices/eventSlice";
+
+/**
+ * This component renders the metadata page for new events and series in the wizards.
+ */
+// interface RequiredFormProps {
+// sourceMode: string,
+// processingWorkflow: string,
+// }
+
+const LifeCyclePolicyGeneralFields =
({
+ formik,
+ isNew,
+}: {
+ formik: FormikProps,
+ isNew: boolean
+}) => {
+ const { t } = useTranslation();
+ const dispatch = useAppDispatch();
+
+ const actions = useAppSelector(state => getLifeCyclePolicyActions(state));
+ const targetTypes = useAppSelector(state => getLifeCyclePolicyTargetTypes(state));
+ const timings = useAppSelector(state => getLifeCyclePolicyTimings(state));
+ const metadataFields = useAppSelector(state => getEventMetadata(state));
+
+ useEffect(() => {
+ dispatch(fetchEventMetadata())
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [])
+
+ const ADDITIONAL_TARGET_FILTER_KEYS_EVENTS = [
+ {
+ id: 'series_name',
+ type: 'text',
+ collection: undefined
+ },
+ {
+ id: 'presenter',
+ type: 'text',
+ collection: undefined
+ },
+ {
+ id: 'start_date',
+ type: 'date',
+ collection: undefined
+ },
+ {
+ id: 'end_date',
+ type: 'date',
+ collection: undefined
+ },
+ {
+ id: 'created',
+ type: 'date',
+ collection: undefined
+ },
+ {
+ id: 'source',
+ type: 'text',
+ collection: undefined
+ },
+ {
+ id: 'rights',
+ type: 'text',
+ collection: undefined
+ },
+ {
+ id: 'location',
+ type: 'text',
+ collection: undefined
+ },
+ ]
+
+ const eventFilterOptions: { id: string, type: string, collection?: unknown }[] = []
+ for (const field of metadataFields.fields) {
+ eventFilterOptions.push(field)
+ }
+ for (const field of ADDITIONAL_TARGET_FILTER_KEYS_EVENTS) {
+ eventFilterOptions.push(field)
+ }
+
+ const createTargetFilter = (): TargetFilter => {
+ return {
+ value: "",
+ type: "SEARCH",
+ must: true
+ }
+ }
+
+ const filterOptions = (targetType: string) => {
+ switch (targetType) {
+ case "EVENT":
+ return eventFilterOptions
+ default:
+ return []
+ }
+ }
+
+ return (
+ <>
+
+
{t("LIFECYCLE.POLICIES.NEW.GENERAL.CAPTION")}
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TITLE")}*
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ISACTIVE")}*
+
+
+
+ {!isNew &&
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ISCREATEDFROMCONFIG")}
+
+
+
+ }
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETTYPE")}*
+
+ ({ value: element, name: element }) ),
+ id: "language",
+ }}
+ component={RenderField}
+ />
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TIMING")}*
+
+ ({ value: element, name: element }) ),
+ id: "language",
+ }}
+ component={RenderField}
+ />
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTION")}*
+
+ ({ value: element, name: element }) ),
+ id: "language"
+ }}
+ component={RenderField}
+ />
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONDATE")}
+ {formik.values.timing === "SPECIFIC_DATE" && * }
+
+
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.CRONTRIGGER")}
+ {formik.values.timing === "REPEATING" && * }
+
+
+
+
+ {!isNew &&
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ID")}
+
+ {formik.values.id}
+
+
+ }
+
+
+
+
+
+
+ {/* Target Filters like the ACLs
+ Can we make "key" a dropdown?
+ Type of "Value" should depend on key, e.g. for key "start_date" show a date picker
+ */}
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.CAPTION") }
+
+
+
+ {/* column headers */}
+
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.FILTER") }
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.VALUE") }
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.TYPE") }
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.MUST") }
+
+
+ { t("EVENTS.EVENTS.DETAILS.ACCESS.ACCESS_POLICY.ACTION") }
+
+
+
+
+
+
+ {({ replace, remove, push }) => (
+ <>
+ {Object.entries(formik.values.targetFiltersArray).map(([key, filter], index) => {
+ return(
+
+
+ e.id)}
+ creatable={true}
+ clearFieldName={`targetFiltersArray.${key}.value`}
+ component={DropdownField}
+ />
+
+
+
+
+
+
+
+
+ remove(index)}
+ className="button-like-anchor remove"
+ />
+
+
+ )
+ })}
+
+
+
+ push(createTargetFilter())
+ }
+ className="button-like-anchor"
+ >
+ +{" "}
+ {t(
+ "LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.NEW"
+ )}
+
+
+
+
+ )}
+
+
+
+
+
+ { t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONPARAMETERS.CAPTION") }
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONPARAMETERS.WORKFLOW_ID")}*
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONPARAMETERS.WORKFLOW_PARAMETERS")}
+
+
+
+
+
+
{
+ setFieldValue(clearFieldName, undefined)
+ element && setFieldValue(field.name, element.value)
+ }}
+ placeholder={`-- ${t("SELECT_NO_OPTION_SELECTED")} --`}
+ creatable={creatable}
+ />
+ )
+};
+
+const getTargetFilterRenderType = (filterName: string, targetFilterOptions: { id: string, type: string, collection?: unknown }[] ) => {
+ const option = targetFilterOptions.find(e => e.id === filterName);
+ if (option === undefined) {
+ return "text";
+ }
+ // Simplify types like "long_text" or "mixed_text"
+ if (option.type.includes("text")) {
+ return "text";
+ }
+ return option.type;
+}
+
+const getTargetFilterRenderCollection = (filterName: string, targetFilterOptions: { id: string, type: string, collection?: unknown }[] ) => {
+ const option = targetFilterOptions.find(e => e.id === filterName);
+ return option !== undefined ? option.collection : undefined
+}
diff --git a/src/components/events/partials/wizards/NewLifeCyclePolicySummary.tsx b/src/components/events/partials/wizards/NewLifeCyclePolicySummary.tsx
new file mode 100644
index 0000000000..be069c305b
--- /dev/null
+++ b/src/components/events/partials/wizards/NewLifeCyclePolicySummary.tsx
@@ -0,0 +1,112 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import AccessSummaryTable from "./summaryTables/AccessSummaryTable";
+import WizardNavigationButtons from "../../../shared/wizard/WizardNavigationButtons";
+import { FormikProps } from "formik";
+import { renderValidDate } from "../../../../utils/dateUtils";
+import { initialFormValuesNewLifeCyclePolicy } from "../../../../configs/modalConfig";
+
+/**
+ * This component renders the summary page for new series in the new series wizard.
+ */
+// interface RequiredFormProps {
+
+// }
+
+const NewLifeCyclePolicySummary = ({
+ formik,
+ previousPage,
+}: {
+ formik: FormikProps,
+ previousPage: (values: T, twoPagesBack?: boolean) => void,
+}) => {
+ const { t } = useTranslation();
+
+ return (
+ <>
+
+
+
+
+
+
{t("LIFECYCLE.POLICIES.NEW.CAPTION")}
+
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TITLE")}
+ {formik.values.title}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ISACTIVE")}
+ {formik.values.isActive}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETTYPE")}
+ {formik.values.targetType}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TIMING")}
+ {formik.values.timing}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTION")}
+ {formik.values.action}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONDATE")}
+ {t("dateFormats.dateTime.medium", { dateTime: renderValidDate(formik.values.actionDate) } )}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.CRONTRIGGER")}
+ {formik.values.cronTrigger}
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.TARGETFILTERS.CAPTION")}
+
+ {formik.values.targetFiltersArray.map((filter) => (
+
+ {filter.filter}
+ {filter.value}
+ {filter.type}
+ {filter.must.toString()}
+
+ ))}
+
+
+
+ {t("LIFECYCLE.POLICIES.DETAILS.GENERAL.ACTIONPARAMETERS.CAPTION")}
+
+ {formik.values.action === "START_WORKFLOW" &&
+
+ {formik.values.actionParameters.workflowId}
+ {formik.values.actionParameters.workflowParameters}
+
+ }
+
+
+
+
+
+
+ {/*Summary access configuration*/}
+
+
+
+
+
handleSubmit(values)}
+ >
+ {/* Render wizard pages depending on current value of page variable */}
+ {(formik) => {
+ // eslint-disable-next-line react-hooks/rules-of-hooks
+ useEffect(() => {
+ formik.validateForm();
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [page]);
+
+ return (
+ <>
+ {/* Stepper that shows each step of wizard as header */}
+
+ {page === 0 && (
+
+
+ );
+ }}
+
+
+ );
+}
+
+// Transform all initial values needed from information provided by backend
+const getInitialValues = (
+ user: UserInfoState
+) => {
+ let initialValues = initialFormValuesNewLifeCyclePolicy;
+
+ initialValues["acls"] = [
+ {
+ role: user.userRole,
+ read: true,
+ write: true,
+ actions: [],
+ },
+ ];
+
+ return initialValues;
+};
+
+export default NewLifeCyclePolicyWizard;
diff --git a/src/components/events/partials/wizards/RenderWorkflowConfig.tsx b/src/components/events/partials/wizards/RenderWorkflowConfig.tsx
index 3ea294a170..9687510502 100644
--- a/src/components/events/partials/wizards/RenderWorkflowConfig.tsx
+++ b/src/components/events/partials/wizards/RenderWorkflowConfig.tsx
@@ -6,7 +6,7 @@ import {
getWorkflowDefById,
} from "../../../../selectors/workflowSelectors";
import { useAppSelector } from "../../../../store";
-import { FieldSetField } from "../../../../slices/workflowSlice";
+import { ConfigurationPanelField, FieldSetField } from "../../../../slices/workflowSlice";
/**
* This component renders the configuration panel for the selected workflow in the processing step of the new event
@@ -32,10 +32,28 @@ const RenderWorkflowConfig = ({
const configPanel = !!workflowDef && workflowDef.configuration_panel_json
? workflowDef.configuration_panel_json
: [];
- const description = !!workflowDef && workflowDef.description
+ const description = !!workflowDef && workflowDef.description && !displayDescription
? workflowDef.description
: "";
+ return (
+ ({
+ formik,
+ configPanel,
+ description
+}: {
+ formik: FormikProps
+ configPanel: string | ConfigurationPanelField[]
+ description: string
+}) => {
const descriptionBoxStyle = {
margin: "15px 0 0 0",
position: "relative" as const,
@@ -55,7 +73,7 @@ const RenderWorkflowConfig = ({
return (
<>
- {displayDescription && description.length > 0 && (
+ {description.length > 0 && (
diff --git a/src/components/shared/ConfirmModal.tsx b/src/components/shared/ConfirmModal.tsx
index 91395fab88..4a4262dc23 100644
--- a/src/components/shared/ConfirmModal.tsx
+++ b/src/components/shared/ConfirmModal.tsx
@@ -15,7 +15,7 @@ const ConfirmModal = ({
deleteWithCautionMessage = "",
}: {
close: () => void,
- resourceType: "EVENT" | "SERIES" | "LOCATION" | "USER" | "GROUP" | "ACL" | "THEME",
+ resourceType: "EVENT" | "SERIES" | "LOCATION" | "USER" | "GROUP" | "ACL" | "THEME" | "LIFECYCLE_POLICY",
resourceName: string,
resourceId: T,
deleteMethod: (id: T) => void,
diff --git a/src/components/shared/DropDown.tsx b/src/components/shared/DropDown.tsx
index 2c746a6307..dfa3d0c922 100644
--- a/src/components/shared/DropDown.tsx
+++ b/src/components/shared/DropDown.tsx
@@ -18,7 +18,7 @@ import CreatableSelect from "react-select/creatable";
* - Creating typescript types for each "type" is moot atm, as a lot of them (i.e. capture agents) are not properly typed yet
* I would suggest waiting with typing options until all of its inputs are properly typed
*/
-export type DropDownType = "language" | "isPartOf" | "license" | "captureAgent" | "aclRole" | "workflow" | "aclTemplate" | "newTheme" | "comment" | "theme" | "time" | "filter";
+export type DropDownType = "language" | "isPartOf" | "license" | "captureAgent" | "aclRole" | "workflow" | "aclTemplate" | "newTheme" | "comment" | "theme" | "time" | "filter" | "policyAction";
/**
* This component provides a bar chart for visualising (statistics) data
diff --git a/src/components/shared/NewResourceModal.tsx b/src/components/shared/NewResourceModal.tsx
index 848e48df43..d47f022c7c 100644
--- a/src/components/shared/NewResourceModal.tsx
+++ b/src/components/shared/NewResourceModal.tsx
@@ -8,6 +8,7 @@ import NewGroupWizard from "../users/partials/wizard/NewGroupWizard";
import NewUserWizard from "../users/partials/wizard/NewUserWizard";
import { useHotkeys } from "react-hotkeys-hook";
import { availableHotkeys } from "../../configs/hotkeysConfig";
+import NewLifeCyclePolicyWizard from "../events/partials/wizards/NewLifeCyclePolicyWizard";
/**
* This component renders the modal for adding new resources
@@ -17,7 +18,7 @@ const NewResourceModal = ({
resource
}: {
handleClose: () => void,
- resource: "events" | "series" | "user" | "group" | "acl" | "themes"
+ resource: "events" | "series" | "user" | "group" | "acl" | "themes" | "lifecyclepolicy"
}) => {
const { t } = useTranslation();
@@ -56,6 +57,9 @@ const NewResourceModal = ({
{resource === "user" && (
{t("USERS.USERS.DETAILS.NEWCAPTION")}
)}
+ {resource === "lifecyclepolicy" && (
+ {t("LIFECYCLE.POLICIES.NEW.CAPTION")}
+ )}
{resource === "events" && (
//New Event Wizard
@@ -81,6 +85,10 @@ const NewResourceModal = ({
// New User Wizard
();
/**
@@ -23,7 +25,7 @@ const RenderField = ({
isFirstField = false,
}: {
field: FieldProps["field"]
- metadataField: MetadataField
+ metadataField: { type: string, collection: { [key: string]: unknown }[], required: boolean, id: string }, //MetadataField
form: FieldProps["form"]
showCheck?: boolean,
isFirstField?: boolean,
@@ -129,6 +131,17 @@ const RenderField = ({
handleKeyDown={handleKeyDown}
/>
)}
+ {metadataField.type === "cron" && (
+ setEditMode(false)}
+ onKeyDown={(e) => handleKeyDown(e, "cron")}
+ // ref={childRef}
+ >
+ setFieldValue(field.name, value)}
+ />
+
+ ) : (
+ setEditMode(true)} className="show-edit">
+
{text || ""}
+
+
+
) => {
diff --git a/src/configs/modalConfig.ts b/src/configs/modalConfig.ts
index 1f155f8352..2d4ad7f108 100644
--- a/src/configs/modalConfig.ts
+++ b/src/configs/modalConfig.ts
@@ -5,6 +5,7 @@ import { TobiraPage } from "../slices/seriesSlice";
import { initArray } from "../utils/utils";
import { EditedEvents, Event, UploadAssetsTrack } from "../slices/eventSlice";
import { Role } from "../slices/aclSlice";
+import { TargetFilter } from "../slices/lifeCycleSlice";
// Context for notifications shown in modals
export const NOTIFICATION_CONTEXT = "modal-form";
@@ -207,3 +208,33 @@ export const initialFormValuesEditScheduledEvents: {
editedEvents: [],
changedEvents: [],
};
+
+export const initialFormValuesNewLifeCyclePolicy: {
+ title: string,
+ isActive: boolean,
+ isCreatedFromConfig: boolean,
+ targetType: string,
+ timing: string,
+ action: string,
+ actionDate: string,
+ cronTrigger: string,
+ actionParameters: { [key: string]: unknown }
+ acls: TransformedAcl[]
+ targetFiltersArray: (TargetFilter & { filter: string })[],
+} = {
+ title: "",
+ isActive: true,
+ isCreatedFromConfig: false,
+ targetType: "EVENT",
+ timing: "SPECIFIC_DATE",
+ action: "START_WORKFLOW",
+ actionDate: "",
+ cronTrigger: "",
+ actionParameters: {
+ workflowId: "noop",
+ workflowParameters: `{"straightToPublishing": true}`
+ },
+
+ acls: [],
+ targetFiltersArray: [],
+};
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
index dd3c50013f..d9589dac19 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
@@ -119,7 +119,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
- "LOCATION": "The following location will be deleted"
+ "LOCATION": "The following location will be deleted",
+ "LIFECYCLE_POLICY": "The following lifeCycle policy will be deleted"
},
"NAME": "Name"
},
@@ -188,6 +189,10 @@
"EVENTS_NOT_DELETED_NOT_AUTHORIZED": "The event(s) could not be deleted, because you don't have the permission to do so.",
"SERIES_DELETED": "The series has been deleted",
"SERIES_NOT_DELETED": "The series could not be deleted",
+ "LIFECYCLE_POLICY_ADDED": "The lifeCycle policy has been created",
+ "LIFECYCLE_POLICY_NOT_SAVED": "The lifeCycle policy could not be saved",
+ "LIFECYCLE_POLICY_DELETED": "The lifeCycle policy has been deleted",
+ "LIFECYCLE_POLICY_NOT_DELETED": "The lifeCycle policy could not be deleted",
"LOCATION_DELETED": "The location has been deleted",
"LOCATION_NOT_DELETED": "The location could not be deleted",
"LOCATION_NOT_DELETED_NOT_AUTHORIZED": "The location could not be deleted, because you don't have the permission to do so.",
@@ -1234,7 +1239,15 @@
"TIMING": "Timing",
"TITLE": "Title",
"TOOLTIP": {
- "DETAILS": "LifeCycle Policy Details"
+ "DETAILS": "LifeCycle Policy Details",
+ "DELETE": "Delete LifeCycle Policy"
+ },
+ "ADD_POLICY": "Add LifeCycle Policy"
+ },
+ "NEW": {
+ "CAPTION": "Create LifeCycle Policy",
+ "GENERAL": {
+ "CAPTION": "General"
}
},
"DETAILS": {
@@ -1242,16 +1255,31 @@
"GENERAL": {
"ACTION": "Action",
"ACTIONDATE": "Action Date",
- "ACTIONPARAMETERS": "Action Parameters",
+ "ACTIONPARAMETERS": {
+ "CAPTION": "Action Parameters",
+ "WORKFLOW_ID": "Workflow ID",
+ "WORKFLOW_PARAMETERS": "Workflow Parameters"
+ },
"CAPTION": "LifeCycle Policy Details",
"CRONTRIGGER": "Cron Trigger",
"ID": "Identifier",
"ISACTIVE": "Active",
"ISCREATEDFROMCONFIG": "Created from Config",
"TARGETTYPE": "Target Type",
- "TARGETFILTERS": "Target Filters",
+ "TARGETFILTERS": {
+ "CAPTION": "Target Filters",
+ "FILTER": "Filter",
+ "VALUE": "Value",
+ "TYPE": "Type",
+ "MUST": "Must",
+ "NEW": "New Filter"
+ },
"TIMING": "Timing",
- "TITLE": "Title"
+ "TITLE": "Title",
+ "NOTE": {
+ "TITLE": "A note on editing LifeCycle Policies",
+ "MESSAGE": "The same policy cannot affect the same target multiple times. Depending on your goals, creating a new policy may be required."
+ }
},
"ACCESS": {
"LABEL": "Select a template",
diff --git a/src/selectors/lifeCycleDetailsSelectors.ts b/src/selectors/lifeCycleDetailsSelectors.ts
index 364368819a..8b279abb40 100644
--- a/src/selectors/lifeCycleDetailsSelectors.ts
+++ b/src/selectors/lifeCycleDetailsSelectors.ts
@@ -5,3 +5,6 @@ import { RootState } from "../store";
*/
export const getLifeCyclePolicyDetails = (state: RootState) => state.lifeCyclePolicyDetails;
export const getLifeCyclePolicyDetailsAcl = (state: RootState) => state.lifeCyclePolicyDetails.accessControlEntries;
+export const getLifeCyclePolicyActions = (state: RootState) => state.lifeCyclePolicyDetails.actionsEnum;
+export const getLifeCyclePolicyTargetTypes = (state: RootState) => state.lifeCyclePolicyDetails.targetTypesEnum;
+export const getLifeCyclePolicyTimings = (state: RootState) => state.lifeCyclePolicyDetails.timingsEnum;
diff --git a/src/slices/lifeCycleDetailsSlice.ts b/src/slices/lifeCycleDetailsSlice.ts
index 2bba3cda56..0a8407afe4 100644
--- a/src/slices/lifeCycleDetailsSlice.ts
+++ b/src/slices/lifeCycleDetailsSlice.ts
@@ -5,6 +5,8 @@ import { LifeCyclePolicy } from './lifeCycleSlice';
import { TransformedAcl } from './aclDetailsSlice';
import { createPolicy } from '../utils/resourceUtils';
import { Ace } from './aclSlice';
+import { addNotification } from './notificationSlice';
+
/**
* This file contains redux reducer for actions affecting the state of a lifeCyclePolicy/capture agent
@@ -12,6 +14,10 @@ import { Ace } from './aclSlice';
interface LifeCyclePolicyDetailsState extends LifeCyclePolicy {
statusLifeCyclePolicyDetails: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
errorLifeCyclePolicyDetails: SerializedError | null,
+
+ actionsEnum: string[],
+ targetTypesEnum: string[],
+ timingsEnum: string[],
}
// Initial state of lifeCyclePolicy details in redux store
@@ -29,7 +35,11 @@ const initialState: LifeCyclePolicyDetailsState = {
actionDate: "",
cronTrigger: "",
targetFilters: {},
- accessControlEntries: []
+ accessControlEntries: [],
+
+ actionsEnum: [],
+ targetTypesEnum: [],
+ timingsEnum: [],
};
// fetch details of certain lifeCyclePolicy from server
@@ -70,6 +80,27 @@ export const fetchLifeCyclePolicyDetails = createAppAsyncThunk('lifeCyclePolicyD
return data;
});
+export const fetchLifeCyclePolicyActions = createAppAsyncThunk('lifeCyclePolicyDetails/fetchLifeCyclePolicyActions', async () => {
+ const res = await axios.get(`/api/lifecyclemanagement/policies/actions`);
+ const data = res.data;
+
+ return data;
+});
+
+export const fetchLifeCyclePolicyTargetTypes = createAppAsyncThunk('lifeCyclePolicyDetails/fetchLifeCyclePolicyTargetTypes', async () => {
+ const res = await axios.get(`/api/lifecyclemanagement/policies/targettypes`);
+ const data = res.data;
+
+ return data;
+});
+
+export const fetchLifeCyclePolicyTimings = createAppAsyncThunk('lifeCyclePolicyDetails/fetchLifeCyclePolicyTimings', async () => {
+ const res = await axios.get(`/api/lifecyclemanagement/policies/timings`);
+ const data = res.data;
+
+ return data;
+});
+
// Dummy function for compatability
export const fetchLifeCyclePolicyDetailsAcls = createAppAsyncThunk('lifeCyclePolicyDetails/fetchLifeCyclePolicyDetailsAcls', async (id: string, {getState}) => {
const state = getState();
@@ -81,7 +112,47 @@ export const updateLifeCyclePolicyAccess = createAppAsyncThunk('lifeCyclePolicyD
id: string,
policies: { acl: { ace: Ace[] } }
}, {dispatch}) => {
- return false;
+ const { id, policies } = params;
+
+ let data = new URLSearchParams();
+ data.append("accessControlEntries", JSON.stringify(policies.acl.ace));
+
+ axios.put(`/api/lifecyclemanagement/policies/${id}`, data)
+ .then((response) => {
+ console.info(response);
+ dispatch(addNotification({type: "success", key: "LIFECYCLEPOLICY_ADDED"}));
+ return true;
+ })
+ .catch((response) => {
+ console.error(response);
+ dispatch(addNotification({type: "error", key: "LIFECYCLEPOLICY_NOT_SAVED"}));
+ return false;
+ });
+});
+
+export const updateLifeCyclePolicy = createAppAsyncThunk('lifeCyclePolicyDetails/updateLifeCyclePolicy', async (policy: LifeCyclePolicy, {dispatch}) => {
+ let data = new URLSearchParams();
+
+ Object.entries(policy).forEach(([key, value]) => {
+ let stringified = value
+ if (stringified instanceof Date) {
+ stringified = stringified.toJSON()
+ }
+ else if (stringified === Object(stringified)) {
+ stringified = JSON.stringify(stringified)
+ }
+ data.append(key, stringified);
+ })
+
+ axios.put(`/api/lifecyclemanagement/policies/${policy.id}`, data)
+ .then((response) => {
+ console.info(response);
+ dispatch(addNotification({type: "success", key: "LIFECYCLEPOLICY_ADDED"}));
+ })
+ .catch((response) => {
+ console.error(response);
+ dispatch(addNotification({type: "error", key: "LIFECYCLEPOLICY_NOT_SAVED"}));
+ });
});
const lifeCyclePolicyDetailsSlice = createSlice({
@@ -126,7 +197,25 @@ const lifeCyclePolicyDetailsSlice = createSlice({
.addCase(fetchLifeCyclePolicyDetails.rejected, (state, action) => {
state.statusLifeCyclePolicyDetails = 'failed';
state.errorLifeCyclePolicyDetails = action.error;
- });
+ })
+ .addCase(fetchLifeCyclePolicyActions.fulfilled, (state, action: PayloadAction<
+ LifeCyclePolicyDetailsState["actionsEnum"]
+ >) => {
+ const actionsEnum = action.payload;
+ state.actionsEnum = actionsEnum;
+ })
+ .addCase(fetchLifeCyclePolicyTargetTypes.fulfilled, (state, action: PayloadAction<
+ LifeCyclePolicyDetailsState["actionsEnum"]
+ >) => {
+ const targetTypesEnum = action.payload;
+ state.targetTypesEnum = targetTypesEnum;
+ })
+ .addCase(fetchLifeCyclePolicyTimings.fulfilled, (state, action: PayloadAction<
+ LifeCyclePolicyDetailsState["actionsEnum"]
+ >) => {
+ const timingsEnum = action.payload;
+ state.timingsEnum = timingsEnum;
+ })
}
});
diff --git a/src/slices/lifeCycleSlice.ts b/src/slices/lifeCycleSlice.ts
index cfa4e78192..32b8aa589e 100644
--- a/src/slices/lifeCycleSlice.ts
+++ b/src/slices/lifeCycleSlice.ts
@@ -2,30 +2,35 @@ import { PayloadAction, SerializedError, createSlice } from '@reduxjs/toolkit'
import { TableConfig } from "../configs/tableConfigs/aclsTableConfig";
import { lifeCyclePolicyTableConfig } from "../configs/tableConfigs/lifeCyclePoliciesTableConfig";
import axios from 'axios';
-import { getURLParams } from '../utils/resourceUtils';
+import { getURLParams, prepareAccessPolicyRulesForPost } from '../utils/resourceUtils';
import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
import { TransformedAcl } from './aclDetailsSlice';
+import { addNotification } from './notificationSlice';
-type LifeCyclePolicyTiming = "SPECIFIC_DATE" | "REPEATING" | "ALWAYS";
-type LifeCyclePolicyAction = "START_WORKFLOW"
-type LifeCyclePolicyTargetType = "EVENT"
+// type LifeCyclePolicyTiming = "SPECIFIC_DATE" | "REPEATING" | "ALWAYS";
+// type LifeCyclePolicyAction = "START_WORKFLOW"
+// type LifeCyclePolicyTargetType = "EVENT"
+export type TargetFilter = {
+ value: string | string[],
+ type: TargetFiltersType,
+ must: boolean
+}
+export const ALL_TARGET_FILTER_TYPES = ['SEARCH', 'WILDCARD', 'GREATER_THAN', 'LESS_THAN'] as const;
+type TargetFilterTypesTuple = typeof ALL_TARGET_FILTER_TYPES;
+type TargetFiltersType = TargetFilterTypesTuple[number];
export type LifeCyclePolicy = {
actionParameters: { [key: string]: unknown }, // JSON. Variable, depends on action
- timing: LifeCyclePolicyTiming,
- action: LifeCyclePolicyAction,
- targetType: LifeCyclePolicyTargetType,
+ timing: string,
+ action: string,
+ targetType: string,
id: string,
title: string,
isActive: boolean,
isCreatedFromConfig: boolean,
actionDate: string, // Date
cronTrigger: string,
- targetFilters: { [key: string]: {
- value: string,
- type: "SEARCH" | "WILDCARD" | "GREATER_THAN" | "LESS_THAN",
- must: boolean
- }},
+ targetFilters: { [key: string]: TargetFilter },
accessControlEntries: TransformedAcl[]
}
@@ -65,6 +70,71 @@ export const fetchLifeCyclePolicies = createAppAsyncThunk('lifeCycle/fetchLifeCy
return res.data;
});
+export const postNewLifeCyclePolicy = createAppAsyncThunk('lifeCycle/postNewLifeCyclePolicy', async (
+ policy: {
+ actionParameters: { [key: string]: unknown },
+ timing: string,
+ action: string,
+ targetType: string,
+ title: string,
+ isActive: boolean,
+ actionDate: string,
+ cronTrigger: string,
+ targetFilters: { [key: string]: TargetFilter },
+ accessControlEntries: TransformedAcl[]
+ },
+ { dispatch }
+) => {
+ let data = new URLSearchParams();
+
+ // Format filter collections
+ // for (const filterName in policy.targetFilters) {
+ // // policy.targetFilters[filterName]
+ // if (hasOwnProperty(TARGET_FILTER_KEYS_EVENTS, filterName)
+ // && TARGET_FILTER_KEYS_EVENTS[filterName].collection) {
+ // policy.targetFilters[filterName].value = policy.targetFilters[filterName].value.toString()
+ // }
+ // }
+
+ // Stringify
+ Object.entries(policy).forEach(([key, value]) => {
+ let stringified = value
+ if (stringified instanceof Date) {
+ stringified = stringified.toJSON()
+ }
+ else if (stringified === Object(stringified)) {
+ stringified = JSON.stringify(stringified)
+ }
+ data.append(key, stringified);
+ })
+
+ data.delete("accessControlEntries");
+ data.append("accessControlEntries", JSON.stringify(prepareAccessPolicyRulesForPost(policy.accessControlEntries).acl.ace))
+
+ axios.post(`/api/lifecyclemanagement/policies`, data)
+ .then((res) => {
+ console.info(res);
+ dispatch(addNotification({type: "success", key: "LIFECYCLE_POLICY_ADDED"}));
+ })
+ .catch((res) => {
+ console.error(res);
+ dispatch(addNotification({type: "error", key: "LIFECYCLE_POLICY_NOT_SAVED"}));
+ });
+});
+
+export const deleteLifeCyclePolicy = createAppAsyncThunk('lifeCycle/fetchLifeCyclePolicies', async (id: string, { dispatch }) => {
+ axios
+ .delete(`/api/lifecyclemanagement/policies/${id}`)
+ .then((res) => {
+ console.info(res);
+ dispatch(addNotification({type: "success", key: "LIFECYCLE_POLICY_DELETED"}));
+ })
+ .catch((res) => {
+ console.error(res);
+ dispatch(addNotification({type: "error", key: "LIFECYCLE_POLICY_NOT_DELETED"}));
+ });
+});
+
const lifeCycleSlice = createSlice({
name: 'lifeCycle',
initialState,
diff --git a/src/slices/workflowSlice.ts b/src/slices/workflowSlice.ts
index e6a9db5b46..a0c8a688b5 100644
--- a/src/slices/workflowSlice.ts
+++ b/src/slices/workflowSlice.ts
@@ -15,7 +15,7 @@ export type FieldSetField = {
[key: string]: unknown
}
-type ConfigurationPanelField = {
+export type ConfigurationPanelField = {
// We could potentially specify 'fieldset' more, but I cannot find a definition
// for which key value pairs are allowed
fieldset?: FieldSetField[] // Values can be anything
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 93ec2056a1..1175d45b6f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -626,3 +626,8 @@ tr.info {
overflow: hidden;
text-overflow: ellipsis;
}
+
+// React-JS-Cron
+.my-project-cron-select-dropdown {
+ z-index: 10000;
+}
\ No newline at end of file
diff --git a/src/utils/componentStyles.ts b/src/utils/componentStyles.ts
index 599d0c68e6..8bee3a5c71 100644
--- a/src/utils/componentStyles.ts
+++ b/src/utils/componentStyles.ts
@@ -19,6 +19,8 @@ export function dropDownStyle(type: DropDownType): StylesConfig {
? 360
: type === "aclTemplate" || type === "comment" || type === "filter"
? 200
+ : type === "policyAction"
+ ? 150
: 250;
return {
diff --git a/src/utils/dropDownUtils.ts b/src/utils/dropDownUtils.ts
index c3c1b052e7..b80e040379 100644
--- a/src/utils/dropDownUtils.ts
+++ b/src/utils/dropDownUtils.ts
@@ -31,6 +31,10 @@ export const filterBySearch = (filterText: string, type: DropDownType, options:
return options.filter((item) =>
t(item.label).toLowerCase().includes(filterText)
);
+ } else if (type === "policyAction") {
+ return options.filter((item) =>
+ t(item).toLowerCase().includes(filterText)
+ );
} else {
return options.filter((item) =>
item.value.toLowerCase().includes(filterText)
@@ -127,7 +131,14 @@ export const formatDropDownOptions = (
label: item.label,
});
}
- } else {
+ } else if (type === "policyAction") {
+ for (const item of unformattedOptions) {
+ formattedOptions.push({
+ value: item,
+ label: item,
+ });
+ }
+ }else {
for (const item of unformattedOptions) {
formattedOptions.push({
value: item.value,
diff --git a/src/utils/lifeCycleUtils.ts b/src/utils/lifeCycleUtils.ts
new file mode 100644
index 0000000000..f39117dde7
--- /dev/null
+++ b/src/utils/lifeCycleUtils.ts
@@ -0,0 +1,16 @@
+import { LifeCyclePolicy, TargetFilter } from "../slices/lifeCycleSlice";
+
+export const parseTargetFiltersForSubmit = (
+ targetFiltersArray: (TargetFilter & { filter: string })[]
+) => {
+ const targetFilters: LifeCyclePolicy["targetFilters"] = {}
+ for (const filter of targetFiltersArray) {
+ targetFilters[filter.filter] = {
+ value: filter.value,
+ type: filter.type,
+ must: filter.must
+ }
+ }
+
+ return targetFilters;
+}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 8e6857d36b..a5e0948c82 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -165,3 +165,13 @@ export const translateOverrideFallback = (asset: UploadAssetOption, t: TFunction
return result;
}
+
+/**
+ * (Hopefully) Typesafe way of checking if an object has a specific property
+ */
+export function hasOwnProperty(
+ obj: O,
+ key: K,
+): obj is O & Record {
+ return Object.prototype.hasOwnProperty.call(obj, key);
+}
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 7d1829bdea..0cc0eb2346 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -225,3 +225,30 @@ export const EditGroupSchema = Yup.object().shape({
export const AdopterRegistrationSchema = Yup.object().shape({
email: Yup.string().email(),
});
+
+// Validation Schema used in lifecycle policy modal
+export const LifeCyclePolicySchema = [
+ Yup.object().shape({
+ title: Yup.string().required("Required"),
+ isActive: Yup.bool().required("Required"),
+ targetType: Yup.string().required("Required"),
+ timing: Yup.string().required("Required"),
+ action: Yup.string().required("Required"),
+ actionParameters: Yup.object().shape({
+ // Property only required if it actually exists on the object
+ workflowId: Yup.string().required("Required"),
+ // workflowId: Yup.string().when("workflowId", {
+ // is: (exists: any) => !!exists,
+ // then: Yup.string().required("Required"),
+ // }),
+ }),
+ actionDate: Yup.date().when("timing", {
+ is: (timing: string) => timing === "SPECIFIC_DATE",
+ then: () => Yup.date().required("Required"),
+ }),
+ cronTrigger: Yup.string().when("timing", {
+ is: (timing: string) => timing === "REPEATING",
+ then: () => Yup.string().required("Required"),
+ }),
+ }),
+];