@steedos/webapp 3.0.13-beta.5 → 3.0.13-beta.50

package/dist/assets/{browser-ponyfill-CMzMMb7h.js → browser-ponyfill-DxTWaLDY.js}

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

package/dist/assets/{index-Cd9-p_c2.css → index-CQX0gCBj.css}

@@ -1010,6 +1010,9 @@ video {
 .top-0 {
   top: 0px;
 }
+.isolate {
+  isolation: isolate;
+}
 .z-10 {
   z-index: 10;
 }
@@ -1050,6 +1053,10 @@ video {
   margin-left: 0px !important;
   margin-right: 0px !important;
 }
+.-mx-2 {
+  margin-left: -0.5rem;
+  margin-right: -0.5rem;
+}
 .mx-0 {
   margin-left: 0px;
   margin-right: 0px;
@@ -1158,6 +1165,9 @@ video {
 .mt-1 {
   margin-top: 0.25rem;
 }
+.mt-1\.5 {
+  margin-top: 0.375rem;
+}
 .mt-2 {
   margin-top: 0.5rem;
 }
@@ -1170,6 +1180,9 @@ video {
 .mt-6 {
   margin-top: 1.5rem;
 }
+.mt-8 {
+  margin-top: 2rem;
+}
 .mt-\[64px\] {
   margin-top: 64px;
 }
@@ -1242,6 +1255,9 @@ video {
 .h-20 {
   height: 5rem;
 }
+.h-3 {
+  height: 0.75rem;
+}
 .h-3\.5 {
   height: 0.875rem;
 }
@@ -1290,6 +1306,9 @@ video {
 .max-h-96 {
   max-height: 24rem;
 }
+.max-h-full {
+  max-height: 100%;
+}
 .min-h-8 {
   min-height: 2rem;
 }
@@ -1314,9 +1333,15 @@ video {
 .w-14 {
   width: 3.5rem;
 }
+.w-16 {
+  width: 4rem;
+}
 .w-20 {
   width: 5rem;
 }
+.w-3 {
+  width: 0.75rem;
+}
 .w-3\.5 {
   width: 0.875rem;
 }
@@ -1422,6 +1447,9 @@ video {
 .flex-shrink-0 {
   flex-shrink: 0;
 }
+.shrink {
+  flex-shrink: 1;
+}
 .shrink-0 {
   flex-shrink: 0;
 }
@@ -1431,6 +1459,9 @@ video {
 .grow {
   flex-grow: 1;
 }
+.border-collapse {
+  border-collapse: collapse;
+}
 .origin-top-right {
   transform-origin: top right;
 }
@@ -1461,6 +1492,9 @@ video {
      -moz-user-select: none;
           user-select: none;
 }
+.resize {
+  resize: both;
+}
 .appearance-none {
   -webkit-appearance: none;
      -moz-appearance: none;
@@ -1626,6 +1660,10 @@ video {
 .rounded-xl {
   border-radius: 0.75rem;
 }
+.rounded-b {
+  border-bottom-right-radius: 0.25rem;
+  border-bottom-left-radius: 0.25rem;
+}
 .rounded-b-md {
   border-bottom-right-radius: 0.375rem;
   border-bottom-left-radius: 0.375rem;
@@ -1689,6 +1727,14 @@ video {
 .border-none {
   border-style: none;
 }
+.border-black {
+  --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));
@@ -1721,6 +1767,18 @@ 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-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));
+}
 .border-slate-200 {
   --tw-border-opacity: 1;
   border-color: rgb(226 232 240 / var(--tw-border-opacity, 1));
@@ -1786,6 +1844,10 @@ 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));
@@ -1812,6 +1874,14 @@ 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-600 {
   --tw-bg-opacity: 1;
   background-color: rgb(220 38 38 / var(--tw-bg-opacity, 1));
@@ -2097,6 +2167,9 @@ video {
 .pb-20 {
   padding-bottom: 5rem;
 }
+.pb-4 {
+  padding-bottom: 1rem;
+}
 .pb-5 {
   padding-bottom: 1.25rem;
 }
@@ -2118,6 +2191,9 @@ video {
 .pl-9 {
   padding-left: 2.25rem;
 }
+.pr-2 {
+  padding-right: 0.5rem;
+}
 .pr-3 {
   padding-right: 0.75rem;
 }
@@ -2154,6 +2230,9 @@ 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;
 }
@@ -2175,6 +2254,9 @@ video {
 .text-\[11px\] {
   font-size: 11px;
 }
+.text-\[15px\] {
+  font-size: 15px;
+}
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
@@ -2260,14 +2342,6 @@ video {
   --tw-text-opacity: 1 !important;
   color: rgb(75 85 99 / var(--tw-text-opacity, 1)) !important;
 }
-.text-\[blue\] {
-  --tw-text-opacity: 1;
-  color: rgb(0 0 255 / var(--tw-text-opacity, 1));
-}
-.text-\[red\] {
-  --tw-text-opacity: 1;
-  color: rgb(255 0 0 / var(--tw-text-opacity, 1));
-}
 .text-black {
   --tw-text-opacity: 1;
   color: rgb(0 0 0 / var(--tw-text-opacity, 1));
@@ -2316,10 +2390,22 @@ 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-red-500 {
   --tw-text-opacity: 1;
   color: rgb(239 68 68 / var(--tw-text-opacity, 1));
 }
+.text-red-600 {
+  --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));
@@ -2358,6 +2444,10 @@ video {
 .no-underline {
   text-decoration-line: none;
 }
+.antialiased {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 .placeholder-gray-500::-moz-placeholder {
   --tw-placeholder-opacity: 1;
   color: rgb(107 114 128 / var(--tw-placeholder-opacity, 1));
@@ -2400,6 +2490,11 @@ video {
   --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
+.shadow-2xl {
+  --tw-shadow: 0 25px 50px -12px rgb(0 0 0 / 0.25);
+  --tw-shadow-colored: 0 25px 50px -12px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
 .shadow-lg {
   --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
   --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
@@ -2488,6 +2583,10 @@ video {
   --tw-drop-shadow: drop-shadow(0 1px 1px rgb(0 0 0 / 0.05));
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
+.grayscale {
+  --tw-grayscale: grayscale(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
@@ -3228,8 +3327,8 @@ video {
 }
 @media (min-width: 1280px) {
 
-  .xl\:w-\[28rem\] {
-    width: 28rem;
+  .xl\:w-\[24rem\] {
+    width: 24rem;
   }
 
   .xl\:grid-cols-4 {

package/dist/assets/{index-LXgDZiSo.js → index-DbB2k2Bs.js}

@@ -41648,6 +41648,7 @@ const HEADER_USER_AGENT = "User-Agent";
 const HEADER_X_CLUSTER_ID = "X-Cluster-Id";
 const HEADER_X_CSRF_TOKEN = "X-CSRF-Token";
 const HEADER_X_VERSION_ID = "X-Version-Id";
+window.sha256 = sha256;
 let Client4$1 = class Client42 {
   LOGIN_TOKEN_KEY = "Meteor.loginToken";
   LOGIN_TOKEN_EXPIRES_KEY = "Meteor.loginTokenExpires";
@@ -42153,6 +42154,7 @@ function requireLodash() {
   return lodash$1;
 }
 var lodashExports = requireLodash();
+const _$1 = /* @__PURE__ */ getDefaultExportFromCjs(lodashExports);
 var Action;
 (function(Action2) {
   Action2["Pop"] = "POP";
@@ -50072,7 +50074,7 @@ const Home = () => {
         goResetPassword(navigate);
       } else {
         let redirect_uri = new URLSearchParams(location ? location.search : "").get("redirect_uri");
-        if (redirect_uri) {
+        if (redirect_uri && redirect_uri != "/update-password") {
           window.location.href = redirect_uri;
         } else {
           window.location.href = "/app";
@@ -51571,6 +51573,7 @@ const normalizeLink = (to, location2 = window.location) => {
 };
 const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
   const navigate = useNavigate();
+  const location2 = useLocation();
   if (!window.goBack) {
     window.goBack = () => {
       navigate(-1);
@@ -51592,10 +51595,70 @@ const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
       user: Builder$1.settings.context.user,
       now: /* @__PURE__ */ new Date()
     },
+    _pathname: location2.pathname,
     ...data2
   };
   const mergedEnv = {
     ...env2,
+    isCurrentUrl: (to, ctx) => {
+      if (!to) {
+        return false;
+      }
+      const link2 = normalizeLink(to);
+      const pathname = window.location.pathname;
+      const idx = link2.indexOf("?");
+      let linkPathname = link2;
+      let linkSearch = "";
+      if (~idx) {
+        linkPathname = link2.substring(0, idx);
+        linkSearch = link2.substring(idx);
+      }
+      if (linkSearch) {
+        if (linkPathname !== pathname) {
+          return false;
+        }
+        const currentSearch = window.location.search;
+        if (!currentSearch) {
+          return false;
+        }
+        const linkParams = new URLSearchParams(linkSearch);
+        const currentParams = new URLSearchParams(currentSearch);
+        let allMatch = true;
+        linkParams.forEach((value2, key2) => {
+          if (currentParams.get(key2) !== value2) {
+            allMatch = false;
+          }
+        });
+        return allMatch;
+      }
+      const decodedPathname = decodeURI(pathname);
+      const decodedLink = decodeURI(linkPathname);
+      if (decodedPathname === decodedLink) {
+        return true;
+      }
+      const linkSegments = decodedLink.replace(/^\//, "").split("/");
+      if (linkSegments.length <= 3 && decodedPathname.startsWith(decodedLink + "/")) {
+        const navPaths = window._steedosNavPaths;
+        if (navPaths && navPaths.some((p) => {
+          let pp = p;
+          const qi = pp.indexOf("?");
+          if (qi > -1) pp = pp.substring(0, qi);
+          const hi = pp.indexOf("#");
+          if (hi > -1) pp = pp.substring(0, hi);
+          if (decodeURI(pp) === decodedLink) return false;
+          const tmplIdx = pp.indexOf("${");
+          if (tmplIdx > -1) {
+            pp = pp.substring(0, tmplIdx);
+          }
+          const decodedNavPath = decodeURI(pp);
+          return decodedNavPath.startsWith(decodedLink + "/") && decodedPathname.startsWith(decodedNavPath);
+        })) {
+          return false;
+        }
+        return true;
+      }
+      return false;
+    },
     jumpTo: (to, action, ctx) => {
       if (to === "goBack") {
         return window.history.back();
@@ -51672,12 +51735,30 @@ const on_click_script = `
     }
   `;
 const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) => {
+  const resolvePathTemplate = (path2, data2) => {
+    if (!path2 || path2.indexOf("${") < 0) {
+      return path2;
+    }
+    try {
+      var currentAmis = window.amisRequire && window.amisRequire("amis");
+      var createObject = window.BuilderAmisObject && window.BuilderAmisObject.AmisLib && window.BuilderAmisObject.AmisLib.createObject;
+      if (currentAmis && createObject) {
+        const resolved = currentAmis.evaluate(path2, createObject(context, data2 || {}));
+        if (typeof resolved === "string" && resolved) {
+          return resolved;
+        }
+      }
+    } catch (ex) {
+      console.warn("resolvePathTemplate failed:", ex);
+    }
+    return path2;
+  };
   let app_items = payload;
   if (app_items && app_items.length > 0) {
     let firstApp = app_items[0];
     if (firstApp && firstApp.default_tab) {
       if (typeof firstApp.default_tab === "object" && firstApp.default_tab.path) {
-        window.location.href = firstApp.default_tab.path;
+        window.location.href = resolvePathTemplate(firstApp.default_tab.path, firstApp.default_tab);
       } else {
         window.location.href = `/app/${firstApp.id}/${firstApp.default_tab}`;
       }
@@ -51686,7 +51767,7 @@ const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) =>
     if (firstApp && firstApp.children && firstApp.children.length > 0) {
       let firstTab = firstApp.children[0];
       if (firstTab) {
-        window.location.href = firstTab.path;
+        window.location.href = resolvePathTemplate(firstTab.path, firstTab);
       }
     }
   }
@@ -54453,6 +54534,33 @@ const {
 const AppView = () => {
   const { appId } = useParams();
   const navigate = useNavigate();
+  const resolvePathTemplate = (path2, data2) => {
+    if (!path2 || path2.indexOf("${") < 0) {
+      return path2 || "";
+    }
+    try {
+      const currentAmis = window.amisRequire?.("amis");
+      const createObject = window.BuilderAmisObject?.AmisLib?.createObject;
+      if (currentAmis && createObject) {
+        const settings2 = window.Builder?.settings || {};
+        const scope = {
+          context: settings2.context,
+          global: {
+            userId: settings2.context?.userId,
+            spaceId: settings2.context?.tenantId,
+            user: settings2.context?.user
+          }
+        };
+        const resolved = currentAmis.evaluate(path2, createObject(scope, data2 || {}));
+        if (typeof resolved === "string" && resolved) {
+          return resolved;
+        }
+      }
+    } catch (error) {
+      console.warn("resolvePathTemplate failed:", error);
+    }
+    return path2;
+  };
   reactExports.useEffect(() => {
     const fetchData = async () => {
       try {
@@ -54462,9 +54570,19 @@ const AppView = () => {
           // Include credentials if needed
         );
         const data2 = response.data;
+        if (data2?.default_tab) {
+          if (typeof data2.default_tab === "object" && data2.default_tab !== null && data2.default_tab.path) {
+            navigate(resolvePathTemplate(data2.default_tab.path, data2.default_tab));
+            return;
+          }
+          if (typeof data2.default_tab === "string") {
+            navigate(`/app/${appId}/${data2.default_tab}`);
+            return;
+          }
+        }
         if (data2?.children.length > 0 && data2.children[0].path) {
-          const children = _.sortBy(data2.children, ["index"]);
-          navigate(children[0].path);
+          const children = _$1.sortBy(data2.children, ["index"]);
+          navigate(resolvePathTemplate(children[0].path, children[0]));
         }
       } catch (error) {
         console.error("Error fetching data:", error);
@@ -54884,7 +55002,7 @@ const ObjectListView = () => {
   }
   return /* @__PURE__ */ jsxRuntimeExports.jsx(AmisRender, { schema: {
     type: "page",
-    bodyClassName: "p-0",
+    bodyClassName: "p-0 h-full",
     body: {
       "type": "steedos-page-object-control",
       "name": "steedosPageObjectControl",
@@ -81231,7 +81349,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-CMzMMb7h.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-DxTWaLDY.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });

package/dist/index.html

@@ -65,8 +65,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-LXgDZiSo.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Cd9-p_c2.css">
+    <script type="module" crossorigin src="/assets/index-DbB2k2Bs.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CQX0gCBj.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.13-beta.5",
+  "version": "3.0.13-beta.50",
   "files": [
     "dist"
   ],
@@ -75,9 +75,9 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "6cd0e81ae9986fc6fc7bc1b40519b63695d03879",
+  "gitHead": "732dec4ff1ad0fa939301524b7ca7c0025ccfe35",
   "dependencies": {
-    "@steedos-widgets/amis-object": "^6.10.51",
+    "@steedos-widgets/amis-object": "^6.10.52-beta.34",
     "autoprefixer": "^10.4.23"
   }
 }