4565: Started work on upgrading redux-toolkit

tuj · tuj · commit ae868445aeb8 · 2025-08-25T18:37:03.000+02:00
diff --git a/assets/admin/components/activation-code/activation-code-activate.jsx b/assets/admin/components/activation-code/activation-code-activate.jsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import Form from "react-bootstrap/Form";
 import { Button } from "react-bootstrap";
-import { usePostV2UserActivationCodesActivateMutation } from "../../redux/api/api.generated.ts";
+import { usePostV2UserActivationCodesActivateMutation } from "../../../shared/redux/generated-api.ts";
 import {
   displaySuccess,
   displayError,
diff --git a/assets/admin/components/activation-code/activation-code-create.jsx b/assets/admin/components/activation-code/activation-code-create.jsx
@@ -1,7 +1,7 @@
 import { React, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
-import { usePostV2UserActivationCodesMutation } from "../../redux/api/api.generated.ts";
+import { usePostV2UserActivationCodesMutation } from "../../../shared/redux/generated-api.ts";
 import ActivationCodeForm from "./activation-code-form";
 import {
   displaySuccess,
diff --git a/assets/admin/components/activation-code/activation-code-list.jsx b/assets/admin/components/activation-code/activation-code-list.jsx
@@ -18,7 +18,7 @@ import {
   api,
   useDeleteV2UserActivationCodesByIdMutation,
   useGetV2UserActivationCodesQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The Activation Code list component.
diff --git a/assets/admin/components/feed-sources/feed-source-edit.jsx b/assets/admin/components/feed-sources/feed-source-edit.jsx
@@ -1,6 +1,6 @@
 import { React } from "react";
 import { useParams } from "react-router-dom";
-import { useGetV2FeedSourcesByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2FeedSourcesByIdQuery } from "../../../shared/redux/generated-api.ts";
 import FeedSourceManager from "./feed-source-manager";
 
 /**
diff --git a/assets/admin/components/feed-sources/feed-source-manager.jsx b/assets/admin/components/feed-sources/feed-source-manager.jsx
@@ -6,7 +6,7 @@ import FeedSourceForm from "./feed-source-form";
 import {
   usePostV2FeedSourcesMutation,
   usePutV2FeedSourcesByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import {
   displayError,
   displaySuccess,
diff --git a/assets/admin/components/feed-sources/feed-sources-list.jsx b/assets/admin/components/feed-sources/feed-sources-list.jsx
@@ -5,7 +5,7 @@ import {
   useGetV2FeedSourcesQuery,
   useDeleteV2FeedSourcesByIdMutation,
   useGetV2FeedSourcesByIdSlidesQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import ListContext from "../../context/list-context";
 import ContentBody from "../util/content-body/content-body";
 import List from "../util/list/list";
diff --git a/assets/admin/components/groups/group-create.jsx b/assets/admin/components/groups/group-create.jsx
@@ -1,7 +1,7 @@
 import { React, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
-import { usePostV2ScreenGroupsMutation } from "../../redux/api/api.generated.ts";
+import { usePostV2ScreenGroupsMutation } from "../../../shared/redux/generated-api.ts";
 import GroupForm from "./group-form";
 import {
   displaySuccess,
diff --git a/assets/admin/components/groups/group-edit.jsx b/assets/admin/components/groups/group-edit.jsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import {
   useGetV2ScreenGroupsByIdQuery,
   usePutV2ScreenGroupsByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import {
   displaySuccess,
   displayError,
diff --git a/assets/admin/components/groups/groups-list.jsx b/assets/admin/components/groups/groups-list.jsx
@@ -16,7 +16,7 @@ import {
   useGetV2ScreenGroupsQuery,
   useGetV2ScreenGroupsByIdScreensQuery,
   useDeleteV2ScreenGroupsByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The groups list component.
diff --git a/assets/admin/components/media/media-create.jsx b/assets/admin/components/media/media-create.jsx
@@ -1,6 +1,6 @@
 import { React, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { usePostMediaCollectionMutation } from "../../redux/api/api.generated.ts";
+import { usePostMediaCollectionMutation } from "../../../shared/redux/generated-api.ts";
 import MediaForm from "./media-form";
 import {
   displayError,
diff --git a/assets/admin/components/media/media-list.jsx b/assets/admin/components/media/media-list.jsx
@@ -17,7 +17,7 @@ import {
 import {
   useGetV2MediaQuery,
   useDeleteV2MediaByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import FormCheckbox from "../util/forms/form-checkbox";
 import "./media-list.scss";
 
diff --git a/assets/admin/components/playlist-drag-and-drop/playlist-drag-and-drop.jsx b/assets/admin/components/playlist-drag-and-drop/playlist-drag-and-drop.jsx
@@ -7,7 +7,7 @@ import FormCheckbox from "../util/forms/form-checkbox";
 import {
   useGetV2PlaylistsByIdSlidesQuery,
   useGetV2PlaylistsQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import ScreenGanttChart from "../screen/util/screen-gantt-chart";
 
 /**
diff --git a/assets/admin/components/playlist/campaign-form.jsx b/assets/admin/components/playlist/campaign-form.jsx
@@ -2,7 +2,7 @@ import { React } from "react";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
 import idFromUrl from "../util/helpers/id-from-url";
-import { useGetV2CampaignsByIdScreenGroupsQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2CampaignsByIdScreenGroupsQuery } from "../../../shared/redux/generated-api.ts";
 import ContentBody from "../util/content-body/content-body";
 import SelectScreensTable from "../util/multi-and-table/select-screens-table";
 import SelectGroupsTable from "../util/multi-and-table/select-groups-table";
diff --git a/assets/admin/components/playlist/playlist-campaign-edit.jsx b/assets/admin/components/playlist/playlist-campaign-edit.jsx
@@ -3,7 +3,7 @@ import { useParams } from "react-router-dom";
 import PropTypes from "prop-types";
 import PlaylistCampaignManager from "./playlist-campaign-manager";
 import idFromUrl from "../util/helpers/id-from-url";
-import { useGetV2PlaylistsByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2PlaylistsByIdQuery } from "../../../shared/redux/generated-api.ts";
 
 /**
  * The playlist/campaign edit component.
diff --git a/assets/admin/components/playlist/playlist-campaign-list.jsx b/assets/admin/components/playlist/playlist-campaign-list.jsx
@@ -17,7 +17,7 @@ import {
   useDeleteV2PlaylistsByIdMutation,
   useGetV2PlaylistsByIdSlidesQuery,
   useGetV2PlaylistsQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The shared list component.
diff --git a/assets/admin/components/playlist/playlist-campaign-manager.jsx b/assets/admin/components/playlist/playlist-campaign-manager.jsx
@@ -17,7 +17,7 @@ import {
   api,
   usePutV2PlaylistsByIdMutation,
   usePostV2PlaylistsMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The shared manager component.
diff --git a/assets/admin/components/playlist/playlist-form.jsx b/assets/admin/components/playlist/playlist-form.jsx
@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import { Alert } from "react-bootstrap";
 import UserContext from "../../context/user-context";
 import Schedule from "../util/schedule/schedule";
-import { useGetV2TenantsQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2TenantsQuery } from "../../../shared/redux/generated-api.ts";
 import ContentBody from "../util/content-body/content-body";
 import TenantsDropdown from "../util/forms/multiselect-dropdown/tenants/tenants-dropdown";
 
diff --git a/assets/admin/components/playlist/shared-playlists.jsx b/assets/admin/components/playlist/shared-playlists.jsx
@@ -7,7 +7,7 @@ import ListContext from "../../context/list-context";
 import ContentBody from "../util/content-body/content-body";
 import { displayError } from "../util/list/toast-component/display-toast";
 import getSharedPlaylistColumns from "./shared-playlists-column";
-import { useGetV2PlaylistsQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2PlaylistsQuery } from "../../../shared/redux/generated-api.ts";
 
 /**
  * The list component for shared playlists.
diff --git a/assets/admin/components/screen/screen-edit.jsx b/assets/admin/components/screen/screen-edit.jsx
@@ -2,7 +2,7 @@ import { React, useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 import idFromUrl from "../util/helpers/id-from-url";
 import ScreenManager from "./screen-manager";
-import { useGetV2ScreensByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2ScreensByIdQuery } from "../../../shared/redux/generated-api.ts";
 
 /**
  * The screen edit component.
diff --git a/assets/admin/components/screen/screen-form.jsx b/assets/admin/components/screen/screen-form.jsx
@@ -14,7 +14,7 @@ import idFromUrl from "../util/helpers/id-from-url";
 import {
   useGetV2LayoutsQuery,
   useGetV2ScreensByIdScreenGroupsQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import FormCheckbox from "../util/forms/form-checkbox";
 import "./screen-form.scss";
 import Preview from "../preview/preview";
diff --git a/assets/admin/components/screen/screen-list.jsx b/assets/admin/components/screen/screen-list.jsx
@@ -12,7 +12,7 @@ import {
   useGetV2ScreensQuery,
   useDeleteV2ScreensByIdMutation,
   useGetV2ScreensByIdScreenGroupsQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import {
   displaySuccess,
   displayError,
diff --git a/assets/admin/components/screen/screen-manager.jsx b/assets/admin/components/screen/screen-manager.jsx
@@ -6,7 +6,7 @@ import { useNavigate } from "react-router-dom";
 import {
   usePostV2ScreensMutation,
   usePutV2ScreensByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import ScreenForm from "./screen-form";
 import {
   displaySuccess,
diff --git a/assets/admin/components/screen/screen-status.jsx b/assets/admin/components/screen/screen-status.jsx
@@ -15,7 +15,7 @@ import {
 import { useNavigate } from "react-router-dom";
 import { useDispatch } from "react-redux";
 import idFromUrl from "../util/helpers/id-from-url";
-import { api } from "../../redux/api/api.generated.ts";
+import { api } from "../../../shared/redux/generated-api.ts";
 import { displayError } from "../util/list/toast-component/display-toast";
 import FormInput from "../util/forms/form-input";
 import AdminConfigLoader from "../../admin-config-loader.js";
diff --git a/assets/admin/components/screen/util/campaign-icon.jsx b/assets/admin/components/screen/util/campaign-icon.jsx
@@ -9,7 +9,7 @@ import {
   api,
   useGetV2ScreensByIdCampaignsQuery,
   useGetV2ScreensByIdScreenGroupsQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 
 /**
  * An icon to show if the screen has an active campaign.
diff --git a/assets/admin/components/screen/util/grid-generation-and-select.jsx b/assets/admin/components/screen/util/grid-generation-and-select.jsx
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import idFromUrl from "../../util/helpers/id-from-url";
 import PlaylistDragAndDrop from "../../playlist-drag-and-drop/playlist-drag-and-drop";
-import { api } from "../../../redux/api/api.generated.ts";
+import { api } from "../../../../shared/redux/generated-api.ts";
 import "./grid.scss";
 
 /**
diff --git a/assets/admin/components/slide/content/feed-selector.jsx b/assets/admin/components/slide/content/feed-selector.jsx
@@ -7,7 +7,7 @@ import set from "lodash.set";
 import {
   api,
   useGetV2FeedSourcesQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 import MultiSelectComponent from "../../util/forms/multiselect-dropdown/multi-dropdown";
 import idFromUrl from "../../util/helpers/id-from-url";
 import ContentForm from "./content-form";
diff --git a/assets/admin/components/slide/content/media-selector-list.jsx b/assets/admin/components/slide/content/media-selector-list.jsx
@@ -4,7 +4,7 @@ import { Col, Form, Row, Spinner } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import SearchBox from "../../util/search-box/search-box";
 import ContentBody from "../../util/content-body/content-body";
-import { useGetV2MediaQuery } from "../../../redux/api/api.generated.ts";
+import { useGetV2MediaQuery } from "../../../../shared/redux/generated-api.ts";
 import "../../media/media-list.scss";
 import Pagination from "../../util/paginate/pagination";
 import FilePreview from "./file-preview";
diff --git a/assets/admin/components/slide/slide-edit.jsx b/assets/admin/components/slide/slide-edit.jsx
@@ -1,6 +1,6 @@
 import { React } from "react";
 import { useParams } from "react-router-dom";
-import { useGetV2SlidesByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2SlidesByIdQuery } from "../../../shared/redux/generated-api.ts";
 import SlideManager from "./slide-manager";
 
 /**
diff --git a/assets/admin/components/slide/slide-form.jsx b/assets/admin/components/slide/slide-form.jsx
@@ -11,7 +11,7 @@ import MultiSelectComponent from "../util/forms/multiselect-dropdown/multi-dropd
 import {
   useGetV2TemplatesQuery,
   useGetV2ThemesQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import idFromUrl from "../util/helpers/id-from-url";
 import FormInput from "../util/forms/form-input";
 import ContentForm from "./content/content-form";
diff --git a/assets/admin/components/slide/slide-manager.jsx b/assets/admin/components/slide/slide-manager.jsx
@@ -14,7 +14,7 @@ import {
   usePostV2SlidesMutation,
   usePutV2SlidesByIdPlaylistsMutation,
   usePutV2SlidesByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import SlideForm from "./slide-form";
 import {
   displaySuccess,
diff --git a/assets/admin/components/slide/slides-list.jsx b/assets/admin/components/slide/slides-list.jsx
@@ -16,7 +16,7 @@ import {
   useGetV2SlidesQuery,
   useDeleteV2SlidesByIdMutation,
   useGetV2PlaylistsByIdQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The slides list component.
diff --git a/assets/admin/components/themes/theme-edit.jsx b/assets/admin/components/themes/theme-edit.jsx
@@ -1,6 +1,6 @@
 import { React } from "react";
 import { useParams } from "react-router-dom";
-import { useGetV2ThemesByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2ThemesByIdQuery } from "../../../shared/redux/generated-api.ts";
 import ThemeManager from "./theme-manager";
 
 /**
diff --git a/assets/admin/components/themes/theme-manager.jsx b/assets/admin/components/themes/theme-manager.jsx
@@ -7,7 +7,7 @@ import {
   usePostV2ThemesMutation,
   usePutV2ThemesByIdMutation,
   usePostMediaCollectionMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 import {
   displaySuccess,
   displayError,
diff --git a/assets/admin/components/themes/themes-list.jsx b/assets/admin/components/themes/themes-list.jsx
@@ -15,7 +15,7 @@ import {
 import {
   useGetV2ThemesQuery,
   useDeleteV2ThemesByIdMutation,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The themes list component.
diff --git a/assets/admin/components/user/login.jsx b/assets/admin/components/user/login.jsx
@@ -8,7 +8,7 @@ import Col from "react-bootstrap/Col";
 import {MultiSelect} from "react-multi-select-component";
 import UserContext from "../../context/user-context";
 import FormInput from "../util/forms/form-input";
-import {api} from "../../redux/api/api.generated.ts";
+import { api } from "../../../shared/redux/generated-api.ts";
 import AdminConfigLoader from "../../admin-config-loader.js";
 import {displayError} from "../util/list/toast-component/display-toast";
 import localStorageKeys from "../util/local-storage-keys";
@@ -165,7 +165,7 @@ function Login() {
         e.stopPropagation();
 
         dispatch(
-            api.endpoints.loginCheckPost.initiate({
+          api.endpoints.loginCheckPost.initiate({
                 body: JSON.stringify({
                     providerId: email,
                     password,
diff --git a/assets/admin/components/users/users-list.jsx b/assets/admin/components/users/users-list.jsx
@@ -16,7 +16,7 @@ import {
 import {
   useDeleteV2UsersByIdRemoveFromTenantMutation,
   useGetV2UsersQuery,
-} from "../../redux/api/api.generated.ts";
+} from "../../../shared/redux/generated-api.ts";
 
 /**
  * The users list component.
diff --git a/assets/admin/components/util/multi-and-table/select-groups-table.jsx b/assets/admin/components/util/multi-and-table/select-groups-table.jsx
@@ -6,7 +6,7 @@ import { SelectGroupColumns } from "../../groups/groups-columns";
 import {
   useGetV2ScreenGroupsQuery,
   useGetV2ScreenGroupsByIdScreensQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 import GroupsDropdown from "../forms/multiselect-dropdown/groups/groups-dropdown";
 
 /**
diff --git a/assets/admin/components/util/multi-and-table/select-playlists-table.jsx b/assets/admin/components/util/multi-and-table/select-playlists-table.jsx
@@ -6,7 +6,7 @@ import {
   useGetV2PlaylistsQuery,
   useGetV2SlidesByIdPlaylistsQuery,
   useGetV2PlaylistsByIdSlidesQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 import PlaylistsDropdown from "../forms/multiselect-dropdown/playlists/playlists-dropdown";
 import { SelectPlaylistColumns } from "../../playlist/playlists-columns";
 
diff --git a/assets/admin/components/util/multi-and-table/select-screens-table.jsx b/assets/admin/components/util/multi-and-table/select-screens-table.jsx
@@ -8,7 +8,7 @@ import {
   useGetV2ScreensQuery,
   useGetV2ScreensByIdScreenGroupsQuery,
   useGetV2CampaignsByIdScreensQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 
 /**
  * A multiselect and table for screens.
diff --git a/assets/admin/components/util/multi-and-table/select-slides-table.jsx b/assets/admin/components/util/multi-and-table/select-slides-table.jsx
@@ -9,7 +9,7 @@ import {
   useGetV2SlidesQuery,
   useGetV2PlaylistsByIdSlidesQuery,
   useGetV2PlaylistsByIdQuery,
-} from "../../../redux/api/api.generated.ts";
+} from "../../../../shared/redux/generated-api.ts";
 import PlaylistGanttChart from "../../playlist/playlist-gantt-chart";
 import { displayWarning } from "../list/toast-component/display-toast";
 
diff --git a/assets/admin/components/util/template-label-in-list.jsx b/assets/admin/components/util/template-label-in-list.jsx
@@ -1,7 +1,7 @@
 import { React } from "react";
 import PropTypes from "prop-types";
 import Spinner from "react-bootstrap/Spinner";
-import { useGetV2TemplatesByIdQuery } from "../../redux/api/api.generated.ts";
+import { useGetV2TemplatesByIdQuery } from "../../../shared/redux/generated-api.ts";
 import idFromUrl from "./helpers/id-from-url";
 /**
  * @param {object} props The props.
diff --git a/assets/admin/index.jsx b/assets/admin/index.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import { BrowserRouter } from "react-router-dom";
 import { createRoot } from "react-dom/client";
 import { Provider } from "react-redux";
-import { store } from "./redux/store";
+import { store } from "../shared/redux/store.js";
 import App from "./app";
 
 const container = document.getElementById("root");
diff --git a/assets/admin/redux/README.md b/assets/admin/redux/README.md
diff --git a/assets/admin/redux/api/.gitignore b/assets/admin/redux/api/.gitignore
diff --git a/assets/admin/redux/api/api.generated.ts b/assets/admin/redux/api/api.generated.ts
diff --git a/assets/admin/redux/api/api.json b/assets/admin/redux/api/api.json
diff --git a/assets/admin/redux/api/package-lock.json b/assets/admin/redux/api/package-lock.json
diff --git a/assets/admin/redux/api/package.json b/assets/admin/redux/api/package.json
diff --git a/assets/shared/redux/empty-api.ts b/assets/shared/redux/empty-api.ts
diff --git a/assets/shared/redux/extended-base-query.js b/assets/shared/redux/extended-base-query.js
diff --git a/assets/shared/redux/generated-api.ts b/assets/shared/redux/generated-api.ts
diff --git a/assets/shared/redux/openapi-config.ts b/assets/shared/redux/openapi-config.ts
diff --git a/assets/shared/redux/store.js b/assets/shared/redux/store.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
