Merge pull request #729 from dennis531/custom-roles

Custom roles in ACL policy
opencast · Jul 12, 2024 · a0ab426 · a0ab426
2 parents 675dc70 + 6edee86
commit a0ab426
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 30 deletions.
diff --git a/src/components/shared/DropDown.tsx b/src/components/shared/DropDown.tsx
@@ -8,7 +8,8 @@ import {
 	filterBySearch,
 	formatDropDownOptions,
 } from "../../utils/dropDownUtils";
-import Select from "react-select";
+import Select, { Props } from "react-select";
+import CreatableSelect from "react-select/creatable";
 
 /**
  * TODO: Ideally, we would remove "type", and just type the "options" array properly.
@@ -33,6 +34,7 @@ const DropDown = <T,>({
 	tabIndex = 0,
 	autoFocus = false,
 	defaultOpen = false,
+	creatable = false,
 	disabled = false,
 }: {
 	value: T
@@ -45,6 +47,7 @@ const DropDown = <T,>({
 	tabIndex?: number,
 	autoFocus?: boolean,
 	defaultOpen?: boolean,
+	creatable?: boolean,
 	disabled?: boolean,
 }) => {
 	const { t } = useTranslation();
@@ -53,28 +56,40 @@ const DropDown = <T,>({
 
 	const style = dropDownStyle(type);
 
+	const commonProps: Props = {
+		tabIndex: tabIndex,
+		theme: (theme) => (dropDownSpacingTheme(theme)),
+		styles: style,
+		defaultMenuIsOpen: defaultOpen,
+		autoFocus: autoFocus,
+		isSearchable: true,
+		value: { value: value, label: text === "" ? placeholder : text },
+		inputValue: searchText,
+		options: formatDropDownOptions(
+			filterBySearch(searchText.toLowerCase(), type, options, t),
+			type,
+			required,
+			t
+		),
+		placeholder: placeholder,
+		onInputChange: (value: string) => setSearch(value),
+		onChange: (element) => handleChange(element as {value: T, label: string}),
+		isDisabled: disabled,
+	};
+
 	return (
-		<Select
-			tabIndex={tabIndex}
-			theme={(theme) => (dropDownSpacingTheme(theme))}
-			styles={style}
-			defaultMenuIsOpen={defaultOpen}
-			autoFocus={autoFocus}
-			isSearchable
-			value={{ value: value, label: text === "" ? placeholder : text }}
-			inputValue={searchText}
-			options={formatDropDownOptions(
-				filterBySearch(searchText.toLowerCase(), type, options, t),
-				type,
-				required,
-				t
+		<div>
+			{creatable ? (
+				<CreatableSelect
+					{...commonProps}
+				/>
+			) : (
+				<Select
+					{...commonProps}
+					noOptionsMessage={() => t("SELECT_NO_MATCHING_RESULTS")}
+				/>
 			)}
-			placeholder={placeholder}
-			noOptionsMessage={() => "No matching results."}
-			onInputChange={(value) => setSearch(value)}
-			onChange={(element) => handleChange(element as {value: T, label: string} )}
-			isDisabled={disabled}
-		/>
+		</div>
 	);
 };
 

diff --git a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
@@ -430,6 +430,7 @@ const ResourceDetailsAccessPolicyTab = ({
 																										}
 																										type={"aclRole"}
 																										required={true}
+																										creatable={true}
 																										handleChange={(element) => {
 																											if (element) {
 																												replace(index, {
@@ -439,13 +440,7 @@ const ResourceDetailsAccessPolicyTab = ({
 																											}
 																										}}
 																										placeholder={
-																											roles.length > 0
-																												? t(
-																														"EVENTS.EVENTS.DETAILS.ACCESS.ROLES.LABEL"
-																												  )
-																												: t(
-																														"EVENTS.EVENTS.DETAILS.ACCESS.ROLES.EMPTY"
-																												  )
+																											t("EVENTS.EVENTS.DETAILS.ACCESS.ROLES.LABEL")
 																										}
 																										disabled={
 																											!hasAccess(

diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
@@ -20,6 +20,7 @@
 	"RESET": "Reset",
 	"SELECT_NO_OPTION_SELECTED": "No option selected",
 	"SELECT_NO_OPTIONS_AVAILABLE": "No options available",
+	"SELECT_NO_MATCHING_RESULTS": "No matching results.",
 	"YES": "Yes",
 	"COPY": "Copy to clipboard",
 	"UPDATE": {
@@ -865,8 +866,7 @@
 						"DETAILS": "Details"
 					},
 					"ROLES": {
-						"LABEL": "Select a role",
-						"EMPTY": "No role found"
+						"LABEL": "Select or create a role"
 					}
 				},
 				"COMMENTS": {