Skip to content

Commit aa9cc6b

Browse files
committed
Merge branch 'develop' into textfilter-persist
2 parents 8b79b8e + dfa50cf commit aa9cc6b

182 files changed

Lines changed: 492 additions & 537 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

eslint.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ export default [
1515
"indent": "off",
1616
"max-len": "off",
1717
"no-tabs": "off",
18-
"no-unused-expressions": "off",
19-
"prefer-const": "off",
18+
"object-curly-spacing": "off",
19+
"quotes": "off",
20+
"semi": "off",
2021
"spaced-comment": "off",
2122
"@typescript-eslint/await-thenable": "off",
2223
"@typescript-eslint/no-explicit-any": "off",
@@ -27,7 +28,6 @@ export default [
2728
"@typescript-eslint/no-unsafe-assignment": "off",
2829
"@typescript-eslint/no-unsafe-call": "off",
2930
"@typescript-eslint/no-unsafe-member-access": "off",
30-
"@typescript-eslint/no-unused-expressions": "off",
3131
"@typescript-eslint/no-unused-vars": "off",
3232
"@typescript-eslint/no-unsafe-return": "off",
3333
"@typescript-eslint/require-await": "off",

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect } from "react";
1+
import { useEffect } from "react";
22
import { HashRouter, Navigate, Route, Routes } from "react-router";
33
import "./App.scss";
44
import Events from "./components/events/Events";
@@ -29,7 +29,7 @@ function App() {
2929
subscribeToAuthEvents();
3030

3131
// Add event listener for back button to check if we are still logged in
32-
window.addEventListener("popstate", function (event) {
32+
window.addEventListener("popstate", function () {
3333
dispatch(fetchUserInfo());
3434
});
3535

src/components/About.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from "react";
1+
import { useEffect, useState } from "react";
22
import Header from "./Header";
33
import NavBar from "./NavBar";
44
import Footer from "./Footer";
@@ -24,7 +24,7 @@ const About = () => {
2424
.then(response => {
2525
setAboutContent(response.data);
2626
})
27-
.catch(error => {
27+
.catch(() => {
2828
axios.get(getURL(typeof i18n.options.fallbackLng === "string" ? i18n.options.fallbackLng : "en-US"))
2929
.then(response => {
3030
setAboutContent(response.data);

src/components/NavBar.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@ const NavBar = ({
5252
const newResourceModalRef = useRef<ModalHandle>(null);
5353

5454
const showNewResourceModal = async () => {
55-
create && create.onShowModal && await create.onShowModal();
56-
newResourceModalRef.current?.open();
55+
newResourceModalRef.current?.open()
5756
};
5857

5958
const hideNewResourceModal = () => {
60-
create && create.onHideModal && create.onHideModal();
61-
newResourceModalRef.current?.close?.();
59+
newResourceModalRef.current?.close?.()
6260
};
6361

6462
const toggleNavigation = () => {

src/components/configuration/Themes.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from "react";
1+
import { useEffect, useState } from "react";
22
import { useTranslation } from "react-i18next";
33
import TableFilters from "../shared/TableFilters";
44
import Table from "../shared/Table";
@@ -48,7 +48,7 @@ const Themes = () => {
4848
loadThemes();
4949

5050
// Fetch themes every minute
51-
let fetchThemesInterval = setInterval(loadThemes, 5000);
51+
const fetchThemesInterval = setInterval(loadThemes, 5000);
5252

5353
return () => {
5454
allowLoadIntoTable = false;

src/components/configuration/partials/ThemesActionsCell.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useRef } from "react";
1+
import { useRef } from "react";
22
import {
33
fetchThemeDetails,
44
fetchUsage,

src/components/configuration/partials/ThemesDateTimeCell.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from "react";
21
import { useTranslation } from "react-i18next";
32
import { renderValidDate } from "../../../utils/dateUtils";
43
import { ThemeDetailsType } from "../../../slices/themeSlice";

src/components/configuration/partials/wizard/BumperPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from "react";
21
import { useTranslation } from "react-i18next";
32
import WizardNavigationButtons from "../../../shared/wizard/WizardNavigationButtons";
43
import FileUpload from "../../../shared/wizard/FileUpload";

src/components/configuration/partials/wizard/GeneralPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from "react";
21
import { useTranslation } from "react-i18next";
32
import Notifications from "../../../shared/Notifications";
43
import { FormikProps } from "formik";

src/components/configuration/partials/wizard/NewThemeWizard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect } from "react";
1+
import { useEffect } from "react";
22
import { Formik } from "formik";
33
import GeneralPage from "./GeneralPage";
44
import BumperPage from "./BumperPage";

0 commit comments

Comments
 (0)