Merge branch 'group-await-calls' of Arnei/opencast-admin-interface into r/17.x

Pull request #1341

  Group async calls

Author: gregorydlogan

src/components/configuration/partials/ThemesActionsCell.tsx

@@ -29,8 +29,10 @@ const ThemesActionsCell = ({
 	};
 
 	const showThemeDetails = async () => {
-		await dispatch(fetchThemeDetails(row.id));
-		await dispatch(fetchUsage(row.id));
+		await Promise.all([
+			dispatch(fetchThemeDetails(row.id)),
+			dispatch(fetchUsage(row.id)),
+		]);
 
 		detailsModalRef.current?.open();
 	};

src/components/events/Events.tsx

@@ -102,8 +102,10 @@ const Events = () => {
 	}, [location.hash]);
 
 	const onNewEventModal = async () => {
-		await dispatch(fetchEventMetadata());
-		await dispatch(fetchAssetUploadOptions());
+		await Promise.all([
+			dispatch(fetchEventMetadata()),
+			dispatch(fetchAssetUploadOptions()),
+		]);
 
 		newEventModalRef.current?.open();
 	};

src/components/events/Series.tsx

@@ -82,9 +82,11 @@ const Series = () => {
 	}, [location.hash]);
 
 	const onNewSeriesModal = async () => {
-		await dispatch(fetchSeriesMetadata());
-		await dispatch(fetchSeriesThemes());
-		await dispatch(fetchSeriesDetailsTobiraNew("/"));
+		await Promise.all([
+			dispatch(fetchSeriesMetadata()),
+			dispatch(fetchSeriesThemes()),
+			dispatch(fetchSeriesDetailsTobiraNew("/")),
+		]);
 
 		newSeriesModalRef.current?.open();
 	};

src/components/events/partials/EventActionCell.tsx

@@ -52,11 +52,13 @@ const EventActionCell = ({
 	};
 
 	const onClickSeriesDetails = async () => {
-		if (!!row.series) {
-			await dispatch(fetchSeriesDetailsMetadata(row.series.id));
-			await dispatch(fetchSeriesDetailsAcls(row.series.id));
-			await dispatch(fetchSeriesDetailsTheme(row.series.id));
-			await dispatch(fetchSeriesDetailsThemeNames());
+		if (row.series) {
+			await Promise.all([
+				dispatch(fetchSeriesDetailsMetadata(row.series.id)),
+				dispatch(fetchSeriesDetailsAcls(row.series.id)),
+				dispatch(fetchSeriesDetailsTheme(row.series.id)),
+				dispatch(fetchSeriesDetailsThemeNames()),
+			]);
 
 			showSeriesDetailsModal();
 		}

src/components/events/partials/EventsSeriesCell.tsx

@@ -21,9 +21,9 @@ const EventsSeriesCell = ({
 
 	// Filter with value of current cell
 	const addFilter = async (seriesId: string) => {
-		let filter = filterMap.find(({ name }) => name === "series");
-		if (!!filter) {
-			await dispatch(editFilterValue({filterName: filter.name, value: seriesId, resource: "events"}));
+		const filter = filterMap.find(({ name }) => name === "series");
+		if (filter) {
+			dispatch(editFilterValue({filterName: filter.name, value: seriesId, resource: "events"}));
 			await dispatch(fetchEvents());
 			dispatch(loadEventsIntoTable());
 		}

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

@@ -64,11 +64,10 @@ const NewAccessPage = <T extends RequiredFormProps>({
 		// fetch data about roles, acl templates and actions from backend
 		async function fetchData() {
 			setLoading(true);
-			const responseTemplates = await fetchAclTemplates();
+			const [responseTemplates, responseActions, responseRoles] = await Promise.all([
+				fetchAclTemplates(), fetchAclActions(), fetchRolesWithTarget("ACL")]);
 			setAclTemplates(responseTemplates);
-			const responseActions = await fetchAclActions();
 			setAclActions(responseActions);
-			const responseRoles = await fetchRolesWithTarget("ACL");
 			setRoles(responseRoles);
 			setLoading(false);
 		}

src/components/events/partials/SeriesActionsCell.tsx

@@ -53,11 +53,13 @@ const SeriesActionsCell = ({
 	};
 
 	const showSeriesDetailsModal = async () => {
-		await dispatch(fetchSeriesDetailsMetadata(row.id));
-		await dispatch(fetchSeriesDetailsAcls(row.id));
-		await dispatch(fetchSeriesDetailsTheme(row.id));
-		await dispatch(fetchSeriesDetailsThemeNames());
-		await dispatch(fetchSeriesDetailsTobira(row.id));
+		await Promise.all([
+			dispatch(fetchSeriesDetailsMetadata(row.id)),
+			dispatch(fetchSeriesDetailsAcls(row.id)),
+			dispatch(fetchSeriesDetailsTheme(row.id)),
+			dispatch(fetchSeriesDetailsThemeNames()),
+			dispatch(fetchSeriesDetailsTobira(row.id)),
+		]);
 
 		detailsModalRef.current?.open();
 	};

src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx

@@ -94,15 +94,12 @@ const ResourceDetailsAccessPolicyTab = ({
 		dispatch(removeNotificationWizardForm());
 		async function fetchData() {
 			setLoading(true);
-			const responseTemplates = await fetchAclTemplates();
-			await setAclTemplates(responseTemplates);
-			const responseActions = await fetchAclActions();
+			const [responseTemplates, responseActions] = await Promise.all([
+				fetchAclTemplates(), fetchAclActions(), dispatch(fetchAccessPolicies(resourceId))]);
+			setAclTemplates(responseTemplates);
 			setAclActions(responseActions);
 			setHasActions(responseActions.length > 0);
-			const responseDefaults = await fetchAclDefaults();
-			await setAclDefaults(responseDefaults);
-			await dispatch(fetchAccessPolicies(resourceId));
-			fetchRolesWithTarget("ACL").then((roles) => setRoles(roles));
+			fetchRolesWithTarget("ACL").then(roles => setRoles(roles));
 			if (fetchHasActiveTransactions) {
 				const fetchTransactionResult = await dispatch(fetchHasActiveTransactions(resourceId)).then(unwrapResult)
 				fetchTransactionResult.active !== undefined

src/components/users/partials/wizard/AclAccessPage.tsx

@@ -59,11 +59,10 @@ const AclAccessPage = <T extends RequiredFormProps>({
 		// fetch data about roles, acl templates and actions from backend
 		async function fetchData() {
 			setLoading(true);
-			const responseTemplates = await fetchAclTemplates();
+			const [responseTemplates, responseActions, responseRoles] = await Promise.all([
+				fetchAclTemplates(), fetchAclActions(), fetchRolesWithTarget("ACL")]);
 			setAclTemplates(responseTemplates);
-			const responseActions = await fetchAclActions();
 			setAclActions(responseActions);
-			const responseRoles = await fetchRolesWithTarget("ACL");
 			setRoles(responseRoles);
 			setLoading(false);
 		}