@raketa-cloud/admin 0.0.16 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/Adapter.js

@@ -93,19 +93,19 @@ export default class Adapter {
     this.router = router;
   }
 
-  routeCollection(_resource, _mapping) {
+  routeCollection(_resource, _mapping, _handlerOpts) {
     throw new Error("Implement in an adapter");
   }
 
-  routeNestedCollection(_resource, _mapping) {
+  routeNestedCollection(_resource, _mapping, _handlerOpts) {
     throw new Error("Implement in an adapter");
   }
 
-  routeMember(_resource, _mapping) {
+  routeMember(_resource, _mapping, _handlerOpts) {
     throw new Error("Implement in an adapter");
   }
 
-  routeNestedMember(_resource, _mapping) {
+  routeNestedMember(_resource, _mapping, _handlerOpts) {
     throw new Error("Implement in an adapter");
   }
 

package/src/HonoAdapter.js

@@ -72,16 +72,10 @@ export default class HonoAdapter extends Adapter {
     });
   }
 
-  async createAction([
-    verb,
-    path,
-    resource,
-    views,
-    action,
-    handler,
-    before_filter,
-    after_filter,
-  ]) {
+  async createAction(
+    [verb, path, resource, views, action, handler, before_filter, after_filter],
+    handlerOpts
+  ) {
     const method = this.getMethod(verb);
 
     Object.keys(this.globalConfig.i18n.locales).forEach((currentLocale) => {
@@ -105,6 +99,7 @@ export default class HonoAdapter extends Adapter {
         ctx.locales = this.globalConfig.i18n.locales;
         ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
         ctx.locale = currentLocale;
+        ctx.remoteConfig = { ...this.globalConfig.remoteConfig };
 
         const _context = {
           locales: ctx.locales,
@@ -153,7 +148,7 @@ export default class HonoAdapter extends Adapter {
           redirect,
           json,
           assigns: actionAssigns = {},
-        } = (await handler(ctx)) || {};
+        } = (await handler(ctx, handlerOpts)) || {};
         assigns.actionAssigns = actionAssigns;
 
         this.applyHeaders(headers, routerCtx);
@@ -200,20 +195,20 @@ export default class HonoAdapter extends Adapter {
     });
   }
 
-  routeCollection(mapping) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap));
+  routeCollection(mapping, handlerOpts) {
+    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
   }
 
-  routeNestedCollection(mapping) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap));
+  routeNestedCollection(mapping, handlerOpts) {
+    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
   }
 
-  routeMember(mapping) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap));
+  routeMember(mapping, handlerOpts) {
+    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
   }
 
-  routeNestedMember(mapping) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap));
+  routeNestedMember(mapping, handlerOpts) {
+    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
   }
 
   getMethod(verb) {

package/src/cloud/Articles.js

@@ -41,11 +41,15 @@ export default class Articles extends RaketaClient {
     return item;
   }
 
-  async list(query, locale) {
-    const { articles: items } = await this.query(
-      ArticlesDocument,
-      this.buildListInput(query, locale)
-    );
+  async list(query, locale, articleTypeSlug) {
+    const vars = this.buildListInput(query, locale);
+
+    const { articles: items } = await this.query(ArticlesDocument, {
+      input: {
+        ...vars.input,
+        filters: { ...vars.input.filters, articleTypeSlug },
+      },
+    });
 
     return items;
   }

package/src/cloud/Events.js

@@ -43,11 +43,15 @@ export default class Events extends RaketaClient {
     return item;
   }
 
-  async list(query, locale) {
-    const { events: items } = await this.query(
-      EventsDocument,
-      this.buildListInput(query, locale)
-    );
+  async list(query, locale, eventTypeSlug) {
+    const vars = this.buildListInput(query, locale);
+
+    const { events: items } = await this.query(EventsDocument, {
+      input: {
+        ...vars.input,
+        filters: { ...vars.input.filters, eventTypeSlug },
+      },
+    });
 
     return items;
   }

package/src/cloud/Pages.js

@@ -39,11 +39,15 @@ export default class Pages extends RaketaClient {
     return item;
   }
 
-  async list(query, locale) {
-    const { pages: items } = await this.query(
-      PagesDocument,
-      this.buildListInput(query, locale)
-    );
+  async list(query, locale, pageTypeSlug) {
+    const vars = this.buildListInput(query, locale);
+
+    const { pages: items } = await this.query(PagesDocument, {
+      input: {
+        ...vars.input,
+        filters: { ...vars.input.filters, pageTypeSlug },
+      },
+    });
 
     return items;
   }

package/src/handlers/article_revisions/ArticleRevisionsHandler.js

@@ -1,4 +1,4 @@
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const { errors, articleErrors } = await ctx.client.articleRevisions.create(
@@ -17,11 +17,11 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles/${parent_id}`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${parent_id}`,
   };
 };
 
-const destroy = async (ctx) => {
+const destroy = async (ctx, opts) => {
   const { id } = ctx.params;
 
   const { errors, revision } = await ctx.client.articleRevisions.delete(
@@ -37,7 +37,7 @@ const destroy = async (ctx) => {
 
   return {
     headers: {
-      "HX-Redirect": `/${ctx.locale}/articles/${revision.originalId}`,
+      "HX-Redirect": `/${ctx.locale}/${opts.articleTypePlural}/${revision.originalId}`,
     },
     json: {},
   };

package/src/handlers/article_revisions/CodeHandler.js

@@ -28,7 +28,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx) => {
+const update = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -80,7 +80,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/article_revisions/${revision.id}/codes/edit`,
+    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/codes/edit`,
   };
 };
 

package/src/handlers/article_revisions/GeneralHandler.js

@@ -32,7 +32,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx) => {
+const update = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -85,7 +85,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/article_revisions/${revision.id}/general/edit`,
+    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/general/edit`,
   };
 };
 

package/src/handlers/article_revisions/LocksHandler.js

@@ -20,7 +20,7 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
   const { message } = ctx.resourceParams.lock_settings;
 
@@ -44,7 +44,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles/${revision.originalId}`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${revision.originalId}`,
   };
 };
 

package/src/handlers/article_revisions/MetaHandler.js

@@ -27,7 +27,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx) => {
+const update = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -80,7 +80,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/article_revisions/${revision.id}/meta/edit`,
+    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/meta/edit`,
   };
 };
 

package/src/handlers/article_revisions/PublishesHandler.js

@@ -46,7 +46,7 @@ function publishArticleParams(
   return { visibility };
 }
 
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
   const publishing = ctx.resourceParams.publishing;
 
@@ -80,7 +80,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles/${revision.originalId}`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${revision.originalId}`,
   };
 };
 

package/src/handlers/article_revisions/RevertsHandler.js

@@ -1,4 +1,4 @@
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
   const { version } = ctx.resourceParams;
 
@@ -19,7 +19,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles/${parent_id}`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${parent_id}`,
   };
 };
 

package/src/handlers/article_revisions/TagHandler.js

@@ -28,7 +28,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx) => {
+const update = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -79,7 +79,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/article_revisions/${revision.id}/tags/edit`,
+    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/tags/edit`,
   };
 };
 

package/src/handlers/article_revisions/UnlocksHandler.js

@@ -1,4 +1,4 @@
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const { revision, errors, articleErrors } =
@@ -13,7 +13,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles/${revision.originalId}`,
+    redirect: `/${ctx.locale}/${opts.articleType}/${revision.originalId}`,
   };
 };
 

package/src/handlers/article_revisions/VisualHandler.js

@@ -25,7 +25,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx) => {
+const update = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -74,7 +74,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/article_revisions/${revision.id}/visuals/edit`,
+    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/visuals/edit`,
   };
 };
 

package/src/handlers/articles/ArticlesHandler.js

@@ -1,7 +1,11 @@
 import { toUTCISO8601String } from "../../utils";
 
-const index = async (ctx) => {
-  const items = await ctx.client.articles.list(ctx.query, ctx.locale);
+const index = async (ctx, opts) => {
+  const items = await ctx.client.articles.list(
+    ctx.query,
+    ctx.locale,
+    opts.articleType
+  );
   const tags = await ctx.client.tags.all(ctx.locale);
 
   return {
@@ -13,12 +17,12 @@ const index = async (ctx) => {
   };
 };
 
-const show = async (ctx) => {
+const show = async (ctx, opts) => {
   const { id } = ctx.params;
-  const article = await ctx.client.articles.find(id, ctx.locale);
+  const resource = await ctx.client.articles.find(id, ctx.locale);
 
-  if (!article) {
-    throw new Error(`Missing article #${id}`);
+  if (!resource) {
+    throw new Error(`Missing ${opts.articleType} #${id}`);
   }
 
   const revisions = await ctx.client.articleRevisions.all(id, ctx.locale);
@@ -26,17 +30,17 @@ const show = async (ctx) => {
 
   return {
     assigns: {
-      article,
+      resource,
       revisions: revisions.list,
       changes: changes.list,
       _translations: Object.keys(ctx.locales)
         .map((locale) => {
-          const translation = article.translations[locale];
+          const translation = resource.translations[locale];
 
           if (translation) {
             return {
               locale,
-              path: `/${locale}/articles/${translation.id}`,
+              path: `/${locale}/${opts.articleTypePlural}/${translation.id}`,
             };
           }
 
@@ -52,7 +56,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
-      article: { ...ctx.client.articles.defaults(), meta_image: {} },
+      resource: { ...ctx.client.articles.defaults(), meta_image: {} },
       tags: tags.list,
       errors: {},
       visibilityOptions: ctx.client.articles.visibilityOptions(),
@@ -61,8 +65,8 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx) => {
-  const params = { ...ctx.resourceParams.article };
+const create = async (ctx, opts) => {
+  const params = { ...ctx.resourceParams.resource };
 
   params.meta_image = JSON.parse(params.meta_image || "{}");
 
@@ -89,7 +93,7 @@ const create = async (ctx) => {
       categories: params.categories || [],
     },
     ctx.locale,
-    "article"
+    opts.articleType
   );
 
   if (errors) {
@@ -97,9 +101,9 @@ const create = async (ctx) => {
 
     return {
       assigns: {
-        article: params,
+        resource: params,
         tags: tags.list,
-        errors: { article: ctx.client.articles.formatErrors(errors) },
+        errors: { resource: ctx.client.articles.formatErrors(errors) },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         _translations: [],
       },
@@ -107,7 +111,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}`,
   };
 };
 

package/src/handlers/articles/ClonesHandler.js

@@ -1,14 +1,16 @@
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
 
   const { errors } = await ctx.client.articles.clone(parent_id, ctx.locale);
 
   if (errors) {
-    throw new Error(`Error cloning article: ${JSON.stringify(errors)}`);
+    throw new Error(
+      `Error cloning ${opts.articleType}: ${JSON.stringify(errors)}`
+    );
   }
 
   return {
-    redirect: `/${ctx.locale}/articles`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}`,
   };
 };
 

package/src/handlers/articles/DeletesHandler.js

@@ -1,9 +1,9 @@
-const create_form = async (ctx) => {
+const create_form = async (ctx, opts) => {
   const { parent_id } = ctx.params;
   const article = await ctx.client.articles.find(parent_id, ctx.locale);
 
   if (!article) {
-    throw new Error(`Missing article #${parent_id}`);
+    throw new Error(`Missing ${opts.articleType} #${parent_id}`);
   }
 
   return {
@@ -18,21 +18,24 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
   const params = ctx.resourceParams.deleteAction;
   const article = await ctx.client.articles.find(parent_id, ctx.locale);
 
   if (!article) {
-    throw new Error(`Missing article #${parent_id}`);
+    throw new Error(`Missing ${opts.articleType} #${parent_id}`);
   }
 
   let redirect = null;
 
   if (params.redirect === "301" || params.redirect === "410") {
     redirect = {
-      // TODO: fix url with consideration of locale & defaultLocale in the frontend project
-      url: `/${article.slug}`,
+      url: ctx.remoteConfig.resourcePath(
+        article,
+        article.articleType.slug,
+        ctx.locale
+      ),
       destination: params.redirect === "301" ? params.destination : "/",
       httpResponseCode: Number.parseInt(params.redirect, 10),
       note: "Created via article deletion process",
@@ -58,7 +61,7 @@ const create = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/articles`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}`,
   };
 };
 

package/src/handlers/articles/TranslationsHandler.js

@@ -6,33 +6,33 @@ const create_form = async (ctx) => {
   const target_locate_tags = await ctx.client.tags.all(target_locale);
 
   const { parent_id } = ctx.params;
-  const blueprint_article = await ctx.client.articles.find(
+  const blueprint_resource = await ctx.client.articles.find(
     parent_id,
     ctx.locale
   );
 
   const translation = {
-    title: blueprint_article.title,
-    slug: blueprint_article.slug,
-    visibility: blueprint_article.visibility,
-    publish_at: toDateTimeInput(blueprint_article.publishAt),
-    layout: blueprint_article.settings.layout,
-    meta_title: blueprint_article.settings.meta.title,
-    meta_description: blueprint_article.settings.meta.description,
-    meta_image: blueprint_article.settings.meta?.image || {},
-    username: blueprint_article.settings.credentials?.user,
-    password: blueprint_article.settings.credentials?.password,
+    title: blueprint_resource.title,
+    slug: blueprint_resource.slug,
+    visibility: blueprint_resource.visibility,
+    publish_at: toDateTimeInput(blueprint_resource.publishAt),
+    layout: blueprint_resource.settings.layout,
+    meta_title: blueprint_resource.settings.meta.title,
+    meta_description: blueprint_resource.settings.meta.description,
+    meta_image: blueprint_resource.settings.meta?.image || {},
+    username: blueprint_resource.settings.credentials?.user,
+    password: blueprint_resource.settings.credentials?.password,
     tags: [],
-    // categories: blueprint_article.categories, # TODO: this will be added later?
+    // categories: blueprint_resource.categories, # TODO: this will be added later?
   };
 
   return {
     assigns: {
-      article: blueprint_article,
+      resource: blueprint_resource,
       translation: translation,
       targetLocale: target_locale,
       tags: target_locate_tags.list,
-      blueprint_tags: blueprint_article.tags,
+      blueprint_tags: blueprint_resource.tags,
       errors: {},
       visibilityOptions: ctx.client.articles.visibilityOptions(),
       _translations: [],
@@ -40,15 +40,15 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx) => {
+const create = async (ctx, opts) => {
   const { parent_id } = ctx.params;
-  const blueprint_article = await ctx.client.articles.find(
+  const blueprint_resource = await ctx.client.articles.find(
     parent_id,
     ctx.locale
   );
 
   const { target_locale } = ctx.resourceParams;
-  const translation = { ...ctx.translation };
+  const translation = { ...ctx.resourceParams.translation };
 
   translation.meta_image = JSON.parse(translation.meta_image || "{}");
 
@@ -61,7 +61,7 @@ const create = async (ctx) => {
       visibility: translation.visibility,
       publishAt: toUTCISO8601String(translation.publish_at),
       settings: {
-        ...blueprint_article.settings,
+        ...blueprint_resource.settings,
         layout: translation.layout,
         meta: {
           title: translation.meta_title,
@@ -73,16 +73,18 @@ const create = async (ctx) => {
           password: translation.password || "",
         },
       },
-      widgets: blueprint_article.widgets,
+      widgets: blueprint_resource.widgets,
       tags: translation.tags || [],
-      categories: blueprint_article.categories.map((category) => category.id),
+      categories: blueprint_resource.categories.map((category) => category.id),
     }
   );
+
   if (errors) {
     const tags = await ctx.client.tags.all(target_locale);
+
     return {
       assigns: {
-        article: blueprint_article,
+        resource: blueprint_resource,
         translation: translation,
         targetLocale: translation.target_locate,
         tags: tags.list,
@@ -92,8 +94,9 @@ const create = async (ctx) => {
       },
     };
   }
+
   return {
-    redirect: `/${ctx.locale}/articles/${parent_id}`,
+    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${parent_id}`,
   };
 };