@steedos/webapp 3.0.14-beta.9 → 3.0.15-beta.1

package/dist/assets/{browser-ponyfill-dzwkrvIe.js → browser-ponyfill-DVX7Lnwe.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-CuG0VhDw.js";
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-BU1448Ok.js";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/assets/{index-CuG0VhDw.js → index-BU1448Ok.js}

@@ -42409,6 +42409,17 @@ typeof window !== "undefined" ? createHashHistory() : null;
 function selectSpace(spaceId) {
   return async (dispatch2, getState) => {
     let selectedSpaceId = spaceId || LocalStorageStore.getItem("spaceId");
+    if (!selectedSpaceId) {
+      selectedSpaceId = getSettingsTenantId(getState());
+      console.log(`selectedSpaceId`, selectedSpaceId);
+    }
+    if (!selectedSpaceId) {
+      const spaces2 = getSpaces(getState());
+      const spaceIds = Object.keys(spaces2);
+      if (spaceIds.length === 1) {
+        selectedSpaceId = spaceIds[0];
+      }
+    }
     if (!selectedSpaceId) {
       return { data: false };
     }
@@ -49544,8 +49555,12 @@ const ReApplyCodeBtn$2 = ({ onClick, id: id2, loginId, disabled }) => {
 class Login extends React$1.Component {
   constructor(props, context) {
     super(props, context);
-    if (this.props.tenant.page_login) {
-      return window.location.href = this.props.tenant.page_login;
+    const noRedirect = new URLSearchParams(this.props.location.search).get("default");
+    if (this.props.tenant.page_login && !noRedirect) {
+      window.location.href = this.props.tenant.page_login;
+      this._redirecting = true;
+      this.state = {};
+      return;
     }
     let inApp = false;
     let email2 = "";
@@ -49862,6 +49877,9 @@ class Login extends React$1.Component {
     }
   }
   render() {
+    if (this._redirecting) {
+      return null;
+    }
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Background$1, {}),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(Card$1, { children: [
@@ -50051,10 +50069,18 @@ const Logout = (props) => {
       redirect_uri = tenant.page_logout;
     }
     logout2().then(() => {
-      navigate(redirect_uri);
+      if (redirect_uri.startsWith("http://") || redirect_uri.startsWith("https://")) {
+        window.location.href = redirect_uri;
+      } else {
+        navigate(redirect_uri);
+      }
     }).catch((e) => {
       console.error(e);
-      navigate(redirect_uri);
+      if (redirect_uri.startsWith("http://") || redirect_uri.startsWith("https://")) {
+        window.location.href = redirect_uri;
+      } else {
+        navigate(redirect_uri);
+      }
     });
   }, [logout2, navigate, location2.search, tenant.page_logout]);
   return null;
@@ -51665,6 +51691,20 @@ const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
         }
       } catch (e) {
       }
+      try {
+        const appMatch = pathname.match(/^\/app\/([^/]+)\//);
+        if (appMatch) {
+          const raw = sessionStorage.getItem(`steedos_last_active_tab:${appMatch[1]}`);
+          if (raw) {
+            const rec = JSON.parse(raw);
+            if (rec && rec.path && rec.path !== pathname) {
+              navigate(rec.path);
+              return;
+            }
+          }
+        }
+      } catch (e) {
+      }
       if (objMatch && objMatch[2]) {
         navigate(objMatch[1]);
       } else {
@@ -51706,6 +51746,33 @@ const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
         linkPathname = link2.substring(0, idx);
         linkSearch = link2.substring(idx);
       }
+      const decodedPathname = decodeURI(pathname);
+      const decodedLink = decodeURI(linkPathname);
+      const _navPaths = window._steedosNavPaths || [];
+      const hasExactNavLinkForCurrentPath = _navPaths.some((p) => {
+        try {
+          return decodeURI(p) === decodedPathname;
+        } catch (e) {
+          return p === pathname;
+        }
+      });
+      const detailMatch = pathname.match(/^\/app\/([^/]+)\/[^/]+\/view\/([^/?#]+)/);
+      if (!hasExactNavLinkForCurrentPath && detailMatch && detailMatch[2] !== "none") {
+        try {
+          const raw = sessionStorage.getItem(`steedos_last_active_tab:${detailMatch[1]}`);
+          if (raw) {
+            const rec = JSON.parse(raw);
+            if (rec && rec.path && rec.tabId) {
+              const recPathOnly = String(rec.path).split("?")[0].split("#")[0];
+              if (decodedLink === decodeURI(recPathOnly)) {
+                return true;
+              }
+              return false;
+            }
+          }
+        } catch (e) {
+        }
+      }
       if (linkSearch) {
         if (linkPathname !== pathname) {
           return false;
@@ -51724,8 +51791,6 @@ const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
         });
         return allMatch;
       }
-      const decodedPathname = decodeURI(pathname);
-      const decodedLink = decodeURI(linkPathname);
       if (decodedPathname === decodedLink) {
         return true;
       }
@@ -51833,6 +51898,19 @@ const on_click_script = `
       console.error(e.message + "\\r\\n" + e.stack);
     }
   `;
+const navigateTo = (path2) => {
+  if (!path2) return;
+  if (path2.startsWith("/") || path2.startsWith(window.location.origin)) {
+    try {
+      const url2 = new URL(path2, window.location.origin);
+      window.navigate(url2.pathname + url2.search + url2.hash);
+    } catch {
+      window.navigate(path2);
+    }
+  } else {
+    window.location.href = path2;
+  }
+};
 const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) => {
   const resolvePathTemplate = (path2, data2) => {
     if (!path2 || path2.indexOf("${") < 0) {
@@ -51857,16 +51935,16 @@ const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) =>
     let firstApp = app_items[0];
     if (firstApp && firstApp.default_tab) {
       if (typeof firstApp.default_tab === "object" && firstApp.default_tab.path) {
-        window.location.href = resolvePathTemplate(firstApp.default_tab.path, firstApp.default_tab);
+        navigateTo(resolvePathTemplate(firstApp.default_tab.path, firstApp.default_tab));
       } else {
-        window.location.href = `/app/${firstApp.id}/${firstApp.default_tab}`;
+        navigateTo(`/app/${firstApp.id}/${firstApp.default_tab}`);
       }
       return payload;
     }
     if (firstApp && firstApp.children && firstApp.children.length > 0) {
       let firstTab = firstApp.children[0];
       if (firstTab) {
-        window.location.href = resolvePathTemplate(firstTab.path, firstTab);
+        navigateTo(resolvePathTemplate(firstTab.path, firstTab));
       }
     }
   }
@@ -55216,6 +55294,26 @@ const ObjectDetail = () => {
   }, env: {} });
 };
 const isString = (val) => typeof val === "string";
+const RUNTIME_CONTEXT_KEYS = [
+  "appId",
+  "app",
+  "app_id",
+  "recordId",
+  "record_id",
+  "objectName",
+  "object_name",
+  "context"
+];
+const stripRuntimeContext = (schema) => {
+  if (schema && typeof schema === "object" && schema.data && typeof schema.data === "object") {
+    for (const key2 of RUNTIME_CONTEXT_KEYS) {
+      if (key2 in schema.data) {
+        delete schema.data[key2];
+      }
+    }
+  }
+  return schema;
+};
 function injectServerCss(cssString) {
   const oldStyle = document.getElementById("dynamic-page-styles");
   if (oldStyle) {
@@ -55263,6 +55361,7 @@ const PageView = () => {
             console.error("Schema parse failed", e);
           }
         }
+        finalSchema = stripRuntimeContext(finalSchema);
         setSchema(finalSchema);
       } catch (err) {
         console.error("Fetch schema failed", err);
@@ -81508,7 +81607,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-dzwkrvIe.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-DVX7Lnwe.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });

package/dist/assets/{index-DR9C1Zsh.css → index-DEwOeOt7.css}

@@ -1134,6 +1134,9 @@ video {
 .mr-0 {
   margin-right: 0px;
 }
+.mr-0\.5 {
+  margin-right: 0.125rem;
+}
 .mr-1 {
   margin-right: 0.25rem;
 }
@@ -1152,9 +1155,6 @@ video {
 .mt-1 {
   margin-top: 0.25rem;
 }
-.mt-1\.5 {
-  margin-top: 0.375rem;
-}
 .mt-2 {
   margin-top: 0.5rem;
 }
@@ -1233,9 +1233,6 @@ video {
 .h-16 {
   height: 4rem;
 }
-.h-3 {
-  height: 0.75rem;
-}
 .h-3\.5 {
   height: 0.875rem;
 }
@@ -1284,6 +1281,9 @@ video {
 .max-h-full {
   max-height: 100%;
 }
+.min-h-0 {
+  min-height: 0px;
+}
 .min-h-8 {
   min-height: 2rem;
 }
@@ -1311,9 +1311,6 @@ video {
 .w-16 {
   width: 4rem;
 }
-.w-3 {
-  width: 0.75rem;
-}
 .w-3\.5 {
   width: 0.875rem;
 }
@@ -1344,6 +1341,9 @@ video {
 .w-96 {
   width: 24rem;
 }
+.w-\[150px\] {
+  width: 150px;
+}
 .w-\[1px\] {
   width: 1px;
 }
@@ -1383,8 +1383,8 @@ video {
 .min-w-\[460px\] {
   min-width: 460px;
 }
-.max-w-5xl {
-  max-width: 64rem;
+.max-w-4xl {
+  max-width: 56rem;
 }
 .max-w-7xl {
   max-width: 80rem;
@@ -1428,6 +1428,9 @@ video {
 .grow {
   flex-grow: 1;
 }
+.table-fixed {
+  table-layout: fixed;
+}
 .border-collapse {
   border-collapse: collapse;
 }
@@ -1450,6 +1453,9 @@ video {
 .animate-spin {
   animation: spin 1s linear infinite;
 }
+.cursor-default {
+  cursor: default;
+}
 .cursor-not-allowed {
   cursor: not-allowed;
 }
@@ -1537,8 +1543,8 @@ video {
   -moz-column-gap: 1.5rem;
        column-gap: 1.5rem;
 }
-.gap-y-8 {
-  row-gap: 2rem;
+.gap-y-6 {
+  row-gap: 1.5rem;
 }
 .space-x-1 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
@@ -1600,6 +1606,9 @@ video {
 .whitespace-nowrap {
   white-space: nowrap;
 }
+.whitespace-pre-wrap {
+  white-space: pre-wrap;
+}
 .break-words {
   overflow-wrap: break-word;
 }
@@ -1693,10 +1702,6 @@ video {
   --tw-border-opacity: 1;
   border-color: rgb(0 0 0 / var(--tw-border-opacity, 1));
 }
-.border-blue-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(191 219 254 / var(--tw-border-opacity, 1));
-}
 .border-blue-400 {
   --tw-border-opacity: 1;
   border-color: rgb(96 165 250 / var(--tw-border-opacity, 1));
@@ -1729,22 +1734,10 @@ video {
   --tw-border-opacity: 1;
   border-color: rgb(107 114 128 / var(--tw-border-opacity, 1));
 }
-.border-green-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(187 247 208 / var(--tw-border-opacity, 1));
-}
 .border-neutral-300 {
   --tw-border-opacity: 1;
   border-color: rgb(212 212 212 / var(--tw-border-opacity, 1));
 }
-.border-orange-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(254 215 170 / var(--tw-border-opacity, 1));
-}
-.border-red-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(254 202 202 / var(--tw-border-opacity, 1));
-}
 .border-red-500 {
   --tw-border-opacity: 1;
   border-color: rgb(239 68 68 / var(--tw-border-opacity, 1));
@@ -1815,10 +1808,6 @@ video {
   --tw-bg-opacity: 1;
   background-color: rgb(75 85 99 / var(--tw-bg-opacity, 1));
 }
-.bg-green-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(220 252 231 / var(--tw-bg-opacity, 1));
-}
 .bg-green-500 {
   --tw-bg-opacity: 1;
   background-color: rgb(34 197 94 / var(--tw-bg-opacity, 1));
@@ -1827,18 +1816,10 @@ video {
   --tw-bg-opacity: 1;
   background-color: rgb(22 163 74 / var(--tw-bg-opacity, 1));
 }
-.bg-neutral-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(245 245 245 / var(--tw-bg-opacity, 1));
-}
 .bg-neutral-500 {
   --tw-bg-opacity: 1;
   background-color: rgb(115 115 115 / var(--tw-bg-opacity, 1));
 }
-.bg-orange-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(255 237 213 / var(--tw-bg-opacity, 1));
-}
 .bg-orange-500 {
   --tw-bg-opacity: 1;
   background-color: rgb(249 115 22 / var(--tw-bg-opacity, 1));
@@ -1859,14 +1840,6 @@ video {
   --tw-bg-opacity: 1;
   background-color: rgb(147 51 234 / var(--tw-bg-opacity, 1));
 }
-.bg-red-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 226 226 / var(--tw-bg-opacity, 1));
-}
-.bg-red-50 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(254 242 242 / var(--tw-bg-opacity, 1));
-}
 .bg-red-500 {
   --tw-bg-opacity: 1;
   background-color: rgb(239 68 68 / var(--tw-bg-opacity, 1));
@@ -2016,6 +1989,10 @@ video {
   padding-left: 1.5rem;
   padding-right: 1.5rem;
 }
+.px-8 {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
 .py-0 {
   padding-top: 0px;
   padding-bottom: 0px;
@@ -2063,18 +2040,12 @@ video {
 .pb-0 {
   padding-bottom: 0px;
 }
-.pb-10 {
-  padding-bottom: 2.5rem;
-}
 .pb-16 {
   padding-bottom: 4rem;
 }
 .pb-2 {
   padding-bottom: 0.5rem;
 }
-.pb-20 {
-  padding-bottom: 5rem;
-}
 .pb-4 {
   padding-bottom: 1rem;
 }
@@ -2120,15 +2091,15 @@ video {
 .pt-2 {
   padding-top: 0.5rem;
 }
-.pt-24 {
-  padding-top: 6rem;
-}
 .pt-3 {
   padding-top: 0.75rem;
 }
 .pt-4 {
   padding-top: 1rem;
 }
+.pt-6 {
+  padding-top: 1.5rem;
+}
 .text-left {
   text-align: left;
 }
@@ -2138,9 +2109,6 @@ video {
 .align-middle {
   vertical-align: middle;
 }
-.font-\[SimSun\] {
-  font-family: SimSun;
-}
 .font-mono {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
@@ -2162,9 +2130,6 @@ video {
 .text-\[11px\] {
   font-size: 11px;
 }
-.text-\[15px\] {
-  font-size: 15px;
-}
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
@@ -2298,10 +2263,6 @@ video {
   --tw-text-opacity: 1;
   color: rgb(22 163 74 / var(--tw-text-opacity, 1));
 }
-.text-green-700 {
-  --tw-text-opacity: 1;
-  color: rgb(21 128 61 / var(--tw-text-opacity, 1));
-}
 .text-neutral-300 {
   --tw-text-opacity: 1;
   color: rgb(212 212 212 / var(--tw-text-opacity, 1));
@@ -2318,10 +2279,6 @@ video {
   --tw-text-opacity: 1;
   color: rgb(38 38 38 / var(--tw-text-opacity, 1));
 }
-.text-orange-600 {
-  --tw-text-opacity: 1;
-  color: rgb(234 88 12 / var(--tw-text-opacity, 1));
-}
 .text-red-500 {
   --tw-text-opacity: 1;
   color: rgb(239 68 68 / var(--tw-text-opacity, 1));
@@ -2330,10 +2287,6 @@ video {
   --tw-text-opacity: 1;
   color: rgb(220 38 38 / var(--tw-text-opacity, 1));
 }
-.text-red-700 {
-  --tw-text-opacity: 1;
-  color: rgb(185 28 28 / var(--tw-text-opacity, 1));
-}
 .text-sky-500 {
   --tw-text-opacity: 1;
   color: rgb(14 165 233 / var(--tw-text-opacity, 1));
@@ -3132,6 +3085,10 @@ video {
     flex-direction: row;
   }
 
+  .md\:p-0 {
+    padding: 0px;
+  }
+
   .md\:p-10 {
     padding: 2.5rem;
   }

package/dist/index.html

@@ -66,8 +66,8 @@
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/themes/antd.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/helper.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/sdk/iconfont.css">
-    <script type="module" crossorigin src="/assets/index-CuG0VhDw.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DR9C1Zsh.css">
+    <script type="module" crossorigin src="/assets/index-BU1448Ok.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DEwOeOt7.css">
   </head>
   <body class="skin-blue-light fixed steedos sidebar-mini three-columns" >
     <div id="root" class="steedos skin-blue-light creator h-full flex flex-col relative overflow-hidden bg-slate-50"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/webapp",
-  "version": "3.0.14-beta.9",
+  "version": "3.0.15-beta.1",
   "files": [
     "dist"
   ],
@@ -75,9 +75,9 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "87f62a32df2ab475171cd9be1c664acd15448f85",
+  "gitHead": "ff62e2bc9d8c85b48d928e042f7882f0ef77cbe1",
   "dependencies": {
-    "@steedos-widgets/amis-object": "^6.10.53-beta.5",
+    "@steedos-widgets/amis-object": "^6.10.53-beta.19",
     "autoprefixer": "^10.4.23"
   }
 }