From 410e638f19f97ee723acee6f9815850f1be21b2f Mon Sep 17 00:00:00 2001
From: MickaelK <mickael@kerjean.me>
Date: Tue, 30 Jan 2024 17:21:48 +1100
Subject: [PATCH] chore (refactoring): cleanup admin

---
 public/assets/pages/adminpage/ctrl_backend.js               | 6 ++++--
 .../adminpage/ctrl_backend_component_authentication.js      | 3 +--
 public/assets/pages/adminpage/ctrl_backend_state.js         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/assets/pages/adminpage/ctrl_backend.js b/public/assets/pages/adminpage/ctrl_backend.js
index 89979ac1..ffc112ea 100644
--- a/public/assets/pages/adminpage/ctrl_backend.js
+++ b/public/assets/pages/adminpage/ctrl_backend.js
@@ -5,7 +5,7 @@ import { CSS } from "../../helpers/loader.js";
 import transition from "./animate.js";
 import AdminHOC from "./decorator.js";
 import { initConfig } from "./model_config.js";
-import { initStorage } from "./ctrl_backend_state.js";
+import { initStorage, initMiddleware } from "./ctrl_backend_state.js";
 import componentStorageBackend from "./ctrl_backend_component_storage.js";
 import componentAuthenticationMiddleware from "./ctrl_backend_component_authentication.js";
 
@@ -17,9 +17,11 @@ export default AdminHOC(async function(render) {
             <div data-bind="authentication_middleware"></div>
         </div>
     `);
-    render(transition($page));
     await initConfig();
     await initStorage();
+    await initMiddleware();
+
+    render(transition($page));
 
     componentStorageBackend(createRender(qs($page, "[data-bind=\"backend\"]")));
     componentAuthenticationMiddleware(createRender(qs($page, "[data-bind=\"authentication_middleware\"]")));
diff --git a/public/assets/pages/adminpage/ctrl_backend_component_authentication.js b/public/assets/pages/adminpage/ctrl_backend_component_authentication.js
index c1aafe62..5026840a 100644
--- a/public/assets/pages/adminpage/ctrl_backend_component_authentication.js
+++ b/public/assets/pages/adminpage/ctrl_backend_component_authentication.js
@@ -7,7 +7,7 @@ import { formTmpl } from "../../components/form.js";
 import { generateSkeleton } from "../../components/skeleton.js";
 
 import {
-    initMiddleware, getState,
+    getState,
     getMiddlewareAvailable, getMiddlewareEnabled, toggleMiddleware,
     getBackendAvailable, getBackendEnabled,
 } from "./ctrl_backend_state.js";
@@ -30,7 +30,6 @@ export default async function(render) {
         </div>
     `);
     render($page);
-    await initMiddleware();
 
     // feature: setup the buttons
     const init$ = getMiddlewareAvailable().pipe(
diff --git a/public/assets/pages/adminpage/ctrl_backend_state.js b/public/assets/pages/adminpage/ctrl_backend_state.js
index 79d010c5..22275475 100644
--- a/public/assets/pages/adminpage/ctrl_backend_state.js
+++ b/public/assets/pages/adminpage/ctrl_backend_state.js
@@ -7,7 +7,7 @@ import { formObjToJSON$ } from "./helper_form.js";
 
 export { getBackends as getBackendAvailable } from "./model_backend.js";
 
-const backendsEnabled$ = new rxjs.ReplaySubject(1);
+const backendsEnabled$ = new rxjs.BehaviorSubject();
 
 export async function initStorage() {
     return await getConfig().pipe(