From c1367a0e52f283bbfdeed2dcb127146bf05c44a2 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Sun, 31 Aug 2025 10:04:26 +0200 Subject: [PATCH] 4565: Removed fetch of access-config.json in admin --- CHANGELOG.md | 1 + assets/admin/app.jsx | 51 +++++++++++++++++--------------------------- 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c2777af..c8dff798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. * Upgraded redux-toolkit and how api slices are generated. * Fixed redux-toolkit cache handling. * Add Taskfile +* Removed admin/access-config.json fetch ### NB! Prior to 3.x the project was split into separate repositories diff --git a/assets/admin/app.jsx b/assets/admin/app.jsx index c34c6d70..17b1d21a 100644 --- a/assets/admin/app.jsx +++ b/assets/admin/app.jsx @@ -55,7 +55,6 @@ function App() { const [authenticated, setAuthenticated] = useState(); const [config, setConfig] = useState(); const [selectedTenant, setSelectedTenant] = useState(); - const [accessConfig, setAccessConfig] = useState(); const [tenants, setTenants] = useState(); const [userName, setUserName] = useState(""); const [userType, setUserType] = useState(""); @@ -66,6 +65,26 @@ function App() { const [isPublished, setIsPublished] = useState("all"); const [exists, setExists] = useState(null); const [screenUserLatestRequest, setScreenUserLatestRequest] = useState(null); + const [accessConfig, setAccessConfig] = useState({ + campaign: { + roles: ["ROLE_ADMIN"], + }, + screen: { + roles: ["ROLE_ADMIN"], + }, + settings: { + roles: ["ROLE_ADMIN"], + }, + groups: { + roles: ["ROLE_ADMIN"], + }, + shared: { + roles: ["ROLE_ADMIN"], + }, + users: { + roles: ["ROLE_ADMIN", "ROLE_EXTERNAL_USER_ADMIN"], + }, + }); const userStore = { authenticated: { get: authenticated, set: setAuthenticated }, @@ -150,36 +169,6 @@ function App() { }; }, []); - useEffect(() => { - fetch("/admin/access-config.json") - .then((response) => response.json()) - .then((jsonData) => { - setAccessConfig(jsonData); - }) - .catch(() => { - setAccessConfig({ - campaign: { - roles: ["ROLE_ADMIN"], - }, - screen: { - roles: ["ROLE_ADMIN"], - }, - settings: { - roles: ["ROLE_ADMIN"], - }, - groups: { - roles: ["ROLE_ADMIN"], - }, - shared: { - roles: ["ROLE_ADMIN"], - }, - users: { - roles: ["ROLE_ADMIN", "ROLE_EXTERNAL_USER_ADMIN"], - }, - }); - }); - }, []); - useEffect(() => { i18next.init({ interpolation: { escapeValue: false }, // React already does escaping