Merge branch 'main' into eslint-9

Arnei · Feb 27, 2025 · 1b6f344 · 1b6f344
2 parents edc6d4e + ef7ca9c
commit 1b6f344
Show file tree

Hide file tree

Showing 27 changed files with 165 additions and 185 deletions.
diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx
@@ -41,7 +41,7 @@ const EventDetailsCommentsTab = ({
 	const isSavingCommentReply = useAppSelector(state => getIsSavingCommentReply(state));
 
 	useEffect(() => {
-		dispatch(fetchComments(eventId)).then((r: any) => console.info(r));
+		dispatch(fetchComments(eventId));
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
 

diff --git a/src/components/events/partials/wizards/NewEventWizard.tsx b/src/components/events/partials/wizards/NewEventWizard.tsx
@@ -287,7 +287,7 @@ const getInitialValues = (
 	if (!!uploadAssetOptions) {
 		initialValues.uploadAssetsTrack = [];
 		// Sort by displayOrder
-		uploadAssetOptions = uploadAssetOptions.slice().sort((a: any, b: any) => a.displayOrder - b.displayOrder)
+		uploadAssetOptions = uploadAssetOptions.slice().sort((a, b) => a.displayOrder - b.displayOrder)
 		// initial value of upload asset needs to be null, because object (file) is saved there
 		for (const option of uploadAssetOptions) {
 			if (option.type === "track") {

diff --git a/src/components/shared/Table.tsx b/src/components/shared/Table.tsx
@@ -84,9 +84,9 @@ const Table = ({
 
 	useEffect(() => {
 		// Function for handling clicks outside of an open dropdown menu
-		const handleClickOutside = (e: any) => {
+		const handleClickOutside = (e: MouseEvent) => {
 			if (
-				e && containerPageSize.current && !containerPageSize.current.contains(e.target)
+				e && containerPageSize.current && !containerPageSize.current.contains(e.target as Node)
 			) {
 				setShowPageSizes(false);
 			}
@@ -395,7 +395,7 @@ const getDirectAccessiblePages = (pages: Page[], pagination: Pagination) => {
 };
 
 // Apply a column template and render corresponding components
-const ColumnTemplate = ({ row, column, templateMap }: {row: Row, column: TableColumn, templateMap: any}) => {
+const ColumnTemplate = ({ row, column, templateMap }: {row: Row, column: TableColumn, templateMap: TemplateMap}) => {
 	if (!column.template) {
 		return <></>;
 	}

diff --git a/src/components/users/partials/UsersActionsCell.tsx b/src/components/users/partials/UsersActionsCell.tsx
@@ -1,6 +1,6 @@
 import React, { useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { UserResult, deleteUser } from "../../../slices/userSlice";
+import { User, deleteUser } from "../../../slices/userSlice";
 import { useAppDispatch } from "../../../store";
 import { fetchUserDetails } from "../../../slices/userDetailsSlice";
 import { Modal, ModalHandle } from "../../shared/modals/Modal";
@@ -14,7 +14,7 @@ import { IconButton } from "../../shared/IconButton";
 const UsersActionCell = ({
 	row,
 }: {
-	row: UserResult
+	row: User
 }) => {
 	const { t } = useTranslation();
 	const dispatch = useAppDispatch();

diff --git a/src/components/users/partials/UsersRolesCell.tsx b/src/components/users/partials/UsersRolesCell.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { UserResult } from "../../../slices/userSlice";
+import { User } from "../../../slices/userSlice";
 
 /**
  * This component renders the roles cells of users in the table view
  */
 const UsersRolesCell = ({
 	row
 }: {
-	row: UserResult
+	row: User
 }) => {
 	const { t } = useTranslation();
 

diff --git a/src/configs/modalConfig.ts b/src/configs/modalConfig.ts
@@ -99,7 +99,7 @@ export const initialFormValuesNewSeries: {
 
 	breadcrumbs: TobiraPage[],
 	selectedPage?: TobiraPage,
-	[key: string]: any,  // Metadata fields that are getting added later
+	[key: string]: unknown,  // Metadata fields that are getting added later
 } = {
 	acls: [
 		{

diff --git a/src/configs/sourceConfig.ts b/src/configs/sourceConfig.ts
@@ -1,3 +1,5 @@
+import { MetadataField } from "../slices/eventSlice";
+
 /* additional metadata that user should provide for new events
  * UPLOAD, SCHEDULE_SINGLE, SCHEDULE_MULTIPLE signal in which case the additional metadata is required/should be provided
  * A metadata field has following keys:
@@ -7,22 +9,12 @@
  * - type: indicates the type of metadata field (see metadata field provided by backend)
  * - readOnly: flag indicating if metadata field can be changed
  * - required: flag indicating if metadata field is required
- * - tabindex: tabindex of the metadata field
  */
-type Metadata = {
-	id: string,
-	label: string,
-	value: any,
-	type: string,
-	readOnly: boolean,
-	required: boolean,
-	tabindex: number,
-}
 
 type SourceType = {
-	UPLOAD?: { metadata: Metadata[] },
-	SCHEDULE_SINGLE?: { metadata: Metadata[] },
-	SCHEDULE_MULTIPLE?: { metadata: Metadata[] },
+	UPLOAD?: { metadata: MetadataField[] },
+	SCHEDULE_SINGLE?: { metadata: MetadataField[] },
+	SCHEDULE_MULTIPLE?: { metadata: MetadataField[] },
 }
 
 export const sourceMetadata: SourceType = {
@@ -35,7 +27,6 @@ export const sourceMetadata: SourceType = {
 				type: "date",
 				readOnly: false,
 				required: false,
-				tabindex: 7,
 			},
 		],
 	},

diff --git a/src/slices/aclDetailsSlice.ts b/src/slices/aclDetailsSlice.ts
@@ -35,7 +35,7 @@ const initialState: AclDetailsState = {
 };
 
 // fetch details about a certain acl from server
-export const fetchAclDetails = createAppAsyncThunk('aclDetails/fetchAclDetails', async (aclId: number) => {
+export const fetchAclDetails = createAppAsyncThunk('aclDetails/fetchAclDetails', async (aclId: AclDetailsState["id"]) => {
 	const res = await axios.get(`/admin-ng/acl/${aclId}`);
 
 	let aclDetails = res.data;