({
{t("BULK_ACTIONS.SCHEDULE_TASK.SUMMARY.EVENTS_SUMMARY", {
numberOfEvents: formik.values.events.filter(
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
(e) => e.selected === true
).length,
})}
diff --git a/src/components/events/partials/ModalTabsAndPages/StartTaskWorkflowPage.tsx b/src/components/events/partials/ModalTabsAndPages/StartTaskWorkflowPage.tsx
index 18baa203d9..1f713b2a0b 100644
--- a/src/components/events/partials/ModalTabsAndPages/StartTaskWorkflowPage.tsx
+++ b/src/components/events/partials/ModalTabsAndPages/StartTaskWorkflowPage.tsx
@@ -46,8 +46,7 @@ const StartTaskWorkflowPage = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [workflowDef]);
- // @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
- const setDefaultValues = (value) => {
+ const setDefaultValues = (value: string) => {
let workflowId = value;
// fill values with default configuration of chosen workflow
let defaultConfiguration = setDefaultConfig(workflowDef, workflowId);
diff --git a/src/components/events/partials/SeriesActionsCell.tsx b/src/components/events/partials/SeriesActionsCell.tsx
index dda3a0a815..5f5faa628c 100644
--- a/src/components/events/partials/SeriesActionsCell.tsx
+++ b/src/components/events/partials/SeriesActionsCell.tsx
@@ -52,8 +52,7 @@ const SeriesActionsCell = ({
setDeleteConfirmation(true);
};
-// @ts-expect-error TS(7006): Parameter 'id' implicitly has an 'any' type.
- const deletingSeries = (id) => {
+ const deletingSeries = (id: string) => {
dispatch(deleteSeries(id));
};
diff --git a/src/components/events/partials/SeriesTitleCell.tsx b/src/components/events/partials/SeriesTitleCell.tsx
index ee423ae64d..27eeede05a 100644
--- a/src/components/events/partials/SeriesTitleCell.tsx
+++ b/src/components/events/partials/SeriesTitleCell.tsx
@@ -18,8 +18,7 @@ const SeriesTitleCell = ({
const { t } = useTranslation();
const dispatch = useAppDispatch();
-// @ts-expect-error TS(7006): Parameter 'seriesId' implicitly has an 'any' type.
- const redirectToEvents = async (seriesId) => {
+ const redirectToEvents = async (seriesId: string) => {
// redirect to tables
await dispatch(loadEventsIntoTable());
diff --git a/src/components/events/partials/modals/DeleteEventsModal.tsx b/src/components/events/partials/modals/DeleteEventsModal.tsx
index 249d73d45f..550655a42c 100644
--- a/src/components/events/partials/modals/DeleteEventsModal.tsx
+++ b/src/components/events/partials/modals/DeleteEventsModal.tsx
@@ -38,8 +38,7 @@ const DeleteEventsModal = ({
};
// Select or deselect all rows in table
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const onChangeAllSelected = (e) => {
+ const onChangeAllSelected = (e: React.ChangeEvent) => {
const selected = e.target.checked;
setAllChecked(selected);
let changedSelection = selectedEvents.map((event) => {
diff --git a/src/components/events/partials/modals/DeleteSeriesModal.tsx b/src/components/events/partials/modals/DeleteSeriesModal.tsx
index 45286e9060..1aaa578666 100644
--- a/src/components/events/partials/modals/DeleteSeriesModal.tsx
+++ b/src/components/events/partials/modals/DeleteSeriesModal.tsx
@@ -68,8 +68,7 @@ const DeleteSeriesModal = ({
};
// Select or deselect all rows in table
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const onChangeAllSelected = (e) => {
+ const onChangeAllSelected = (e: React.ChangeEvent) => {
const selected = e.target.checked;
setAllChecked(selected);
let changedSelection = selectedSeries.map((series) => {
diff --git a/src/components/events/partials/modals/EditMetadataEventsModal.tsx b/src/components/events/partials/modals/EditMetadataEventsModal.tsx
index 735d539d30..0817109dde 100644
--- a/src/components/events/partials/modals/EditMetadataEventsModal.tsx
+++ b/src/components/events/partials/modals/EditMetadataEventsModal.tsx
@@ -45,8 +45,8 @@ const EditMetadataEventsModal = ({
mergedMetadata: []
});
const [loading, setLoading] = useState(true);
- const [fatalError, setFatalError] = useState({});
- const [fetchedValues, setFetchedValues] = useState(null);
+ const [fatalError, setFatalError] = useState(undefined);
+ const [fetchedValues, setFetchedValues] = useState<{ [key: string]: string | string[] }>({});
const user = useAppSelector(state => getUserInformation(state));
@@ -61,19 +61,16 @@ const EditMetadataEventsModal = ({
async function fetchData() {
setLoading(true);
-// @ts-expect-error TS(7034): Variable 'eventIds' implicitly has type 'any[]' in... Remove this comment to see the full error message
- let eventIds = [];
+ let eventIds: string[] = [];
selectedEvents.forEach((event) => isEvent(event) && eventIds.push(event.id));
// Get merged metadata from backend
-// @ts-expect-error TS(7005): Variable 'eventIds' implicitly has an 'any[]' type... Remove this comment to see the full error message
// const responseMetadataFields = await dispatch(postEditMetadata(eventIds))
await dispatch(postEditMetadata(eventIds))
.then(unwrapResult)
.then((result) => {
// Set initial values and save metadata field infos in state
- let initialValues = getInitialValues(result);
-// @ts-expect-error TS(2345): Argument of type '{}' is not assignable to paramet... Remove this comment to see the full error message
+ let initialValues = getInitialValues(result.mergedMetadata);
setFetchedValues(initialValues);
setMetadataFields({
merged: result.merged,
@@ -92,15 +89,13 @@ const EditMetadataEventsModal = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const handleSubmit = (values) => {
+ const handleSubmit = (values: { [key: string]: unknown }) => {
const response = dispatch(updateBulkMetadata({metadataFields, values}));
console.info(response);
close();
};
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const onChangeSelected = (e, fieldId) => {
+ const onChangeSelected = (e: React.ChangeEvent, fieldId: string) => {
let selected = e.target.checked;
let fields = metadataFields;
fields.mergedMetadata = metadataFields.mergedMetadata.map((field) => {
@@ -118,13 +113,11 @@ const EditMetadataEventsModal = ({
};
// Check if value of metadata field is changed
-// @ts-expect-error TS(7006): Parameter 'field' implicitly has an 'any' type.
- const isTouchedOrSelected = (field, formikValues) => {
+ const isTouchedOrSelected = (field: MetadataFieldSelected, formikValues: { [key: string]: string | string[] }) => {
if (field.selected) {
return true;
}
-// @ts-expect-error TS(2531): Object is possibly 'null'.
if (fetchedValues[field.id] !== formikValues[field.id]) {
let fields = metadataFields;
fields.mergedMetadata = metadataFields.mergedMetadata.map((f) => {
@@ -166,16 +159,14 @@ const EditMetadataEventsModal = ({
)}
{/* Fatal error view */}
-{/* @ts-expect-error TS(2339): Property 'fatalError' does not exist on type '{}'. */}
- {!!fatalError.fatalError && (
+ {!!fatalError && (
{t("BULK_ACTIONS.EDIT_EVENTS_METADATA.FATAL_ERROR", {
-// @ts-expect-error TS(2339): Property 'fatalError' does not exist on type '{}'.
- fatalError: fatalError.fatalError,
+ fatalError: fatalError,
})}
@@ -186,10 +177,8 @@ const EditMetadataEventsModal = ({
{/* todo: Request Errors View and Update Errors View (not quite sure what this is used for) */}
-{/* @ts-expect-error TS(2339): Property 'fatalError' does not exist on type '{}'. */}
- {!loading && fatalError.fatalError === undefined && (
+ {!loading && fatalError === undefined && (
handleSubmit(values)}
>
@@ -338,13 +327,10 @@ const EditMetadataEventsModal = ({
);
};
-// @ts-expect-error TS(7006): Parameter 'metadataFields' implicitly has an 'any'... Remove this comment to see the full error message
-const getInitialValues = (metadataFields) => {
+const getInitialValues = (metadataFields: MetadataFieldSelected[]) => {
// Transform metadata fields provided by backend (saved in redux)
- let initialValues = {};
-// @ts-expect-error TS(7006): Parameter 'field' implicitly has an 'any' type.
- metadataFields.mergedMetadata.forEach((field) => {
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+ let initialValues: { [key: string]: string | string[] } = {};
+ metadataFields.forEach((field) => {
initialValues[field.id] = field.value;
});
diff --git a/src/components/events/partials/modals/EditScheduledEventsModal.tsx b/src/components/events/partials/modals/EditScheduledEventsModal.tsx
index 4519036802..d64dd069aa 100644
--- a/src/components/events/partials/modals/EditScheduledEventsModal.tsx
+++ b/src/components/events/partials/modals/EditScheduledEventsModal.tsx
@@ -16,28 +16,27 @@ import {
} from "../../../../utils/bulkActionUtils";
import { useAppDispatch, useAppSelector } from "../../../../store";
import {
- checkForSchedulingConflicts,
+ EditedEvents,
updateScheduledEventsBulk,
+ Conflict,
} from "../../../../slices/eventSlice";
import { fetchRecordings } from "../../../../slices/recordingSlice";
import { useHotkeys } from "react-hotkeys-hook";
import { availableHotkeys } from "../../../../configs/hotkeysConfig";
+import { Event } from "../../../../slices/eventSlice";
/**
* This component manages the pages of the edit scheduled bulk action
*/
const EditScheduledEventsModal = ({
-// @ts-expect-error TS(7031): Binding element 'close' implicitly has an 'any' ty... Remove this comment to see the full error message
close,
+}: {
+ close: () => void
}) => {
const { t } = useTranslation();
const dispatch = useAppDispatch();
const inputDevices = useAppSelector(state => getRecordings(state));
- // TODO: Get rid of the wrappers when modernizing redux is done
- const checkForSchedulingConflictsWrapper = async(events: any) => {
- return dispatch(checkForSchedulingConflicts(events));
- }
const initialValues = initialFormValuesEditScheduledEvents;
@@ -52,7 +51,7 @@ const EditScheduledEventsModal = ({
} = usePageFunctions(0, initialValues);
// for edit page: conflicts with other events
- const [conflicts, setConflicts] = useState([]);
+ const [conflicts, setConflicts] = useState([]);
const user = useAppSelector(state => getUserInformation(state));
@@ -84,23 +83,24 @@ const EditScheduledEventsModal = ({
},
];
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const validateFormik = (values) => {
- const errors = {};
+ const validateFormik = (values: {
+ events: Event[],
+ editedEvents: EditedEvents[],
+ }) => {
+ const errors: {
+ events?: string,
+ editedEvents?: string,
+ } = {};
if (!checkValidityUpdateScheduleEventSelection(values, user)) {
-// @ts-expect-error TS(2339): Property 'events' does not exist on type '{}'.
errors.events = "Not all events editable!";
}
if (steps[page].name !== "general") {
return checkSchedulingConflicts(
values,
setConflicts,
- checkForSchedulingConflictsWrapper,
dispatch
).then((result) => {
- const errors = {};
if (!result) {
-// @ts-expect-error TS(2339): Property 'editedEvents' does not exist on type '{}... Remove this comment to see the full error message
errors.editedEvents = "Scheduling conflicts exist!";
}
return errors;
@@ -110,8 +110,11 @@ const EditScheduledEventsModal = ({
}
};
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const handleSubmit = (values) => {
+ const handleSubmit = (values: {
+ events: Event[];
+ editedEvents: EditedEvents[];
+ changedEvents: string[];
+ }) => {
// Only update events if there are changes
if (values.changedEvents.length > 0) {
const response = dispatch(updateScheduledEventsBulk(values));
diff --git a/src/components/events/partials/modals/EmbeddingCodeModal.tsx b/src/components/events/partials/modals/EmbeddingCodeModal.tsx
index 6da6ab4641..271d96fe65 100644
--- a/src/components/events/partials/modals/EmbeddingCodeModal.tsx
+++ b/src/components/events/partials/modals/EmbeddingCodeModal.tsx
@@ -8,9 +8,12 @@ import { availableHotkeys } from "../../../../configs/hotkeysConfig";
* This component renders the embedding code modal
*/
const EmbeddingCodeModal = ({
- close,
- eventId
-}: any) => {
+ close,
+ eventId,
+}: {
+ close: () => void
+ eventId: string
+}) => {
const { t } = useTranslation();
const [textAreaContent, setTextAreaContent] = useState("");
@@ -40,18 +43,22 @@ const EmbeddingCodeModal = ({
};
const copy = () => {
- let copyText = document.getElementById("social_embed-textarea");
-// @ts-expect-error TS(2531): Object is possibly 'null'.
- copyText.select();
- document.execCommand("copy");
+ let copyText = document.getElementById("social_embed-textarea") as HTMLTextAreaElement;
+ if (copyText) {
+ copyText.select();
+ document.execCommand("copy");
- setCopySuccess(true);
+ setCopySuccess(true);
+ }
};
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const updateTextArea = (e) => {
+ const updateTextArea = (e: React.MouseEvent) => {
// chosen frame size
- let frameSize = e.target ? e.target.textContent : e.toElement.textContent;
+ let frameSize = e.currentTarget.textContent;
+
+ if (!frameSize) {
+ return;
+ }
// buttons containing possible frame sizes
let embedSizeButtons = document.getElementsByClassName("embedSizeButton");
diff --git a/src/components/events/partials/modals/EventDetails.tsx b/src/components/events/partials/modals/EventDetails.tsx
index 9dd050f5eb..19d5ed136b 100644
--- a/src/components/events/partials/modals/EventDetails.tsx
+++ b/src/components/events/partials/modals/EventDetails.tsx
@@ -83,14 +83,6 @@ const EventDetails = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
- // TODO: Get rid of the wrappers when modernizing redux is done
- const updateMetadataWrapper = (id: any, values: any) => {
- dispatch(updateMetadata({eventId: id, values}));
- }
- const updateExtendedMetadataWrapper = (id: any, values: any, catalog: any) => {
- dispatch(updateExtendedMetadata({eventId: id, values, catalog}));
- }
-
const page = useAppSelector(state => getModalPage(state));
const workflowTabHierarchy = useAppSelector(state => getModalWorkflowTabHierarchy(state));
const user = useAppSelector(state => getUserInformation(state));
@@ -233,7 +225,7 @@ const EventDetails = ({
metadataFields={metadata}
resourceId={eventId}
header={tabs[page].bodyHeaderTranslation ?? ""}
- updateResource={updateMetadataWrapper}
+ updateResource={updateMetadata}
editAccessRole="ROLE_UI_EVENTS_DETAILS_METADATA_EDIT"
/>
)}
@@ -241,7 +233,7 @@ const EventDetails = ({
setPolicyChanged(value)}
/>
diff --git a/src/components/events/partials/modals/StartTaskModal.tsx b/src/components/events/partials/modals/StartTaskModal.tsx
index 4a24daf61b..ce559f1a30 100644
--- a/src/components/events/partials/modals/StartTaskModal.tsx
+++ b/src/components/events/partials/modals/StartTaskModal.tsx
@@ -13,18 +13,15 @@ import { checkValidityStartTaskEventSelection } from "../../../../utils/bulkActi
import { useHotkeys } from "react-hotkeys-hook";
import { availableHotkeys } from "../../../../configs/hotkeysConfig";
import { useAppDispatch } from "../../../../store";
-import { connect } from "react-redux";
+import { Event } from "../../../../slices/eventSlice";
/**
* This component manages the pages of the task start bulk action
*/
const StartTaskModal = ({
close,
- postTasks,
}: {
close: () => void,
- // @ts-expect-error
- postTasks,
}) => {
const { t } = useTranslation();
const dispatch = useAppDispatch();
@@ -63,11 +60,15 @@ const StartTaskModal = ({
},
];
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const validateFormik = (values) => {
- const errors = {};
+ const validateFormik = (values: {
+ events: Event[],
+ workflow: string,
+ }) => {
+ const errors: {
+ events?: string,
+ workflow?: string,
+ } = {};
if (!checkValidityStartTaskEventSelection(values)) {
-// @ts-expect-error TS(2339): Property 'events' does not exist on type '{}'.
errors.events = "Not on all events task startable!";
}
if (
@@ -77,14 +78,12 @@ const StartTaskModal = ({
values.workflow !== ""
)
) {
-// @ts-expect-error TS(2339): Property 'worflow' does not exist on type '{}'.
errors.workflow = "Workflow not selected!";
}
return errors;
};
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const handleSubmit = (values) => {
+ const handleSubmit = (values: typeof initialValues) => {
postTasks(values);
dispatch(changeAllSelected(false));
close();
@@ -155,10 +154,4 @@ const StartTaskModal = ({
);
};
-// @ts-expect-error TS(7006): Parameter 'dispatch' implicitly has an 'any' type.
-const mapDispatchToState = (dispatch) => ({
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- postTasks: (values) => dispatch(postTasks(values)),
-});
-
-export default connect(null, mapDispatchToState)(StartTaskModal);
+export default StartTaskModal;
diff --git a/src/components/events/partials/wizards/NewEventSummary.tsx b/src/components/events/partials/wizards/NewEventSummary.tsx
index 4c00f10635..48276f2ac5 100644
--- a/src/components/events/partials/wizards/NewEventSummary.tsx
+++ b/src/components/events/partials/wizards/NewEventSummary.tsx
@@ -97,6 +97,7 @@ const NewEventSummary = ({
{/*Summary metadata*/}
({
{!metaDataExtendedHidden ? (
({
{/*Summary metadata*/}
({
{!metaDataExtendedHidden ? (
({
{configOption.description}
)}
-{/* @ts-expect-error TS(7006): Parameter 'field' implicitly has an 'any' type. */}
{configOption.fieldset?.map((field, keys) =>
renderInputByType(field, keys, formik)
)}
@@ -88,7 +88,7 @@ const RenderWorkflowConfig = ({
// render input depending on field type
const renderInputByType = (
- field: any,
+ field: FieldSetField,
key: React.Key | null | undefined,
formik: FormikProps,
) => {
@@ -109,17 +109,17 @@ const renderInputByType = (
};
const RenderDatetimeLocal = (
- { field, formik } : { field: any, formik: FormikProps }) => {
+ { field, formik } : { field: FieldSetField, formik: FormikProps }) => {
return (
- { field, formik } : { field: any, formik: FormikProps }) => {
+ { field, formik } : { field: FieldSetField, formik: FormikProps }) => {
return (
- { field, formik } : { field: any, formik: FormikProps }) => {
+ { field, formik } : { field: FieldSetField, formik: FormikProps }) => {
return ({
field,
formik
}: {
- field: any,
+ field: FieldSetField,
formik: FormikProps,
}) => {
return ({
formik,
validate = undefined
}: {
- field: any,
+ field: FieldSetField,
formik: FormikProps,
validate?: (value: any) => string | undefined,
}) => {
@@ -184,7 +184,6 @@ const RenderField = ({
then render again by input type*/}
{!!field.fieldset && !!formik.values.configuration && !!formik.values.configuration[field.name] && (
-{/* @ts-expect-error TS(7006): Parameter 'f' implicitly has an 'any' type. */}
{field.fieldset?.map((f, keys) => renderInputByType(f, keys, formik))}
)}
diff --git a/src/components/events/partials/wizards/summaryTables/AccessSummaryTable.tsx b/src/components/events/partials/wizards/summaryTables/AccessSummaryTable.tsx
index baeaea5253..7147f6769d 100644
--- a/src/components/events/partials/wizards/summaryTables/AccessSummaryTable.tsx
+++ b/src/components/events/partials/wizards/summaryTables/AccessSummaryTable.tsx
@@ -1,13 +1,17 @@
import React from "react";
import { useTranslation } from "react-i18next";
+import { TransformedAcl } from "../../../../../slices/aclDetailsSlice";
/**
* This component renders the access table containing access rules provided by user before in wizard summary pages
*/
const AccessSummaryTable = ({
- policies,
- header
-}: any) => {
+ policies,
+ header
+}: {
+ policies: TransformedAcl[]
+ header: string
+}) => {
const { t } = useTranslation();
return (
@@ -32,7 +36,6 @@ const AccessSummaryTable = ({
{/*Insert row for each policy user has provided*/}
-{/* @ts-expect-error TS(7006): Parameter 'policy' implicitly has an 'any' type. */}
{policies.map((policy, key) => (
{policy.role}
@@ -44,7 +47,6 @@ const AccessSummaryTable = ({
{/*repeat for each additional action*/}
-{/* @ts-expect-error TS(7006): Parameter 'action' implicitly has an 'any' type. */}
{policy.actions.map((action, key) => (
{action}
))}
diff --git a/src/components/events/partials/wizards/summaryTables/MetadataExtendedSummaryTable.tsx b/src/components/events/partials/wizards/summaryTables/MetadataExtendedSummaryTable.tsx
index 73f0efcb52..7ad11874b3 100644
--- a/src/components/events/partials/wizards/summaryTables/MetadataExtendedSummaryTable.tsx
+++ b/src/components/events/partials/wizards/summaryTables/MetadataExtendedSummaryTable.tsx
@@ -1,20 +1,22 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { getMetadataCollectionFieldName } from "../../../../../utils/resourceUtils";
+import { MetadataCatalog } from "../../../../../slices/eventSlice";
/**
* This component renders the metadata extended table containing access rules provided by user
* before in wizard summary pages
*/
const MetadataExtendedSummaryTable = ({
-// @ts-expect-error TS(7031): Binding element 'extendedMetadata' implicitly has ... Remove this comment to see the full error message
extendedMetadata,
-// @ts-expect-error TS(7031): Binding element 'formikValues' implicitly has an '... Remove this comment to see the full error message
formikValues,
-// @ts-expect-error TS(7031): Binding element 'formikInitialValues' implicitly h... Remove this comment to see the full error message
formikInitialValues,
-// @ts-expect-error TS(7031): Binding element 'header' implicitly has an 'any' t... Remove this comment to see the full error message
header,
+}: {
+ extendedMetadata: MetadataCatalog[],
+ formikValues: { [key: string]: string | string[] | boolean },
+ formikInitialValues: { [key: string]: string | string[] | boolean },
+ header: string,
}) => {
const { t } = useTranslation();
@@ -22,8 +24,11 @@ const MetadataExtendedSummaryTable = ({
const catalogs = [];
for (const catalog of extendedMetadata) {
const metadataFields = catalog.fields;
-// @ts-expect-error TS(7034): Variable 'metadata' implicitly has type 'any[]' in... Remove this comment to see the full error message
- let metadata = [];
+ let metadata: {
+ name: string,
+ label: string,
+ value: unknown,
+ }[] = [];
for (let i = 0; metadataFields.length > i; i++) {
let fieldValue =
@@ -39,10 +44,10 @@ const MetadataExtendedSummaryTable = ({
}
if (!!fieldValue && fieldValue.length > 0) {
+ const collection = metadataFields[i].collection;
if (
metadataFields[i].type === "text" &&
- !!metadataFields[i].collection &&
- metadataFields[i].collection.length > 0
+ !!collection && collection.length > 0
) {
fieldValue = getMetadataCollectionFieldName(
metadataFields[i],
@@ -53,7 +58,6 @@ const MetadataExtendedSummaryTable = ({
);
}
-// @ts-expect-error TS(7005): Variable 'metadata' implicitly has an 'any[]' type... Remove this comment to see the full error message
metadata = metadata.concat({
name: catalog.flavor + "_" + metadataFields[i].id,
label: metadataFields[i].label,
diff --git a/src/components/events/partials/wizards/summaryTables/MetadataSummaryTable.tsx b/src/components/events/partials/wizards/summaryTables/MetadataSummaryTable.tsx
index a80744d59c..182baffdbf 100644
--- a/src/components/events/partials/wizards/summaryTables/MetadataSummaryTable.tsx
+++ b/src/components/events/partials/wizards/summaryTables/MetadataSummaryTable.tsx
@@ -1,27 +1,36 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { getMetadataCollectionFieldName } from "../../../../../utils/resourceUtils";
+import { MetadataField } from "../../../../../slices/eventSlice";
/**
* This component renders the metadata table containing access rules provided by user before in wizard summary pages
*/
const MetadataSummaryTable = ({
- metadataFields,
- formikValues,
- header
-}: any) => {
+ metadataFields,
+ formikValues,
+ header
+}: {
+ metadataFields: MetadataField[],
+ formikValues: { [key: string]: string | string[] },
+ header: string,
+}) => {
const { t } = useTranslation();
// metadata that user has provided
-// @ts-expect-error TS(7034): Variable 'metadata' implicitly has type 'any[]' in... Remove this comment to see the full error message
- let metadata = [];
+ let metadata: {
+ name: string,
+ label: string,
+ value: unknown,
+ }[] = [];
for (let i = 0; metadataFields.length > i; i++) {
let fieldValue = formikValues[metadataFields[i].id];
if (!!fieldValue && fieldValue.length > 0) {
+ const collection = metadataFields[i].collection;
if (
metadataFields[i].type === "text" &&
- !!metadataFields[i].collection &&
- metadataFields[i].collection.length > 0
+ !!collection &&
+ collection.length > 0
) {
fieldValue = getMetadataCollectionFieldName(
metadataFields[i],
@@ -32,7 +41,6 @@ const MetadataSummaryTable = ({
)
}
-// @ts-expect-error TS(7005): Variable 'metadata' implicitly has an 'any[]' type... Remove this comment to see the full error message
metadata = metadata.concat({
name: metadataFields[i].id,
label: metadataFields[i].label,
diff --git a/src/components/recordings/Recordings.tsx b/src/components/recordings/Recordings.tsx
index c042d7f8c8..b030f0dce9 100644
--- a/src/components/recordings/Recordings.tsx
+++ b/src/components/recordings/Recordings.tsx
@@ -19,6 +19,8 @@ import { hasAccess } from "../../utils/utils";
import { getCurrentFilterResource } from "../../selectors/tableFilterSelectors";
import { useAppDispatch, useAppSelector } from "../../store";
import { fetchRecordings } from "../../slices/recordingSlice";
+import { AsyncThunk } from "@reduxjs/toolkit";
+import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk";
/**
* This component renders the table view of recordings
@@ -32,10 +34,6 @@ const Recordings = () => {
const currentFilterType = useAppSelector(state => getCurrentFilterResource(state));
const recordings = useAppSelector(state => getTotalRecordings(state));
- const fetchRecordingsWrapper = () => {
- fetchRecordings(undefined)
- }
-
const loadRecordings = async () => {
// Fetching recordings from server
await dispatch(fetchRecordings(undefined));
@@ -88,7 +86,7 @@ const Recordings = () => {
{/* Include filters component */}
}
loadResourceIntoTable={loadRecordingsIntoTable}
resource={"recordings"}
/>
diff --git a/src/components/recordings/partials/RecordingsNameCell.tsx b/src/components/recordings/partials/RecordingsNameCell.tsx
index 12baa0c890..2b91e8e9db 100644
--- a/src/components/recordings/partials/RecordingsNameCell.tsx
+++ b/src/components/recordings/partials/RecordingsNameCell.tsx
@@ -18,8 +18,7 @@ const RecordingsNameCell = ({
const { t } = useTranslation();
const dispatch = useAppDispatch();
-// @ts-expect-error TS(7006): Parameter 'locationName' implicitly has an 'any' t... Remove this comment to see the full error message
- const redirectToEvents = async (locationName) => {
+ const redirectToEvents = async (locationName: string) => {
// redirect to tables
await dispatch(loadEventsIntoTable());
diff --git a/src/components/recordings/partials/modal/RecordingsDetails.tsx b/src/components/recordings/partials/modal/RecordingsDetails.tsx
index 5752e501c0..088a5a5eec 100644
--- a/src/components/recordings/partials/modal/RecordingsDetails.tsx
+++ b/src/components/recordings/partials/modal/RecordingsDetails.tsx
@@ -33,8 +33,7 @@ const RecordingsDetails: React.FC = () => {
},
];
-// @ts-expect-error TS(7006): Parameter 'tabNr' implicitly has an 'any' type.
- const openTab = (tabNr) => {
+ const openTab = (tabNr: number) => {
setPage(tabNr);
};
diff --git a/src/components/shared/EditTableViewModal.tsx b/src/components/shared/EditTableViewModal.tsx
index bba49d6c59..e6e9ac4c48 100644
--- a/src/components/shared/EditTableViewModal.tsx
+++ b/src/components/shared/EditTableViewModal.tsx
@@ -11,6 +11,7 @@ import { DragDropContext, Droppable, OnDragEndResponder, Draggable as Draggablee
import { availableHotkeys } from "../../configs/hotkeysConfig";
import { useHotkeys } from "react-hotkeys-hook";
import { useAppDispatch, useAppSelector } from "../../store";
+import { TableColumn } from "../../configs/tableConfigs/aclsTableConfig";
/**
* This component renders the modal for editing which columns are shown in the table
@@ -57,8 +58,7 @@ const EditTableViewModal = ({
};
// set deactivated property of column to true (deactivate = true) or false (deactivate = false) and move to corresponding list
-// @ts-expect-error TS(7006): Parameter 'column' implicitly has an 'any' type.
- const changeColumn = (column, deactivate) => {
+ const changeColumn = (column: TableColumn, deactivate: boolean) => {
if (deactivate) {
setActiveColumns(activeCols.filter((col) => col !== column));
column = { ...column, deactivated: deactivate };
@@ -86,14 +86,14 @@ const EditTableViewModal = ({
// change column order based on where column was dragged and dropped
const onDragEnd: OnDragEndResponder = (result) => {
- // dropped outside the list
- if (!result.destination) {
- return;
- }
-
- // @ts-expect-error TS(7006): Parameter 'columns' implicitly has an 'any' type.
- setActiveColumns((columns) => arrayMoveImmutable(columns, result.source.index, result.destination.index));
- }
+ // dropped outside the list
+ const destination = result.destination
+ if (destination === null) {
+ return;
+ }
+
+ setActiveColumns((columns) => arrayMoveImmutable(columns, result.source.index, destination.index));
+ }
return (
<>
diff --git a/src/components/shared/MainNav.tsx b/src/components/shared/MainNav.tsx
index 5c55220a37..67ee4ce1ad 100644
--- a/src/components/shared/MainNav.tsx
+++ b/src/components/shared/MainNav.tsx
@@ -39,10 +39,11 @@ import { Tooltip } from "./Tooltip";
* This component renders the main navigation that opens when the burger button is clicked
*/
const MainNav = ({
-// @ts-expect-error TS(7031): Binding element 'isOpen' implicitly has an 'any' t... Remove this comment to see the full error message
isOpen,
-// @ts-expect-error TS(7031): Binding element 'toggleMenu' implicitly has an 'an... Remove this comment to see the full error message
toggleMenu,
+}: {
+ isOpen: boolean,
+ toggleMenu: () => void,
}) => {
const { t } = useTranslation();
const dispatch = useAppDispatch();
diff --git a/src/components/shared/Stats.tsx b/src/components/shared/Stats.tsx
index 4ba24859ed..2266bba353 100644
--- a/src/components/shared/Stats.tsx
+++ b/src/components/shared/Stats.tsx
@@ -5,6 +5,7 @@ import {
editFilterValue,
resetFilterValues,
fetchStats,
+ Stats as StatsType,
} from "../../slices/tableFilterSlice";
import { loadEventsIntoTable } from "../../thunks/tableThunks";
import { useAppDispatch, useAppSelector } from "../../store";
@@ -21,11 +22,9 @@ const Stats = () => {
const stats = useAppSelector(state => getStats(state));
// Filter with value of clicked status
-// @ts-expect-error TS(7006): Parameter 'stats' implicitly has an 'any' type.
- const showStatsFilter = async (stats) => {
+ const showStatsFilter = async (stats: StatsType) => {
dispatch(resetFilterValues());
let filterValue;
-// @ts-expect-error TS(7006): Parameter 'f' implicitly has an 'any' type.
await stats.filters.forEach((f) => {
let filter = filterMap.find(({ name }) => name === f.name);
filterValue = f.value;
diff --git a/src/components/shared/Table.tsx b/src/components/shared/Table.tsx
index e7159b5bd9..91280305c9 100644
--- a/src/components/shared/Table.tsx
+++ b/src/components/shared/Table.tsx
@@ -16,6 +16,8 @@ import {
setOffset,
setSortBy,
updatePageSize,
+ Page,
+ Pagination,
} from "../../slices/tableSlice";
import {
changeAllSelected,
@@ -32,6 +34,7 @@ import sortUpIcon from "../../img/tbl-sort-up.png";
import sortDownIcon from "../../img/tbl-sort-down.png";
import Notifications from "./Notifications";
import { useAppDispatch, useAppSelector } from "../../store";
+import { TableColumn } from "../../configs/tableConfigs/aclsTableConfig";
const SortIcon = styled.i`
float: right;
@@ -50,18 +53,23 @@ const SortActiveIcon = styled.i<{order: string}>`
left: auto;
width: 8px;
height: 13px;
- background-image: url(${(props: any) =>
+ background-image: url(${(props: { order: string }) =>
props.order === "ASC" ? sortUpIcon : sortDownIcon})};
`;
-const containerPageSize = React.createRef();
+const containerPageSize = React.createRef();
+
+type TemplateMap = {
+ [key: string]: ({ row }: { row: any }) => JSX.Element | JSX.Element[]
+}
/**
* This component renders the table in the table views of resources
*/
const Table = ({
-// @ts-expect-error TS(7031): Binding element 'templateMap' implicitly has an 'a... Remove this comment to see the full error message
templateMap,
+}: {
+ templateMap: TemplateMap
}) => {
const dispatch = useAppDispatch();
@@ -97,12 +105,9 @@ const Table = ({
useEffect(() => {
// Function for handling clicks outside of an open dropdown menu
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const handleClickOutside = (e) => {
+ const handleClickOutside = (e: any) => {
if (
- containerPageSize.current &&
-// @ts-expect-error TS(2571): Object is of type 'unknown'.
- !containerPageSize.current.contains(e.target)
+ e && containerPageSize.current && !containerPageSize.current.contains(e.target)
) {
setShowPageSizes(false);
}
@@ -117,14 +122,12 @@ const Table = ({
});
// Select or deselect all rows on a page
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const onChangeAllSelected = (e) => {
+ const onChangeAllSelected = (e: React.ChangeEvent) => {
const selected = e.target.checked;
dispatch(changeAllSelected(selected));
};
-// @ts-expect-error TS(7006): Parameter 'size' implicitly has an 'any' type.
- const changePageSize = (size) => {
+ const changePageSize = (size: number) => {
dispatch(updatePageSize(size));
dispatch(setOffset(0));
dispatch(updatePages());
@@ -302,7 +305,6 @@ const Table = ({
setShowPageSizes(!showPageSizes)}
-// @ts-expect-error TS(2322): Type 'RefObject' is not assignable to typ... Remove this comment to see the full error message
ref={containerPageSize}
>
{pagination.limit}
@@ -356,8 +358,8 @@ const Table = ({
};
// get all pages directly accessible from current page
-// @ts-expect-error TS(7006): Parameter 'pages' implicitly has an 'any' type.
-const getDirectAccessiblePages = (pages, pagination) => {
+
+const getDirectAccessiblePages = (pages: Page[], pagination: Pagination) => {
let startIndex = pagination.offset - pagination.directAccessibleNo,
endIndex = pagination.offset + pagination.directAccessibleNo,
directAccessible = [],
@@ -407,8 +409,10 @@ const getDirectAccessiblePages = (pages, pagination) => {
};
// Apply a column template and render corresponding components
-// @ts-expect-error TS(7031): Binding element 'row' implicitly has an 'any' type... Remove this comment to see the full error message
-const ColumnTemplate = ({ row, column, templateMap }) => {
+const ColumnTemplate = ({ row, column, templateMap }: {row: Row, column: TableColumn, templateMap: any}) => {
+ if (!column.template) {
+ return <>;
+ }
let Template = templateMap[column.template];
return ,
loadResourceIntoTable: () => AppThunk,
resource: string,
}) => {
@@ -77,8 +78,7 @@ const TableFiltersProfiles = ({
resetStateValues();
};
-// @ts-expect-error TS(7006): Parameter 'profile' implicitly has an 'any' type.
- const editFilterProfile = (profile) => {
+ const editFilterProfile = (profile: FilterProfile) => {
setSettingsMode(false);
setCurrentlyEditing(profile);
setProfileName(profile.name);
@@ -110,8 +110,7 @@ const TableFiltersProfiles = ({
setValidName(false);
};
-// @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const handleChange = (e) => {
+ const handleChange = (e: React.ChangeEvent) => {
const itemName = e.target.name;
const itemValue = e.target.value;
@@ -131,8 +130,7 @@ const TableFiltersProfiles = ({
}
};
-// @ts-expect-error TS(7006): Parameter 'filterMap' implicitly has an 'any' type... Remove this comment to see the full error message
- const chooseFilterProfile = (filterMap) => {
+ const chooseFilterProfile = (filterMap: FilterData[]) => {
dispatch(loadFilterProfile(filterMap));
// No matter what, we go to page one.
diff --git a/src/components/shared/TableFilters.tsx b/src/components/shared/TableFilters.tsx
index 096c7d81b2..b312b95384 100644
--- a/src/components/shared/TableFilters.tsx
+++ b/src/components/shared/TableFilters.tsx
@@ -28,6 +28,8 @@ import { AppThunk, useAppDispatch, useAppSelector } from "../../store";
import { renderValidDate } from "../../utils/dateUtils";
import { Tooltip } from "./Tooltip";
import DropDown from "./DropDown";
+import { AsyncThunk } from "@reduxjs/toolkit";
+import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk";
/**
* This component renders the table filters in the upper right corner of the table
@@ -37,8 +39,7 @@ const TableFilters = ({
loadResourceIntoTable,
resource,
}: {
- // TODO: Figure out proper typings
- loadResource: any, // (() => AppThunk ) | AsyncThunkAction
+ loadResource: AsyncThunk,
loadResourceIntoTable: () => AppThunk,
resource: string,
}) => {
@@ -81,8 +82,7 @@ const TableFilters = ({
};
// Remove a certain filter
-// @ts-expect-error TS(7006): Parameter 'filter' implicitly has an 'any' type.
- const removeFilter = async (filter) => {
+ const removeFilter = async (filter: FilterData) => {
if (filter.name === "startDate") {
// Clear state
setStartDate(undefined);
@@ -97,8 +97,7 @@ const TableFilters = ({
};
// Handle changes when an item of the component is changed
- // @ts-expect-error TS(7006): Parameter 'e' implicitly has an 'any' type.
- const handleChange = (name, value) => {
+ const handleChange = (name: string, value: string) => {
let mustApplyChanges = false;
if (name === "textFilter") {
dispatch(editTextFilter(value));
@@ -229,9 +228,7 @@ const TableFilters = ({
[removeFilters]
);
-// @ts-expect-error TS(7006): Parameter 'filter' implicitly has an 'any' type.
- const renderBlueBox = (filter) => {
-// @ts-expect-error TS(7006): Parameter 'opt' implicitly has an 'any' type.
+ const renderBlueBox = (filter: FilterData) => {
let valueLabel = filter.options?.find((opt) => opt.value === filter.value)
?.label || filter.value;
return (
diff --git a/src/components/shared/TimeSeriesStatistics.tsx b/src/components/shared/TimeSeriesStatistics.tsx
index d900a9450e..5b72053a3a 100644
--- a/src/components/shared/TimeSeriesStatistics.tsx
+++ b/src/components/shared/TimeSeriesStatistics.tsx
@@ -2,7 +2,7 @@ import React from "react";
import moment from "moment";
import { getCurrentLanguageInformation } from "../../utils/utils";
import { DatePicker } from "@mui/x-date-pickers/DatePicker";
-import { Formik } from "formik";
+import { Formik, FormikErrors } from "formik";
import { Field } from "./Field";
import BarChart from "./BarChart";
import {
@@ -13,44 +13,48 @@ import {
} from "../../configs/statisticsConfig";
import { localizedMoment } from "../../utils/dateUtils";
import { parseISO } from "date-fns";
+import { useTranslation } from "react-i18next";
+import type { ChartDataset, ChartOptions } from 'chart.js';
+
/**
* This component visualizes statistics with data of type time series
*/
const TimeSeriesStatistics = ({
-// @ts-expect-error TS(7031): Binding element 't' implicitly has an 'any' type.
- t,
-// @ts-expect-error TS(7031): Binding element 'resourceId' implicitly has an 'an... Remove this comment to see the full error message
resourceId,
-// @ts-expect-error TS(7031): Binding element 'statTitle' implicitly has an 'any... Remove this comment to see the full error message
statTitle,
-// @ts-expect-error TS(7031): Binding element 'providerId' implicitly has an 'an... Remove this comment to see the full error message
providerId,
-// @ts-expect-error TS(7031): Binding element 'fromDate' implicitly has an 'any'... Remove this comment to see the full error message
fromDate,
-// @ts-expect-error TS(7031): Binding element 'toDate' implicitly has an 'any' t... Remove this comment to see the full error message
toDate,
-// @ts-expect-error TS(7031): Binding element 'timeMode' implicitly has an 'any'... Remove this comment to see the full error message
timeMode,
-// @ts-expect-error TS(7031): Binding element 'dataResolution' implicitly has an... Remove this comment to see the full error message
dataResolution,
-// @ts-expect-error TS(7031): Binding element 'statDescription' implicitly has a... Remove this comment to see the full error message
statDescription,
-// @ts-expect-error TS(7031): Binding element 'onChange' implicitly has an 'any'... Remove this comment to see the full error message
onChange,
-// @ts-expect-error TS(7031): Binding element 'exportUrl' implicitly has an 'any... Remove this comment to see the full error message
exportUrl,
-// @ts-expect-error TS(7031): Binding element 'exportFileName' implicitly has an... Remove this comment to see the full error message
exportFileName,
-// @ts-expect-error TS(7031): Binding element 'totalValue' implicitly has an 'an... Remove this comment to see the full error message
totalValue,
-// @ts-expect-error TS(7031): Binding element 'sourceData' implicitly has an 'an... Remove this comment to see the full error message
sourceData,
-// @ts-expect-error TS(7031): Binding element 'chartLabels' implicitly has an 'a... Remove this comment to see the full error message
chartLabels,
-// @ts-expect-error TS(7031): Binding element 'chartOptions' implicitly has an '... Remove this comment to see the full error message
chartOptions,
+}: {
+ resourceId: string,
+ statTitle: string,
+ providerId: string,
+ fromDate: string,
+ toDate: string,
+ timeMode: any, // startOf | "custom" ???
+ dataResolution: string[],
+ statDescription: string,
+ onChange: (id: any, providerId: any, from: any, to: any, dataResolution: any, timeMode: any) => void,
+ exportUrl: string,
+ exportFileName: (statsTitle: string) => string,
+ totalValue: string,
+ sourceData: ChartDataset<'bar'>,
+ chartLabels: string[],
+ chartOptions: ChartOptions<'bar'>,
}) => {
+ const { t } = useTranslation();
+
// Style for radio buttons
const radioButtonStyle = {
backgroundColor: "whitesmoke",
@@ -74,16 +78,19 @@ const TimeSeriesStatistics = ({
const currentLanguage = getCurrentLanguageInformation();
// change formik values and get new statistic values from API
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- const change = (setFormikValue, timeMode, from, to, dataResolution) => {
+ const change = (
+ setFormikValue: (field: string, value: any) => Promise>,
+ timeMode: string,
+ from: Date | string,
+ to: Date | string,
+ dataResolution: unknown
+ ) => {
if (timeMode === "year" || timeMode === "month") {
from = moment(from).clone().startOf(timeMode).format("YYYY-MM-DD");
to = moment(from).clone().endOf(timeMode).format("YYYY-MM-DD");
- setFormikValue("fromDate", from);
+ setFormikValue("fromDat0e", from);
setFormikValue("toDate", to);
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
setFormikValue("dataResolution", fixedDataResolutions[timeMode]);
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
dataResolution = fixedDataResolutions[timeMode];
}
@@ -92,16 +99,11 @@ const TimeSeriesStatistics = ({
// change time mode in formik and get new values from API
const changeTimeMode = async (
-// @ts-expect-error TS(7006): Parameter 'newTimeMode' implicitly has an 'any' ty... Remove this comment to see the full error message
- newTimeMode,
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- setFormikValue,
-// @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
- from,
-// @ts-expect-error TS(7006): Parameter 'to' implicitly has an 'any' type.
- to,
-// @ts-expect-error TS(7006): Parameter 'dataResolution' implicitly has an 'any'... Remove this comment to see the full error message
- dataResolution
+ newTimeMode: string,
+ setFormikValue: (field: string, value: any) => Promise>,
+ from: Date | string,
+ to: Date | string,
+ dataResolution: unknown
) => {
setFormikValue("timeMode", newTimeMode);
change(setFormikValue, newTimeMode, from, to, dataResolution);
@@ -109,16 +111,11 @@ const TimeSeriesStatistics = ({
// change custom from date in formik and get new values from API
const changeFrom = async (
-// @ts-expect-error TS(7006): Parameter 'newFrom' implicitly has an 'any' type.
- newFrom,
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- setFormikValue,
-// @ts-expect-error TS(7006): Parameter 'timeMode' implicitly has an 'any' type.
- timeMode,
-// @ts-expect-error TS(7006): Parameter 'to' implicitly has an 'any' type.
- to,
-// @ts-expect-error TS(7006): Parameter 'dataResolution' implicitly has an 'any'... Remove this comment to see the full error message
- dataResolution
+ newFrom: Date,
+ setFormikValue: (field: string, value: any) => Promise>,
+ timeMode: string,
+ to: Date | string,
+ dataResolution: unknown,
) => {
setFormikValue("fromDate", newFrom);
change(setFormikValue, timeMode, newFrom, to, dataResolution);
@@ -126,16 +123,11 @@ const TimeSeriesStatistics = ({
// change custom to date in formik and get new values from API
const changeTo = async (
-// @ts-expect-error TS(7006): Parameter 'newTo' implicitly has an 'any' type.
- newTo,
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- setFormikValue,
-// @ts-expect-error TS(7006): Parameter 'timeMode' implicitly has an 'any' type.
- timeMode,
-// @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
- from,
-// @ts-expect-error TS(7006): Parameter 'dataResolution' implicitly has an 'any'... Remove this comment to see the full error message
- dataResolution
+ newTo: Date,
+ setFormikValue: (field: string, value: any) => Promise>,
+ timeMode: string,
+ from: Date | string,
+ dataResolution: unknown
) => {
setFormikValue("toDate", newTo);
change(setFormikValue, timeMode, from, newTo, dataResolution);
@@ -143,33 +135,33 @@ const TimeSeriesStatistics = ({
// change custom time granularity in formik and get new values from API
const changeGranularity = async (
-// @ts-expect-error TS(7006): Parameter 'granularity' implicitly has an 'any' ty... Remove this comment to see the full error message
- granularity,
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- setFormikValue,
-// @ts-expect-error TS(7006): Parameter 'timeMode' implicitly has an 'any' type.
- timeMode,
-// @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
- from,
-// @ts-expect-error TS(7006): Parameter 'to' implicitly has an 'any' type.
- to
+ granularity: unknown,
+ setFormikValue: (field: string, value: any) => Promise>,
+ timeMode: string,
+ from: Date | string,
+ to: Date | string,
) => {
setFormikValue("dataResolution", granularity);
change(setFormikValue, timeMode, from, to, granularity);
};
// format selected time to display as name of timeframe
-// @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
- const formatSelectedTimeframeName = (from, timeMode) => {
+ const formatSelectedTimeframeName = (
+ from: string,
+ timeMode: keyof typeof formatStrings
+ ) => {
return localizedMoment(from, currentLanguage ? currentLanguage.dateLocale.code : "en").format(
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
formatStrings[timeMode]
);
};
// change to and from dates in formik to previous timeframe and get new values from API
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- const selectPrevious = (setFormikValue, from, timeMode, dataResolution) => {
+ const selectPrevious = (
+ setFormikValue: (field: string, value: any) => Promise>,
+ from: string,
+ timeMode: keyof typeof formatStrings,
+ dataResolution: unknown,
+ ) => {
const newFrom = moment(from)
// @ts-expect-error TS(2769): No overload matches this call.
.subtract(1, timeMode + "s")
@@ -179,8 +171,12 @@ const TimeSeriesStatistics = ({
};
// change to and from dates in formik to next timeframe and get new values from API
-// @ts-expect-error TS(7006): Parameter 'setFormikValue' implicitly has an 'any'... Remove this comment to see the full error message
- const selectNext = (setFormikValue, from, timeMode, dataResolution) => {
+ const selectNext = (
+ setFormikValue: (field: string, value: any) => Promise>,
+ from: string,
+ timeMode: keyof typeof formatStrings,
+ dataResolution: unknown,
+ ) => {
const newFrom = moment(from)
// @ts-expect-error TS(2769): No overload matches this call.
.add(1, timeMode + "s")
@@ -306,15 +302,17 @@ const TimeSeriesStatistics = ({
slotProps={{ textField: { placeholder: t(
"EVENTS.EVENTS.NEW.SOURCE.PLACEHOLDER.START_DATE"
) } }}
- onChange={(value) =>
- changeFrom(
- value,
- formik.setFieldValue,
- formik.values.timeMode,
- formik.values.toDate,
- formik.values.dataResolution
- )
- }
+ onChange={(value) => {
+ if (value) {
+ changeFrom(
+ value,
+ formik.setFieldValue,
+ formik.values.timeMode,
+ formik.values.toDate,
+ formik.values.dataResolution
+ )
+ }
+ }}
/>
,
- fetchAccessPolicies: (id: string) => void,
- saveNewAccessPolicies: (id: string, policies: { acl: Acl }) => Promise,
+ fetchHasActiveTransactions?: AsyncThunk
+ fetchAccessPolicies: AsyncThunk,
+ saveNewAccessPolicies: AsyncThunk
descriptionText: string,
buttonText: string,
saveButtonText: string,
@@ -89,12 +91,10 @@ const ResourceDetailsAccessPolicyTab = ({
const responseActions = await fetchAclActions();
setAclActions(responseActions);
setHasActions(responseActions.length > 0);
- await fetchAccessPolicies(resourceId);
+ await dispatch(fetchAccessPolicies(resourceId));
fetchRolesWithTarget("ACL").then((roles) => setRoles(roles));
if (fetchHasActiveTransactions) {
- const fetchTransactionResult = await fetchHasActiveTransactions(
- resourceId
- );
+ const fetchTransactionResult = await dispatch(fetchHasActiveTransactions(resourceId)).then(unwrapResult)
fetchTransactionResult.active !== undefined
? setTransactions({ read_only: fetchTransactionResult.active })
: setTransactions({ read_only: true });
@@ -154,11 +154,11 @@ const ResourceDetailsAccessPolicyTab = ({
}
if (allRulesValid && roleWithFullRightsExists) {
- saveNewAccessPolicies(resourceId, access).then((success) => {
+ dispatch(saveNewAccessPolicies({id: resourceId, policies: access})).then((success) => {
// fetch new policies from the backend, if save successful
if (success) {
setPolicyChanged(false);
- fetchAccessPolicies(resourceId);
+ dispatch(fetchAccessPolicies(resourceId));
}
});
}
diff --git a/src/components/shared/modals/TermsOfUsePage.tsx b/src/components/shared/modals/TermsOfUsePage.tsx
index e523d48d13..e4336c7594 100644
--- a/src/components/shared/modals/TermsOfUsePage.tsx
+++ b/src/components/shared/modals/TermsOfUsePage.tsx
@@ -13,8 +13,7 @@ const TermsOfUsePage = () => {
{t("ADOPTER_REGISTRATION.MODAL.LEGAL_INFO_STATE.HEADER")}
diff --git a/src/components/shared/wizard/RenderMultiField.tsx b/src/components/shared/wizard/RenderMultiField.tsx
index 64b57daa83..b9415afe3a 100644
--- a/src/components/shared/wizard/RenderMultiField.tsx
+++ b/src/components/shared/wizard/RenderMultiField.tsx
@@ -249,7 +249,7 @@ const ShowValue = ({
setEditMode: (e: boolean) => void
form: FieldProps["form"]
field: FieldProps["field"]
- showCheck: any,
+ showCheck: boolean,
}) => {
return (
setEditMode(true)} className="show-edit">
diff --git a/src/components/statistics/Statistics.tsx b/src/components/statistics/Statistics.tsx
index 57c8167488..2d1b46dba8 100644
--- a/src/components/statistics/Statistics.tsx
+++ b/src/components/statistics/Statistics.tsx
@@ -57,8 +57,7 @@ const Statistics: React.FC = () => {
};
/* generates file name for download-link for a statistic */
-// @ts-expect-error TS(7006): Parameter 'statsTitle' implicitly has an 'any' typ... Remove this comment to see the full error message
- const statisticsCsvFileName = (statsTitle) => {
+ const statisticsCsvFileName = (statsTitle: string) => {
const sanitizedStatsTitle = statsTitle
.replace(/[^0-9a-z]/gi, "_")
.toLowerCase();
@@ -121,7 +120,6 @@ const Statistics: React.FC = () => {
/* visualization of statistic for time series data */
) : !row.online ? (
- ) : null;
+ ) : <>;
};
export default ServersStatusCell;
diff --git a/src/components/systems/partials/ServicesActionsCell.tsx b/src/components/systems/partials/ServicesActionsCell.tsx
index 4fbe5be0b6..225543ffd4 100644
--- a/src/components/systems/partials/ServicesActionsCell.tsx
+++ b/src/components/systems/partials/ServicesActionsCell.tsx
@@ -27,8 +27,8 @@ const ServicesActionCell = ({
};
return (
- row.status !== "SYSTEMS.SERVICES.STATUS.NORMAL" &&
- hasAccess("ROLE_UI_SERVICES_STATUS_EDIT", user) && (
+ (row.status !== "SYSTEMS.SERVICES.STATUS.NORMAL" &&
+ hasAccess("ROLE_UI_SERVICES_STATUS_EDIT", user)) ? (
)
+ : <>
);
};
diff --git a/src/components/users/Users.tsx b/src/components/users/Users.tsx
index c6da995f23..f3c1f8ff1e 100644
--- a/src/components/users/Users.tsx
+++ b/src/components/users/Users.tsx
@@ -41,11 +41,6 @@ const Users: React.FC = () => {
const user = useAppSelector(state => getUserInformation(state));
const currentFilterType = useAppSelector(state => getCurrentFilterResource(state));
- // TODO: Get rid of the wrappers when modernizing redux is done
- const fetchUsersWrapper = async () => {
- await dispatch(fetchUsers())
- }
-
const loadUsers = async () => {
// Fetching users from server
await dispatch(fetchUsers());
@@ -169,7 +164,7 @@ const Users: React.FC = () => {
{/* Include filters component */}
diff --git a/src/components/users/partials/AclsActionsCell.tsx b/src/components/users/partials/AclsActionsCell.tsx
index 4ea8650364..1fa2b0dabd 100644
--- a/src/components/users/partials/AclsActionsCell.tsx
+++ b/src/components/users/partials/AclsActionsCell.tsx
@@ -29,8 +29,7 @@ const AclsActionsCell = ({
setDeleteConfirmation(false);
};
-// @ts-expect-error TS(7006): Parameter 'id' implicitly has an 'any' type.
- const deletingAcl = (id) => {
+ const deletingAcl = (id: number) => {
dispatch(deleteAcl(id));
};
diff --git a/src/components/users/partials/GroupsActionsCell.tsx b/src/components/users/partials/GroupsActionsCell.tsx
index 838734322f..727890b676 100644
--- a/src/components/users/partials/GroupsActionsCell.tsx
+++ b/src/components/users/partials/GroupsActionsCell.tsx
@@ -29,8 +29,7 @@ const GroupsActionsCell = ({
setDeleteConfirmation(false);
};
-// @ts-expect-error TS(7006): Parameter 'id' implicitly has an 'any' type.
- const deletingGroup = (id) => {
+ const deletingGroup = (id: string) => {
dispatch(deleteGroup(id));
};
diff --git a/src/components/users/partials/UsersActionsCell.tsx b/src/components/users/partials/UsersActionsCell.tsx
index fc11e94a7c..3b53b605fa 100644
--- a/src/components/users/partials/UsersActionsCell.tsx
+++ b/src/components/users/partials/UsersActionsCell.tsx
@@ -29,8 +29,7 @@ const UsersActionCell = ({
setDeleteConfirmation(false);
};
-// @ts-expect-error TS(7006): Parameter 'id' implicitly has an 'any' type.
- const deletingUser = (id) => {
+ const deletingUser = (id: string) => {
dispatch(deleteUser(id));
};
diff --git a/src/components/users/partials/wizard/NewGroupSummaryPage.tsx b/src/components/users/partials/wizard/NewGroupSummaryPage.tsx
index d1a9b83f54..ff03c7b84d 100644
--- a/src/components/users/partials/wizard/NewGroupSummaryPage.tsx
+++ b/src/components/users/partials/wizard/NewGroupSummaryPage.tsx
@@ -18,11 +18,10 @@ const NewGroupSummaryPage =
({
const { t } = useTranslation();
// get values of objects in field that should be shown
-// @ts-expect-error TS(7006): Parameter 'field' implicitly has an 'any' type.
- const getValues = (field) => {
+ const getValues = (fields: { name: string }[]) => {
let names = [];
- for (let i = 0; i < field.length; i++) {
- names.push(field[i].name);
+ for (const field of fields) {
+ names.push(field.name);
}
return names;
};
diff --git a/src/components/users/partials/wizard/NewGroupWizard.tsx b/src/components/users/partials/wizard/NewGroupWizard.tsx
index 94ab85ecdf..bea88b9683 100644
--- a/src/components/users/partials/wizard/NewGroupWizard.tsx
+++ b/src/components/users/partials/wizard/NewGroupWizard.tsx
@@ -56,8 +56,7 @@ const NewGroupWizard: React.FC<{
// Validation schema of current page
const currentValidationSchema = NewGroupSchema[page];
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
- const handleSubmit = (values) => {
+ const handleSubmit = (values: typeof initialFormValuesNewGroup) => {
const response = dispatch(postNewGroup(values));
console.info(response);
close();
diff --git a/src/configs/modalConfig.ts b/src/configs/modalConfig.ts
index 8575788014..c08b03deb1 100644
--- a/src/configs/modalConfig.ts
+++ b/src/configs/modalConfig.ts
@@ -118,6 +118,15 @@ export const initialFormValuesNewThemes = {
watermarkFile: "",
watermarkFileName: "",
watermarkPosition: "topRight",
+
+ // Don't care about these, but they are required by type
+ creationDate: "",
+ creator: "",
+ default: false,
+ id: 0,
+ licenseSlideBackground: "",
+ licenseSlideDescription: "",
+ titleSlideMetadata: "",
};
// All fields for new acl form that are fix and not depending on response of backend
@@ -166,7 +175,11 @@ export const initialFormValuesNewUser: {
// All fields for start task form that are fix and not depending on response of backend
// InitialValues of Formik form (others computed dynamically depending on responses from backend)
-export const initialFormValuesStartTask = {
+export const initialFormValuesStartTask: {
+ events: Event[],
+ workflow: string,
+ configuration: { [key: string]: string },
+} = {
events: [],
workflow: "",
configuration: {},
diff --git a/src/configs/tableConfigs/aclsTableConfig.ts b/src/configs/tableConfigs/aclsTableConfig.ts
index 9266a0f5c2..1f9d9f08bd 100644
--- a/src/configs/tableConfigs/aclsTableConfig.ts
+++ b/src/configs/tableConfigs/aclsTableConfig.ts
@@ -1,18 +1,20 @@
export type TableConfig = {
- columns: {
- name: string,
- label: string,
- template?: string,
- sortable?: boolean,
- translate?: boolean,
- deactivated?: boolean,
- }[],
+ columns: TableColumn[],
caption: string,
resource: string,
category: string,
multiSelect: boolean,
}
+export type TableColumn = {
+ name: string,
+ label: string,
+ template?: string,
+ sortable?: boolean,
+ translate?: boolean,
+ deactivated?: boolean,
+}
+
/**
* Config that contains the columns and further information regarding acls. These are the information that never or hardly changes.
* That's why it is hard coded here and not fetched from server.
diff --git a/src/slices/aclSlice.ts b/src/slices/aclSlice.ts
index 1b7816fcbd..8450cd252a 100644
--- a/src/slices/aclSlice.ts
+++ b/src/slices/aclSlice.ts
@@ -144,7 +144,7 @@ export const postNewAcl = (values: typeof initialFormValuesNewAcl) => async (dis
});
};
// delete acl with provided id
-export const deleteAcl = (id: string) => async (dispatch: AppDispatch) => {
+export const deleteAcl = (id: number) => async (dispatch: AppDispatch) => {
axios
.delete(`/admin-ng/acl/${id}`)
.then((res) => {
diff --git a/src/slices/eventDetailsSlice.ts b/src/slices/eventDetailsSlice.ts
index 89a75b5044..1f5bffb67b 100644
--- a/src/slices/eventDetailsSlice.ts
+++ b/src/slices/eventDetailsSlice.ts
@@ -72,7 +72,6 @@ type CommentAuthor = {
username: string,
}
-// TODO: Further define this after modernizing Workflows
type Workflow = {
scheduling: boolean,
entries: {
@@ -84,7 +83,22 @@ type Workflow = {
submitterName: string,
title: string
}[],
- workflow: any // TODO: proper typing
+ // TODO: This looks like really bad practice. Rewrite.
+ workflow: { // The type when looking at the list of workflows
+ workflowId: string,
+ description?: string,
+ configuration?: unknown
+ } | { // The type when looking at the details of a particular workflow
+ configuration: { [key: string]: unknown }
+ creator: string
+ description: string
+ executionTime: number
+ status: string // translation string
+ submittedAt: string // date string
+ title: string
+ wdid: string
+ wiid: number
+ }
}
type Device = {
@@ -123,6 +137,25 @@ export type Publication = {
description?: string,
}
+export type Comment = {
+ author: CommentAuthor,
+ creationDate: string,
+ id: number,
+ modificationDate: string,
+ reason: string, // translation key
+ replies: CommentReply[],
+ resolvedStatus: boolean,
+ text: string,
+}
+
+export type CommentReply = {
+ author: CommentAuthor,
+ creationDate: string,
+ id: number,
+ modificationDate: string,
+ text: string,
+}
+
type EventDetailsState = {
statusMetadata: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
errorMetadata: SerializedError | null,
@@ -249,22 +282,7 @@ type EventDetailsState = {
channel: string,
},
policies: TransformedAcl[],
- comments: {
- author: CommentAuthor,
- creationDate: string,
- id: number,
- modificationDate: string,
- reason: string, // translation key
- replies: {
- author: CommentAuthor,
- creationDate: string,
- id: number,
- modificationDate: string,
- text: string,
- }[],
- resolvedStatus: boolean,
- text: string,
- }[],
+ comments: Comment[],
commentReasons: { [key: string]: string },
scheduling: {
hasProperties: boolean,
@@ -300,7 +318,11 @@ type EventDetailsState = {
description?: string,
},
workflowDefinitions: WorkflowDefinitions[],
- baseWorkflow: any, // TODO: proper typing
+ baseWorkflow: {
+ workflowId: string,
+ description?: string,
+ configuration?: unknown
+ },
workflowOperations: {
entries: {
configuration: { [key: string]: string },
@@ -536,7 +558,9 @@ const initialState: EventDetailsState = {
description: "",
},
workflowDefinitions: [],
- baseWorkflow: {},
+ baseWorkflow: {
+ workflowId: ""
+ },
workflowOperations: {
entries: [],
},
@@ -837,9 +861,9 @@ export const fetchAssetPublicationDetails = createAppAsyncThunk('eventDetails/fe
return await publicationDetailsRequest.data;
});
-export const fetchAccessPolicies = createAppAsyncThunk('eventDetails/fetchAccessPolicies', async (eventId: string) => {
+export const fetchAccessPolicies = createAppAsyncThunk('eventDetails/fetchAccessPolicies', async (id: string) => {
const policyData = await axios.get(
- `/admin-ng/event/${eventId}/access.json`
+ `/admin-ng/event/${id}/access.json`
);
let accessPolicies = await policyData.data;
@@ -964,7 +988,7 @@ export const saveComment = createAppAsyncThunk('eventDetails/saveComment', async
export const saveCommentReply = createAppAsyncThunk('eventDetails/saveCommentReply', async (params: {
eventId: string,
- commentId: string,
+ commentId: number,
replyText: string,
commentResolved: boolean
}) => {
@@ -1059,20 +1083,22 @@ export const fetchSchedulingInfo = createAppAsyncThunk('eventDetails/fetchSchedu
return source;
});
+export type SchedulingInfo = {
+ captureAgent: string,
+ inputs: string[],
+ scheduleDurationHours: string,
+ scheduleDurationMinutes: string,
+ scheduleEndDate: string,
+ scheduleEndHour: string,
+ scheduleEndMinute: string,
+ scheduleStartDate: string,
+ scheduleStartHour: string,
+ scheduleStartMinute: string,
+}
+
export const saveSchedulingInfo = createAppAsyncThunk('eventDetails/saveSchedulingInfo', async (params: {
eventId: string,
- values: {
- captureAgent: string,
- inputs: string[],
- scheduleDurationHours: string,
- scheduleDurationMinutes: string,
- scheduleEndDate: string,
- scheduleEndHour: string,
- scheduleEndMinute: string,
- scheduleStartDate: string,
- scheduleStartHour: string,
- scheduleStartMinute: string,
- },
+ values: SchedulingInfo,
startDate: Date,
endDate: Date
}, { dispatch, getState }) => {
@@ -1482,7 +1508,7 @@ export const fetchWorkflowErrors = createAppAsyncThunk('eventDetails/fetchWorkfl
export const fetchWorkflowErrorDetails = createAppAsyncThunk('eventDetails/fetchWorkflowErrorDetails', async (params: {
eventId: string,
- workflowId: string,
+ workflowId: number,
errorId?: number
}) => {
const { eventId, workflowId, errorId } = params;
@@ -1536,10 +1562,10 @@ export const fetchEventStatisticsValueUpdate = createAppAsyncThunk('eventDetails
});
export const updateMetadata = createAppAsyncThunk('eventDetails/updateMetadata', async (params: {
- eventId: string,
- values: { [key: string]: any }
+ id: string,
+ values: { [key: string]: MetadataCatalog["fields"][0]["value"] }
}, { dispatch, getState }) => {
- const { eventId, values } = params;
+ const { id, values } = params;
let metadataInfos = getMetadata(getState());
@@ -1548,7 +1574,7 @@ export const updateMetadata = createAppAsyncThunk('eventDetails/updateMetadata',
values
);
- await axios.put(`/admin-ng/event/${eventId}/metadata`, data, headers);
+ await axios.put(`/admin-ng/event/${id}/metadata`, data, headers);
// updated metadata in event details redux store
let eventMetadata = {
@@ -1560,18 +1586,18 @@ export const updateMetadata = createAppAsyncThunk('eventDetails/updateMetadata',
});
export const updateExtendedMetadata = createAppAsyncThunk('eventDetails/updateExtendedMetadata', async (params: {
- eventId: string,
- values: { [key: string]: any },
+ id: string,
+ values: { [key: string]: MetadataCatalog["fields"][0]["value"] }
catalog: MetadataCatalog
}, { dispatch, getState }) => {
- const { eventId, values, catalog } = params;
+ const { id, values, catalog } = params;
const { fields, data, headers } = transformMetadataForUpdate(
catalog,
values
);
- await axios.put(`/admin-ng/event/${eventId}/metadata`, data, headers);
+ await axios.put(`/admin-ng/event/${id}/metadata`, data, headers);
// updated extended metadata in event details redux store
let eventMetadata = {
@@ -1605,7 +1631,7 @@ export const fetchHasActiveTransactions = createAppAsyncThunk('eventDetails/fetc
});
export const updateAssets = createAppAsyncThunk('eventDetails/updateAssets', async (params: {
- values: { [key: string]: string },
+ values: { [key: string]: File },
eventId: string
}, { dispatch, getState }) => {
const { values, eventId } = params;
@@ -1692,22 +1718,21 @@ export const updateAssets = createAppAsyncThunk('eventDetails/updateAssets', asy
});
export const saveAccessPolicies = createAppAsyncThunk('eventDetails/saveAccessPolicies', async (params: {
- eventId: string,
+ id: string,
policies: { acl: { ace: Ace[] } }
}, { dispatch }) => {
- const { eventId, policies } = params;
+ const { id, policies } = params;
const headers = getHttpHeaders();
let data = new URLSearchParams();
data.append("acl", JSON.stringify(policies));
-// @ts-expect-error TS(2345): Argument of type 'boolean' is not assignable to pa... Remove this comment to see the full error message
- data.append("override", true);
+ data.append("override", "true");
return axios
- .post(`/admin-ng/event/${eventId}/access`, data.toString(), headers)
+ .post(`/admin-ng/event/${id}/access`, data.toString(), headers)
.then((response) => {
console.info(response);
- dispatch(fetchAccessPolicies(eventId))
+ dispatch(fetchAccessPolicies(id))
dispatch(
addNotification({
type: "info",
@@ -1793,7 +1818,7 @@ export const updateWorkflow = createAppAsyncThunk('eventDetails/updateWorkflow',
export const saveWorkflowConfig = createAppAsyncThunk('eventDetails/saveWorkflowConfig', async (params: {
values: {
workflowDefinition: string,
- configuration: { [key: string]: unknown }
+ configuration: { [key: string]: unknown } | undefined
},
eventId: string
}, { dispatch }) => {
@@ -1881,7 +1906,9 @@ const eventDetailsSlice = createSlice({
workflows: EventDetailsState["workflows"],
workflowDefinitions: EventDetailsState["workflowDefinitions"],
}>) {
- state.baseWorkflow = { ...action.payload.workflows.workflow };
+ if ("workflowId" in action.payload.workflows.workflow) {
+ state.baseWorkflow = { ...action.payload.workflows.workflow };
+ }
state.workflows = action.payload.workflows;
state.workflowDefinitions = action.payload.workflowDefinitions;
},
@@ -2294,7 +2321,7 @@ const eventDetailsSlice = createSlice({
>) => {
state.statusWorkflows = 'succeeded';
state.workflows = action.payload;
- if (!!state.workflows.workflow.workflowId) {
+ if ("workflowId" in state.workflows.workflow && !!state.workflows.workflow.workflowId) {
state.workflowConfiguration = state.workflows.workflow;
} else {
state.workflowConfiguration = state.baseWorkflow;
@@ -2499,7 +2526,7 @@ const eventDetailsSlice = createSlice({
console.error(action.error);
})
.addCase(updateWorkflow.fulfilled, (state, action) => {
- if (!!state.workflows.workflow.workflowId) {
+ if ("workflowId" in state.workflows.workflow && !!state.workflows.workflow.workflowId) {
state.workflowConfiguration = state.workflows.workflow;
} else {
state.workflowConfiguration = state.baseWorkflow;
diff --git a/src/slices/eventSlice.ts b/src/slices/eventSlice.ts
index 274febe97f..d48ddab24f 100644
--- a/src/slices/eventSlice.ts
+++ b/src/slices/eventSlice.ts
@@ -136,8 +136,9 @@ export type EditedEvents = {
export type UploadAssetOption = {
accept: string,
- "displayFallback.DETAIL": string,
- "displayFallback.SHORT": string,
+ displayFallback?: string,
+ "displayFallback.DETAIL"?: string,
+ "displayFallback.SHORT"?: string,
displayOrder: number,
flavorSubType: string,
flavorType: string,
@@ -147,12 +148,23 @@ export type UploadAssetOption = {
title: string,
type: string,
displayOverride?: string,
+ "displayOverride.SHORT"?: string,
+ "displayOverride.DETAIL"?: string,
}
export type UploadAssetsTrack = UploadAssetOption & {
file?: FileList
}
+export type Conflict = {
+ conflicts: {
+ end: string,
+ start: string,
+ title: string,
+ }[],
+ eventId: string,
+}
+
type EventState = {
status: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
error: SerializedError | null,
@@ -328,7 +340,7 @@ export const updateBulkMetadata = createAppAsyncThunk('events/updateBulkMetadata
notFound?: string[],
runningWorkflow?: string[],
},
- values: { [key: string]: unknown}
+ values: { [key: string]: unknown }
}, { dispatch }) => {
const { metadataFields, values } = params;
@@ -773,7 +785,6 @@ export const fetchScheduling = createAppAsyncThunk('events/fetchScheduling', asy
// update multiple scheduled events at once
export const updateScheduledEventsBulk = createAppAsyncThunk('events/updateScheduledEventsBulk', async (
values: {
- changedEvent: number,
changedEvents: string[],
editedEvents: EditedEvents[],
events: Event[],
@@ -1061,14 +1072,7 @@ export const checkForSchedulingConflicts = (events: EditedEvents[]) => async (di
formData.append("update", JSON.stringify(update));
- let data: {
- conflicts: {
- end: string,
- start: string,
- title: string,
- }[],
- eventId: string,
- }[] = [];
+ let data: Conflict[] = [];
axios
.post("/admin-ng/event/bulk/conflicts", formData)
diff --git a/src/slices/seriesDetailsSlice.ts b/src/slices/seriesDetailsSlice.ts
index 1e9179a640..3e9f86c2f8 100644
--- a/src/slices/seriesDetailsSlice.ts
+++ b/src/slices/seriesDetailsSlice.ts
@@ -24,7 +24,7 @@ import { MetadataCatalog } from './eventSlice';
/**
* This file contains redux reducer for actions affecting the state of a series
*/
-type Feed = {
+export type Feed = {
link: string,
type: string,
version: string,
@@ -220,19 +220,7 @@ export const fetchSeriesDetailsThemeNames = createAppAsyncThunk('seriesDetails/f
// update series with new metadata
export const updateSeriesMetadata = createAppAsyncThunk('seriesDetails/updateSeriesMetadata', async (params: {
id: string,
- values: {
- contributor: string[],
- createdBy: string,
- creator: string[],
- description: string,
- identifier: string,
- language: string,
- license: string,
- publisher: string[],
- rightsHolder: string,
- subject: string,
- title: string,
- }
+ values: { [key: string]: MetadataCatalog["fields"][0]["value"] }
}, {dispatch, getState}) => {
const { id, values } = params;
let metadataInfos = getSeriesDetailsMetadata(getState());
@@ -256,7 +244,7 @@ export const updateSeriesMetadata = createAppAsyncThunk('seriesDetails/updateSer
// update series with new metadata
export const updateExtendedSeriesMetadata = createAppAsyncThunk('seriesDetails/updateExtendedSeriesMetadata', async (params: {
id: string,
- values: { [key: string]: any },
+ values: { [key: string]: MetadataCatalog["fields"][0]["value"] }
catalog: MetadataCatalog,
}, {dispatch, getState}) => {
const { id, values, catalog } = params;
@@ -294,7 +282,7 @@ export const updateExtendedSeriesMetadata = createAppAsyncThunk('seriesDetails/u
export const updateSeriesAccess = createAppAsyncThunk('seriesDetails/updateSeriesAccess', async (params: {
id: string,
- policies: { [key: string]: TransformedAcl }
+ policies: { acl: { ace: Ace[] } }
}, {dispatch}) => {
const { id, policies } = params;
diff --git a/src/slices/tableFilterProfilesSlice.ts b/src/slices/tableFilterProfilesSlice.ts
index 5b0e262e70..eb147eeb7e 100644
--- a/src/slices/tableFilterProfilesSlice.ts
+++ b/src/slices/tableFilterProfilesSlice.ts
@@ -1,4 +1,5 @@
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
+import { FilterData } from './tableFilterSlice'
/**
* This file contains redux reducer for actions affecting the state of table filter profiles
@@ -8,17 +9,7 @@ export type FilterProfile = {
name: string,
description: string,
resource: string,
- filterMap: {
- label: string,
- name: string
- options: {
- label: string,
- value: string,
- }[],
- // translatable: false,
- // type: string,
- // value: string,
- }[]
+ filterMap: FilterData[]
}
type TableFilterProfilesState = {
diff --git a/src/slices/tableFilterSlice.ts b/src/slices/tableFilterSlice.ts
index 98739b393c..366b32d1ac 100644
--- a/src/slices/tableFilterSlice.ts
+++ b/src/slices/tableFilterSlice.ts
@@ -15,7 +15,7 @@ import { FilterProfile } from './tableFilterProfilesSlice';
export type FilterData = {
label: string,
name: string,
- options: {
+ options?: {
label: string,
value: string,
}[],
@@ -24,6 +24,18 @@ export type FilterData = {
value: string,
}
+export type Stats = {
+ count: number,
+ description: string,
+ filters: {
+ filter: string,
+ name: string,
+ value: string,
+ }[],
+ name: string,
+ order: number,
+}
+
type TableFilterState = {
status: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
error: SerializedError | null,
@@ -35,17 +47,7 @@ type TableFilterState = {
textFilter: string,
selectedFilter: string,
secondFilter: string,
- stats: {
- count: number,
- description: string,
- filters: {
- filter: string,
- name: string,
- value: string,
- }[],
- name: string,
- order: number,
- }[],
+ stats: Stats[],
}
// Initial state of table filters in redux store
@@ -64,7 +66,7 @@ const initialState: TableFilterState = {
};
// Fetch table filters from opencast instance and transform them for further use
-export const fetchFilters = createAppAsyncThunk('tableFilters/fetchFilters', async (resource: any, { getState }) => {
+export const fetchFilters = createAppAsyncThunk('tableFilters/fetchFilters', async (resource: TableFilterState["currentResource"], { getState }) => {
const data = await axios.get(
`/admin-ng/resources/${resource}/filters.json`
);
@@ -72,7 +74,6 @@ export const fetchFilters = createAppAsyncThunk('tableFilters/fetchFilters', asy
const filters = transformResponse(resourceData);
const filtersList = Object.keys(filters.filters).map((key) => {
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
let filter = filters.filters[key];
filter.name = key;
return filter;
@@ -82,7 +83,9 @@ export const fetchFilters = createAppAsyncThunk('tableFilters/fetchFilters', asy
filtersList.push({
label: "FILTERS.EVENTS.PRESENTERS_BIBLIOGRAPHIC.LABEL",
name: "presentersBibliographic",
- translatable: false
+ translatable: false,
+ type: "events",
+ value: "",
});
}
@@ -145,7 +148,7 @@ export const fetchStats = createAppAsyncThunk('tableFilters/fetchStats', async (
return stats;
});
-export const setSpecificEventFilter = createAppAsyncThunk('tableFilters/setSpecificEventFilter', async (params: { filter: any, filterValue: any }, { dispatch, getState }) => {
+export const setSpecificEventFilter = createAppAsyncThunk('tableFilters/setSpecificEventFilter', async (params: { filter: string, filterValue: string }, { dispatch, getState }) => {
const { filter, filterValue } = params;
await dispatch(fetchFilters("events"));
@@ -167,7 +170,7 @@ export const setSpecificEventFilter = createAppAsyncThunk('tableFilters/setSpeci
dispatch(fetchEvents());
});
-export const setSpecificServiceFilter = createAppAsyncThunk('tableFilters/setSpecificServiceFilter', async (params: { filter: any, filterValue: any }, { dispatch, getState }) => {
+export const setSpecificServiceFilter = createAppAsyncThunk('tableFilters/setSpecificServiceFilter', async (params: { filter: string, filterValue: string }, { dispatch, getState }) => {
const { filter, filterValue } = params;
await dispatch(fetchFilters("services"));
@@ -188,22 +191,47 @@ export const setSpecificServiceFilter = createAppAsyncThunk('tableFilters/setSpe
});
// Transform received filter.json to a structure that can be used for filtering
-// @ts-expect-error TS(7006): Parameter 'data' implicitly has an 'any' type.
-function transformResponse(data) {
- let filters = {};
- try {
- filters = data;
+function transformResponse(data: {
+ [key: string]: {
+ value: string,
+ label: string,
+ options?: { [key: string]: string },
+ name: string
+ translatable: boolean,
+ type: string,
+ }
+}) {
+ type ParsedFilters = {
+ [key: string]: {
+ value: string
+ label: string
+ options?: { value: string, label: string }[]
+ name: string
+ translatable: boolean,
+ type: string,
+ }
+ }
- for (let key in filters) {
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+ let filters = Object.keys(data).reduce((acc, key) => {
+ let newOptions: {
+ label: string,
+ value: string,
+ }[] = []
+ acc[key] = {
+ ...data[key],
+ options: newOptions
+ };
+ return acc;
+ }, {} as ParsedFilters);
+
+ try {
+ for (let key in data) {
filters[key].value = "";
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
- if (!filters[key].options) {
+ if (!data[key].options) {
continue;
}
- let filterArr = [];
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
- let options = filters[key].options;
+ let filterArr: { value: string, label: string }[] = [];
+ let options = data[key].options;
for (let subKey in options) {
filterArr.push({ value: subKey, label: options[subKey] });
}
@@ -216,11 +244,9 @@ function transformResponse(data) {
}
return 0;
});
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
filters[key].options = filterArr;
}
- } catch (e) {
-// @ts-expect-error TS(2571): Object is of type 'unknown'.
+ } catch (e: any) {
console.error(e.message);
}
@@ -228,8 +254,7 @@ function transformResponse(data) {
}
// compare function for sort stats array by order property
-// @ts-expect-error TS(7006): Parameter 'a' implicitly has an 'any' type.
-const compareOrder = (a, b) => {
+const compareOrder = (a: { order: number }, b: { order: number }) => {
if (a.order < b.order) {
return -1;
}
diff --git a/src/slices/tableSlice.ts b/src/slices/tableSlice.ts
index 76d108907e..ae6455574e 100644
--- a/src/slices/tableSlice.ts
+++ b/src/slices/tableSlice.ts
@@ -39,12 +39,19 @@ const columns = [{
* This file contains methods/thunks used to manage the table in the main view and its state changes
*/
-type Page = {
+export type Page = {
active: boolean,
label: string,
number: number,
};
+export type Pagination = {
+ limit: number,
+ offset: number,
+ totalItems: number,
+ directAccessibleNo: number,
+}
+
export function isRowSelectable(row: Row) {
if ("id" in row === true) {
return true;
@@ -75,12 +82,7 @@ type TableState = {
reverse: string,
rows: Row[],
maxLabel: string,
- pagination: {
- limit: number,
- offset: number,
- totalItems: number,
- directAccessibleNo: number,
- },
+ pagination: Pagination,
}
// initial redux state
diff --git a/src/slices/themeDetailsSlice.ts b/src/slices/themeDetailsSlice.ts
index fd42713a81..d093c10a02 100644
--- a/src/slices/themeDetailsSlice.ts
+++ b/src/slices/themeDetailsSlice.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
import { buildThemeBody } from '../utils/resourceUtils';
import { addNotification } from './notificationSlice';
import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
-import { ThemeDetailsType } from './themeSlice';
+import { ThemeDetailsInitialValues, ThemeDetailsType } from './themeSlice';
/**
* This file contains redux reducer for actions affecting the state of a theme
@@ -69,7 +69,7 @@ export const fetchUsage = createAppAsyncThunk('themeDetails/fetchUsage', async (
// update a certain theme
export const updateThemeDetails = createAppAsyncThunk('themeDetails/updateThemeDetails', async (params: {
id: number,
- values: ThemeDetailsType
+ values: ThemeDetailsInitialValues
}, {dispatch}) => {
const { values, id } = params
let data = buildThemeBody(values);
diff --git a/src/slices/themeSlice.ts b/src/slices/themeSlice.ts
index e3682ce2e6..78e2db7948 100644
--- a/src/slices/themeSlice.ts
+++ b/src/slices/themeSlice.ts
@@ -31,6 +31,8 @@ export type ThemeDetailsType = {
watermarkPosition: string,
}
+export type ThemeDetailsInitialValues = ThemeDetailsType & { titleSlideMode: string }
+
type ThemeState = {
status: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
error: SerializedError | null,
@@ -73,7 +75,27 @@ export const fetchThemes = createAppAsyncThunk('theme/fetchThemes', async (_, {
});
// post new theme to backend
-export const postNewTheme = createAppAsyncThunk('theme/postNewTheme', async (values: ThemeDetailsType, {dispatch}) => {
+export const postNewTheme = createAppAsyncThunk('theme/postNewTheme', async (values: ThemeDetailsInitialValues
+ // All params that would be accepted by the endpoint
+ // {
+ // default: boolean,
+ // name: string,
+ // description: string
+ // bumperActive: boolean,
+ // trailerActive: boolean,
+ // titleSlideActive: boolean,
+ // licenseSlideActive: boolean,
+ // watermarkActive: boolean,
+ // bumperFile: string,
+ // trailerFile: string,
+ // watermarkFile: string,
+ // titleSlideBackground: string,
+ // licenseSlideBackground: string,
+ // titleSlideMetadata: string,
+ // licenseSlideDescription: string,
+ // watermarkPosition: string,
+// }
+, {dispatch}) => {
// get URL params used for post request
let data = buildThemeBody(values);
diff --git a/src/slices/workflowSlice.ts b/src/slices/workflowSlice.ts
index a64d88c753..e6a9db5b46 100644
--- a/src/slices/workflowSlice.ts
+++ b/src/slices/workflowSlice.ts
@@ -5,10 +5,20 @@ import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
/**
* This file contains redux reducer for actions affecting the state of workflows
*/
+export type FieldSetField = {
+ name: string
+ value: unknown,
+ type: string,
+ checked: boolean,
+ fieldset?: FieldSetField[]
+ defaultValue?: unknown
+ [key: string]: unknown
+}
+
type ConfigurationPanelField = {
// We could potentially specify 'fieldset' more, but I cannot find a definition
// for which key value pairs are allowed
- fieldset?: { [key: string]: any } // Values can be anything
+ fieldset?: FieldSetField[] // Values can be anything
legend?: string,
description?: string,
}
diff --git a/src/thunks/taskThunks.ts b/src/thunks/taskThunks.ts
index c4398ca9d4..cf3ca42e1e 100644
--- a/src/thunks/taskThunks.ts
+++ b/src/thunks/taskThunks.ts
@@ -1,18 +1,24 @@
import axios from "axios";
import { addNotification } from "../slices/notificationSlice";
+import { AppDispatch } from "../store";
+import { Event } from "../slices/eventSlice";
-export const postTasks = (values: any) => async (dispatch: any) => {
- let configuration = {};
+export const postTasks = (
+ values: {
+ events: Event[]
+ configuration: { [key: string] : string }
+ workflow: string
+ }
+) => async (dispatch: AppDispatch) => {
+ let configuration: { [key: string] : string } = {};
Object.keys(values.configuration).forEach((config) => {
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
configuration[config] = String(values.configuration[config]);
});
- let workflowConfig = {};
+ let workflowConfig: { [key: string] : { [key: string] : string } } = {};
for (let i = 0; i < values.events.length; i++) {
if (values.events[i].selected) {
let eventId = values.events[i].id;
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
workflowConfig[eventId] = configuration;
}
}
diff --git a/src/utils/bulkActionUtils.ts b/src/utils/bulkActionUtils.ts
index 44e1e248cc..b81c143940 100644
--- a/src/utils/bulkActionUtils.ts
+++ b/src/utils/bulkActionUtils.ts
@@ -2,7 +2,7 @@
import { hasDeviceAccess } from "./resourceUtils";
import { NOTIFICATION_CONTEXT } from "../configs/modalConfig";
import { addNotification } from "../slices/notificationSlice";
-import { EditedEvents, Event } from "../slices/eventSlice";
+import { checkForSchedulingConflicts, EditedEvents, Event, Conflict } from "../slices/eventSlice";
import { UserInfoState } from "../slices/userInfoSlice";
import { AppDispatch } from "../store";
@@ -68,8 +68,7 @@ export const checkSchedulingConflicts = async (
formikValues: {
editedEvents: EditedEvents[]
},
- setConflicts: (conflicts: any) => void,
- checkConflicts: (editedEvents: EditedEvents[]) => Promise,
+ setConflicts: (conflicts: Conflict[]) => void,
dispatch: AppDispatch,
) => {
// Check if each start is before end
@@ -103,7 +102,7 @@ export const checkSchedulingConflicts = async (
}
// Use backend for check for conflicts with other events
- const response = await checkConflicts(formikValues.editedEvents);
+ const response = await dispatch(checkForSchedulingConflicts(formikValues.editedEvents));
if (response.length > 0) {
setConflicts(response);
diff --git a/src/utils/dropDownUtils.ts b/src/utils/dropDownUtils.ts
index 455ecc72be..c3c1b052e7 100644
--- a/src/utils/dropDownUtils.ts
+++ b/src/utils/dropDownUtils.ts
@@ -45,8 +45,7 @@ export const filterBySearch = (filterText: string, type: DropDownType, options:
* as well as adding an empty option, if available
*/
export const formatDropDownOptions = (
-// @ts-expect-error TS(7006): Parameter 'unformattedOptions' implicitly has an '... Remove this comment to see the full error message
- unformattedOptions,
+ unformattedOptions: any[],
type: DropDownType,
required: boolean,
t: TFunction
@@ -56,7 +55,7 @@ export const formatDropDownOptions = (
* contains an `order` field, indicating that a custom ordering for that list
* exists and the list therefore should not be ordered alphabetically.
*/
- const hasCustomOrder = unformattedOptions.every((item: any) =>
+ const hasCustomOrder = unformattedOptions.every((item: any) =>
isJson(item.name) && JSON.parse(item.name).order !== undefined);
if (hasCustomOrder) {
diff --git a/src/utils/resourceUtils.ts b/src/utils/resourceUtils.ts
index d817540ad0..6db5aff5e6 100644
--- a/src/utils/resourceUtils.ts
+++ b/src/utils/resourceUtils.ts
@@ -559,26 +559,39 @@ export const hasDeviceAccess = (user: UserInfoState, deviceId: Recording["id"])
};
// build body for post/put request in theme context
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
-export const buildThemeBody = (values) => {
+export const buildThemeBody = (values: {
+ name: string,
+ description: string,
+ bumperActive: boolean,
+ bumperFile: string,
+ trailerActive: boolean,
+ trailerFile: string,
+ titleSlideActive: boolean,
+ titleSlideMode: string,
+ titleSlideBackground: string,
+ licenseSlideActive: boolean,
+ watermarkActive: boolean,
+ watermarkFile: string,
+ watermarkPosition: string,
+}) => {
// fill form data depending on user inputs
let data = new URLSearchParams();
data.append("name", values.name);
data.append("description", values.description);
- data.append("bumperActive", values.bumperActive);
+ data.append("bumperActive", values.bumperActive.toString());
if (values.bumperActive) {
data.append("bumperFile", values.bumperFile);
}
- data.append("trailerActive", values.trailerActive);
+ data.append("trailerActive", values.trailerActive.toString());
if (values.trailerActive) {
data.append("trailerFile", values.trailerFile);
}
- data.append("titleSlideActive", values.titleSlideActive);
+ data.append("titleSlideActive", values.titleSlideActive.toString());
if (values.titleSlideActive && values.titleSlideMode === "upload") {
data.append("titleSlideBackground", values.titleSlideBackground);
}
- data.append("licenseSlideActive", values.licenseSlideActive);
- data.append("watermarkActive", values.watermarkActive);
+ data.append("licenseSlideActive", values.licenseSlideActive.toString());
+ data.append("watermarkActive", values.watermarkActive.toString());
if (values.watermarkActive) {
data.append("watermarkFile", values.watermarkFile);
data.append("watermarkPosition", values.watermarkPosition);
@@ -588,8 +601,7 @@ export const buildThemeBody = (values) => {
};
// creates an empty policy with the role from the argument
-// @ts-expect-error TS(7006): Parameter 'role' implicitly has an 'any' type.
-export const createPolicy = (role) => {
+export const createPolicy = (role: string) => {
return {
role: role,
read: false,
diff --git a/src/utils/statisticsUtils.ts b/src/utils/statisticsUtils.ts
index 20ea3a6206..ab813650fa 100644
--- a/src/utils/statisticsUtils.ts
+++ b/src/utils/statisticsUtils.ts
@@ -1,13 +1,20 @@
import moment from "moment";
import "moment/min/locales.min";
import { getCurrentLanguageInformation } from "./utils";
+import {
+ statisticDateFormatStrings,
+} from "../configs/statisticsConfig";
/**
* This file contains functions that are needed for thunks for statistics
*/
/* creates callback function for formatting the labels of the xAxis in a statistics diagram */
-const createXAxisTickCallback = (timeMode: any, dataResolution: any, language: any) => {
+const createXAxisTickCallback = (
+ timeMode: "year" | "month",
+ dataResolution: "yearly" | "monthly" | "daily" | "hourly",
+ language: string
+) => {
let formatString = "L";
if (timeMode === "year") {
formatString = "MMMM";
@@ -29,15 +36,17 @@ const createXAxisTickCallback = (timeMode: any, dataResolution: any, language: a
}
}
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
- return (value, index, ticks) => {
+ return (value: moment.MomentInput) => {
return moment(value).locale(language).format(formatString);
};
};
/* creates callback function for the displayed label when hovering over a data point in a statistics diagram */
-// @ts-expect-error TS(7006): Parameter 'timeMode' implicitly has an 'any' type.
-const createTooltipCallback = (timeMode, dataResolution, language) => {
+const createTooltipCallback = (
+ timeMode: "year" | "month",
+ dataResolution: "yearly" | "monthly" | "daily",
+ language: string
+) => {
let formatString;
if (timeMode === "year") {
formatString = "MMMM YYYY";
@@ -67,8 +76,7 @@ const createTooltipCallback = (timeMode, dataResolution, language) => {
}
}
-// @ts-expect-error TS(7006): Parameter 'tooltipItem' implicitly has an 'any' ty... Remove this comment to see the full error message
- return (tooltipItem) => {
+ return (tooltipItem: { label: Date | string; value: string; }) => {
const date = tooltipItem.label;
const finalDate = moment(date).locale(language).format(formatString);
return finalDate + ": " + tooltipItem.value;
@@ -76,11 +84,16 @@ const createTooltipCallback = (timeMode, dataResolution, language) => {
};
/* creates options for statistics chart */
-// @ts-expect-error TS(7006): Parameter 'timeMode' implicitly has an 'any' type.
-export const createChartOptions = (timeMode, dataResolution) => {
+export const createChartOptions = (
+ timeMode: keyof typeof statisticDateFormatStrings,
+ dataResolution: "yearly" | "monthly" | "daily"
+) => {
// Get info about the current language and its date locale
-// @ts-expect-error TS(2532): Object is possibly 'undefined'.
- const currentLanguage = getCurrentLanguageInformation().dateLocale.code;
+ const currentLanguageInfo = getCurrentLanguageInformation();
+ let currentLanguage = "";
+ if (currentLanguageInfo) {
+ currentLanguage = currentLanguageInfo.dateLocale.code
+ }
return {
responsive: true,
@@ -120,18 +133,12 @@ export const createChartOptions = (timeMode, dataResolution) => {
/* creates the url for downloading a csv file with current statistics */
export const createDownloadUrl = (
-// @ts-expect-error TS(7006): Parameter 'resourceId' implicitly has an 'any' typ... Remove this comment to see the full error message
- resourceId,
-// @ts-expect-error TS(7006): Parameter 'resourceType' implicitly has an 'any' t... Remove this comment to see the full error message
- resourceType,
-// @ts-expect-error TS(7006): Parameter 'providerId' implicitly has an 'any' typ... Remove this comment to see the full error message
- providerId,
-// @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
- from,
-// @ts-expect-error TS(7006): Parameter 'to' implicitly has an 'any' type.
- to,
-// @ts-expect-error TS(7006): Parameter 'dataResolution' implicitly has an 'any'... Remove this comment to see the full error message
- dataResolution
+ resourceId: string,
+ resourceType: string,
+ providerId: string,
+ from: Date | string,
+ to: Date | string,
+ dataResolution: string
) => {
const csvUrlSearchParams = new URLSearchParams({
dataResolution: dataResolution,
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index aee61f2682..8e6857d36b 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -2,6 +2,7 @@ import languages from "../i18n/languages";
import i18n from "../i18n/i18n";
import { TFunction } from "i18next";
import { UserInfoState } from "../slices/userInfoSlice";
+import { UploadAssetOption } from "../slices/eventSlice";
/**
* This File contains methods that are needed in more than one places
@@ -105,7 +106,7 @@ export const parseBooleanInObject = (baseObject: {[key: string]: any}) => {
* switches 'true'- and 'false'-Strings
* to their corresponding boolean value. All other kinds of values stay the same.
*/
-export const parseValueForBooleanStrings = (value: any) => {
+export const parseValueForBooleanStrings = (value: unknown) => {
let parsedValue = value;
if (parsedValue === "true") {
parsedValue = true;
@@ -143,19 +144,19 @@ export const isJson = (text: string) => {
* t is the hook returned by i18next.useTranslation
* suffix further specifies the asset value if necessary, e.g. "SHORT" for "displayOverride.SHORT"
*/
-export const translateOverrideFallback = (asset: any, t: TFunction, suffix?: string) => {
+export const translateOverrideFallback = (asset: UploadAssetOption, t: TFunction, suffix?: "SHORT" | "DETAIL") => {
let result = undefined;
- const sub = !!suffix ? "." + suffix : "";
+ const sub = !!suffix ? `.${suffix}` as const : "" as const;
const translatable = asset["title"] + sub;
- if (asset['displayOverride' + sub]) {
- result = asset['displayOverride' + sub];
+ if (asset[`displayOverride${sub}` as const]) {
+ result = asset[`displayOverride${sub}` as const];
} else if (i18n.exists(translatable)) {
result = t(translatable);
- } else if (asset['displayFallback' + sub]) {
- result = asset['displayFallback' + sub];
+ } else if (asset[`displayFallback${sub}` as const]) {
+ result = asset[`displayFallback${sub}` as const];
} else {
// no translate, override, or fallback, use what is given
diff --git a/src/utils/workflowPanelUtils.ts b/src/utils/workflowPanelUtils.ts
index 8c032d0c25..6017c5a153 100644
--- a/src/utils/workflowPanelUtils.ts
+++ b/src/utils/workflowPanelUtils.ts
@@ -1,8 +1,8 @@
-import { Workflow } from "../slices/workflowSlice";
+import { Workflow, FieldSetField } from "../slices/workflowSlice";
// fill values with default configuration of chosen workflow
export const setDefaultConfig = (workflowDefinitions: Workflow[], workflowId: string) => {
- let defaultConfiguration = {};
+ let defaultConfiguration: { [key: string]: unknown } = {};
// find configuration panel information about chosen workflow
let configPanel = workflowDefinitions.find(
@@ -26,9 +26,12 @@ export const setDefaultConfig = (workflowDefinitions: Workflow[], workflowId: st
};
// fills default configuration with values
-const fillDefaultConfig = (fieldset: { [key: string]: any }, defaultConfiguration: { [key: string]: any }) => {
+const fillDefaultConfig = (
+ fieldset: FieldSetField[],
+ defaultConfiguration: { [key: string]: unknown }
+) => {
// iteration through each input field
- fieldset.forEach((field: any) => {
+ fieldset.forEach((field) => {
// set only the checked input of radio button as default value
if (field.type === "radio" && field.checked) {