@nocobase/plugin-multi-portal 3.0.0-alpha.4 → 3.0.0-alpha.5

package/dist/server/plugin.js

@@ -60,9 +60,9 @@ const MULTI_PORTAL_RUNTIME_FIELDS = [
   "portalName",
   "routePath",
   "authCheck",
-  "enabled"
+  "enabled",
+  "uiLayoutUid"
 ];
-const MULTI_PORTAL_RUNTIME_QUERY_FIELDS = [...MULTI_PORTAL_RUNTIME_FIELDS, "uiLayoutUid"];
 const MULTI_PORTAL_ACCESSIBLE_FIELDS = [
   "uid",
   "title",
@@ -71,10 +71,9 @@ const MULTI_PORTAL_ACCESSIBLE_FIELDS = [
   "portalName",
   "routePath",
   "authCheck",
-  "enabled"
+  "enabled",
+  "uiLayoutUid"
 ];
-const MULTI_PORTAL_ACCESSIBLE_QUERY_FIELDS = [...MULTI_PORTAL_ACCESSIBLE_FIELDS, "uiLayoutUid"];
-const MULTI_PORTAL_UI_LAYOUT_RUNTIME_FIELDS = ["layoutType"];
 const DESKTOP_ROUTE_ROLE_PERMISSION_TARGET_FIELDS = ["id", "title", "hidden", "parentId", "options"];
 const UI_LAYOUT_DESKTOP_ROUTE_WRITE_LAYOUT_HANDLER_TAG = "plugin-ui-layout:desktop-route-write-layout";
 const MAIN_APP_NAME = "main";
@@ -181,7 +180,7 @@ function getDefaultMultiPortalRecord(options = {}) {
     authCheck: true,
     enabled: true,
     ...options.isDefault ? { isDefault: true } : {},
-    uiLayoutUid: "admin-layout-model"
+    uiLayoutUid: import_constants.ADMIN_UI_LAYOUT_UID
   };
 }
 function getFreshMultiPortalRecords() {
@@ -198,7 +197,7 @@ function getFixedLayoutMultiPortalRecords() {
       routePath: "/admin",
       authCheck: true,
       enabled: true,
-      uiLayoutUid: "admin-layout-model"
+      uiLayoutUid: import_constants.ADMIN_UI_LAYOUT_UID
     },
     {
       uid: import_constants.DEFAULT_MOBILE_MULTI_PORTAL_UID,
@@ -209,7 +208,7 @@ function getFixedLayoutMultiPortalRecords() {
       routePath: "/mobile",
       authCheck: true,
       enabled: true,
-      uiLayoutUid: "mobile-layout-model"
+      uiLayoutUid: import_constants.MOBILE_UI_LAYOUT_UID
     }
   ];
 }
@@ -294,6 +293,13 @@ function getPortalDeployBasePath(appName, portalName) {
   const portalPath = appName === MAIN_APP_NAME ? `/${PORTAL_CLIENT_PREFIX}/${portalName}/` : `/${PORTAL_CLIENT_PREFIX}/apps/${appName}/${portalName}/`;
   return resolvePortalStoragePublicPath(joinPortalStoragePublicPath(process.env.APP_PUBLIC_PATH || "/", portalPath));
 }
+function getPortalDeployBasePathCandidates(appName, portalName) {
+  const expectedBasePaths = [getPortalDeployBasePath(appName, portalName)];
+  if (appName !== MAIN_APP_NAME) {
+    expectedBasePaths.push(getPortalDeployBasePath(MAIN_APP_NAME, portalName));
+  }
+  return expectedBasePaths;
+}
 function createPortalDeployUploadMiddleware() {
   const storage = import_utils.koaMulter.diskStorage({
     destination: import_os.default.tmpdir(),
@@ -620,9 +626,9 @@ function validatePortalDeployBasePath(appName, portalName, basePath) {
   if (normalizedBasePath.includes("..")) {
     throw new Error('basePath cannot contain ".."');
   }
-  const expectedBasePath = getPortalDeployBasePath(appName, portalName);
-  if (normalizedBasePath !== expectedBasePath) {
-    throw new Error(`basePath must be ${expectedBasePath}`);
+  const expectedBasePaths = getPortalDeployBasePathCandidates(appName, portalName);
+  if (!expectedBasePaths.includes(normalizedBasePath)) {
+    throw new Error(`basePath must be ${expectedBasePaths.join(" or ")}`);
   }
 }
 function isPortalDeployTarEntry(entry) {
@@ -860,19 +866,11 @@ function collectDesktopRouteIds(record) {
   }
   return uniqueDesktopRouteIds(routeIds);
 }
-function pickMultiPortalUiLayoutRuntimeFields(record) {
-  const result = {};
-  for (const field of MULTI_PORTAL_UI_LAYOUT_RUNTIME_FIELDS) {
-    result[field] = getRecordField(record, field);
-  }
-  return result;
-}
 function pickMultiPortalRuntimeFields(record) {
   const result = {};
   for (const field of MULTI_PORTAL_RUNTIME_FIELDS) {
     result[field] = getRecordField(record, field);
   }
-  result.uiLayout = pickMultiPortalUiLayoutRuntimeFields(getRecordField(record, "uiLayout"));
   return result;
 }
 function pickMultiPortalAccessibleFields(record) {
@@ -880,7 +878,6 @@ function pickMultiPortalAccessibleFields(record) {
   for (const field of MULTI_PORTAL_ACCESSIBLE_FIELDS) {
     result[field] = getRecordField(record, field) ?? null;
   }
-  result.uiLayout = pickMultiPortalUiLayoutRuntimeFields(getRecordField(record, "uiLayout"));
   return result;
 }
 function getExplicitRequestedLayoutUid(layout) {
@@ -1130,14 +1127,27 @@ async function seedHistoricalMultiPortals(db) {
   }
   await repairFixedLayoutMultiPortalRecords(db);
 }
-async function preventMultiPortalBackingLayoutChange(ctx, next) {
+async function validateMultiPortalUiLayoutUidWrite(ctx, next) {
+  var _a;
   const targets = await getMultiPortalWriteTargets(ctx, ["uiLayoutUid"]);
+  const actionName = (_a = ctx.action) == null ? void 0 : _a.actionName;
+  const createsWhenMissing = actionName === "create" || actionName === "firstOrCreate" || actionName === "updateOrCreate";
   for (const { existing, values } of targets) {
-    if (!Object.prototype.hasOwnProperty.call(values, "uiLayoutUid")) {
+    const hasUiLayoutUid = Object.prototype.hasOwnProperty.call(values, "uiLayoutUid");
+    if (!existing && createsWhenMissing && !hasUiLayoutUid) {
+      ctx.throw(400, `Portal UI layout must be one of: ${import_constants.MULTI_PORTAL_UI_LAYOUT_UIDS.join(", ")}`);
+      return;
+    }
+    if (!hasUiLayoutUid) {
       continue;
     }
-    if (existing && existing.get("uiLayoutUid") !== values.uiLayoutUid) {
-      ctx.throw(400, "Portal backing UI layout cannot be changed");
+    if (!(0, import_constants.isMultiPortalUiLayoutUid)(values.uiLayoutUid)) {
+      ctx.throw(400, `Portal UI layout must be one of: ${import_constants.MULTI_PORTAL_UI_LAYOUT_UIDS.join(", ")}`);
+      return;
+    }
+    const existingUiLayoutUid = existing == null ? void 0 : existing.get("uiLayoutUid");
+    if (existing && existingUiLayoutUid !== values.uiLayoutUid) {
+      ctx.throw(400, "Portal UI layout cannot be changed");
       return;
     }
   }
@@ -1165,20 +1175,8 @@ async function findRequestedMultiPortal(ctx, transaction) {
     ctx.throw(400, `Portal '${portalUid}' does not support desktop routes`);
   }
   const uiLayoutUid = portal.get("uiLayoutUid");
-  if (typeof uiLayoutUid !== "string" || !uiLayoutUid) {
-    ctx.throw(400, `Portal '${portalUid}' has no backing UI layout`);
-  }
-  const uiLayout = await ctx.db.getRepository("uiLayouts").findOne({
-    filter: {
-      uid: uiLayoutUid,
-      enabled: true
-    },
-    fields: ["uid"],
-    ...transaction ? { lock: transaction.LOCK.UPDATE } : {},
-    transaction
-  });
-  if (!uiLayout) {
-    ctx.throw(400, `Portal '${portalUid}' has no enabled backing UI layout`);
+  if (!(0, import_constants.isMultiPortalUiLayoutUid)(uiLayoutUid)) {
+    ctx.throw(400, `Portal '${portalUid}' has an unsupported UI layout UID`);
   }
   const usesLayoutPermissions = (0, import_constants.isDefaultLayoutMultiPortalUid)(portalUid);
   return {
@@ -1363,7 +1361,7 @@ async function removeRouteIdsWithUnauthorizedAncestors(ctx, routeIds) {
     }
   }
 }
-async function getMultiPortalAccessibleRouteIds(ctx, multiPortalUid) {
+async function getMultiPortalAccessibleRouteIds(ctx, portalContext) {
   const currentRoles = getCurrentRoles(ctx);
   if (currentRoles.includes("root")) {
     return;
@@ -1371,11 +1369,11 @@ async function getMultiPortalAccessibleRouteIds(ctx, multiPortalUid) {
   if (!currentRoles.length) {
     return /* @__PURE__ */ new Set();
   }
-  const routePermissions = await ctx.db.getRepository("rolesMultiPortalDesktopRoutes").find({
+  const routePermissions = await ctx.db.getRepository(portalContext.relation === "uiLayouts" ? "rolesDesktopRoutes" : "rolesMultiPortalDesktopRoutes").find({
     fields: ["desktopRouteId"],
     filter: {
       roleName: currentRoles,
-      multiPortalUid
+      ...portalContext.relation === "multiPortals" ? { multiPortalUid: portalContext.portalUid } : {}
     }
   });
   const routeIds = /* @__PURE__ */ new Set();
@@ -1391,7 +1389,7 @@ async function getMultiPortalAccessibleRouteIds(ctx, multiPortalUid) {
   const portalRoutes = await ctx.db.getRepository("desktopRoutes").find({
     fields: ["id"],
     filter: {
-      ...getDesktopRoutePortalFilter(multiPortalUid),
+      ...portalContext.filter,
       id: Array.from(routeIds)
     }
   });
@@ -1421,9 +1419,107 @@ function setDesktopRouteChildren(route, children) {
   const maybeModel = route;
   if (typeof maybeModel.setDataValue === "function") {
     maybeModel.setDataValue("children", children);
+  } else {
+    maybeModel.children = children;
+  }
+  if (!maybeModel._options) {
+    return;
+  }
+  if (!maybeModel._options.includeNames) {
+    maybeModel._options.includeNames = ["children"];
     return;
   }
-  route.children = children;
+  if (!maybeModel._options.includeNames.includes("children")) {
+    maybeModel._options.includeNames.push("children");
+  }
+}
+function getDesktopRouteId(route) {
+  const id = getRecordField(route, "id");
+  return id === null || id === void 0 ? void 0 : String(id);
+}
+function getDesktopRouteParentId(route) {
+  const parentId = getRecordField(route, "parentId");
+  return parentId === null || parentId === void 0 ? void 0 : String(parentId);
+}
+function collectDesktopRouteStringIds(routes, routeIds) {
+  for (const route of routes) {
+    const routeId = getDesktopRouteId(route);
+    if (routeId) {
+      routeIds.add(routeId);
+    }
+    const children = getRecordField(route, "children");
+    if (Array.isArray(children)) {
+      collectDesktopRouteStringIds(children, routeIds);
+    }
+  }
+}
+function removeNestedRootDesktopRoutes(routes) {
+  if (!Array.isArray(routes)) {
+    return [];
+  }
+  const routeIds = /* @__PURE__ */ new Set();
+  collectDesktopRouteStringIds(routes, routeIds);
+  return routes.filter((route) => {
+    const parentId = getDesktopRouteParentId(route);
+    return !parentId || !routeIds.has(parentId);
+  });
+}
+function buildAccessibleDesktopRouteTreeWithAncestors(routes, accessibleRouteIds) {
+  const routeById = /* @__PURE__ */ new Map();
+  const childrenByParentId = /* @__PURE__ */ new Map();
+  const roots = [];
+  for (const route of routes) {
+    const routeId = getDesktopRouteId(route);
+    if (!routeId) {
+      continue;
+    }
+    setDesktopRouteChildren(route, void 0);
+    routeById.set(routeId, route);
+  }
+  for (const route of routes) {
+    const routeId = getDesktopRouteId(route);
+    if (!routeId || !routeById.has(routeId)) {
+      continue;
+    }
+    const parentId = getDesktopRouteParentId(route);
+    if (!parentId || !routeById.has(parentId)) {
+      roots.push(route);
+      continue;
+    }
+    const children = childrenByParentId.get(parentId) ?? [];
+    children.push(route);
+    childrenByParentId.set(parentId, children);
+  }
+  const visitRoute = (route, visitingRouteIds) => {
+    const routeId = getDesktopRouteId(route);
+    if (!routeId || visitingRouteIds.has(routeId)) {
+      return void 0;
+    }
+    visitingRouteIds.add(routeId);
+    const visibleChildren = (childrenByParentId.get(routeId) ?? []).map((child) => visitRoute(child, visitingRouteIds)).filter((child) => child !== void 0);
+    visitingRouteIds.delete(routeId);
+    if (!accessibleRouteIds.has(routeId) && visibleChildren.length === 0) {
+      return void 0;
+    }
+    setDesktopRouteChildren(route, visibleChildren.length ? visibleChildren : void 0);
+    return route;
+  };
+  return roots.map((route) => visitRoute(route, /* @__PURE__ */ new Set())).filter((route) => route !== void 0);
+}
+async function includeDesktopRouteAncestorsForListAccessible(ctx, routes, portalFilter) {
+  if (!Array.isArray(routes)) {
+    return routes;
+  }
+  const accessibleRouteIds = /* @__PURE__ */ new Set();
+  collectDesktopRouteStringIds(routes, accessibleRouteIds);
+  if (!accessibleRouteIds.size) {
+    return routes;
+  }
+  const portalRoutes = await ctx.db.getRepository("desktopRoutes").find({
+    sort: "sort",
+    filter: portalFilter
+  });
+  return buildAccessibleDesktopRouteTreeWithAncestors(portalRoutes, accessibleRouteIds);
 }
 function removeDesktopRoutesByIds(routes, routeIds) {
   return routes.map((route) => {
@@ -1490,23 +1586,26 @@ async function removeMultiPortalOwnedRouteFromGetResponse(ctx) {
   ctx.body = void 0;
 }
 async function replaceListAccessibleRoutesWithPortalScopedRoutes(ctx, portalContext) {
-  const routeIds = await getMultiPortalAccessibleRouteIds(ctx, portalContext.portalUid);
+  const routeIds = await getMultiPortalAccessibleRouteIds(ctx, portalContext);
   if (routeIds && routeIds.size === 0) {
     ctx.body = [];
     return;
   }
-  ctx.body = await ctx.db.getRepository("desktopRoutes").find({
+  const routes = await ctx.db.getRepository("desktopRoutes").find({
     tree: true,
     sort: "sort",
     filter: {
-      ...getDesktopRoutePortalFilter(portalContext.portalUid),
+      ...portalContext.filter,
       ...routeIds ? { id: Array.from(routeIds) } : {}
     }
   });
+  ctx.body = removeNestedRootDesktopRoutes(
+    await includeDesktopRouteAncestorsForListAccessible(ctx, routes, portalContext.filter)
+  );
 }
 async function replaceGetAccessibleRouteWithPortalScopedRoute(ctx, portalContext) {
   var _a;
-  const routeIds = await getMultiPortalAccessibleRouteIds(ctx, portalContext.portalUid);
+  const routeIds = await getMultiPortalAccessibleRouteIds(ctx, portalContext);
   if (routeIds && routeIds.size === 0) {
     ctx.status = 204;
     ctx.body = void 0;
@@ -1516,7 +1615,7 @@ async function replaceGetAccessibleRouteWithPortalScopedRoute(ctx, portalContext
     sort: "sort",
     filterByTk: (_a = ctx.action) == null ? void 0 : _a.params.filterByTk,
     filter: {
-      ...getDesktopRoutePortalFilter(portalContext.portalUid),
+      ...portalContext.filter,
       ...routeIds ? { id: Array.from(routeIds) } : {}
     }
   });
@@ -1553,13 +1652,10 @@ async function addMultiPortalListAccessibleGuard(ctx, next) {
     return;
   }
   await next();
-  if ((portalContext == null ? void 0 : portalContext.relation) === "multiPortals") {
+  if (portalContext) {
     await replaceListAccessibleRoutesWithPortalScopedRoutes(ctx, portalContext);
     return;
   }
-  if ((portalContext == null ? void 0 : portalContext.relation) === "uiLayouts") {
-    return;
-  }
   await removeMultiPortalOwnedRoutesFromListResponse(ctx);
 }
 async function addMultiPortalGetAccessibleGuard(ctx, next) {
@@ -1570,17 +1666,13 @@ async function addMultiPortalGetAccessibleGuard(ctx, next) {
     return;
   }
   await next();
-  if ((portalContext == null ? void 0 : portalContext.relation) === "multiPortals") {
+  if (portalContext) {
     await replaceGetAccessibleRouteWithPortalScopedRoute(ctx, portalContext);
     return;
   }
-  if ((portalContext == null ? void 0 : portalContext.relation) === "uiLayouts") {
-    return;
-  }
   await removeMultiPortalOwnedRouteFromGetResponse(ctx);
 }
 async function mapMultiPortalLayoutToUiLayoutForRolePermissionTargets(ctx, next) {
-  var _a;
   const portalRequest = await findRequestedMultiPortal(ctx);
   if (portalRequest.requested && !portalRequest.portal) {
     ctx.status = 200;
@@ -1588,22 +1680,19 @@ async function mapMultiPortalLayoutToUiLayoutForRolePermissionTargets(ctx, next)
     return;
   }
   const scope = portalRequest.scope;
-  if ((scope == null ? void 0 : scope.relation) === "uiLayouts") {
-    if ((_a = ctx.action) == null ? void 0 : _a.params) {
-      ctx.action.params.layout = scope.uiLayoutUid;
-    }
-    await next();
-    return;
-  }
-  if ((scope == null ? void 0 : scope.relation) === "multiPortals") {
+  if (scope) {
     const routes = await ctx.db.getRepository("desktopRoutes").find({
-      tree: true,
       sort: "sort",
       filter: scope.filter,
       fields: [...DESKTOP_ROUTE_ROLE_PERMISSION_TARGET_FIELDS]
     });
+    const routeIds = /* @__PURE__ */ new Set();
+    collectDesktopRouteStringIds(routes, routeIds);
+    const routeTree = buildAccessibleDesktopRouteTreeWithAncestors(routes, routeIds);
     ctx.status = 200;
-    ctx.body = routes.map((route) => pickDesktopRouteRolePermissionTargetFields(route));
+    ctx.body = removeNestedRootDesktopRoutes(routeTree).map(
+      (route) => pickDesktopRouteRolePermissionTargetFields(route)
+    );
     return;
   }
   await next();
@@ -2191,10 +2280,11 @@ async function listEnabledMultiPortals(ctx, next) {
   const records = await ctx.db.getRepository("multiPortals").find({
     filter: {
       enabled: true,
-      "uiLayout.enabled": true
+      uiLayoutUid: {
+        $in: [...import_constants.MULTI_PORTAL_UI_LAYOUT_UIDS]
+      }
     },
-    fields: [...MULTI_PORTAL_RUNTIME_QUERY_FIELDS],
-    appends: ["uiLayout"],
+    fields: [...MULTI_PORTAL_RUNTIME_FIELDS],
     sort: ["uid"]
   });
   ctx.body = records.map((record) => pickMultiPortalRuntimeFields(record));
@@ -2222,7 +2312,6 @@ async function findEnabledDefaultMultiPortal(ctx, transaction) {
       isDefault: true
     },
     fields: [...DEFAULT_MULTI_PORTAL_RESPONSE_FIELDS, "uiLayoutUid"],
-    appends: ["uiLayout"],
     transaction
   });
   if (!record) {
@@ -2232,11 +2321,8 @@ async function findEnabledDefaultMultiPortal(ctx, transaction) {
   if (!portalType) {
     return null;
   }
-  if (portalType === "no-code") {
-    const uiLayout = record.get("uiLayout");
-    if (!uiLayout || uiLayout.get("enabled") !== true) {
-      return null;
-    }
+  if (!(0, import_constants.isMultiPortalUiLayoutUid)(record.get("uiLayoutUid"))) {
+    return null;
   }
   return record;
 }
@@ -2274,21 +2360,9 @@ async function setDefaultMultiPortal(ctx, next) {
       ctx.throw(400, ctx.t("Unsupported Portal type cannot be set as default", { ns: import_constants.NAMESPACE }));
       return null;
     }
-    if (portalType === "no-code") {
-      const uiLayoutUid = target.get("uiLayoutUid");
-      const uiLayout = typeof uiLayoutUid === "string" && uiLayoutUid ? await ctx.db.getRepository("uiLayouts").findOne({
-        filter: {
-          uid: uiLayoutUid,
-          enabled: true
-        },
-        fields: ["uid"],
-        lock: transaction.LOCK.UPDATE,
-        transaction
-      }) : null;
-      if (!uiLayout) {
-        ctx.throw(400, ctx.t("Portal layout must be enabled before setting it as default", { ns: import_constants.NAMESPACE }));
-        return null;
-      }
+    if (!(0, import_constants.isMultiPortalUiLayoutUid)(target.get("uiLayoutUid"))) {
+      ctx.throw(400, ctx.t("Portal device configuration is invalid", { ns: import_constants.NAMESPACE }));
+      return null;
     }
     await repository.update({
       filter: { isDefault: true },
@@ -2314,10 +2388,11 @@ async function listAccessibleMultiPortals(ctx, next) {
   const records = await ctx.db.getRepository("multiPortals").find({
     filter: {
       enabled: true,
-      "uiLayout.enabled": true
+      uiLayoutUid: {
+        $in: [...import_constants.MULTI_PORTAL_UI_LAYOUT_UIDS]
+      }
     },
-    fields: [...MULTI_PORTAL_ACCESSIBLE_QUERY_FIELDS],
-    appends: ["uiLayout"],
+    fields: [...MULTI_PORTAL_ACCESSIBLE_FIELDS],
     sort: ["uid"]
   });
   const accessiblePortalUidSet = Array.isArray(accessiblePortalUids) ? new Set(accessiblePortalUids) : void 0;
@@ -2461,6 +2536,9 @@ class PluginMultiPortalServer extends import_server.Plugin {
   getAppName() {
     return this.app.name || MAIN_APP_NAME;
   }
+  getCurrentStorageAppName() {
+    return normalizePortalStorageName(this.getAppName()) || MAIN_APP_NAME;
+  }
   getMultiPortalStorageItem(multiPortal, previous = false) {
     const record = multiPortal;
     const readField = (field) => previous && typeof record.previous === "function" ? record.previous(field) : getRecordField(record, field);
@@ -2558,8 +2636,6 @@ class PluginMultiPortalServer extends import_server.Plugin {
           return;
         }
         this.logPortalBuildHtml(item, "skipped", "the portal is disabled");
-        await this.removePortalStorageIndexHtml(item);
-        await appendPortalStorageLog(logPath, `Portal index.html removed for ${item.appName}/${item.portalName}.`);
       } catch (error) {
         await appendPortalStorageLog(
           logPath,
@@ -2601,14 +2677,12 @@ class PluginMultiPortalServer extends import_server.Plugin {
       return;
     }
     this.logPortalBuildHtml(item, "skipped", "the portal is disabled");
-    await this.removePortalStorageIndexHtml(item);
-    await appendPortalStorageLog(logPath, `Portal index.html removed for ${item.appName}/${item.portalName}.`);
   }
   async syncMultiPortalStorageItem(multiPortal, options, syncPrevious = false, forceBuild = false) {
     const currentItem = this.getMultiPortalStorageItem(multiPortal);
     const previousItem = syncPrevious ? this.getMultiPortalStorageItem(multiPortal, true) : null;
     await this.runPortalStorageTask(async () => {
-      if (previousItem && (!currentItem || previousItem.appName !== currentItem.appName || previousItem.portalName !== currentItem.portalName || !currentItem.enabled)) {
+      if (previousItem && (!currentItem || previousItem.appName !== currentItem.appName || previousItem.portalName !== currentItem.portalName)) {
         await this.removePortalStorageIndexHtml(previousItem);
       }
       if (currentItem) {
@@ -2655,12 +2729,12 @@ class PluginMultiPortalServer extends import_server.Plugin {
     await next();
   }
   async deployPortalDist(ctx, next) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployCtx = ctx;
-    const appName = normalizePortalStorageName(((_a = deployCtx.request.body) == null ? void 0 : _a.app) || MAIN_APP_NAME) || MAIN_APP_NAME;
-    const portalName = normalizePortalStorageName((_b = deployCtx.request.body) == null ? void 0 : _b.portal);
-    const basePath = trimString((_c = deployCtx.request.body) == null ? void 0 : _c.basePath);
-    const filePath = trimString((_d = deployCtx.request.file) == null ? void 0 : _d.path);
+    const appName = this.getCurrentStorageAppName();
+    const portalName = normalizePortalStorageName((_a = deployCtx.request.body) == null ? void 0 : _a.portal);
+    const basePath = trimString((_b = deployCtx.request.body) == null ? void 0 : _b.basePath);
+    const filePath = trimString((_c = deployCtx.request.file) == null ? void 0 : _c.path);
     try {
       if (!isValidPortalDeploySegment(appName)) {
         throw new Error("Invalid app");
@@ -2697,9 +2771,9 @@ class PluginMultiPortalServer extends import_server.Plugin {
     }
   }
   async pullPortalSource(ctx, next) {
-    var _a, _b;
-    const appName = normalizePortalStorageName(((_a = ctx.action.params.values) == null ? void 0 : _a.app) || MAIN_APP_NAME) || MAIN_APP_NAME;
-    const portalName = normalizePortalStorageName((_b = ctx.action.params.values) == null ? void 0 : _b.portal);
+    var _a;
+    const appName = this.getCurrentStorageAppName();
+    const portalName = normalizePortalStorageName((_a = ctx.action.params.values) == null ? void 0 : _a.portal);
     try {
       if (!isValidPortalDeploySegment(appName)) {
         throw new Error("Invalid app");
@@ -2719,11 +2793,11 @@ class PluginMultiPortalServer extends import_server.Plugin {
     }
   }
   async pushPortalSource(ctx, next) {
-    var _a, _b, _c;
+    var _a, _b;
     const sourceCtx = ctx;
-    const appName = normalizePortalStorageName(((_a = sourceCtx.request.body) == null ? void 0 : _a.app) || MAIN_APP_NAME) || MAIN_APP_NAME;
-    const portalName = normalizePortalStorageName((_b = sourceCtx.request.body) == null ? void 0 : _b.portal);
-    const filePath = trimString((_c = sourceCtx.request.file) == null ? void 0 : _c.path);
+    const appName = this.getCurrentStorageAppName();
+    const portalName = normalizePortalStorageName((_a = sourceCtx.request.body) == null ? void 0 : _a.portal);
+    const filePath = trimString((_b = sourceCtx.request.file) == null ? void 0 : _b.path);
     try {
       if (!isValidPortalDeploySegment(appName)) {
         throw new Error("Invalid app");
@@ -2777,38 +2851,20 @@ class PluginMultiPortalServer extends import_server.Plugin {
     const records = await this.db.getRepository("multiPortals").find({
       filter: {
         enabled: true,
-        "uiLayout.enabled": true
+        uiLayoutUid: {
+          $in: [...import_constants.MULTI_PORTAL_UI_LAYOUT_UIDS]
+        }
       },
-      fields: [...MULTI_PORTAL_ACCESSIBLE_QUERY_FIELDS],
-      appends: ["uiLayout"],
+      fields: [...MULTI_PORTAL_ACCESSIBLE_FIELDS],
       sort: ["uid"],
       transaction: options == null ? void 0 : options.transaction
     });
-    return records.map((record) => {
-      const portal = pickMultiPortalAccessibleFields(record);
-      const uiLayout = portal.uiLayout;
-      const uid = typeof portal.uid === "string" ? portal.uid : "";
-      const title = typeof portal.title === "string" ? portal.title : "";
-      return {
-        uid,
-        title,
-        icon: typeof portal.icon === "string" ? portal.icon : null,
-        portalType: typeof portal.portalType === "string" ? portal.portalType : null,
-        routePath: String(portal.routePath || ""),
-        layout: typeof (uiLayout == null ? void 0 : uiLayout.layoutType) === "string" ? uiLayout.layoutType : null
-      };
+    return records.flatMap((record) => {
+      const item = this.toAppPortalManifestItem(record);
+      return item ? [item] : [];
     });
   }
-  async getUiLayout(uid, options) {
-    if (typeof uid !== "string" || !uid) {
-      return null;
-    }
-    return this.db.getRepository("uiLayouts").findOne({
-      filterByTk: uid,
-      transaction: options == null ? void 0 : options.transaction
-    });
-  }
-  async toAppPortalManifestItem(multiPortal, options) {
+  toAppPortalManifestItem(multiPortal) {
     const uid = getRecordField(multiPortal, "uid");
     const title = getRecordField(multiPortal, "title");
     const portalType = getRecordField(multiPortal, "portalType");
@@ -2818,19 +2874,18 @@ class PluginMultiPortalServer extends import_server.Plugin {
       return null;
     }
     const uiLayoutUid = getRecordField(multiPortal, "uiLayoutUid");
-    const uiLayout = getRecordField(multiPortal, "uiLayout") || await this.getUiLayout(uiLayoutUid, options);
-    if (!uiLayout || getRecordField(uiLayout, "enabled") !== true) {
+    const layout = (0, import_constants.getMultiPortalLayoutType)(uiLayoutUid);
+    if (!layout) {
       return null;
     }
     const icon = getRecordField(multiPortal, "icon");
-    const layoutType = getRecordField(uiLayout, "layoutType");
     return {
       uid,
       title,
       icon: typeof icon === "string" ? icon : null,
       portalType: typeof portalType === "string" ? portalType : null,
       routePath,
-      layout: typeof layoutType === "string" ? layoutType : null
+      layout
     };
   }
   async setAppManifestItem(item, options) {
@@ -2873,30 +2928,13 @@ class PluginMultiPortalServer extends import_server.Plugin {
     if (typeof uid !== "string" || !uid) {
       return;
     }
-    const item = await this.toAppPortalManifestItem(multiPortal, options);
+    const item = this.toAppPortalManifestItem(multiPortal);
     if (item) {
       await this.setAppManifestItem(item, options);
       return;
     }
     await this.removeAppManifestItem(uid, options);
   }
-  async publishUiLayoutManifestItems(uiLayout, options) {
-    const uiLayoutUid = getRecordField(uiLayout, "uid");
-    if (typeof uiLayoutUid !== "string" || !uiLayoutUid) {
-      return;
-    }
-    const records = await this.db.getRepository("multiPortals").find({
-      filter: {
-        uiLayoutUid
-      },
-      fields: [...MULTI_PORTAL_ACCESSIBLE_QUERY_FIELDS],
-      transaction: options == null ? void 0 : options.transaction
-    });
-    for (const record of records) {
-      record.set("uiLayout", uiLayout);
-      await this.publishAppManifestItem(record, options);
-    }
-  }
   async reconcilePortalStorage(options) {
     const records = await this.db.getRepository("multiPortals").find({
       filter: {
@@ -2960,15 +2998,16 @@ class PluginMultiPortalServer extends import_server.Plugin {
       mapMultiPortalLayoutToUiLayoutForRolePermissionTargets
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:create", preventDirectDefaultPortalMutation);
+    this.app.resourceManager.registerPreActionHandler("multiPortals:create", validateMultiPortalUiLayoutUidWrite);
     this.app.resourceManager.registerPreActionHandler("multiPortals:create", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:create", normalizeMultiPortalSlugValues);
     this.app.resourceManager.registerPreActionHandler("multiPortals:update", preventDirectDefaultPortalMutation);
-    this.app.resourceManager.registerPreActionHandler("multiPortals:update", preventMultiPortalBackingLayoutChange);
+    this.app.resourceManager.registerPreActionHandler("multiPortals:update", validateMultiPortalUiLayoutUidWrite);
     this.app.resourceManager.registerPreActionHandler("multiPortals:update", normalizeMultiPortalSlugValues);
     this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", preventDirectDefaultPortalMutation);
     this.app.resourceManager.registerPreActionHandler(
       "multiPortals:firstOrCreate",
-      preventMultiPortalBackingLayoutChange
+      validateMultiPortalUiLayoutUidWrite
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", normalizeMultiPortalSlugValues);
@@ -2978,7 +3017,7 @@ class PluginMultiPortalServer extends import_server.Plugin {
     );
     this.app.resourceManager.registerPreActionHandler(
       "multiPortals:updateOrCreate",
-      preventMultiPortalBackingLayoutChange
+      validateMultiPortalUiLayoutUidWrite
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:updateOrCreate", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:updateOrCreate", normalizeMultiPortalSlugValues);
@@ -3063,9 +3102,6 @@ class PluginMultiPortalServer extends import_server.Plugin {
       }
       await this.removeMultiPortalStorageItem(multiPortal, options);
     });
-    this.app.db.on("uiLayouts.afterUpdate", async (uiLayout, options) => {
-      await this.publishUiLayoutManifestItems(uiLayout, options);
-    });
   }
   async install() {
     const version = await this.app.version.get();