Remove non-Promise awaits

Author: Arnei

src/slices/aclSlice.ts

@@ -96,7 +96,7 @@ export const fetchAcls = createAppAsyncThunk("acls/fetchAcls", async (_, { getSt
 export const fetchAclTemplates = async () => {
 	const data = await axios.get<{ [key: string]: string }>("/admin-ng/resources/ACL.json");
 
-	const response = await data.data;
+	const response = data.data;
 
 	return transformToIdValueArray(response);
 };
@@ -105,7 +105,7 @@ export const fetchAclTemplates = async () => {
 export const fetchAclActions = async () => {
 	const data = await axios.get<{ [key: string]: string }>("/admin-ng/resources/ACL.ACTIONS.json");
 
-	const response = await data.data;
+	const response = data.data;
 
 	const actions = transformToIdValueArray(response);
 
@@ -116,7 +116,7 @@ export const fetchAclActions = async () => {
 export const fetchAclDefaults = async () => {
 	const data = await axios.get<{ [key: string]: string }>("/admin-ng/resources/ACL.DEFAULTS.json");
 
-	const response = await data.data;
+	const response = data.data;
 
 	return response;
 };

src/slices/eventDetailsSlice.ts

@@ -614,7 +614,7 @@ const initialState: EventDetailsState = {
 
 export const fetchMetadata = createAppAsyncThunk("eventDetails/fetchMetadata", async (eventId: Event["id"]) => {
 	const metadataRequest = await axios.get<(MetadataCatalog & { locked?: string})[]>(`/admin-ng/event/${eventId}/metadata.json`);
-	const metadataResponse = await metadataRequest.data;
+	const metadataResponse = metadataRequest.data;
 
 	const mainCatalog = "dublincore/episode";
 	let metadata: MetadataCatalog = {
@@ -660,7 +660,7 @@ export const fetchAssets = createAppAsyncThunk("eventDetails/fetchAssets", async
 	const assetsRequest = await axios.get<EventDetailsState["assets"]>(
 		`/admin-ng/event/${eventId}/asset/assets.json`,
 	);
-	const assets = await assetsRequest.data;
+	const assets = assetsRequest.data;
 
 	let transactionsReadOnly = true;
 	const fetchTransactionResult = await dispatch(fetchHasActiveTransactions(eventId))
@@ -672,7 +672,7 @@ export const fetchAssets = createAppAsyncThunk("eventDetails/fetchAssets", async
 	const resourceOptionsListRequest = await axios.get<{ [key: string]: string}>(
 		"/admin-ng/resources/eventUploadAssetOptions.json",
 	);
-	const resourceOptionsListResponse = await resourceOptionsListRequest.data;
+	const resourceOptionsListResponse = resourceOptionsListRequest.data;
 
 	const optionsData = formatUploadAssetOptions(resourceOptionsListResponse);
 
@@ -754,7 +754,7 @@ export const fetchAssetAttachments = createAppAsyncThunk("eventDetails/fetchAsse
 		`/admin-ng/event/${eventId}/asset/attachment/attachments.json`,
 		{ params },
 	);
-	return await attachmentsRequest.data;
+	return attachmentsRequest.data;
 });
 
 export const fetchAssetAttachmentDetails = createAppAsyncThunk("eventDetails/fetchAssetAttachmentDetails", async (params: {
@@ -769,7 +769,7 @@ export const fetchAssetAttachmentDetails = createAppAsyncThunk("eventDetails/fet
 		`/admin-ng/event/${eventId}/asset/attachment/${attachmentId}.json`,
 		{ params },
 	);
-	return await attachmentDetailsRequest.data;
+	return attachmentDetailsRequest.data;
 });
 
 export const fetchAssetCatalogs = createAppAsyncThunk("eventDetails/fetchAssetCatalogs", async (eventId: Event["id"]) => {
@@ -780,7 +780,7 @@ export const fetchAssetCatalogs = createAppAsyncThunk("eventDetails/fetchAssetCa
 		`/admin-ng/event/${eventId}/asset/catalog/catalogs.json`,
 		{ params },
 	);
-	return await catalogsRequest.data;
+	return catalogsRequest.data;
 });
 
 export const fetchAssetCatalogDetails = createAppAsyncThunk("eventDetails/fetchAssetCatalogDetails", async (params: {
@@ -795,7 +795,7 @@ export const fetchAssetCatalogDetails = createAppAsyncThunk("eventDetails/fetchA
 		`/admin-ng/event/${eventId}/asset/catalog/${catalogId}.json`,
 		{ params },
 	);
-	return await catalogDetailsRequest.data;
+	return catalogDetailsRequest.data;
 });
 
 export const fetchAssetMedia = createAppAsyncThunk("eventDetails/fetchAssetMedia", async (eventId: Event["id"]) => {
@@ -813,7 +813,7 @@ export const fetchAssetMedia = createAppAsyncThunk("eventDetails/fetchAssetMedia
 		`/admin-ng/event/${eventId}/asset/media/media.json`,
 		{ params },
 	);
-	const mediaResponse = await mediaRequest.data;
+	const mediaResponse = mediaRequest.data;
 
 	const media: EventDetailsState["assetMedia"] = [];
 
@@ -844,7 +844,7 @@ export const fetchAssetMediaDetails = createAppAsyncThunk("eventDetails/fetchAss
 		`/admin-ng/event/${eventId}/asset/media/${mediaId}.json`,
 		{ params },
 	);
-	const mediaDetailsResponse = await mediaDetailsRequest.data;
+	const mediaDetailsResponse = mediaDetailsRequest.data;
 
 	let mediaDetails: EventDetailsState["assetMediaDetails"];
 
@@ -877,7 +877,7 @@ export const fetchAssetPublications = createAppAsyncThunk("eventDetails/fetchAss
 		`/admin-ng/event/${eventId}/asset/publication/publications.json`,
 		{ params },
 	);
-	return await publicationsRequest.data;
+	return publicationsRequest.data;
 });
 
 export const fetchAssetPublicationDetails = createAppAsyncThunk("eventDetails/fetchAssetPublicationDetails", async (params: {
@@ -892,7 +892,7 @@ export const fetchAssetPublicationDetails = createAppAsyncThunk("eventDetails/fe
 		`/admin-ng/event/${eventId}/asset/publication/${publicationId}.json`,
 		{ params },
 	);
-	return await publicationDetailsRequest.data;
+	return publicationDetailsRequest.data;
 });
 
 export const fetchAccessPolicies = createAppAsyncThunk("eventDetails/fetchAccessPolicies", async (id: Event["id"]) => {
@@ -905,7 +905,7 @@ export const fetchAccessPolicies = createAppAsyncThunk("eventDetails/fetchAccess
 	const policyData = await axios.get<FetchAccessPolicies>(
 		`/admin-ng/event/${id}/access.json`,
 	);
-	const accessPolicies = await policyData.data;
+	const accessPolicies = policyData.data;
 
 	let policies: TransformedAcl[] = [];
 	let currentAclTemplateId = 0;
@@ -920,12 +920,12 @@ export const fetchAccessPolicies = createAppAsyncThunk("eventDetails/fetchAccess
 
 export const fetchComments = createAppAsyncThunk("eventDetails/fetchComments", async (eventId: Event["id"]) => {
 	const commentsData = await axios.get<Comment[]>(`/admin-ng/event/${eventId}/comments`);
-	const comments = await commentsData.data;
+	const comments = commentsData.data;
 
 	const commentReasonsData = await axios.get<{ eventCommentReasons: { [key: string]: string }}>(
 		"/admin-ng/resources/components.json",
 	);
-	const commentReasons = (await commentReasonsData.data).eventCommentReasons;
+	const commentReasons = (commentReasonsData.data).eventCommentReasons;
 
 	return { comments, commentReasons };
 });
@@ -942,7 +942,7 @@ export const fetchEventPublications = createAppAsyncThunk("eventDetails/fetchEve
 	};
 	const data = await axios.get<FetchEventPublications>(`/admin-ng/event/${eventId}/publications.json`);
 
-	const publications = await data.data;
+	const publications = data.data;
 
 	return await dispatch(enrichPublications(publications)).unwrap();
 });
@@ -1023,7 +1023,7 @@ export const fetchSchedulingInfo = createAppAsyncThunk("eventDetails/fetchSchedu
 		const schedulingRequest = await axios.get<FetchSchedulingInfo>(
 			`/admin-ng/event/${eventId}/scheduling.json`,
 		);
-		const schedulingResponse = await schedulingRequest.data;
+		const schedulingResponse = schedulingRequest.data;
 
 		// get data from API about capture agents
 		await dispatch(fetchRecordings("inputs"));
@@ -1309,7 +1309,7 @@ export const fetchWorkflows = createAppAsyncThunk("eventDetails/fetchWorkflows",
 		workflowId: string
 	}
 	const data = await axios.get<FetchWorkflows>(`/admin-ng/event/${eventId}/workflows.json`);
-	const workflowsData = await data.data;
+	const workflowsData = data.data;
 	let workflows: Workflow;
 
 	if ("results" in workflowsData) {
@@ -1354,7 +1354,7 @@ export const fetchWorkflowDetails = createAppAsyncThunk("eventDetails/fetchWorkf
 	const data = await axios.get<EventDetailsState["workflows"]["workflow"]>(
 		`/admin-ng/event/${eventId}/workflows/${workflowId}.json`,
 	);
-	return await data.data;
+	return data.data;
 });
 
 export const performWorkflowAction = createAppAsyncThunk("eventDetails/performWorkflowAction", async (params: {
@@ -1458,7 +1458,7 @@ export const fetchWorkflowOperations = createAppAsyncThunk("eventDetails/fetchWo
 	const data = await axios.get<EventDetailsState["workflowOperations"]["entries"]>(
 		`/admin-ng/event/${eventId}/workflows/${workflowId}/operations.json`,
 	);
-	const workflowOperationsData = await data.data;
+	const workflowOperationsData = data.data;
 	return { entries: workflowOperationsData };
 });
 
@@ -1504,7 +1504,7 @@ export const fetchWorkflowOperationDetails = createAppAsyncThunk("eventDetails/f
 	const data = await axios.get<EventDetailsState["workflowOperationDetails"]>(
 		`/admin-ng/event/${eventId}/workflows/${workflowId}/operations/${operationId}`,
 	);
-	return await data.data;
+	return data.data;
 });
 
 export const fetchWorkflowErrors = createAppAsyncThunk("eventDetails/fetchWorkflowErrors", async (params: {
@@ -1515,7 +1515,7 @@ export const fetchWorkflowErrors = createAppAsyncThunk("eventDetails/fetchWorkfl
 	const data = await axios.get<EventDetailsState["workflowErrors"]["entries"]>(
 		`/admin-ng/event/${eventId}/workflows/${workflowId}/errors.json`,
 	);
-	const workflowErrorsData = await data.data;
+	const workflowErrorsData = data.data;
 	return { entries: workflowErrorsData };
 });
 
@@ -1528,7 +1528,7 @@ export const fetchWorkflowErrorDetails = createAppAsyncThunk("eventDetails/fetch
 	const data = await axios.get<EventDetailsState["workflowErrorDetails"]>(
 		`/admin-ng/event/${eventId}/workflows/${workflowId}/errors/${errorId}.json`,
 	);
-	return await data.data;
+	return data.data;
 });
 
 // TODO: Fix this after the modernization of statisticsThunks happened
@@ -1638,7 +1638,7 @@ export const fetchHasActiveTransactions = createAppAsyncThunk("eventDetails/fetc
 	const transactionsData = await axios.get<{ active: boolean }>(
 		`/admin-ng/event/${eventId}/hasActiveTransaction`,
 	);
-	const hasActiveTransactions = await transactionsData.data;
+	const hasActiveTransactions = transactionsData.data;
 	return hasActiveTransactions;
 });
 

src/slices/eventSlice.ts

@@ -287,7 +287,7 @@ export const fetchEvents = createAppAsyncThunk("events/fetchEvents", async (_, {
 // fetch event metadata from server
 export const fetchEventMetadata = createAppAsyncThunk("events/fetchEventMetadata", async (_, { rejectWithValue }) => {
 	const data = await axios.get<MetadataCatalog[]>("/admin-ng/event/new/metadata");
-	const response = await data.data;
+	const response = data.data;
 
 	const mainCatalog = "dublincore/episode";
 	let metadata: EventState["metadata"] | undefined = undefined;
@@ -331,7 +331,7 @@ export const postEditMetadata = createAppAsyncThunk("events/postEditMetadata", a
 			},
 		},
 	);
-	const response = await data.data;
+	const response = data.data;
 
 	// transform response
 	const metadata = transformMetadataFields(response.metadata)
@@ -753,7 +753,7 @@ export const fetchScheduling = createAppAsyncThunk("events/fetchScheduling", asy
 			formData,
 		);
 
-		const data = await response.data;
+		const data = response.data;
 
 		// transform data for further use
 		for (const d of data) {

src/slices/groupDetailsSlice.ts

@@ -38,7 +38,7 @@ const initialState: GroupDetailsState = {
 export const fetchGroupDetails = createAppAsyncThunk("groupDetails/fetchGroupDetails", async (groupId: GroupDetails["id"]) => {
 	type FetchGroupDetails = Omit<GroupDetails, "users"> & { users: { username: string, name: string }[] };
 	const res = await axios.get<FetchGroupDetails>(`/admin-ng/groups/${groupId}`);
-	const response = await res.data;
+	const response = res.data;
 
 	let users: GroupDetailsState["users"] = [];
 	if (response.users.length > 0) {

src/slices/seriesSlice.ts

@@ -142,7 +142,7 @@ export const fetchSeries = createAppAsyncThunk("series/fetchSeries", async (_, {
 // fetch series metadata from server
 export const fetchSeriesMetadata = createAppAsyncThunk("series/fetchSeriesMetadata", async (_, { rejectWithValue }) => {
 	const res = await axios.get<MetadataCatalog[]>("/admin-ng/series/new/metadata");
-	const data = await res.data;
+	const data = res.data;
 
 	const mainCatalog = "dublincore/series";
 	let metadata: SeriesState["metadata"] | undefined = undefined;
@@ -289,13 +289,13 @@ export const checkForEventsDeleteSeriesModal = createAppAsyncThunk("series/check
 	const hasEventsRequest = await axios.get<{ hasEvents: boolean }>(
 		`/admin-ng/series/${id}/hasEvents.json`,
 	);
-	const hasEventsResponse = await hasEventsRequest.data;
+	const hasEventsResponse = hasEventsRequest.data;
 	const hasEvents = hasEventsResponse.hasEvents;
 
 	const deleteWithEventsAllowedRequest = await axios.get<{ deleteSeriesWithEventsAllowed: boolean }>(
 		"/admin-ng/series/configuration.json",
 	);
-	const deleteWithEventsAllowedResponse = await deleteWithEventsAllowedRequest.data;
+	const deleteWithEventsAllowedResponse = deleteWithEventsAllowedRequest.data;
 	const deleteWithEventsAllowed =
 		deleteWithEventsAllowedResponse.deleteSeriesWithEventsAllowed;
 
@@ -373,7 +373,7 @@ export const fetchSeriesDetailsTobiraNew = createAppAsyncThunk("seriesDetails/fe
 export const fetchSeriesOptions = async () => {
 	const data = await axios.get<{ [key: string]: string }>("/admin-ng/resources/SERIES.json");
 
-	const response = await data.data;
+	const response = data.data;
 
 	const seriesCollection = [];
 	for (const series of transformToIdValueArray(response)) {
@@ -387,14 +387,14 @@ export const fetchSeriesOptions = async () => {
 export const hasEvents = async (seriesId: Series["id"]) => {
 	const data = await axios.get<{ hasEvents: boolean }>(`/admin-ng/series/${seriesId}/hasEvents.json`);
 
-	return (await data.data).hasEvents;
+	return (data.data).hasEvents;
 };
 
 // Get series configuration and flag indicating if series with events is allowed to delete
 export const getSeriesConfig = async () => {
 	const data = await axios.get<{ deleteSeriesWithEventsAllowed: boolean }>("/admin-ng/series/configuration.json");
 
-	const response = await data.data;
+	const response = data.data;
 
 	return !!response.deleteSeriesWithEventsAllowed;
 };

src/slices/tableFilterSlice.ts

@@ -83,7 +83,7 @@ export const fetchFilters = createAppAsyncThunk("tableFilters/fetchFilters", asy
 	const data = await axios.get<FetchFilters>(
 		`/admin-ng/resources/${resource}/filters.json`,
 	);
-	const resourceData = await data.data;
+	const resourceData = data.data;
 
 	const filters = transformResponse(resourceData);
 	const filtersList: TableFilterState["data"] = Object.keys(filters.filters).map(key => {
@@ -135,7 +135,7 @@ export const fetchStats = createAppAsyncThunk("tableFilters/fetchStats", async (
 }
 	// fetch information about possible status an event can have
 	const data = await axios.get<FetchStats>("/admin-ng/resources/STATS.json");
-	const response = await data.data;
+	const response = data.data;
 
 	// transform response
 	const statsResponse = Object.keys(response).map(key => {
@@ -176,7 +176,7 @@ export const fetchStats = createAppAsyncThunk("tableFilters/fetchStats", async (
 			},
 		});
 
-		const response = await data.data;
+		const response = data.data;
 
 		// add count to status information fetched before
 		statsResponse[i] = {

src/slices/userSlice.ts

@@ -133,7 +133,7 @@ export const fetchUsersAndUsernames = async () => {
 		"/admin-ng/resources/USERS.NAME.AND.USERNAME.json",
 	);
 
-	const response = await data.data;
+	const response = data.data;
 
 	return transformToIdValueArray(response);
 };

src/thunks/assetsThunks.ts

@@ -95,7 +95,7 @@ export const enrichPublications = createAppAsyncThunk("assets/enrichPublications
 	// get information about possible publication channels
 	const data = await axios.get<{ [key: string]: string }>("/admin-ng/resources/PUBLICATION.CHANNELS.json");
 
-	const publicationChannels = await data.data;
+	const publicationChannels = data.data;
 
 	const now = new Date();
 	let combinedPublications: Publication[] = [];

src/utils/adopterRegistrationUtils.ts

@@ -14,7 +14,7 @@ export const fetchAdopterRegistration = async () => {
 	// fetch current information about adopter
 	const response = await axios.get<FetchRegistration>("/admin-ng/adopter/registration");
 
-	return await response.data;
+	return response.data;
 };
 
 // get statistics information about adopter
@@ -45,7 +45,7 @@ export const fetchAdopterStatisticsSummary = async () => {
 	};
 	const response = await axios.get<FetchSummary>("/admin-ng/adopter/summary");
 
-	return await response.data;
+	return response.data;
 };
 
 export type Registration = {

src/utils/embeddedCodeUtils.ts

@@ -7,7 +7,7 @@ export const getSourceURL = async () => {
 			"/api/info/organization/properties/engageuiurl",
 		);
 
-		const data = await response.data;
+		const data = response.data;
 
 		if (data["org.opencastproject.engage.ui.url"]) {
 			return data["org.opencastproject.engage.ui.url"];