sitero 0.6.0 → 0.8.0

package/dist/src/cms/client/interfaces/pages/dashboard/system/storage/file/_id_/relations/page.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslator } from 'intor/react';
-import { Network, Settings } from 'lucide-react';
+import { Network, FileText, Settings } from 'lucide-react';
 import { useParams } from 'next/navigation';
 import { useState } from 'react';
 import { POST_TYPES } from 'sitero-domain';
@@ -50,14 +50,14 @@ import 'intor/next';
 import { ContentContainer } from '../../../../../../../components/ui/layouts/content-container.js';
 
 function createFileRelationsPage({
+  contentUi,
   configs: staticConfigs,
+  pages: staticPages,
   fileFindRelationsAction,
   AdminList,
   PostList,
   CategoryCard,
   CategoryTable,
-  TopicCard,
-  TopicTable,
   TagCard,
   TagTable
 }) {
@@ -75,7 +75,6 @@ function createFileRelationsPage({
     );
     const [adminStates, setAdminStates] = useState({});
     const [categoryStates, setCategoryStates] = useState({});
-    const [topicStates, setTopicStates] = useState({});
     const [subcategoryStates, setSubcategoryStates] = useState({});
     const [postStates, setPostStates] = useState(
       {}
@@ -101,6 +100,7 @@ function createFileRelationsPage({
             hasBorder: true,
             deps: [adminStates.isFetching],
             accordionHeaderProps: {
+              showCount: true,
               count: adminStates.count ?? relations.adminIds.length,
               children: t("resources.admin.text")
             },
@@ -115,35 +115,13 @@ function createFileRelationsPage({
             )
           }
         ),
-        /* @__PURE__ */ jsx(
-          Accordion,
-          {
-            hasBorder: true,
-            deps: [topicStates.isFetching],
-            accordionHeaderProps: {
-              count: topicStates.count ?? (relations.postIds.length === 0 ? 0 : void 0),
-              children: t("resources.topic.text")
-            },
-            children: /* @__PURE__ */ jsx(
-              PostList,
-              {
-                postIds: relations.postIds,
-                type: POST_TYPES.TOPIC,
-                Card: TopicCard,
-                Table: TopicTable,
-                openNewTab: true,
-                setListItemStates: setTopicStates,
-                localKey: "file-related-topics"
-              }
-            )
-          }
-        ),
-        /* @__PURE__ */ jsx(
+        (contentUi?.hasCategory ?? true) && /* @__PURE__ */ jsx(
           Accordion,
           {
             hasBorder: true,
             deps: [categoryStates.isFetching],
             accordionHeaderProps: {
+              showCount: true,
               count: categoryStates.count ?? (relations.postIds.length === 0 ? 0 : void 0),
               children: t("resources.category.text")
             },
@@ -161,12 +139,13 @@ function createFileRelationsPage({
             )
           }
         ),
-        /* @__PURE__ */ jsx(
+        (contentUi?.hasSubcategory ?? true) && /* @__PURE__ */ jsx(
           Accordion,
           {
             hasBorder: true,
             deps: [subcategoryStates.isFetching],
             accordionHeaderProps: {
+              showCount: true,
               count: subcategoryStates.count ?? (relations.postIds.length === 0 ? 0 : void 0),
               children: t("resources.subcategory.text")
             },
@@ -190,6 +169,7 @@ function createFileRelationsPage({
             hasBorder: true,
             deps: [postStates.isFetching],
             accordionHeaderProps: {
+              showCount: true,
               count: postStates.count ?? (relations.postIds.length === 0 ? 0 : void 0),
               children: t("resources.post.text")
             },
@@ -205,12 +185,13 @@ function createFileRelationsPage({
             )
           }
         ),
-        /* @__PURE__ */ jsx(
+        (contentUi?.hasTag ?? true) && /* @__PURE__ */ jsx(
           Accordion,
           {
             hasBorder: true,
             deps: [tagStates.isFetching],
             accordionHeaderProps: {
+              showCount: true,
               count: tagStates.count ?? (relations.postIds.length === 0 ? 0 : void 0),
               children: t("resources.tag.text")
             },
@@ -233,6 +214,36 @@ function createFileRelationsPage({
           {
             hasBorder: true,
             accordionHeaderProps: {
+              showCount: true,
+              count: relations.pageKeys.length,
+              children: t("main.website-page.text")
+            },
+            children: relations.pageKeys.length ? /* @__PURE__ */ jsx("div", { className: "flex flex-wrap gap-4", children: relations.pageKeys.map((key) => /* @__PURE__ */ jsx(
+              ResourceCard,
+              {
+                identity: { icon: /* @__PURE__ */ jsx(FileText, {}) },
+                interaction: {
+                  type: "navigate",
+                  href: joinUrl(
+                    CMS_PATHS.website["website-page"].pathname,
+                    key
+                  ),
+                  openNewTab: true
+                },
+                title: staticPages?.[key]?.title[locale] ?? key,
+                secondary: key,
+                style: { width: "200px" }
+              },
+              key
+            )) }) : /* @__PURE__ */ jsx(NoData, {})
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          Accordion,
+          {
+            hasBorder: true,
+            accordionHeaderProps: {
+              showCount: true,
               count: relations.configSlugs.length,
               children: t("resources.config.text")
             },

package/dist/src/cms/client/interfaces/pages/dashboard/system/storage/file/delete-many/page.js

@@ -120,7 +120,7 @@ function createFileDeleteManyPage({
           titleProps: {
             icon: Images,
             title: t("resources.file.text"),
-            subtitle: t("ui.delete-many.text")
+            subtitle: t("ui.move-many-to-trash.text")
           },
           utilities: /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsx(
@@ -149,12 +149,12 @@ function createFileDeleteManyPage({
                 variant: "destructive",
                 icon: Trash2,
                 onClick: () => {
-                  if (!confirm(t("ui.dialog.confirm.text"))) return;
+                  if (!confirm(t("ui.dialog.move-to-trash.text"))) return;
                   void execute();
                 },
                 isLoading: isPending,
                 isDisabled: isPending || pickedItems.length === 0,
-                children: t("ui.destroy.text")
+                children: t("ui.move-to-trash.text")
               }
             )
           ] })

package/dist/src/cms/client/interfaces/pages/dashboard/system/storage/file/page.js

@@ -83,7 +83,7 @@ function createFileIndexPage({
               href: `${CMS_PATHS.system.storage.file.pathname}/delete-many`,
               variant: "outline",
               icon: Trash2,
-              children: t("ui.delete-many.text")
+              children: t("ui.move-many-to-trash.text")
             }
           ) })
         }

package/dist/src/cms/client/interfaces/pages/dashboard/system/storage/trash/page.js

@@ -176,7 +176,8 @@ function createTrashPage({
                 variant: "success",
                 icon: FileSymlink,
                 onClick: () => {
-                  if (!confirm(t("ui.dialog.confirm.text"))) return;
+                  if (!confirm(t("resources.file.confirm-restore.text")))
+                    return;
                   void restoreFn();
                 },
                 isLoading: isRestoring,
@@ -194,7 +195,7 @@ function createTrashPage({
                 variant: "destructive",
                 icon: Trash2,
                 onClick: () => {
-                  if (!confirm(t("ui.dialog.confirm.text"))) return;
+                  if (!confirm(t("ui.dialog.purge.text"))) return;
                   void destroyFn();
                 },
                 isLoading: isDestroying,

package/dist/src/cms/client/interfaces/pages/dashboard/website/website-page/_slug_/edit/page.js

@@ -2,7 +2,6 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslator } from 'intor/react';
 import { useParams } from 'next/navigation';
-import { POST_TYPES } from 'sitero-domain';
 import 'zod';
 import 'sonner';
 import 'react';
@@ -10,10 +9,12 @@ import 'ua-parser-js';
 import '../../../../../../../../../shared/client/react-query/client.js';
 import '@tanstack/react-query';
 import { useCmsQuery } from '../../../../../../../infrastructure/operation-result/use-cms-query.js';
+import { resolvePageFields, createAllowPageField } from '../../../../../../components/resources/page/content/types.js';
 import { PageHeaderLayout } from '../../../../../../components/ui/blocks/page-header/page-header-layout.js';
 import 'lucide-react';
 import '@radix-ui/react-avatar';
 import 'mime-types';
+import 'sitero-domain';
 import 'clsx';
 import 'tailwind-merge';
 import '../../../../../../components/shadcn/badge.js';
@@ -41,9 +42,12 @@ import '../../../../../../components/ui/inputs/password-input.js';
 
 function createWebsitePageEditPage({
   pages: staticPages,
-  postFindDetailAction,
-  renderPostEditContent
+  pageFindDetailAction,
+  renderPageEditContent,
+  PageEditContent,
+  fieldRules
 }) {
+  const allowField = createAllowPageField(fieldRules);
   return function WebsitePageEditPage() {
     const { locale } = useTranslator();
     const { slug } = useParams();
@@ -52,10 +56,18 @@ function createWebsitePageEditPage({
       isFetching,
       isNotFound
     } = useCmsQuery(
-      () => postFindDetailAction({ type: POST_TYPES.PAGE, slug }),
-      ["postFindDetailAction", POST_TYPES.PAGE, slug],
-      { select: (data) => data?.post }
+      () => pageFindDetailAction({ key: slug }),
+      ["pageFindDetailAction", slug],
+      { select: (data) => data?.page }
     );
+    const contentProps = {
+      page,
+      pageKey: slug,
+      fields: resolvePageFields(fieldRules, slug),
+      isFetching,
+      isNotFound,
+      allowField: (params) => allowField({ ...params, pageKey: params.pageKey ?? slug })
+    };
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         PageHeaderLayout,
@@ -67,11 +79,7 @@ function createWebsitePageEditPage({
           }
         }
       ),
-      renderPostEditContent({
-        page,
-        isFetching,
-        isNotFound
-      })
+      renderPageEditContent ? renderPageEditContent(contentProps) : PageEditContent ? /* @__PURE__ */ jsx(PageEditContent, { ...contentProps }, slug) : null
     ] });
   };
 }

package/dist/src/cms/client/interfaces/pages/dashboard/website/website-page/_slug_/page.js

@@ -3,7 +3,6 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslator } from 'intor/react';
 import { SquareArrowOutUpRight, Pen } from 'lucide-react';
 import { useParams, usePathname } from 'next/navigation';
-import { POST_TYPES } from 'sitero-domain';
 import 'zod';
 import 'sonner';
 import 'react';
@@ -11,9 +10,11 @@ import 'ua-parser-js';
 import '../../../../../../../../shared/client/react-query/client.js';
 import '@tanstack/react-query';
 import { useCmsQuery } from '../../../../../../infrastructure/operation-result/use-cms-query.js';
+import { resolvePageFields, createAllowPageField } from '../../../../../components/resources/page/content/types.js';
 import { PageHeaderLayout } from '../../../../../components/ui/blocks/page-header/page-header-layout.js';
 import '@radix-ui/react-avatar';
 import 'mime-types';
+import 'sitero-domain';
 import 'clsx';
 import 'tailwind-merge';
 import '../../../../../components/shadcn/badge.js';
@@ -43,10 +44,13 @@ import '../../../../../components/ui/inputs/password-input.js';
 
 function createWebsitePageShowPage({
   pages: staticPages,
-  postFindDetailAction,
+  pageFindDetailAction,
   SeoMetadataDialog,
-  renderPostShowContent
+  renderPageShowContent,
+  PageShowContent,
+  fieldRules
 }) {
+  const allowField = createAllowPageField(fieldRules);
   return function WebsitePageShowPage() {
     const { t, locale } = useTranslator();
     const { slug } = useParams();
@@ -56,11 +60,19 @@ function createWebsitePageShowPage({
       isFetching,
       isNotFound
     } = useCmsQuery(
-      () => postFindDetailAction({ type: POST_TYPES.PAGE, slug }),
-      ["postFindDetailAction", POST_TYPES.PAGE, slug],
-      { select: (data) => data?.post }
+      () => pageFindDetailAction({ key: slug }),
+      ["pageFindDetailAction", slug],
+      { select: (data) => data?.page }
     );
-    const websiteHref = `/${slug === "home" ? "" : slug}`;
+    const websiteHref = staticPages[slug]?.pathname;
+    const contentProps = {
+      page,
+      pageKey: slug,
+      isFetching,
+      isNotFound,
+      fields: resolvePageFields(fieldRules, slug),
+      allowField: (params) => allowField({ ...params, pageKey: params.pageKey ?? slug })
+    };
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         PageHeaderLayout,
@@ -76,7 +88,7 @@ function createWebsitePageShowPage({
               variant: "warning",
               icon: Pen,
               href: `${pathname}/edit`,
-              isDisabled: isFetching,
+              isDisabled: isFetching || isNotFound || !page,
               children: t("ui.edit.text")
             }
           ),
@@ -84,9 +96,10 @@ function createWebsitePageShowPage({
             /* @__PURE__ */ jsx(
               SeoMetadataDialog,
               {
+                ownerType: "page",
                 id: page?.id,
                 isLoading: isFetching,
-                isDisabled: isNotFound
+                isDisabled: isNotFound || !page
               }
             ),
             websiteHref && /* @__PURE__ */ jsx(
@@ -102,7 +115,7 @@ function createWebsitePageShowPage({
           ] })
         }
       ),
-      renderPostShowContent({ page, isFetching, isNotFound })
+      renderPageShowContent ? renderPageShowContent(contentProps) : PageShowContent ? /* @__PURE__ */ jsx(PageShowContent, { ...contentProps }, slug) : null
     ] });
   };
 }

package/dist/src/cms/client/interfaces/pages/dashboard/website/website-page/page.js

@@ -2,11 +2,11 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslator } from 'intor/react';
 import { AppWindow } from 'lucide-react';
-import { POST_TYPES } from 'sitero-domain';
 import { CMS_PATHS } from '../../../../../../../constants/paths/cms-paths.js';
 import '../../../../../../../constants/paths/redirect.js';
 import '../../../../../../../constants/cms-locale.js';
 import 'mime-types';
+import 'sitero-domain';
 import 'react';
 import 'ua-parser-js';
 import '../../../../../../../shared/client/react-query/client.js';
@@ -48,14 +48,14 @@ import { ContentContainer } from '../../../../components/ui/layouts/content-cont
 
 function createWebsitePagePage({
   pages: staticPages,
-  postFindManyAction
+  pageFindManyAction
 }) {
   return function WebsitePagePage() {
     const { t, locale } = useTranslator();
     const { data: pages } = useQuery(
-      () => postFindManyAction({ type: POST_TYPES.PAGE }),
-      ["postFindManyAction", POST_TYPES.PAGE],
-      { select: (data) => data?.posts }
+      () => pageFindManyAction({ keys: Object.keys(staticPages) }),
+      ["pageFindManyAction", Object.keys(staticPages)],
+      { select: (data) => data?.pages }
     );
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
@@ -69,10 +69,10 @@ function createWebsitePagePage({
         }
       ),
       /* @__PURE__ */ jsx(ContentContainer, { children: /* @__PURE__ */ jsx("div", { className: "flex flex-wrap max-lg:gap-3 lg:gap-6", children: ensureArray(pages).map((page, index) => {
-        const staticPage = staticPages[page.slug];
+        const staticPage = staticPages[page.key];
         const href = joinUrl(
           CMS_PATHS.website["website-page"].pathname,
-          page.slug
+          page.key
         );
         return /* @__PURE__ */ jsx(
           FeatureCard,

package/dist/src/cms/server/create-cms-server.js

@@ -13,6 +13,7 @@ import { createFileActions } from './resources/file/actions.js';
 import { createInquiryActions } from './resources/inquiry/actions.js';
 import { createPostActions } from './resources/post/actions.js';
 import { createSeoMetadataActions } from './resources/seo-metadata/actions.js';
+import { createPageActions } from './resources/page/actions.js';
 import { createAdminSessionRuntime } from './sessions/admin/admin-session-runtime.js';
 
 function createCmsServer({
@@ -53,6 +54,7 @@ function createCmsServer({
           ...actionInput
         }),
         adminRefreshToken: createAdminRefreshTokenActions(actionInput),
+        page: createPageActions(actionInput),
         config: createConfigActions(actionInput),
         file: createFileActions(actionInput),
         inquiry: createInquiryActions(actionInput),

package/dist/src/cms/server/resources/page/actions.js

@@ -0,0 +1,31 @@
+import { operationResult, PageUnavailableError } from 'sitero-server';
+
+function createPageActions({
+  resolveExecutionContext,
+  siteroServer
+}) {
+  const findDetail = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.findDetail, input, context.data);
+  };
+  const findMany = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.findMany, input, context.data);
+  };
+  const update = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    const page = siteroServer.resources.page;
+    if (!page) return operationResult.failure(new PageUnavailableError());
+    return siteroServer.executor.execute(page.update, input, context.data);
+  };
+  return { findDetail, findMany, update };
+}
+
+export { createPageActions };

package/dist/src/cms/server/resources/post/actions.js

@@ -1,8 +1,5 @@
 import { operationResult } from 'sitero-server';
 
-function toItem(id) {
-  return id ? { id } : null;
-}
 function toItems(items) {
   return items?.map(({ id }) => ({ id })) ?? [];
 }
@@ -54,7 +51,7 @@ function toPostCreateInput({
     parents,
     relatedPosts,
     tags,
-    topicId
+    topicKey
   } = formData;
   return {
     author: author ? { id: author.id } : null,
@@ -108,7 +105,7 @@ function toPostCreateInput({
     text8: formData.text8,
     text9: formData.text9,
     text10: formData.text10,
-    topic: toItem(topicId),
+    topicKey,
     translations: formData.translations.map(toPostTranslationWriteInput),
     type: formData.type
   };
@@ -117,7 +114,11 @@ function toPostUpdateInput({
   formData,
   id
 }) {
-  const { type: _type, ...createInput } = toPostCreateInput({
+  const {
+    type: _type,
+    topicKey: _topicKey,
+    ...createInput
+  } = toPostCreateInput({
     formData
   });
   return {
@@ -156,6 +157,24 @@ function createPostActions({
       contextResult.data
     );
   };
+  const postRestoreAction = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    return siteroServer.executor.execute(
+      siteroServer.resources.post.restore,
+      input,
+      context.data
+    );
+  };
+  const postPurgeAction = async (input) => {
+    const context = await resolveExecutionContext();
+    if (!context.success) return context;
+    return siteroServer.executor.execute(
+      siteroServer.resources.post.purge,
+      input,
+      context.data
+    );
+  };
   const postFindDetailAction = async (input) => {
     const contextResult = await resolveExecutionContext();
     if (!contextResult.success) return contextResult;
@@ -201,6 +220,8 @@ function createPostActions({
   return {
     create: postCreateAction,
     delete: postDeleteAction,
+    restore: postRestoreAction,
+    purge: postPurgeAction,
     findDetail: postFindDetailAction,
     findRelations: postFindRelationsAction,
     findListCards: postFindListCardsAction,

package/dist/src/cms/server/resources/seo-metadata/actions.js

@@ -45,7 +45,7 @@ function createSeoMetadataActions({
           ogArticleModifiedTime: normalizeDatetime(
             translation.ogArticleModifiedTime
           ),
-          // Keep server validation running for every other submitted field.
+          // Invalid JSON is rejected below before the command can write.
           jsonLd: jsonLd ?? []
         };
       }
@@ -54,31 +54,22 @@ function createSeoMetadataActions({
       ...input.formData,
       translations
     };
-    const result = await siteroServer.executor.execute(
-      siteroServer.resources.seoMetadata.upsert,
-      formData,
-      contextResult.data
-    );
     const jsonLdFields = invalidJsonLdIndexes.map((index) => ({
       path: ["translations", index, "jsonLd"],
       kind: "custom",
       code: "validation.json.invalid"
     }));
-    if (jsonLdFields.length === 0) return result;
-    if (result.success) {
+    if (jsonLdFields.length > 0) {
       return {
         success: false,
         error: { code: "VALIDATION_FAILED", fields: jsonLdFields }
       };
     }
-    if (result.error.code !== "VALIDATION_FAILED") return result;
-    return {
-      success: false,
-      error: {
-        ...result.error,
-        fields: [...result.error.fields ?? [], ...jsonLdFields]
-      }
-    };
+    return siteroServer.executor.execute(
+      siteroServer.resources.seoMetadata.upsert,
+      formData,
+      contextResult.data
+    );
   };
   return {
     upsert: seoMetadataUpsertAction

package/dist/src/config/content-ui.js

@@ -0,0 +1,24 @@
+import { hasTopicRole } from './topics.js';
+
+function deriveContentUiCapabilities(topics, features) {
+  const byTopic = Object.fromEntries(
+    Object.keys(topics).map((key) => [
+      key,
+      {
+        hasCategory: hasTopicRole(topics, key, "CATEGORY"),
+        hasSubcategory: hasTopicRole(topics, key, "SUBCATEGORY"),
+        hasTag: features.tag
+      }
+    ])
+  );
+  return {
+    hasCategory: Object.values(byTopic).some((flags) => flags.hasCategory),
+    hasSubcategory: Object.values(byTopic).some(
+      (flags) => flags.hasSubcategory
+    ),
+    hasTag: features.tag,
+    byTopic
+  };
+}
+
+export { deriveContentUiCapabilities };

package/dist/src/config/topics.js

@@ -5,7 +5,7 @@ function getTopicItemsByRole(topics, slug, items, role) {
   return (items ?? []).filter((item) => item.type === role);
 }
 function hasTopicRole(topics, slug, role) {
-  return topics[slug]?.roles.includes(role) ?? false;
+  return Object.hasOwn(topics, slug) && (topics[slug]?.roles.includes(role) ?? false);
 }
 function isContentTopic(topics, slug) {
   return hasTopicRole(topics, slug, POST_TYPES.POST) && !hasTopicRole(topics, slug, POST_TYPES.PRODUCT);

package/dist/src/constants/paths/cms-paths.js

@@ -53,8 +53,8 @@ const CMS_PATHS = {
       subcategory: {
         pathname: (topicSlug = "") => `${DB}/content/content-management/${topicSlug}/subcategory`
       },
-      topic: { pathname: `${DB}/content/content-management/topic` },
-      tag: { pathname: `${DB}/content/content-management/tag` }
+      tag: { pathname: `${DB}/content/content-management/tag` },
+      trash: { pathname: `${DB}/content/content-management/trash` }
     }
   }
 };