From 3dd306bc87825d9d3c17b45dfa90f3e00e5b8242 Mon Sep 17 00:00:00 2001 From: Rizky Date: Sun, 17 Dec 2023 08:51:47 +0700 Subject: [PATCH] wip fix --- app/srv/api/site-export.ts | 2 +- app/web/src/base/load/db/db-proxy.tsx | 2 +- app/web/src/render/editor/panel/manager/site/site-mgr.tsx | 2 +- .../src/render/editor/panel/toolbar/center/ToolbarCenter.tsx | 4 +++- app/web/src/render/live/dev-loader.tsx | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/srv/api/site-export.ts b/app/srv/api/site-export.ts index 05ee1399..a34648cd 100644 --- a/app/srv/api/site-export.ts +++ b/app/srv/api/site-export.ts @@ -38,7 +38,7 @@ export const _ = { where: { id_site: site.id }, }); - if (cgroups) { + if (Array.isArray(cgroups)) { site.cgroup_ids = []; for (const id of cgroups.map((c) => c.use_id_site)) { site.cgroup_ids.push(id); diff --git a/app/web/src/base/load/db/db-proxy.tsx b/app/web/src/base/load/db/db-proxy.tsx index 0f1c667f..ff36b8ac 100644 --- a/app/web/src/base/load/db/db-proxy.tsx +++ b/app/web/src/base/load/db/db-proxy.tsx @@ -80,7 +80,7 @@ const cachedQueryResult: Record< export const fetchSendDb = async (params: any, dburl: string) => { const base = new URL(dburl); - base.pathname = `/_dbs/`; + base.pathname = `/_dbs`; if (params.table) { base.pathname += `/${params.table}`; } diff --git a/app/web/src/render/editor/panel/manager/site/site-mgr.tsx b/app/web/src/render/editor/panel/manager/site/site-mgr.tsx index 137d0d8f..24a43465 100644 --- a/app/web/src/render/editor/panel/manager/site/site-mgr.tsx +++ b/app/web/src/render/editor/panel/manager/site/site-mgr.tsx @@ -22,7 +22,6 @@ export const SiteManager = () => { }); const reloadSites = async () => { - const orgs = await db.org_user.findMany({ where: { id_user: p.session.data.user.id, @@ -32,6 +31,7 @@ export const SiteManager = () => { }, }); + console.log(orgs); if (orgs) { orgs.push({ org: { diff --git a/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx b/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx index 53339aed..854da2a9 100644 --- a/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx @@ -40,7 +40,9 @@ export const ToolbarCenter = () => { try { local.apiStatus = "starting"; local.render(); - await fetch(p.site.api_url + "/_prasi/_"); + if (p.site.api_url) { + await fetch(p.site.api_url + "/_prasi/_"); + } local.apiStatus = "started"; local.render(); } catch (e) { diff --git a/app/web/src/render/live/dev-loader.tsx b/app/web/src/render/live/dev-loader.tsx index 568b5dd2..4c8a6e0c 100644 --- a/app/web/src/render/live/dev-loader.tsx +++ b/app/web/src/render/live/dev-loader.tsx @@ -29,7 +29,7 @@ export const devLoader: Loader = { select: { use_id_site: true }, }); - if (cgroups) { + if (Array.isArray(cgroups)) { site.cgroup_ids = []; for (const id of cgroups.map((c: any) => c.use_id_site)) { site.cgroup_ids.push(id); @@ -46,7 +46,7 @@ export const devLoader: Loader = { select: { content_tree: true, id: true }, }); - if (layout) { + if (layout && layout.content_tree) { const childs = (layout.content_tree as any).childs; if (childs && childs.length > 0) { site.layout = childs[0];