Skip to content

Commit f993104

Browse files
committed
4565: Fixed issues raised in review
1 parent e2ffe83 commit f993104

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

assets/admin/app.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Container from "react-bootstrap/Container";
77
import Row from "react-bootstrap/Row";
88
import Col from "react-bootstrap/Col";
99
import localStorageKeys from "./components/util/local-storage-keys";
10-
import RestrictedRoute from "./components/restricted-route.jsx";
10+
import RestrictedRoute from "./components/restricted-route";
1111
import Topbar from "./components/navigation/topbar/top-bar";
1212
import SideBar from "./components/navigation/sidebar/sidebar";
1313
import ScreenList from "./components/screen/screen-list";
@@ -32,7 +32,7 @@ import UserContext from "./context/user-context";
3232
import ListContext from "./context/list-context";
3333
import SharedPlaylists from "./components/playlist/shared-playlists";
3434
import Logout from "./components/user/logout";
35-
import AuthHandler from "./components/auth-handler.jsx";
35+
import AuthHandler from "./components/auth-handler";
3636
import LoadingComponent from "./components/util/loading-component/loading-component";
3737
import ModalProvider from "./context/modal-context/modal-provider";
3838
import UsersList from "./components/users/users-list";

assets/admin/components/auth-handler.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { React, useContext } from "react";
22
import PropTypes from "prop-types";
3-
import Login from "./user/login.jsx";
4-
import UserContext from "../context/user-context.jsx";
3+
import Login from "./user/login";
4+
import UserContext from "../context/user-context";
55

66
/**
77
* The auth handler wrapper.

assets/admin/components/restricted-route.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { React, useContext } from "react";
22
import PropTypes from "prop-types";
3-
import UserContext from "../context/user-context.jsx";
4-
import NoAccess from "./no-access/no-access.jsx";
3+
import UserContext from "../context/user-context";
4+
import NoAccess from "./no-access/no-access";
55

66
/**
77
* The restricted route wrapper.

assets/admin/components/slide/preview/slide-preview.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { React, useEffect, useState } from "react";
22
import { Button } from "react-bootstrap";
33
import PropTypes from "prop-types";
44
import { useTranslation } from "react-i18next";
5-
import ErrorBoundary from "../../error-boundary.jsx";
5+
import ErrorBoundary from "../../error-boundary";
66
import "./slide-preview.scss";
77
import { renderSlide } from "../../../../shared/slide-utils/templates";
88

assets/admin/components/slide/slide-form.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import idFromUrl from "../util/helpers/id-from-url";
1616
import FormInput from "../util/forms/form-input";
1717
import ContentForm from "./content/content-form";
1818
import LoadingComponent from "../util/loading-component/loading-component";
19-
import SlidePreview from "./preview/slide-preview.jsx";
19+
import SlidePreview from "./preview/slide-preview";
2020
import FeedSelector from "./content/feed-selector";
2121
import SelectPlaylistsTable from "../util/multi-and-table/select-playlists-table";
2222
import localStorageKeys from "../util/local-storage-keys";
@@ -161,8 +161,10 @@ function SlideForm({
161161
if (selectedTemplate) {
162162
const slideConfig = getConfig(selectedTemplate['id']);
163163
setContentFormElements(slideConfig.adminForm ?? []);
164+
setDisableLivePreview(slideConfig?.options?.disableLivePreview ?? false);
164165
newSelectedTemplates.push(selectedTemplate);
165166
}
167+
166168
setSelectedTemplates(newSelectedTemplates);
167169
}, [selectedTemplate]);
168170

0 commit comments

Comments
 (0)