Merge branch 'r/18.x' into r/19.x

Author: gregorydlogan

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

@@ -8,6 +8,9 @@ import {
 import { removeNotificationWizardForm } from "../../../../slices/notificationSlice";
 import { useAppDispatch, useAppSelector } from "../../../../store";
 import { ParseKeys } from "i18next";
+import {
+	getOrgProperties,
+} from "../../../../selectors/userInfoSelectors";
 
 /**
  * This component manages the access policy tab of the series details modal
@@ -28,6 +31,9 @@ const SeriesDetailsAccessTab = ({
 	const policies = useAppSelector(state => getSeriesDetailsAcl(state));
 	const policyTemplateId = useAppSelector(state => getPolicyTemplateId(state));
 
+	const orgProperties = useAppSelector(state => getOrgProperties(state));
+	const overrideEnabled = (orgProperties["admin.series.acl.event.update.mode"] || "optional").toLowerCase() === "optional";
+
 	useEffect(() => {
 		dispatch(removeNotificationWizardForm());
 	// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -54,7 +60,7 @@ const SeriesDetailsAccessTab = ({
 			viewNonUsersAccessRole={"ROLE_UI_SERIES_DETAILS_ACL_NONUSER_ROLES_VIEW"}
 			policyChanged={policyChanged}
 			setPolicyChanged={setPolicyChanged}
-			withOverrideButton={true}
+			withOverrideButton={overrideEnabled}
 		/>
 	);
 };

src/components/shared/SaveEditFooter.tsx

@@ -8,6 +8,7 @@ type SaveEditFooterProps = {
     reset: () => void;
     submit: () => void;
     isValid?: boolean;
+    customSaveButtonText?: ParseKeys;
     additionalButton?: {
         label: ParseKeys,
         hint: ParseKeys,
@@ -20,10 +21,13 @@ export const SaveEditFooter: React.FC<SaveEditFooterProps> = ({
     reset,
     submit,
     isValid,
+    customSaveButtonText,
     additionalButton,
 }) => {
     const { t } = useTranslation();
 
+    const saveButtonText = customSaveButtonText || "SAVE";
+
     return <footer>
         <BaseButton
             onClick={submit}
@@ -32,7 +36,7 @@ export const SaveEditFooter: React.FC<SaveEditFooterProps> = ({
             className={`save green ${
                 !isValid || !active ? "disabled" : ""
             }`}
-        >{t("SAVE")}</BaseButton>
+        >{t(saveButtonText)}</BaseButton>
         {additionalButton && (
             <Tooltip title={t(additionalButton.hint)}>
                 <BaseButton

src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx

@@ -378,6 +378,7 @@ const ResourceDetailsAccessPolicyTab = ({
 											hint: "EVENTS.SERIES.DETAILS.ACCESS.ACCESS_POLICY.REPLACE_EVENT_ACLS_HINT",
 											onClick: () => saveAccess(formik.values, true),
 										} : undefined}
+										customSaveButtonText={withOverrideButton ? "EVENTS.SERIES.DETAILS.ACCESS.ACCESS_POLICY.SAVE_SERIES_ACL_ONLY" : undefined}
 									/>}
 								</div>
 							)}

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

@@ -1228,12 +1228,14 @@
 						"ADDITIONAL_ACTIONS": "Additional Actions",
 						"ACTION": "Actions",
 						"NEW": "New policy",
+						"DETAILS": "Details",
+						"REPLACE_EVENT_ACLS": "Save series and overwrite event permissions",
+						"REPLACE_EVENT_ACLS_HINT": "Save the series permissions and overwrite the permissions for all events in this series.",
+						"SAVE_SERIES_ACL_ONLY": "Save series permission",
 						"NON_USER_ROLES": "Roles and Groups authorized for the series",
 						"USER": "User",
 						"USERS": "Users who are authorized for the series",
 						"NEW_USER": "New user",
-						"REPLACE_EVENT_ACLS": "Update series permissions",
-						"REPLACE_EVENT_ACLS_HINT": "Ensure all events of this series have these permissions in effect",
 						"LOAD_MORE_LIMIT": "policies shown.",
 						"LOAD_MORE_LINK": "Load more"
 					},

src/slices/seriesDetailsSlice.ts

@@ -5,6 +5,9 @@ import {
 	getSeriesDetailsExtendedMetadata,
 	getStatistics,
 } from "../selectors/seriesDetailsSelectors";
+import {
+	getOrgProperties,
+} from "../selectors/userInfoSelectors";
 import { addNotification } from "./notificationSlice";
 import {
 	transformMetadataCollection,
@@ -259,12 +262,19 @@ export const updateSeriesAccess = createAppAsyncThunk("seriesDetails/updateSerie
 		id: Series["id"],
 		policies: { acl: Acl },
 		override?: boolean
-	}, { dispatch }) => {
+	}, { dispatch, getState }) => {
 	const { id, policies, override } = params;
 
 	const data = new URLSearchParams();
 
-	const overrideString = override ? String(true) : String(false);
+	// Here we should check for the "always" option as well, so that we can force override!
+	const orgProperties = getOrgProperties(getState());
+	const alwaysOverride = (orgProperties["admin.series.acl.event.update.mode"] || "optional").toLowerCase() === "always";
+
+	let overrideString = override ? String(true) : String(false);
+	if (alwaysOverride) {
+		overrideString = String(true);
+	}
 
 	data.append("acl", JSON.stringify(policies));
 	data.append("override", overrideString);