@raketa-cloud/admin 0.0.25 → 0.0.26

package/package.json

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

package/src/Adapter.js

@@ -1,4 +1,5 @@
 import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
 import ejs from "ejs";
 import currentPath from "./currentPath.cjs";
 import FormBuilder from "./helpers/FormBuilder";
@@ -88,11 +89,38 @@ function putIn(result, key, value) {
   });
 }
 
-function getPartialPath(partialPath) {
-  const packagePath = `${currentPath}/views/${partialPath}`;
-  const appPath = `${process.cwd()}/src/views/${partialPath}`;
+function sanitizePath(filePath) {
+  return path.normalize(path.join(...["/", ...filePath.split("/")]));
+}
+
+function getPartialPath(partialPath, views, viewsFallback) {
+  const packagePath = sanitizePath(
+    `${currentPath}/views/${views}/${partialPath}`
+  );
+
+  const fallbackPackagePath = sanitizePath(
+    `${currentPath}/views/${viewsFallback}/${partialPath}`
+  );
+
+  const appPath = sanitizePath(
+    `${process.cwd()}/src/views/${views}/${partialPath}`
+  );
 
-  return existsSync(appPath) ? appPath : packagePath;
+  if (existsSync(appPath)) {
+    return appPath;
+  }
+
+  if (existsSync(packagePath)) {
+    return packagePath;
+  }
+
+  if (existsSync(fallbackPackagePath)) {
+    return fallbackPackagePath;
+  }
+
+  throw new Error(
+    `Looked for "${partialPath}" in the following places: \n${appPath}\n${packagePath}\n${fallbackPackagePath}\n`
+  );
 }
 
 export default class Adapter {
@@ -100,25 +128,25 @@ export default class Adapter {
     this.router = router;
   }
 
-  routeCollection(_resource, _mapping, _handlerOpts) {
+  routeCollection(_resource, _mapping, _resourceConfig) {
     throw new Error("Implement in an adapter");
   }
 
-  routeNestedCollection(_resource, _mapping, _handlerOpts) {
+  routeNestedCollection(_resource, _mapping, _resourceConfig) {
     throw new Error("Implement in an adapter");
   }
 
-  routeMember(_resource, _mapping, _handlerOpts) {
+  routeMember(_resource, _mapping, _resourceConfig) {
     throw new Error("Implement in an adapter");
   }
 
-  routeNestedMember(_resource, _mapping, _handlerOpts) {
+  routeNestedMember(_resource, _mapping, _resourceConfig) {
     throw new Error("Implement in an adapter");
   }
 
-  getActionPath(views, packageViewsFallback, action) {
-    const packagePath = packageViewsFallback
-      ? `${currentPath}/views/${packageViewsFallback}/${action}.ejs`
+  getActionPath(views, viewsFallback, action) {
+    const packagePath = viewsFallback
+      ? `${currentPath}/views/${viewsFallback}/${action}.ejs`
       : `${currentPath}/views/${views}/${action}.ejs`;
 
     const appPath = `${process.cwd()}/src/views/${views}/${action}.ejs`;
@@ -148,9 +176,10 @@ export default class Adapter {
     });
   }
 
-  renderPartial(assigns) {
+  renderPartial(assigns, views, viewsFallback) {
     return function render(relativePath, localAssigns) {
-      const partialPath = getPartialPath(relativePath);
+      const partialPath = getPartialPath(relativePath, views, viewsFallback);
+
       try {
         // Synchronously read the partial file as ejs does not support async/await
         const partialTemplate = readFileSync(partialPath, "utf8");
@@ -174,17 +203,17 @@ export default class Adapter {
   }
 
   async renderAction(
-    { views, packageViewsFallback, action, assigns },
+    { views, viewsFallback, action, assigns },
     viewHelpersConfig = {}
   ) {
     // Pick the parent here in the views so we can reuse stuff...
-    const fullTemplatePath = this.getActionPath(
+    const fullTemplatePath = this.getActionPath(views, viewsFallback, action);
+    const renderAssigns = { ...this.getHelpers(viewHelpersConfig), ...assigns };
+    const renderPartialHelper = this.renderPartial(
+      renderAssigns,
       views,
-      packageViewsFallback,
-      action
+      viewsFallback
     );
-    const renderAssigns = { ...this.getHelpers(viewHelpersConfig), ...assigns };
-    const renderPartialHelper = this.renderPartial(renderAssigns);
 
     try {
       // Synchronously read the full template file

package/src/HonoAdapter.js

@@ -74,7 +74,7 @@ export default class HonoAdapter extends Adapter {
 
   async createAction(
     [verb, path, resource, views, action, handler, before_filter, after_filter],
-    handlerOpts
+    resourceConfig
   ) {
     const method = this.getMethod(verb);
 
@@ -96,6 +96,7 @@ export default class HonoAdapter extends Adapter {
           action
         );
 
+        ctx.resourceConfig = resourceConfig;
         ctx.locales = this.globalConfig.i18n.locales;
         ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
         ctx.locale = currentLocale;
@@ -111,7 +112,7 @@ export default class HonoAdapter extends Adapter {
           layout: {
             ...this.globalConfig.layout,
           },
-          handlerOpts: handlerOpts,
+          resourceConfig: resourceConfig,
         };
 
         console.info(
@@ -150,7 +151,7 @@ export default class HonoAdapter extends Adapter {
           redirect,
           json,
           assigns: actionAssigns = {},
-        } = (await handler(ctx, handlerOpts)) || {};
+        } = (await handler(ctx, resourceConfig)) || {};
         assigns.actionAssigns = actionAssigns;
 
         this.applyHeaders(headers, routerCtx);
@@ -189,7 +190,7 @@ export default class HonoAdapter extends Adapter {
         const rendered = this.renderAction(
           {
             views: views,
-            packageViewsFallback: handlerOpts.packageViewsFallback,
+            viewsFallback: resourceConfig.viewsFallback,
             action,
             assigns: fullAssigns,
           },
@@ -201,20 +202,28 @@ export default class HonoAdapter extends Adapter {
     });
   }
 
-  routeCollection(mapping, handlerOpts) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
+  routeCollection(mapping, resourceConfig) {
+    mapping.forEach((handlerMap) =>
+      this.createAction(handlerMap, resourceConfig)
+    );
   }
 
-  routeNestedCollection(mapping, handlerOpts) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
+  routeNestedCollection(mapping, resourceConfig) {
+    mapping.forEach((handlerMap) =>
+      this.createAction(handlerMap, resourceConfig)
+    );
   }
 
-  routeMember(mapping, handlerOpts) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
+  routeMember(mapping, resourceConfig) {
+    mapping.forEach((handlerMap) =>
+      this.createAction(handlerMap, resourceConfig)
+    );
   }
 
-  routeNestedMember(mapping, handlerOpts) {
-    mapping.forEach((handlerMap) => this.createAction(handlerMap, handlerOpts));
+  routeNestedMember(mapping, resourceConfig) {
+    mapping.forEach((handlerMap) =>
+      this.createAction(handlerMap, resourceConfig)
+    );
   }
 
   getMethod(verb) {

package/src/handlers/article_revisions/ArticleRevisionsHandler.js

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

package/src/handlers/article_revisions/CodeHandler.js

@@ -28,7 +28,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx, opts) => {
+const update = async (ctx) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -80,7 +80,7 @@ const update = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/codes/edit`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.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, opts) => {
+const update = async (ctx) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -85,7 +85,7 @@ const update = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/general/edit`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.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, opts) => {
+const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const { message } = ctx.resourceParams.lock_settings;
 
@@ -44,7 +44,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${revision.originalId}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${revision.originalId}`,
   };
 };
 

package/src/handlers/article_revisions/MetaHandler.js

@@ -27,7 +27,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx, opts) => {
+const update = async (ctx) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.articleRevisions.find(
@@ -80,7 +80,7 @@ const update = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleType}_revisions/${revision.id}/meta/edit`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.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, opts) => {
+const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const publishing = ctx.resourceParams.publishing;
 
@@ -80,7 +80,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${revision.originalId}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${revision.originalId}`,
   };
 };
 

package/src/handlers/article_revisions/RevertsHandler.js

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

package/src/handlers/article_revisions/TagHandler.js

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

package/src/handlers/article_revisions/UnlocksHandler.js

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

package/src/handlers/article_revisions/VisualHandler.js

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

package/src/handlers/articles/ArticlesHandler.js

@@ -1,10 +1,10 @@
 import { toUTCISO8601String } from "../../utils";
 
-const index = async (ctx, opts) => {
+const index = async (ctx) => {
   const items = await ctx.client.articles.list(
     ctx.query,
     ctx.locale,
-    opts.articleType
+    ctx.resourceConfig.articleType
   );
   const tags = await ctx.client.tags.all(ctx.locale);
 
@@ -17,12 +17,12 @@ const index = async (ctx, opts) => {
   };
 };
 
-const show = async (ctx, opts) => {
+const show = async (ctx) => {
   const { id } = ctx.params;
   const resource = await ctx.client.articles.find(id, ctx.locale);
 
   if (!resource) {
-    throw new Error(`Missing ${opts.articleType} #${id}`);
+    throw new Error(`Missing ${ctx.resourceConfig.articleType} #${id}`);
   }
 
   const revisions = await ctx.client.articleRevisions.all(id, ctx.locale);
@@ -40,7 +40,7 @@ const show = async (ctx, opts) => {
           if (translation) {
             return {
               locale,
-              path: `/${locale}/${opts.articleTypePlural}/${translation.id}`,
+              path: `/${locale}/${ctx.resourceConfig.articleTypePlural}/${translation.id}`,
             };
           }
 
@@ -65,7 +65,7 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx, opts) => {
+const create = async (ctx) => {
   const params = { ...ctx.resourceParams.resource };
 
   params.meta_image = JSON.parse(params.meta_image || "{}");
@@ -93,7 +93,7 @@ const create = async (ctx, opts) => {
       categories: params.categories || [],
     },
     ctx.locale,
-    opts.articleType
+    ctx.resourceConfig.articleType
   );
 
   if (errors) {
@@ -111,7 +111,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}`,
   };
 };
 

package/src/handlers/articles/ClonesHandler.js

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

package/src/handlers/articles/DeletesHandler.js

@@ -1,9 +1,9 @@
-const create_form = async (ctx, opts) => {
+const create_form = async (ctx) => {
   const { parent_id } = ctx.params;
   const article = await ctx.client.articles.find(parent_id, ctx.locale);
 
   if (!article) {
-    throw new Error(`Missing ${opts.articleType} #${parent_id}`);
+    throw new Error(`Missing ${ctx.resourceConfig.articleType} #${parent_id}`);
   }
 
   return {
@@ -18,13 +18,13 @@ const create_form = async (ctx, opts) => {
   };
 };
 
-const create = async (ctx, opts) => {
+const create = async (ctx) => {
   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 ${opts.articleType} #${parent_id}`);
+    throw new Error(`Missing ${ctx.resourceConfig.articleType} #${parent_id}`);
   }
 
   let redirect = null;
@@ -61,7 +61,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}`,
   };
 };
 

package/src/handlers/articles/TranslationsHandler.js

@@ -40,7 +40,7 @@ const create_form = async (ctx) => {
   };
 };
 
-const create = async (ctx, opts) => {
+const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const blueprint_resource = await ctx.client.articles.find(
     parent_id,
@@ -96,7 +96,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${parent_id}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${parent_id}`,
   };
 };
 

package/src/handlers/articles/URLsHandler.js

@@ -1,9 +1,11 @@
-const create_form = async (ctx, opts) => {
+const create_form = async (ctx) => {
   const { parent_id } = ctx.params;
   const article = await ctx.client.articles.find(parent_id, ctx.locale);
 
   if (!article) {
-    throw new Error(`Cannot find ${opts.articleType} with id ${parent_id}`);
+    throw new Error(
+      `Cannot find ${ctx.resourceConfig.articleType} with id ${parent_id}`
+    );
   }
 
   return {
@@ -19,14 +21,16 @@ const create_form = async (ctx, opts) => {
   };
 };
 
-const create = async (ctx, opts) => {
+const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const change = ctx.resourceParams.change;
 
   const article = await ctx.client.articles.find(parent_id, ctx.locale);
 
   if (!article) {
-    throw new Error(`Cannot find ${opts.articleType} with id ${parent_id}`);
+    throw new Error(
+      `Cannot find ${ctx.resourceConfig.articleType} with id ${parent_id}`
+    );
   }
 
   let redirectParams = null;
@@ -41,7 +45,7 @@ const create = async (ctx, opts) => {
       url: `/${article.slug}`,
       destination: change.slug,
       httpResponseCode: 301,
-      note: `Created with changed URL for a resource of type ${opts.articleType}`,
+      note: `Created with changed URL for a resource of type ${ctx.resourceConfig.articleType}`,
     };
   }
 
@@ -65,7 +69,7 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.articleTypePlural}/${parent_id}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${parent_id}`,
   };
 };
 

package/src/handlers/event_revisions/CodeHandler.js

@@ -25,7 +25,7 @@ const edit_form = async (ctx) => {
   };
 };
 
-const update = async (ctx, opts) => {
+const update = async (ctx) => {
   const { parent_id } = ctx.params;
 
   const revision = await ctx.client.eventRevisions.find(parent_id, ctx.locale);
@@ -76,7 +76,7 @@ const update = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.eventType}_revisions/${revision.id}/codes/edit`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/codes/edit`,
   };
 };
 

package/src/handlers/event_revisions/EventRevisionsHandler.js

@@ -1,4 +1,4 @@
-const create = async (ctx, opts) => {
+const create = async (ctx) => {
   const { parent_id } = ctx.params;
 
   const { errors, eventErrors } = await ctx.client.eventRevisions.create(
@@ -15,11 +15,11 @@ const create = async (ctx, opts) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${opts.eventTypePlural}/${parent_id}`,
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventTypePlural}/${parent_id}`,
   };
 };
 
-const destroy = async (ctx, opts) => {
+const destroy = async (ctx) => {
   const { id } = ctx.params;
 
   const { errors, revision } = await ctx.client.eventRevisions.delete(
@@ -35,7 +35,7 @@ const destroy = async (ctx, opts) => {
 
   return {
     headers: {
-      "HX-Redirect": `/${ctx.locale}/${opts.eventTypePlural}/${revision.originalId}`,
+      "HX-Redirect": `/${ctx.locale}/${ctx.resourceConfig.eventTypePlural}/${revision.originalId}`,
     },
     json: {},
   };

package/src/handlers/event_revisions/GeneralHandler.js

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

package/src/handlers/event_revisions/LocksHandler.js

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