@dyrected/core 2.22.0 → 2.23.0

package/dist/server.js

@@ -6643,20 +6643,12 @@ function isUserAdmin(user, collection) {
 }
 
 // src/utils/collection-search.ts
-var DEFAULT_SEARCHABLE_NAMES = /* @__PURE__ */ new Set([
-  "title",
-  "name",
-  "label",
-  "slug",
-  "email",
-  "caption",
-  "description"
-]);
 var MAX_RELATION_MATCHES = 50;
+var MAX_DEFAULT_SEARCH_FIELDS = 8;
 var MAX_RELATION_TITLE_DEPTH = 8;
 var TITLE_FALLBACK_NAMES = ["title", "name", "label", "heading", "email", "subject"];
 function isScalarSearchField(field) {
-  return field.type === "text" || field.type === "textarea" || field.type === "richText" || field.type === "email";
+  return field.type === "text" || field.type === "textarea" || field.type === "richText" || field.type === "email" || field.type === "url";
 }
 function findFieldByName(collection, fieldName) {
   if (!fieldName) return void 0;
@@ -6671,10 +6663,20 @@ function resolveCollectionTitleField(collection) {
   }
   return collection.fields.find((field) => !!field.name && field.type !== "join" && field.type !== "row");
 }
+function flattenNamedFields(fields) {
+  const result = [];
+  for (const field of fields) {
+    if (field.type === "row" && field.fields) {
+      result.push(...flattenNamedFields(field.fields));
+      continue;
+    }
+    if (field.name) result.push(field);
+  }
+  return result;
+}
 function getCollectionSearchableFields(collection) {
-  const fieldByName = new Map(
-    collection.fields.filter((field) => !!field.name).map((field) => [field.name, field])
-  );
+  const namedFields = flattenNamedFields(collection.fields);
+  const fieldByName = new Map(namedFields.map((field) => [field.name, field]));
   const configured = collection.admin?.searchableFields?.map((fieldName) => fieldByName.get(fieldName)).filter((field) => !!field);
   if (configured && configured.length > 0) {
     return configured;
@@ -6685,12 +6687,12 @@ function getCollectionSearchableFields(collection) {
     if (results.some((item) => item.name === field.name)) return;
     results.push(field);
   };
-  pushUnique(findFieldByName(collection, collection.admin?.useAsTitle));
-  for (const field of collection.fields) {
-    if (!field.name) continue;
-    if (isScalarSearchField(field) && DEFAULT_SEARCHABLE_NAMES.has(field.name)) {
-      pushUnique(field);
-    }
+  const titleField = collection.admin?.useAsTitle ? fieldByName.get(collection.admin.useAsTitle) : void 0;
+  pushUnique(titleField);
+  for (const field of namedFields) {
+    if (results.length >= MAX_DEFAULT_SEARCH_FIELDS) break;
+    if (field.admin?.hidden || !isScalarSearchField(field)) continue;
+    pushUnique(field);
   }
   return results;
 }
@@ -7115,11 +7117,32 @@ var RESERVED_NAVIGATION_SLUGS = /* @__PURE__ */ new Set([
   "admin",
   "preferences",
   "auth",
-  "trash"
+  "trash",
+  "pages"
 ]);
 function assertValidNavigationSlugs(navigation) {
+  const seenWorkspaceSlugs = /* @__PURE__ */ new Set();
+  const seenPageSlugs = /* @__PURE__ */ new Set();
   for (const item of navigation) {
     if (item.dashboard || item.trash) continue;
+    if (item.page) {
+      const pageSlug = typeof item.page === "string" ? item.slug || item.page : item.slug || item.page.slug;
+      if (pageSlug) {
+        const normalized = pageSlug.toLowerCase().trim().replace(/^\//, "");
+        if (RESERVED_NAVIGATION_SLUGS.has(normalized)) {
+          throw new Error(
+            `[Dyrected Config] The slug '${pageSlug}' in custom page '${item.label || pageSlug}' is a reserved system path and cannot be used as a page slug.`
+          );
+        }
+        if (seenPageSlugs.has(normalized)) {
+          throw new Error(
+            `[Dyrected Config] Duplicate page slug '${pageSlug}' in navigation. Page slugs must be unique.`
+          );
+        }
+        seenPageSlugs.add(normalized);
+      }
+      continue;
+    }
     if (item.slug) {
       const normalizedSlug = item.slug.toLowerCase().trim().replace(/^\//, "");
       if (RESERVED_NAVIGATION_SLUGS.has(normalizedSlug)) {
@@ -7127,6 +7150,12 @@ function assertValidNavigationSlugs(navigation) {
           `[Dyrected Config] The slug '${item.slug}' in navigation item '${item.label || item.slug}' is a reserved system path and cannot be used as an operational workspace slug.`
         );
       }
+      if (seenWorkspaceSlugs.has(normalizedSlug)) {
+        throw new Error(
+          `[Dyrected Config] Duplicate workspace slug '${item.slug}' in navigation. Workspace slugs must be unique.`
+        );
+      }
+      seenWorkspaceSlugs.add(normalizedSlug);
     }
   }
 }
@@ -7269,6 +7298,43 @@ function compileNavigation(config) {
       });
       continue;
     }
+    if (item.page) {
+      const pageConfig = typeof item.page === "string" ? {
+        slug: item.slug || item.page,
+        label: item.label || item.page,
+        icon: item.icon,
+        component: item.page,
+        group: typeof item.group === "string" ? item.group : item.group?.name,
+        order: item.order,
+        badge: item.badge,
+        access: item.access
+      } : {
+        ...item.page,
+        slug: item.slug || item.page.slug || "page",
+        label: item.label || item.page.label || item.slug || "Page",
+        icon: item.icon || item.page.icon,
+        group: item.group ? typeof item.group === "string" ? item.group : item.group?.name : item.page.group,
+        order: item.order ?? item.page.order,
+        badge: item.badge || item.page.badge,
+        access: item.access || (item.page.access && typeof item.page.access === "object" && "read" in item.page.access ? item.page.access.read : item.page.access)
+      };
+      const pageSlug = pageConfig.slug || "page";
+      registerItem(groupName, {
+        id: `page:${pageSlug}`,
+        type: "page",
+        slug: pageSlug,
+        label: pageConfig.label || pageSlug,
+        icon: pageConfig.icon || "FileText",
+        href: `/pages/${pageSlug}`,
+        group: groupName,
+        order: pageConfig.order ?? 100,
+        views: [],
+        badge: pageConfig.badge,
+        access: pageConfig.access && typeof pageConfig.access === "object" && "read" in pageConfig.access ? pageConfig.access.read : pageConfig.access,
+        page: pageConfig
+      });
+      continue;
+    }
     const workspaceSlug = item.slug || "workspace";
     registerItem(groupName, {
       id: `workspace_${workspaceSlug}`,
@@ -16776,6 +16842,9 @@ async function serializeViewForApi(view, serializeAccess) {
     dateField: view.dateField,
     startDateField: view.startDateField,
     endDateField: view.endDateField,
+    component: view.layout === "custom" ? view.component : void 0,
+    options: view.layout === "custom" ? view.options : void 0,
+    data: view.layout === "custom" ? view.data : void 0,
     columns: view.columns,
     sort: view.sort,
     metrics: view.metrics,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/core",
-  "version": "2.22.0",
+  "version": "2.23.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",