Merge remote-tracking branch 'origin/main' into to-redux-toolkit-table

package.json

@@ -49,9 +49,6 @@
     "serve": "vite preview",
     "test": "vitest"
   },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
   "browserslist": {
     "production": [
       ">0.2%",

src/components/events/partials/EventsDateCell.tsx

@@ -26,7 +26,16 @@ const EventsDateCell = ({
 	const addFilter = async (date: string) => {
 		let filter = filterMap.find(({ name }) => name === "startDate");
 		if (!!filter) {
-			await dispatch(editFilterValue({filterName: filter.name, value: date + "/" + date}));
+			let startDate = new Date(date);
+			startDate.setHours(0);
+			startDate.setMinutes(0);
+			startDate.setSeconds(0);
+			let endDate = new Date(date);
+			endDate.setHours(23);
+			endDate.setMinutes(59);
+			endDate.setSeconds(59);
+
+			await dispatch(editFilterValue({filterName: filter.name, value: startDate.toISOString() + "/" + endDate.toISOString()}));
 			await dispatch(fetchEvents());
 			dispatch(loadEventsIntoTable());
 		}

src/components/events/partials/ModalTabsAndPages/NewAccessPage.tsx

@@ -17,6 +17,8 @@ import { hasAccess } from "../../../../utils/utils";
 import DropDown from "../../../shared/DropDown";
 import { filterRoles, getAclTemplateText } from "../../../../utils/aclUtils";
 import { useAppDispatch, useAppSelector } from "../../../../store";
+import { fetchSeriesDetailsAcls } from "../../../../slices/seriesDetailsSlice";
+import { getSeriesDetailsAcl } from "../../../../selectors/seriesDetailsSelectors";
 
 /**
  * This component renders the access page for new events and series in the wizards.
@@ -30,6 +32,8 @@ const NewAccessPage = ({
 	formik,
 // @ts-expect-error TS(7031): Binding element 'editAccessRole' implicitly has an... Remove this comment to see the full error message
 	editAccessRole,
+	// @ts-expect-error TS(7031): Binding element 'checkAcls' implicitly has an 'any... Remove this comment to see the full error messag
+	initEventAclWithSeriesAcl //boolean
 }) => {
 	const { t } = useTranslation();
 	const dispatch = useAppDispatch();
@@ -41,6 +45,7 @@ const NewAccessPage = ({
 	const [loading, setLoading] = useState(false);
 
 	const user = useAppSelector(state => getUserInformation(state));
+	const seriesAcl = useAppSelector(state => getSeriesDetailsAcl(state));
 
 	useEffect(() => {
 		// fetch data about roles, acl templates and actions from backend
@@ -58,6 +63,22 @@ const NewAccessPage = ({
 		fetchData();
 	}, []);
 
+	// If we have to use series ACL, fetch it
+	useEffect(() => {
+		if (initEventAclWithSeriesAcl && formik.values.isPartOf) {
+			dispatch(fetchSeriesDetailsAcls(formik.values.isPartOf))
+		}
+	// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [formik.values, initEventAclWithSeriesAcl]);
+
+	// If we have to use series ACL, overwrite existing rules
+	useEffect(() => {
+		if (initEventAclWithSeriesAcl && formik.values.isPartOf && seriesAcl) {
+			formik.setFieldValue("acls", seriesAcl)
+		}
+	// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [initEventAclWithSeriesAcl, seriesAcl]);
+
 // @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
 	const handleTemplateChange = async (value) => {
 		// fetch information about chosen template from backend

src/components/events/partials/wizards/NewEventWizard.tsx

@@ -18,8 +18,8 @@ import {
 	getExtendedEventMetadata,
 } from "../../../../selectors/eventSelectors";
 import { useAppDispatch, useAppSelector } from "../../../../store";
+import { getOrgProperties, getUserInformation } from "../../../../selectors/userInfoSelectors";
 import { MetadataCatalog, UploadAssetOption, postNewEvent } from "../../../../slices/eventSlice";
-import { getUserInformation } from "../../../../selectors/userInfoSelectors";
 import { UserInfoState } from "../../../../slices/userInfoSlice";
 
 /**
@@ -36,12 +36,20 @@ const NewEventWizard: React.FC<{
 	const metadataFields = useAppSelector(state => getEventMetadata(state));
 	const extendedMetadata = useAppSelector(state => getExtendedEventMetadata(state));
 	const user = useAppSelector(state => getUserInformation(state));
+	const orgProperties = useAppSelector(state => getOrgProperties(state));
+
+	// Whether the ACL of a new event is initialized with the ACL of its series.
+	let initEventAclWithSeriesAcl = true
+	const ADMIN_INIT_EVENT_ACL_WITH_SERIES_ACL = "admin.init.event.acl.with.series.acl";
+	if (!!orgProperties && !!orgProperties[ADMIN_INIT_EVENT_ACL_WITH_SERIES_ACL]) {
+		initEventAclWithSeriesAcl = user.org.properties[ADMIN_INIT_EVENT_ACL_WITH_SERIES_ACL] === 'true';
+	}
 
 	const initialValues = getInitialValues(
 		metadataFields,
 		extendedMetadata,
 		uploadAssetOptions,
-		user
+		user,
 	);
 
 	const [page, setPage] = useState(0);
@@ -193,6 +201,7 @@ const NewEventWizard: React.FC<{
 										nextPage={nextPage}
 										formik={formik}
 										editAccessRole="ROLE_UI_SERIES_DETAILS_ACL_EDIT"
+										initEventAclWithSeriesAcl={initEventAclWithSeriesAcl}
 									/>
 								)}
 								{page === 6 && (

src/components/events/partials/wizards/NewSeriesWizard.tsx

@@ -177,6 +177,7 @@ const NewSeriesWizard: React.FC<{
 										previousPage={previousPage}
 										formik={formik}
 										editAccessRole="ROLE_UI_SERIES_DETAILS_ACL_EDIT"
+										initEventAclWithSeriesAcl={false}
 									/>
 								)}
 								{page === 3 && (

src/i18n/org/opencastproject/adminui/languages/lang-da_DK.json

@@ -8,7 +8,7 @@
 		"COMMIT": "Git commit this version of Opencast was built from.",
 		"VERSION": "Common bundle version of Opencast modules"
 	},
-	"NO": "No",
+	"NO": "Nej",
 	"SUBMIT": "Submit",
 	"UPDATE": {
 		"MINOR": "Minor update available",

src/slices/eventDetailsSlice.ts

@@ -1631,6 +1631,7 @@ export const saveAccessPolicies = createAsyncThunk('eventDetails/saveAccessPolic
 		.post(`/admin-ng/event/${eventId}/access`, data.toString(), headers)
 		.then((response) => {
 			console.info(response);
+			dispatch(fetchAccessPolicies(eventId))
 			dispatch(
 				addNotification({
 					type: "info",

src/slices/tableSlice.ts

@@ -91,9 +91,9 @@ const initialState: TableState = {
 	resource: "",
 	pages: [],
 	columns: [],
-	sortBy: "",
+	sortBy: "date",
 	predicate: "",
-	reverse: "ASC",
+	reverse: "DESC",
 	rows: [],
 	maxLabel: "",
 	pagination: {
@@ -115,6 +115,7 @@ const tableSlice = createSlice({
 			pages: TableState["pages"],
 			rows: TableState["rows"],
 			sortBy: TableState["sortBy"],
+			reverse: TableState["reverse"],
 			totalItems: TableState["pagination"]["totalItems"],
 		}>) {
 			state.multiSelect = action.payload.multiSelect;
@@ -123,6 +124,7 @@ const tableSlice = createSlice({
 			state.pages = action.payload.pages;
 			state.rows = action.payload.rows;
 			state.sortBy = action.payload.sortBy;
+			state.reverse = action.payload.reverse;
 			state.pagination = {
 				...state.pagination,
 				totalItems: action.payload.totalItems,

src/styles/components/_steps.scss

@@ -22,8 +22,12 @@
 
 .step-by-step {
 
+    .MuiStepLabel-iconContainer svg {
+        color: $color-gray !important;
+    }
+
     .MuiStepLabel-labelContainer span {
-        color: #92a0ab;
+        color: $color-darkgray;
         margin: 3px 10px;
         position: relative;
     }

src/styles/main.scss

@@ -405,7 +405,7 @@ div.table-filter {
     }
 
     .ng-multi-value {
-      padding: 5px;
+      align-self: center;
     }
 
     .MuiInputBase-root {