@raketa-cloud/admin 1.8.4 → 1.8.6

package/src/handlers/{pages/PagesHandler.js → resources/ResourcesHandler.js}

@@ -1,12 +1,15 @@
 const index = async (ctx) => {
-  const items = await ctx.client.pages.list(
+  const { resourceType } = ctx.resourceConfig;
+
+  const items = await ctx.client.resources.list(
     ctx.query,
     ctx.locale,
-    ctx.resourceConfig.pageType,
+    resourceType,
   );
 
+
   const tags = await ctx.client.tags.all(ctx.locale);
-  const languages = ctx.client.pages.getConfig().i18n.locales;
+  const languages = ctx.client.resources.getConfig().i18n.locales;
   const translations = Object.keys(languages).map((key) => ({
     name: languages[key].name,
     code: key,
@@ -17,21 +20,31 @@ const index = async (ctx) => {
       tags: tags.list,
       translations,
       items,
-      visibilityOptions: ctx.client.pages.visibilityOptions(),
+      visibilityOptions: ctx.client.resources.visibilityOptions(),
     },
   };
 };
 
 const show = async (ctx) => {
   const { id } = ctx.params;
-  const resource = await ctx.client.pages.find(id, ctx.locale);
+  const { resourceType, resourceTypePlural } = ctx.resourceConfig;
+
+  const resource = await ctx.client.resources.find(
+    id,
+    ctx.locale,
+    resourceType,
+  );
 
   if (!resource) {
-    throw new Error(`Missing ${ctx.resourceConfig.pageType} #${id}`);
+    throw new Error(`Missing ${resourceType} #${id}`);
   }
 
-  const revisions = await ctx.client.pageRevisions.all(id, ctx.locale);
-  const changes = await ctx.client.pageChanges.list(
+  const revisions = await ctx.client.resourceRevisions.all(
+    id,
+    ctx.locale,
+    resourceType,
+  );
+  const changes = await ctx.client.resourceChanges.list(
     {
       "f:change_type": [
         "revision_publish",
@@ -42,6 +55,7 @@ const show = async (ctx) => {
     },
     id,
     ctx.locale,
+    resourceType,
   );
 
   return {
@@ -56,7 +70,7 @@ const show = async (ctx) => {
           if (translation) {
             return {
               locale,
-              path: `/${locale}/${ctx.resourceConfig.pageTypePlural}/${translation.id}`,
+              path: `/${locale}/${resourceTypePlural}/${translation.id}`,
             };
           }
 
@@ -72,26 +86,29 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
-      resource: { ...ctx.client.pages.defaults() },
+      resource: {
+        ...ctx.client.resources.defaults(ctx.resourceConfig.dateFields),
+      },
       tags: tags.list,
       errors: {},
-      visibilityOptions: ctx.client.pages.visibilityOptions(),
+      visibilityOptions: ctx.client.resources.visibilityOptions(),
       _translations: [],
     },
   };
 };
 
 const create = async (ctx) => {
+  const { resourceType, resourceTypePlural } = ctx.resourceConfig;
   const params = { ...ctx.resourceParams.resource };
-  const resource = ctx.client.pages.deepMerge(
-    ctx.client.pages.defaults(),
+  const resource = ctx.client.resources.deepMerge(
+    ctx.client.resources.defaults(ctx.resourceConfig.dateFields),
     params,
   );
 
-  const { errors } = await ctx.client.pages.create(
+  const { errors } = await ctx.client.resources.create(
     resource,
     ctx.locale,
-    ctx.resourceConfig.pageType,
+    resourceType,
   );
 
   if (errors) {
@@ -101,15 +118,15 @@ const create = async (ctx) => {
       assigns: {
         resource,
         tags: tags.list,
-        errors: { resource: ctx.client.pages.formatErrors(errors) },
-        visibilityOptions: ctx.client.pages.visibilityOptions(),
+        errors: { resource: ctx.client.resources.formatErrors(errors) },
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
         _translations: [],
       },
     };
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageTypePlural}`,
+    redirect: `/${ctx.locale}/${resourceTypePlural}`,
   };
 };
 

package/src/handlers/{pages → resources}/TranslationsHandler.js

@@ -1,7 +1,8 @@
 const index = async (ctx) => {
   const { parent_id } = ctx.params;
   const { translations } = ctx.query;
-  let translatedPages = [];
+  const { resourceType } = ctx.resourceConfig;
+  let translatedRecords = [];
 
   if (translations) {
     const translationPairs = translations.split(";").map((pair) => {
@@ -9,55 +10,72 @@ const index = async (ctx) => {
       return { locale, id };
     });
 
-    translatedPages = await Promise.all(
+    translatedRecords = await Promise.all(
       translationPairs.map(async ({ locale, id }) => {
-        const page = await ctx.client.pages.find(id, locale);
+        const record = await ctx.client.resources.find(
+          id,
+          locale,
+          resourceType,
+        );
 
-        if (!page) {
+        if (!record) {
           throw new Error(
-            `Cannot find translated page with id ${id} and locale ${locale}`
+            `Cannot find translated record with id ${id} and locale ${locale}`,
           );
         }
 
-        const revisions = await ctx.client.pageRevisions.all(id, locale);
+        const revisions = await ctx.client.resourceRevisions.all(
+          id,
+          locale,
+          resourceType,
+        );
         const openRevision = revisions.list[0];
 
         return {
-          ...page,
+          ...record,
           translationLocale: locale,
           revisionId: openRevision?.id,
         };
-      })
+      }),
     );
   }
 
-  const items = await ctx.client.pages.list(
+  const items = await ctx.client.resources.list(
     ctx.query,
     ctx.locale,
-    ctx.resourceConfig.pageType
+    resourceType,
   );
 
-  const originalPage = await ctx.client.pages.find(parent_id, ctx.locale);
+  const originalRecord = await ctx.client.resources.find(
+    parent_id,
+    ctx.locale,
+    resourceType,
+  );
 
   return {
     assigns: {
       items,
-      visibilityOptions: ctx.client.pages.visibilityOptions(),
-      translations: translatedPages,
+      visibilityOptions: ctx.client.resources.visibilityOptions(),
+      translations: translatedRecords,
       parent_id,
-      pageTitle: originalPage.title,
+      resourceTitle: originalRecord.title,
     },
   };
 };
 
 const create_form = async (ctx) => {
   const { target_locale = "" } = ctx.query;
+  const { resourceType } = ctx.resourceConfig;
 
   const { parent_id } = ctx.params;
-  const blueprint = await ctx.client.pages.find(parent_id, ctx.locale);
+  const blueprint = await ctx.client.resources.find(
+    parent_id,
+    ctx.locale,
+    resourceType,
+  );
 
   if (!blueprint) {
-    throw new Error(`Cannot find page with id ${parent_id}`);
+    throw new Error(`Cannot find ${resourceType} with id ${parent_id}`);
   }
 
   const resource = structuredClone(blueprint);
@@ -75,8 +93,13 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
+  const { resourceType, resourceTypePlural } = ctx.resourceConfig;
   const originalLocale = ctx.locale;
-  const blueprint = await ctx.client.pages.find(parent_id, originalLocale);
+  const blueprint = await ctx.client.resources.find(
+    parent_id,
+    originalLocale,
+    resourceType,
+  );
 
   if (!ctx.resourceParams?.resource?.languages) {
     return {
@@ -88,7 +111,7 @@ const create = async (ctx) => {
         blueprint,
         targetLocale: originalLocale,
         errors: {
-          resource: ctx.client.pages.formatErrors([
+          resource: ctx.client.resources.formatErrors([
             {
               key: "languages",
               message: "select at least one language for translation",
@@ -106,7 +129,7 @@ const create = async (ctx) => {
   const existingTranslations = Object.keys(blueprint.translations || {});
   const selectedLocales = formLanguages.filter(
     (locale) =>
-      locale !== originalLocale && !existingTranslations.includes(locale)
+      locale !== originalLocale && !existingTranslations.includes(locale),
   );
 
   const params = {
@@ -116,21 +139,22 @@ const create = async (ctx) => {
     slug: blueprint.slug,
   };
 
-  const resource = ctx.client.pages.deepMerge(
+  const resource = ctx.client.resources.deepMerge(
     {
       settings: blueprint.settings,
       widgets: blueprint.widgets,
       categories: blueprint.categories.map((category) => category.id),
     },
-    params
+    params,
   );
 
   const translationIds = [];
 
-  const translations = await ctx.client.pages.translateBatch(
+  const translations = await ctx.client.resources.translateBatch(
     parent_id,
     selectedLocales,
-    resource
+    resource,
+    resourceType,
   );
 
   if (!translations) {
@@ -144,7 +168,7 @@ const create = async (ctx) => {
         blueprint,
         targetLocale: originalLocale,
         errors: {
-          resource: ctx.client.pages.formatErrors([
+          resource: ctx.client.resources.formatErrors([
             {
               key: "generalError",
               message: "Failed to process translations",
@@ -156,16 +180,16 @@ const create = async (ctx) => {
   }
 
   for (let i = 0; i < translations.length; i++) {
-    const { page } = translations[i];
+    const { resource: translated } = translations[i];
     const locale = selectedLocales[i];
 
-    if (page) {
+    if (translated) {
       blueprint.translations = {
         ...blueprint.translations,
         [locale]: {
-          id: page.id,
-          slug: page.slug,
-          visibility: page.visibility,
+          id: translated.id,
+          slug: translated.slug,
+          visibility: translated.visibility,
         },
       };
     }
@@ -174,7 +198,7 @@ const create = async (ctx) => {
   const revisionInputs = [];
 
   for (let i = 0; i < translations.length; i++) {
-    const { errors, page } = translations[i];
+    const { errors, resource: translated } = translations[i];
     const locale = selectedLocales[i];
 
     if (errors) {
@@ -187,19 +211,23 @@ const create = async (ctx) => {
           },
           blueprint,
           targetLocale: locale,
-          errors: { resource: ctx.client.pages.formatErrors(errors) },
+          errors: { resource: ctx.client.resources.formatErrors(errors) },
         },
       };
     }
 
-    if (page) {
-      translationIds.push(`${locale}:${page.id}`);
-      revisionInputs.push({ pageId: page.id, locale });
+    if (translated) {
+      translationIds.push(`${locale}:${translated.id}`);
+      revisionInputs.push({
+        resourceId: translated.id,
+        resourceType,
+        locale,
+      });
     }
   }
 
   const revisionResults =
-    await ctx.client.pageRevisions.createBatch(revisionInputs);
+    await ctx.client.resourceRevisions.createBatch(revisionInputs);
 
   for (let i = 0; i < revisionResults.length; i++) {
     const { errors: revisionErrors } = revisionResults[i];
@@ -214,7 +242,7 @@ const create = async (ctx) => {
           blueprint,
           targetLocale: selectedLocales[i],
           errors: {
-            resource: ctx.client.pages.formatErrors(revisionErrors),
+            resource: ctx.client.resources.formatErrors(revisionErrors),
           },
         },
       };
@@ -222,7 +250,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${originalLocale}/${ctx.resourceConfig.pageTypePlural}/${parent_id}/translations?translations=${translationIds.join(";")}`,
+    redirect: `/${originalLocale}/${resourceTypePlural}/${parent_id}/translations?translations=${translationIds.join(";")}`,
   };
 };
 

package/src/handlers/resources/URLsHandler.js

@@ -0,0 +1,84 @@
+const create_form = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const { resourceType } = ctx.resourceConfig;
+  const record = await ctx.client.resources.find(
+    parent_id,
+    ctx.locale,
+    resourceType,
+  );
+
+  if (!record) {
+    throw new Error(`Cannot find ${resourceType} with id ${parent_id}`);
+  }
+
+  return {
+    assigns: {
+      record,
+      resource: {
+        id: record.id,
+        slug: record.slug,
+        redirect: null,
+      },
+      errors: {},
+      _translations: [],
+    },
+  };
+};
+
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const { resourceType, resourceTypePlural } = ctx.resourceConfig;
+  const resource = ctx.resourceParams.resource;
+
+  const record = await ctx.client.resources.find(
+    parent_id,
+    ctx.locale,
+    resourceType,
+  );
+
+  if (!record) {
+    throw new Error(`Cannot find ${resourceType} with id ${parent_id}`);
+  }
+
+  let redirectParams = null;
+
+  if (resource.redirect) {
+    redirectParams = {
+      url: ctx.remoteConfig.resourcePath(record, resourceType, ctx.locale),
+      destination: ctx.remoteConfig.resourcePath(
+        { slug: resource.slug },
+        resourceType,
+        ctx.locale,
+      ),
+      httpResponseCode: 301,
+      note: `Created with changed URL for a ${resourceType}`,
+    };
+  }
+
+  const { errors } = await ctx.client.resources.updateSlug(
+    parent_id,
+    resource.slug,
+    ctx.locale,
+    resourceType,
+    redirectParams,
+  );
+
+  if (errors) {
+    return {
+      assigns: {
+        resource: { ...resource, id: record.id },
+        errors: { resource: ctx.client.resources.formatErrors(errors, "redirect") },
+        _translations: [],
+      },
+    };
+  }
+
+  return {
+    redirect: `/${ctx.locale}/${resourceTypePlural}/${parent_id}`,
+  };
+};
+
+export default {
+  create_form,
+  create,
+};

package/src/helpers/CSVExportHelper.js

@@ -64,16 +64,15 @@ function generateExportFilename(contentType) {
 }
 
 const extractResourceType = (resource, type) => {
-  if (resource.pageType) return resource.pageType;
-  if (resource.articleType) return resource.articleType;
-  if (resource.eventType) return resource.eventType;
   if (resource.resourceType) return resource.resourceType;
   if (resource.type) return resource.type;
   return type;
 };
 
 function formatTranslations(item) {
-  return Object.keys(item?.translations || {}).map(locale => locale).join(";")
+  return Object.keys(item?.translations || {})
+    .map((locale) => locale)
+    .join(";");
 }
 
 const standardFieldMapping = (remoteConfig, locale, type) => ({
@@ -85,7 +84,7 @@ const standardFieldMapping = (remoteConfig, locale, type) => ({
   visibility: "visibility",
   created_at: "insertedAt",
   updated_at: "updatedAt",
-  translations: formatTranslations
+  translations: formatTranslations,
 });
 
 const standardHeaders = [
@@ -97,7 +96,7 @@ const standardHeaders = [
   "visibility",
   "created_at",
   "updated_at",
-  "translations"
+  "translations",
 ];
 
 export default {

package/src/index.js

@@ -4,6 +4,7 @@ export { default as routeNestedCollection } from "./routeNestedCollection";
 export { default as routeMember } from "./routeMember";
 export { default as routeNestedMember } from "./routeNestedMember";
 export { default as setGlobalContext } from "./setGlobalContext";
+export { default as routeResource } from "./routeResource";
 export { default as routePagesModule } from "./routePagesModule";
 export { default as routeArticlesModule } from "./routeArticlesModule";
 export { default as routeEventsModule } from "./routeEventsModule";
@@ -18,81 +19,39 @@ export { default as RaketaClient } from "./cloud/RaketaClient";
 export { default as Redirects } from "./cloud/Redirects";
 export { default as Tags } from "./cloud/Tags";
 export { default as Settings } from "./cloud/Settings";
-export { default as PageChanges } from "./cloud/PageChanges";
-export { default as PageRevisions } from "./cloud/PageRevisions";
-export { default as Pages } from "./cloud/Pages";
-export { default as ArticleChanges } from "./cloud/ArticleChanges";
-export { default as ArticleRevisions } from "./cloud/ArticleRevisions";
-export { default as Articles } from "./cloud/Articles";
-export { default as EventChanges } from "./cloud/EventChanges";
-export { default as EventRevisions } from "./cloud/EventRevisions";
-export { default as Events } from "./cloud/Events";
-export { default as Categories } from "./cloud/Categories";
 
-export { default as PageRevisionsHandler } from "./handlers/page_revisions/PageRevisionsHandler";
-export { default as PageRevisionsCodeHandler } from "./handlers/page_revisions/CodeHandler";
-export { default as PageRevisionsGeneralHandler } from "./handlers/page_revisions/GeneralHandler";
-export { default as PageRevisionsMetaHandler } from "./handlers/page_revisions/MetaHandler";
-export { default as PageRevisionsLocksHandler } from "./handlers/page_revisions/LocksHandler";
-export { default as PageRevisionsUnlocksHandler } from "./handlers/page_revisions/UnlocksHandler";
-export { default as PageRevisionsVisualHandler } from "./handlers/page_revisions/VisualHandler";
-export { default as PageRevisionsTagHandler } from "./handlers/page_revisions/TagHandler";
-export { default as PageRevisionsWidgetHandler } from "./handlers/page_revisions/WidgetHandler";
-export { default as PageRevisionsPublishesHandler } from "./handlers/page_revisions/PublishesHandler";
-export { default as PageRevisionsRevertsHandler } from "./handlers/page_revisions/RevertsHandler";
+export { default as ResourceChanges } from "./cloud/ResourceChanges";
+export { default as ResourceRevisions } from "./cloud/ResourceRevisions";
+export { default as Resources } from "./cloud/Resources";
+export { default as Categories } from "./cloud/Categories";
 
 export { default as RedirectsHandler } from "./handlers/RedirectsHandler";
-
 export { default as TagsHandler } from "./handlers/TagsHandler";
-
-export { default as PageClonesHandler } from "./handlers/pages/ClonesHandler";
-export { default as ChangeHandler } from "./handlers/pages/ChangeHandler";
-export { default as PageDeletesHandler } from "./handlers/pages/DeletesHandler";
-export { default as PageTranslationsHandler } from "./handlers/pages/TranslationsHandler";
-export { default as PageURLsHandler } from "./handlers/pages/URLsHandler";
-export { default as PagesHandler } from "./handlers/pages/PagesHandler";
-
 export { default as SettingsHandler } from "./handlers/_shared/SettingsHandler";
 
-export { default as ArticleRevisionsHandler } from "./handlers/article_revisions/ArticleRevisionsHandler";
-export { default as ArticleRevisionsCodeHandler } from "./handlers/article_revisions/CodeHandler";
-export { default as ArticleRevisionsGeneralHandler } from "./handlers/article_revisions/GeneralHandler";
-export { default as ArticleRevisionsMetaHandler } from "./handlers/article_revisions/MetaHandler";
-export { default as ArticleRevisionsLocksHandler } from "./handlers/article_revisions/LocksHandler";
-export { default as ArticleRevisionsUnlocksHandler } from "./handlers/article_revisions/UnlocksHandler";
-export { default as ArticleRevisionsVisualHandler } from "./handlers/article_revisions/VisualHandler";
-export { default as ArticleRevisionsTagHandler } from "./handlers/article_revisions/TagHandler";
-export { default as ArticleRevisionsWidgetHandler } from "./handlers/article_revisions/WidgetHandler";
-export { default as ArticleRevisionsPublishesHandler } from "./handlers/article_revisions/PublishesHandler";
-export { default as ArticleRevisionsRevertsHandler } from "./handlers/article_revisions/RevertsHandler";
-
-export { default as ArticleClonesHandler } from "./handlers/articles/ClonesHandler";
-export { default as ArticleDeletesHandler } from "./handlers/articles/DeletesHandler";
-export { default as ArticleTranslationsHandler } from "./handlers/articles/TranslationsHandler";
-export { default as ArticleURLsHandler } from "./handlers/articles/URLsHandler";
-export { default as ArticlesHandler } from "./handlers/articles/ArticlesHandler";
-
-export { default as EventRevisionsHandler } from "./handlers/event_revisions/EventRevisionsHandler";
-export { default as EventRevisionsCodeHandler } from "./handlers/event_revisions/CodeHandler";
-export { default as EventRevisionsGeneralHandler } from "./handlers/event_revisions/GeneralHandler";
-export { default as EventRevisionsMetaHandler } from "./handlers/event_revisions/MetaHandler";
-export { default as EventRevisionsLocksHandler } from "./handlers/event_revisions/LocksHandler";
-export { default as EventRevisionsUnlocksHandler } from "./handlers/event_revisions/UnlocksHandler";
-export { default as EventRevisionsVisualHandler } from "./handlers/event_revisions/VisualHandler";
-export { default as EventRevisionsTagHandler } from "./handlers/event_revisions/TagHandler";
-export { default as EventRevisionsWidgetHandler } from "./handlers/event_revisions/WidgetHandler";
-export { default as EventRevisionsPublishesHandler } from "./handlers/event_revisions/PublishesHandler";
-export { default as EventRevisionsRevertsHandler } from "./handlers/event_revisions/RevertsHandler";
-
-export { default as EventClonesHandler } from "./handlers/events/ClonesHandler";
-export { default as EventDeletesHandler } from "./handlers/events/DeletesHandler";
-export { default as EventTranslationsHandler } from "./handlers/events/TranslationsHandler";
-export { default as EventURLsHandler } from "./handlers/events/URLsHandler";
-export { default as EventsHandler } from "./handlers/events/EventsHandler";
-
-export { default as getPagesUpdateDestination } from "./handlers/_shared/getPagesUpdateDestination";
-export { default as getArticlesUpdateDestination } from "./handlers/_shared/getArticlesUpdateDestination";
-export { default as getEventsUpdateDestination } from "./handlers/_shared/getEventsUpdateDestination";
+export { default as ResourcesHandler } from "./handlers/resources/ResourcesHandler";
+export { default as ResourcesAPIHandler } from "./handlers/resources/ResourcesAPIHandler";
+export { default as ResourceChangeHandler } from "./handlers/resources/ChangeHandler";
+export { default as ResourceClonesHandler } from "./handlers/resources/ClonesHandler";
+export { default as ResourceDeletesHandler } from "./handlers/resources/DeletesHandler";
+export { default as ResourceExportsHandler } from "./handlers/resources/ExportsHandler";
+export { default as ResourceHistoryHandler } from "./handlers/resources/HistoryHandler";
+export { default as ResourceTranslationsHandler } from "./handlers/resources/TranslationsHandler";
+export { default as ResourceURLsHandler } from "./handlers/resources/URLsHandler";
+
+export { default as ResourceRevisionsHandler } from "./handlers/resource_revisions/ResourceRevisionsHandler";
+export { default as ResourceRevisionsGeneralHandler } from "./handlers/resource_revisions/GeneralHandler";
+export { default as ResourceRevisionsVisualHandler } from "./handlers/resource_revisions/VisualHandler";
+export { default as ResourceRevisionsCodeHandler } from "./handlers/resource_revisions/CodeHandler";
+export { default as ResourceRevisionsMetaHandler } from "./handlers/resource_revisions/MetaHandler";
+export { default as ResourceRevisionsTagHandler } from "./handlers/resource_revisions/TagHandler";
+export { default as ResourceRevisionsLocksHandler } from "./handlers/resource_revisions/LocksHandler";
+export { default as ResourceRevisionsUnlocksHandler } from "./handlers/resource_revisions/UnlocksHandler";
+export { default as ResourceRevisionsPublishesHandler } from "./handlers/resource_revisions/PublishesHandler";
+export { default as ResourceRevisionsRevertsHandler } from "./handlers/resource_revisions/RevertsHandler";
+export { default as ResourceRevisionsWidgetHandler } from "./handlers/resource_revisions/WidgetHandler";
+
+export { default as getResourceUpdateDestination } from "./handlers/_shared/getResourceUpdateDestination";
 
 export { default as Factory } from "./tests/support/factory";
 export { default as Logger } from "./Logger";