From fdd96adecbc8758a44d36f23fdf5654a9bf6d405 Mon Sep 17 00:00:00 2001 From: MickaelK Date: Mon, 29 Jan 2024 18:27:27 +1100 Subject: [PATCH] chore (cleanup): refactoring syntax issue --- .../ctrl_backend_component_authentication.js | 24 +++++++++---------- .../pages/adminpage/ctrl_backend_state.js | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/assets/pages/adminpage/ctrl_backend_component_authentication.js b/public/assets/pages/adminpage/ctrl_backend_component_authentication.js index 56d46d48..c1aafe62 100644 --- a/public/assets/pages/adminpage/ctrl_backend_component_authentication.js +++ b/public/assets/pages/adminpage/ctrl_backend_component_authentication.js @@ -51,7 +51,7 @@ export default async function(render) { effect(init$.pipe( rxjs.concatMap(() => getMiddlewareEnabled()), rxjs.filter((backend) => !!backend), - rxjs.tap((backend) => qsa($page, "[is=\"box-item\"]").forEach(($button) => { + rxjs.tap((backend) => qsa($page, `[is="box-item"]`).forEach(($button) => { $button.getAttribute("data-label") === backend ? $button.classList.add("active") : $button.classList.remove("active"); @@ -98,7 +98,7 @@ export default async function(render) { } return idps; }), - applyMutations(qs($page, "[data-bind=\"idp\"]"), "appendChild"), + applyMutations(qs($page, `[data-bind="idp"]`), "appendChild"), rxjs.share(), ); effect(setupIDPForm$); @@ -107,12 +107,12 @@ export default async function(render) { effect(setupIDPForm$.pipe( rxjs.concatMap(() => getMiddlewareEnabled()), rxjs.tap((currentMiddleware) => { - qsa($page, "[data-bind=\"idp\"] .formbuilder").forEach(($node) => { + qsa($page, `[data-bind="idp"] .formbuilder`).forEach(($node) => { $node.getAttribute("id") === currentMiddleware ? $node.classList.remove("hidden") : $node.classList.add("hidden"); }); - const $attrMap = qs($page, "[data-bind=\"attribute-mapping\"]"); + const $attrMap = qs($page, `[data-bind="attribute-mapping"]`); currentMiddleware ? $attrMap.classList.remove("hidden") : $attrMap.classList.add("hidden"); @@ -154,7 +154,7 @@ export default async function(render) { }), )), rxjs.concatMap(async(specs) => await createForm(specs, formTmpl({}))), - applyMutation(qs($page, "[data-bind=\"attribute-mapping\"]"), "replaceChildren"), + applyMutation(qs($page, `[data-bind="attribute-mapping"]`), "replaceChildren"), rxjs.share(), ); effect(setupAMForm$); @@ -163,14 +163,14 @@ export default async function(render) { effect(setupAMForm$.pipe( rxjs.switchMap(() => rxjs.merge( getBackendEnabled(), - rxjs.fromEvent(qs(document.body, "[data-bind=\"backend-enabled\"]"), "input").pipe( + rxjs.fromEvent(qs(document.body, `[data-bind="backend-enabled"]`), "input").pipe( rxjs.debounceTime(500), rxjs.mergeMap(() => getState().pipe(rxjs.map(({ connections }) => connections))), ), )), rxjs.map((connections) => connections.map(({ label }) => label)), rxjs.tap((datalist) => { - const $input = $page.querySelector("[name=\"attribute_mapping.related_backend\"]"); + const $input = $page.querySelector(`[name="attribute_mapping.related_backend"]`); if (!$input) throw new ApplicationError("INTERNAL_ERROR", "assumption failed: missing related backend"); $input.setAttribute("datalist", datalist.join(",")); // @ts-ignore @@ -182,16 +182,16 @@ export default async function(render) { effect(setupAMForm$.pipe( rxjs.switchMap(() => rxjs.merge( // case 1: user is typing in the related backend field - rxjs.fromEvent(qs($page, "[name=\"attribute_mapping.related_backend\"]"), "input").pipe( + rxjs.fromEvent(qs($page, `[name="attribute_mapping.related_backend"]`), "input").pipe( rxjs.map((e) => e.target.value), ), // case 2: user is adding / removing a storage backend getBackendEnabled().pipe( - rxjs.map(() => qs($page, "[name=\"attribute_mapping.related_backend\"]").value) + rxjs.map(() => qs($page, `[name=\"attribute_mapping.related_backend"]`).value) ), // case 3: user is changing the storage backend label - rxjs.fromEvent(qs(document.body, "[data-bind=\"backend-enabled\"]"), "input").pipe( - rxjs.map(() => qs($page, "[name=\"attribute_mapping.related_backend\"]").value), + rxjs.fromEvent(qs(document.body, `[data-bind="backend-enabled"]`), "input").pipe( + rxjs.map(() => qs($page, `[name="attribute_mapping.related_backend"]`).value), ), )), rxjs.map((value) => value.split(",").map((val) => (val || "").trim()).filter((t) => !!t)), @@ -247,7 +247,7 @@ export default async function(render) { rxjs.tap(($node) => { /** @type { Element | undefined} */ let $relatedBackendField; - $page.querySelectorAll("[data-bind=\"attribute-mapping\"] fieldset").forEach(($el, i) => { + $page.querySelectorAll(`[data-bind="attribute-mapping"] fieldset`).forEach(($el, i) => { if (i === 0) $relatedBackendField = $el; else $el.remove(); }); diff --git a/public/assets/pages/adminpage/ctrl_backend_state.js b/public/assets/pages/adminpage/ctrl_backend_state.js index ea6d5982..79d010c5 100644 --- a/public/assets/pages/adminpage/ctrl_backend_state.js +++ b/public/assets/pages/adminpage/ctrl_backend_state.js @@ -83,7 +83,7 @@ export function getState() { formObjToJSON$(), rxjs.map((config) => { // connections const connections = []; - const formData = new FormData(qs(document.body, "[data-bind=\"backend-enabled\"]")); + const formData = new FormData(qs(document.body, `[data-bind="backend-enabled"]`)); for (const [type, label] of formData.entries()) { connections.push({ type, label }); } @@ -92,7 +92,7 @@ export function getState() { }), rxjs.map((config) => { // middleware const authType = document - .querySelector("[data-bind=\"authentication_middleware\"] [is=\"box-item\"].active") + .querySelector(`[data-bind="authentication_middleware"] [is="box-item"].active`) ?.getAttribute("data-label"); config.middleware = { @@ -101,7 +101,7 @@ export function getState() { }; if (!authType) return config; - const $formIDP = document.querySelector("[data-bind=\"idp\"]"); + const $formIDP = document.querySelector(`[data-bind="idp"]`); if (!($formIDP instanceof window.HTMLFormElement)) throw new ApplicationError("INTERNAL_ERROR", "assumption failed: idp isn't a form"); let formValues = [...new FormData($formIDP)]; config.middleware.identity_provider = { @@ -121,7 +121,7 @@ export function getState() { ), }; - const $formAM = document.querySelector("[data-bind=\"attribute-mapping\"]"); + const $formAM = document.querySelector(`[data-bind="attribute-mapping"]`); if (!($formAM instanceof window.HTMLFormElement)) throw new ApplicationError("INTERNAL_ERROR", "assumption failed: attribute mapping isn't a form"); formValues = [...new FormData($formAM)]; config.middleware.attribute_mapping = {