From d79e7ec11e48a4b1a37f887a1bf043687f58deb5 Mon Sep 17 00:00:00 2001
From: Rizky <rizky05@gmail.com>
Date: Tue, 31 Oct 2023 17:02:29 +0700
Subject: [PATCH] fix

---
 app/web/src/render/editor/editor.tsx    |  5 ++++-
 app/web/src/render/editor/logic/init.ts | 10 ++++++++--
 pkgs/core/index.ts                      |  8 ++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/web/src/render/editor/editor.tsx b/app/web/src/render/editor/editor.tsx
index cb30ef31..ed40fe5d 100644
--- a/app/web/src/render/editor/editor.tsx
+++ b/app/web/src/render/editor/editor.tsx
@@ -1,5 +1,5 @@
 import { FC, useEffect } from "react";
-import { useGlobal, deepClone } from "web-utils";
+import { useGlobal, deepClone, waitUntil } from "web-utils";
 import { Loading } from "../../utils/ui/loading";
 import { EMainEditor } from "./panel/e-main-editor";
 import { EditorGlobal } from "./logic/global";
@@ -126,6 +126,9 @@ export const Editor: FC<{ site_id: string; page_id: string; session: any }> = ({
       return p.ui.error;
     }
     if (!p.site.id) {
+      waitUntil(() => p.site?.id).then(() => {
+        p.render();
+      });
       return <Loading note="editor-prepare" />;
     }
   }
diff --git a/app/web/src/render/editor/logic/init.ts b/app/web/src/render/editor/logic/init.ts
index 792cb036..c65beff3 100644
--- a/app/web/src/render/editor/logic/init.ts
+++ b/app/web/src/render/editor/logic/init.ts
@@ -8,9 +8,10 @@ import {
 import { LSite } from "../../live/logic/global";
 import { validateLayout } from "../../live/logic/layout";
 import importModule from "../tools/dynamic-import";
-import { PG } from "./global";
+import { EditorGlobal, PG } from "./global";
 import { devLoader } from "../../live/dev-loader";
 import { jscript } from "../../../utils/script/jscript";
+import { deepClone } from "web-utils";
 
 export const w = window as unknown as {
   basepath: string;
@@ -29,6 +30,7 @@ export const w = window as unknown as {
     devUrl: string;
     prodUrl: string;
   };
+  blankGlobal: typeof EditorGlobal;
 };
 
 export const initEditor = async (p: PG, site_id: string) => {
@@ -50,7 +52,10 @@ export const initEditor = async (p: PG, site_id: string) => {
     jscript.init(p.render);
   }
 
-  if (!p.item) return;
+  if (!p.item) {
+    location.reload();
+    return;
+  }
 
   p.item.active = localStorage.getItem("prasi-item-active-id") || "";
   p.item.activeOriginalId = localStorage.getItem("prasi-item-active-oid") || "";
@@ -84,6 +89,7 @@ export const initEditor = async (p: PG, site_id: string) => {
     localStorage.setItem(`prasi-site-${site_id}`, JSON.stringify(site));
     return site;
   };
+
   const processSite = async (site: LSite) => {
     if (!site || (site && !site.id)) return;
     if (!w.exports) {
diff --git a/pkgs/core/index.ts b/pkgs/core/index.ts
index 4490a64d..0e9c3b89 100644
--- a/pkgs/core/index.ts
+++ b/pkgs/core/index.ts
@@ -44,14 +44,10 @@ if (g.db) {
 
 await initSrv();
 await syncActionDefinition();
-
 await generateAPIFrm();
 await prepareApiRoutes();
-
 await prepareAPITypes();
-
 await parcelBuild();
+await createServer();
 
-// await createServer();
-
-// g.status = "ready";
+g.status = "ready";