Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-09 09:52:54 +01:00
Code Issues Projects Releases Wiki Activity

fix (admin): prepare for release

Browse source
This commit is contained in:
Mickael Kerjean 2023-10-09 07:14:19 +02:00
parent d9202c7f15
commit ac0fdc7a23
7 changed files with 88 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/pages/adminpage/ctrl_backend.js
View file

@ -4,6 +4,7 @@ import { CSS } from "../../helpers/loader.js";
import transition from "./animate.js";
import AdminHOC from "./decorator.js";
import { initConfig } from "./model_config.js";
import componentStorageBackend from "./ctrl_backend_component_storage.js";
import componentAuthenticationMiddleware from "./ctrl_backend_component_authentication.js";
@ -16,6 +17,7 @@ export default AdminHOC(async function(render) {
</div>
`);
render(transition($page));
await initConfig();
componentStorageBackend(createRender(qs($page, `[data-bind="backend"]`)));
componentAuthenticationMiddleware(createRender(qs($page, `[data-bind="authentication_middleware"]`)));

56
public/pages/adminpage/ctrl_backend_component_authentication.js
View file

@ -8,7 +8,7 @@ import { generateSkeleton } from "../../components/skeleton.js";
import { get as getConfig } from "../../model/config.js";
import {
initMiddleware, initStorage,
initMiddleware, initStorage, getState,
getMiddlewareAvailable, getMiddlewareEnabled, toggleMiddleware,
getBackendAvailable, getBackendEnabled,
} from "./ctrl_backend_state.js";
@ -65,7 +65,7 @@ export default async function(render) {
rxjs.mergeMap(($nodes) => $nodes),
rxjs.mergeMap(($node) => onClick($node)),
rxjs.map(($node) => toggleMiddleware($node.getAttribute("data-label"))),
saveMiddleware,
saveMiddleware(),
));
// feature: setup forms - we insert everything in the DOM so we don't lose
@ -237,57 +237,11 @@ export default async function(render) {
effect(setupAMForm$.pipe(
rxjs.switchMap(() => rxjs.fromEvent($page, "input")),
rxjs.mergeMap(() => getMiddlewareEnabled().pipe(rxjs.first())),
saveMiddleware,
saveMiddleware(),
));
}
const saveMiddleware = rxjs.pipe(
rxjs.map((authType) => {
const middleware = {
identity_provider: {},
attribute_mapping: {},
};
if (!authType) return middleware;
let formValues = [...new FormData(document.querySelector(`[data-bind="idp"]`))];
middleware.identity_provider = {
type: authType,
params: JSON.stringify(
formValues
.filter(([key, value]) => key.startsWith(`${authType}.`)) // remove elements that aren't in scope
.map(([key, value]) => [key.replace(new RegExp(`^${authType}\.`), ""), value]) // format the relevant keys
.reduce((acc, [key, value]) => { // transform onto something ready to be saved
if (key === "type") return acc;
return {
...acc,
[key]: value,
};
}, {}),
),
};
formValues = [...new FormData(document.querySelector(`[data-bind="attribute-mapping"]`))];
middleware.attribute_mapping = {
related_backend: formValues.shift()[1],
params: JSON.stringify(formValues.reduce((acc, [key, value]) => {
const k = key.split(".");
if (k.length !== 2) return acc;
if (!acc[k[0]]) acc[k[0]] = {};
if (value !== "") acc[k[0]][k[1]] = value;
return acc;
}, {})),
};
return middleware;
}),
rxjs.mergeMap((middleware) => getAdminConfig().pipe(
rxjs.first(),
formObjToJSON$(),
rxjs.map((config) => [middleware, config]),
)),
rxjs.map(([middleware, config]) => ({...config, middleware})),
rxjs.mergeMap((newConfig) => getConfig().pipe(
rxjs.first(),
rxjs.map(({ connections }) => ({ ...newConfig, connections })),
)),
const saveMiddleware = () => rxjs.pipe(
rxjs.mergeMap(() => getState()),
saveConfig(),
);

30
public/pages/adminpage/ctrl_backend_component_storage.js
View file

@ -5,7 +5,7 @@ import { qs, qsa } from "../../lib/dom.js";
import { formTmpl } from "../../components/form.js";
import { generateSkeleton } from "../../components/skeleton.js";
import { initStorage, getBackendAvailable, getBackendEnabled, addBackendEnabled, removeBackendEnabled } from "./ctrl_backend_state.js";
import { initStorage, getState, getBackendAvailable, getBackendEnabled, addBackendEnabled, removeBackendEnabled } from "./ctrl_backend_state.js";
import { formObjToJSON$ } from "./helper_form.js";
import { get as getAdminConfig, save as saveConfig } from "./model_config.js";
@ -57,7 +57,7 @@ export default async function(render) {
rxjs.mergeMap(($nodes) => $nodes),
rxjs.mergeMap(($node) => onClick($node)),
rxjs.map(($node) => addBackendEnabled($node.getAttribute("data-label"))),
saveConnections,
saveConnections(),
));
// feature: setup form
@ -105,33 +105,21 @@ export default async function(render) {
rxjs.mergeMap(($node) => onClick($node.querySelector(".icons"))),
rxjs.map(($node) => qs($node.parentElement, "input").value),
rxjs.map((label) => removeBackendEnabled(label)),
saveConnections,
saveConnections(),
));
// feature: form input change handler
effect(setupForm$.pipe(
rxjs.mergeMap((forms) => forms),
rxjs.mergeMap(($el) => rxjs.fromEvent($el, "input")),
rxjs.map(() => new FormData(qs($page, `[data-bind="backend-enabled"]`))),
rxjs.map((formData) => {
const connections = [];
for (const [type, label] of formData.entries()) {
connections.push({ type, label });
}
return connections;
}),
saveConnections,
saveConnections(),
));
}
const saveConnections = rxjs.pipe(
rxjs.mergeMap((connections) => getAdminConfig().pipe(
rxjs.first(),
formObjToJSON$(),
rxjs.map((config) => ({
...config,
connections,
})),
)),
const saveConnections = () => rxjs.pipe(
rxjs.mergeMap((connections) => getState().pipe(rxjs.map((config) => {
config.connections = connections;
return config;
}))),
saveConfig(),
);

60
public/pages/adminpage/ctrl_backend_state.js
View file

@ -1,4 +1,5 @@
import rxjs from "../../lib/rx.js";
import { qs } from "../../lib/dom.js";
import { get as getConfig } from "../../model/config.js";
import { get as getAdminConfig } from "./model_config.js";
import { formObjToJSON$ } from "./helper_form.js";
@ -66,3 +67,62 @@ export function toggleMiddleware(type) {
middlewareEnabled$.next(newValue);
return newValue;
}
export function getState() {
return getAdminConfig().pipe(
rxjs.first(),
formObjToJSON$(),
rxjs.map((config) => { // connections
const connections = [];
const formData = new FormData(qs(document, `[data-bind="backend-enabled"]`));
for (const [type, label] of formData.entries()) {
connections.push({ type, label });
}
config.connections = connections;
return config;
}),
rxjs.map((config) => { // middleware
const authType = document
.querySelector(`[data-bind="authentication_middleware"] [is="box-item"].active`)
.getAttribute("data-label");
const middleware = {
identity_provider: {},
attribute_mapping: {},
};
if (!authType) return config;
let formValues = [...new FormData(document.querySelector(`[data-bind="idp"]`))];
middleware.identity_provider = {
type: authType,
params: JSON.stringify(
formValues
.filter(([key, value]) => key.startsWith(`${authType}.`)) // remove elements that aren't in scope
.map(([key, value]) => [key.replace(new RegExp(`^${authType}\.`), ""), value]) // format the relevant keys
.reduce((acc, [key, value]) => { // transform onto something ready to be saved
if (key === "type") return acc;
return {
...acc,
[key]: value,
};
}, {}),
),
};
formValues = [...new FormData(document.querySelector(`[data-bind="attribute-mapping"]`))];
middleware.attribute_mapping = {
related_backend: formValues.shift()[1],
params: JSON.stringify(formValues.reduce((acc, [key, value]) => {
const k = key.split(".");
if (k.length !== 2) return acc;
if (!acc[k[0]]) acc[k[0]] = {};
if (value !== "") acc[k[0]][k[1]] = value;
return acc;
}, {})),
};
config.middleware = middleware;
return config;
}),
);
}

8
public/pages/adminpage/ctrl_log.js
View file

@ -1,12 +1,13 @@
import { createElement, createRender } from "../../lib/skeleton/index.js";
import { initConfig } from "./model_config.js";
import componentLogForm from "./ctrl_log_form.js";
import componentLogViewer from "./ctrl_log_viewer.js";
import componentAuditor from "./ctrl_log_audit.js";
import transition from "./animate.js";
import AdminHOC from "./decorator.js";
function Page(render) {
export default AdminHOC(async function (render) {
const $page = createElement(`
<div class="component_logpage sticky">
<h2>Logging</h2>
@ -18,10 +19,9 @@ function Page(render) {
<div>
`);
render(transition($page));
await initConfig();
componentLogViewer(createRender($page.querySelector(".component_logviewer")));
componentLogForm(createRender($page.querySelector(".component_logger")));
componentAuditor(createRender($page.querySelector(".component_reporter")));
}
export default AdminHOC(Page);
});

5
public/pages/adminpage/ctrl_settings.js
View file

@ -7,12 +7,12 @@ import { generateSkeleton } from "../../components/skeleton.js";
import notification from "../../components/notification.js";
import { get as getConfig } from "../../model/config.js";
import { get as getAdminConfig, save as saveConfig } from "./model_config.js";
import { get as getAdminConfig, save as saveConfig, initConfig } from "./model_config.js";
import { renderLeaf, useForm$, formObjToJSON$ } from "./helper_form.js";
import transition from "./animate.js";
import AdminHOC from "./decorator.js";
export default AdminHOC(function(render) {
export default AdminHOC(async function(render) {
const $container = createElement(`
<div class="component_settingspage sticky">
<form data-bind="form" class="formbuilder">
@ -22,6 +22,7 @@ export default AdminHOC(function(render) {
</div>
`);
render(transition($container));
await initConfig();
const config$ = getAdminConfig().pipe(
rxjs.first(),

6
public/pages/adminpage/model_config.js
View file

@ -14,6 +14,10 @@ const config$ = isSaving$.pipe(
rxjs.shareReplay(1),
)
export async function initConfig() {
if (isSaving$.value === true) isSaving$.next(false);
}
export function isSaving() {
return isSaving$.asObservable();
}
@ -25,7 +29,7 @@ export function get() {
export function save() {
return rxjs.pipe(
rxjs.tap(() => isSaving$.next(true)),
rxjs.debounceTime(2000),
rxjs.debounceTime(1500),
rxjs.mergeMap((formData) => ajax({
url: "/admin/api/config",
method: "POST",