Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
593 changes: 117 additions & 476 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 6 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
"dompurify": "^3.4.17",
"focus-trap-react": "^12.0.3",
"formik": "^2.4.9",
"http-proxy-middleware": "^4.2.1",
"i18next": "26.5.11",
"i18next-browser-languagedetector": "^8.2.3",
"i18next-http-backend": "^4.0.6",
"lodash": "^4.17.23",
"lodash-es": "^4.18.1",
"react": "^19.3.1",
"react-chartjs-2": "^5.3.1",
"react-datepicker": "^8.8.0",
Expand All @@ -37,17 +36,14 @@
"react-textarea-autosize": "^8.5.9",
"react-tooltip": "^6.0.9",
"react-window": "^2.5.1",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"redux-thunk": "^3.1.0",
"reselect": "^5.3.0",
"uuid": "^14.0.3",
"yup": "^1.7.1"
},
"scripts": {
"start": "vite",
"build": "tsc && eslint . --max-warnings=0 && vite build",
"serve": "vite preview",
"test": "vitest"
"serve": "vite preview"
},
"browserslist": {
"production": [
Expand All @@ -63,18 +59,15 @@
},
"devDependencies": {
"@opencast/eslint-config-ts-react": "^0.3.0",
"@redux-devtools/extension": "^4.0.0",
"@types/lodash": "^4.17.27",
"@types/lodash-es": "^4.17.12",
"@types/node": "^26.6.6",
"@types/react": "^19.3.0",
"@types/react-dom": "^19.3.0",
"@vitejs/plugin-react": "^6.1.2",
"eslint": "^9.39.2",
"prop-types": "^15.8.1",
"sass": "^1.107.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.72.1",
"uuid": "^14.0.3",
"vite": "^8.3.5",
"vitest": "^5.0.5"
"vite": "^8.3.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { useTranslation } from "react-i18next";
import { Formik, FormikProps } from "formik";
import { Field } from "../../../shared/Field";
import _ from "lodash";
import { isEqual } from "lodash-es";
import Notifications from "../../../shared/Notifications";
import RenderMultiField from "../../../shared/wizard/RenderMultiField";
import RenderField from "../../../shared/wizard/RenderField";
Expand Down Expand Up @@ -91,7 +91,7 @@ const DetailsMetadataTab = ({
const checkValidity = (formik: FormikProps<InitialValues>) => {
if (formik.dirty && formik.isValid && hasAccess(editAccessRole, user)) {
// check if user provided values differ from initial ones
return !_.isEqual(formik.values, formik.initialValues);
return !isEqual(formik.values, formik.initialValues);
} else {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
Conflict,
} from "../../../../slices/eventSlice";
import { Recording } from "../../../../slices/recordingSlice";
import lodash, { groupBy } from "lodash";
import { cloneDeep, groupBy } from "lodash-es";
import WizardNavigationButtons from "../../../shared/wizard/WizardNavigationButtons";
import SchedulingTime from "../wizards/scheduling/SchedulingTime";
import SchedulingLocation from "../wizards/scheduling/SchedulingLocation";
Expand Down Expand Up @@ -99,7 +99,7 @@ const EditScheduledEventsEditPage = <T extends RequiredFormProps>({
updateKey(key, prev, curr, defaultValuesEditedEvents);
}
return prev;
}, lodash.cloneDeep(groupedEvents[0]));
}, cloneDeep(groupedEvents[0]));
return result;
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import _ from "lodash";
import { isEqual } from "lodash-es";
import DatePicker from "react-datepicker";
import { Formik, FormikHelpers, FormikProps } from "formik";
import Notifications from "../../../shared/Notifications";
Expand Down Expand Up @@ -162,9 +162,9 @@ const EventDetailsSchedulingTab = ({
!(conflicts.length > 0)
) {
// check if user provided values differ from initial ones
if (!_.isEqual(formik.values, formik.initialValues)) {
if (!_.isEqual(formik.values.inputs, formik.initialValues.inputs)) {
return !_.isEqual(
if (!isEqual(formik.values, formik.initialValues)) {
if (!isEqual(formik.values.inputs, formik.initialValues.inputs)) {
return !isEqual(
[...formik.values.inputs].sort(),
[...formik.initialValues.inputs].sort(),
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useTranslation } from "react-i18next";
import { Formik, FormikProps } from "formik";
import _ from "lodash";
import { isEqual } from "lodash-es";
import Notifications from "../../../shared/Notifications";
import { getUserInformation } from "../../../../selectors/userInfoSelectors";
import { hasAccess } from "../../../../utils/utils";
Expand Down Expand Up @@ -36,7 +36,7 @@ const SeriesDetailsThemeTab = ({
const checkValidity = (formik: FormikProps<{theme: SeriesTheme | null }>) => {
if (formik.dirty && formik.isValid) {
// check if user provided values differ from initial ones
return !_.isEqual(formik.values, formik.initialValues);
return !isEqual(formik.values, formik.initialValues);
} else {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { getMetadataCollectionFieldName } from "../../../../../utils/resourceUtils";
import { MetadataCatalog } from "../../../../../slices/eventSlice";
import { isEmpty } from "lodash";
import { isEmpty } from "lodash-es";
import { isEmptyArray } from "formik";
import { ParseKeys } from "i18next";

Expand Down
Binary file removed src/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed src/fonts/OpenSans-Bold-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-Bold-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-BoldItalic-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-BoldItalic-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-ExtraBold-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-ExtraBold-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-ExtraBoldItalic-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-Italic-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-Italic-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-Light-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-Light-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-LightItalic-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-LightItalic-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-Regular-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-Regular-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-Semibold-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-Semibold-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/OpenSans-SemiboldItalic-webfont.eot
Binary file not shown.
Binary file removed src/fonts/OpenSans-SemiboldItalic-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/fontawesome-webfont.eot
Binary file not shown.
Binary file removed src/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed src/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed src/fonts/fontawesome-webfont.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion src/selectors/notificationSelector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from "reselect";
import { createSelector } from "@reduxjs/toolkit";
import { RootState } from "../store";
import { OurNotification } from "../slices/notificationSlice";

Expand Down
2 changes: 1 addition & 1 deletion src/selectors/tableSelectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from "reselect";
import { createSelector } from "@reduxjs/toolkit";
import { RootState } from "../store";
import { isEvent, isSeries, rowsSelectors, TableState } from "../slices/tableSlice";

Expand Down
2 changes: 1 addition & 1 deletion src/selectors/userSelectors.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file contains selectors regarding users
*/
import { createSelector } from "reselect";
import { createSelector } from "@reduxjs/toolkit";
import { RootState } from "../store";

export const getUsers = (state: RootState) => state.users.results;
Expand Down
2 changes: 1 addition & 1 deletion src/selectors/workflowSelectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSelector } from "reselect";
import { createSelector } from "@reduxjs/toolkit";
import { RootState } from "../store";

/**
Expand Down
3 changes: 1 addition & 2 deletions src/slices/healthSlice.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { PayloadAction, SerializedError, createSlice } from "@reduxjs/toolkit";
import { PayloadAction, SerializedError, WritableDraft, createSlice } from "@reduxjs/toolkit";
import axios from "axios";
import { WritableDraft } from "immer";
import { createAppAsyncThunk } from "../createAsyncThunkWithTypes";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/slices/seriesDetailsSlice.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PayloadAction, SerializedError, createSlice } from "@reduxjs/toolkit";
import axios, { AxiosError } from "axios";
import _ from "lodash";
import { isEmpty } from "lodash-es";
import {
getSeriesDetailsExtendedMetadata,
getStatistics,
Expand Down Expand Up @@ -175,7 +175,7 @@ export const fetchSeriesDetailsTheme = createAppAsyncThunk("seriesDetails/fetchS
let seriesTheme: SeriesDetailsState["theme"] = null;

// check if series has a theme
if (!_.isEmpty(themeResponse)) {
if (!isEmpty(themeResponse)) {
// transform response for further use
seriesTheme = transformToIdValueArray(themeResponse)[0];
}
Expand Down
3 changes: 1 addition & 2 deletions src/store.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { FLUSH, PAUSE, PERSIST, PURGE, REGISTER, REHYDRATE, persistReducer } from "redux-persist";
import storage from "redux-persist/es/storage";
import { UnknownAction, combineReducers } from "redux";
import tableFilters from "./slices/tableFilterSlice";
import tableFilterProfiles from "./slices/tableFilterProfilesSlice";
import events from "./slices/eventSlice";
Expand Down Expand Up @@ -29,7 +28,7 @@ import playlistDetails from "./slices/playlistDetailsSlice";
import themeDetails from "./slices/themeDetailsSlice";
import userInfo from "./slices/userInfoSlice";
import statistics from "./slices/statisticsSlice";
import { ThunkAction, configureStore } from "@reduxjs/toolkit";
import { ThunkAction, UnknownAction, combineReducers, configureStore } from "@reduxjs/toolkit";
import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
import autoMergeLevel2 from "redux-persist/es/stateReconciler/autoMergeLevel2";

Expand Down
5 changes: 1 addition & 4 deletions src/styles/base/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
@mixin font-face($font-family, $file, $font-weight, $font-style) {
@font-face {
font-family: $font-family;
src: url('#{variables.$font-path}#{$file}.eot');
src: url('#{variables.$font-path}#{$file}.eot?#iefix') format('embedded-opentype'),
url('#{variables.$font-path}#{$file}.woff') format('woff'),
url('#{variables.$font-path}#{$file}.ttf') format('truetype');
src: url('#{variables.$font-path}#{$file}.woff') format('woff');
font-weight: $font-weight;
font-style: $font-style;
}
Expand Down
Loading