@raketa-cloud/admin 0.0.24 → 0.0.25

package/package.json

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

package/src/Adapter.js

@@ -116,9 +116,12 @@ export default class Adapter {
     throw new Error("Implement in an adapter");
   }
 
-  getActionPath(resource, action) {
-    const packagePath = `${currentPath}/views/${resource}/${action}.ejs`;
-    const appPath = `${process.cwd()}/src/views/${resource}/${action}.ejs`;
+  getActionPath(views, packageViewsFallback, action) {
+    const packagePath = packageViewsFallback
+      ? `${currentPath}/views/${packageViewsFallback}/${action}.ejs`
+      : `${currentPath}/views/${views}/${action}.ejs`;
+
+    const appPath = `${process.cwd()}/src/views/${views}/${action}.ejs`;
 
     return existsSync(appPath) ? appPath : packagePath;
   }
@@ -170,8 +173,16 @@ export default class Adapter {
     };
   }
 
-  async renderAction({ views, action, assigns }, viewHelpersConfig = {}) {
-    const fullTemplatePath = this.getActionPath(views, action);
+  async renderAction(
+    { views, packageViewsFallback, action, assigns },
+    viewHelpersConfig = {}
+  ) {
+    // Pick the parent here in the views so we can reuse stuff...
+    const fullTemplatePath = this.getActionPath(
+      views,
+      packageViewsFallback,
+      action
+    );
     const renderAssigns = { ...this.getHelpers(viewHelpersConfig), ...assigns };
     const renderPartialHelper = this.renderPartial(renderAssigns);
 

package/src/HonoAdapter.js

@@ -111,6 +111,7 @@ export default class HonoAdapter extends Adapter {
           layout: {
             ...this.globalConfig.layout,
           },
+          handlerOpts: handlerOpts,
         };
 
         console.info(
@@ -187,7 +188,8 @@ export default class HonoAdapter extends Adapter {
 
         const rendered = this.renderAction(
           {
-            views,
+            views: views,
+            packageViewsFallback: handlerOpts.packageViewsFallback,
             action,
             assigns: fullAssigns,
           },

package/src/routeArticlesModule.js

@@ -31,105 +31,96 @@ function routeArticlesModule(
     articleTypePlural,
   };
 
-  routeCollection(adapter, baseResource, ArticlesHandler, handlerOpts);
+  routeCollection(adapter, baseResource, ArticlesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "articles",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "articles/translations" }
   );
+
   routeNestedCollection(
     adapter,
     baseResource,
     revisionsBaseResource,
     ArticleRevisionsHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "articles/article_revisions" }
   );
+
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/general",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/visuals",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/codes",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/meta",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/tags",
+  });
+
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "article_revisions/locks",
+  });
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
     UnlocksHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "article_revisions/unlocks" }
   );
+
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "articles/clones",
+  });
+
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "articles/urls",
+  });
+
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "articles/deletes",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     `${articleType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "article_changes/reverts" }
   );
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "article_revisions/publishes" }
   );
+
   routeNestedMember(
     adapter,
     `api/${revisionsBaseResource}`,

package/src/routeEventsModule.js

@@ -31,105 +31,111 @@ function routeEventsModule(
     eventTypePlural,
   };
 
-  routeCollection(adapter, baseResource, EventsHandler, handlerOpts);
+  routeCollection(adapter, baseResource, EventsHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "events",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "events/translations",
+    }
   );
+
   routeNestedCollection(
     adapter,
     baseResource,
     revisionsBaseResource,
     EventRevisionsHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "events/event_revisions",
+    }
   );
+
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/general",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/visuals",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/codes",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/meta",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/tags",
+  });
+
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "event_revisions/locs",
+  });
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
     UnlocksHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "event_revisions/unlocks",
+    }
   );
+
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "events/clones",
+  });
+
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "events/urls",
+  });
+
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "events/deletes",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     `${eventType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "event_changes/reverts",
+    }
   );
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "event_revisions/publishes",
+    }
   );
+
   routeNestedMember(
     adapter,
     `api/${revisionsBaseResource}`,

package/src/routePagesModule.js

@@ -31,13 +31,17 @@ function routePagesModule(
     pageTypePlural,
   };
 
-  routeCollection(adapter, pageTypePlural, PagesHandler, handlerOpts);
+  routeCollection(adapter, pageTypePlural, PagesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "pages",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    { ...handlerOpts, packageViewsFallback: "pages/translations" }
   );
 
   routeNestedCollection(
@@ -45,94 +49,77 @@ function routePagesModule(
     baseResource,
     revisionsBaseResource,
     PageRevisionsHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "pages/page_revisions",
+    }
   );
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/general",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/visual",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/codes",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/meta",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/tags",
+  });
 
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "page_revisions/locks",
+  });
 
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
-    UnlocksHandler
+    UnlocksHandler,
+    {
+      ...handlerOpts,
+      packageViewsFallback: "page_revisions/unlocks",
+    }
   );
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "pages/clones",
+  });
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "pages/urls",
+  });
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...handlerOpts,
+    packageViewsFallback: "pages/deletes",
+  });
 
   routeNestedCollection(
     adapter,
     baseResource,
     `${pageType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "page_changes/reverts",
+    }
   );
 
   routeNestedCollection(
@@ -140,7 +127,10 @@ function routePagesModule(
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    {
+      ...handlerOpts,
+      packageViewsFallback: "page_revisions/publishes",
+    }
   );
 
   routeNestedMember(

package/src/views/article_revisions/_nav.ejs

@@ -7,31 +7,31 @@
   <div class="flex items-center justify-between mb-4">
     <div class="flex items-center border-b-2">
       <div class=" <%= active === 'general' ? activeClass : inactiveClass %>">
-        <a href="<%= `/${_context.locale}/article_revisions/${settings.id}/general/edit` %>" class="text-raketa-primary font-semibold">
+        <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${settings.id}/general/edit` %>" class="text-raketa-primary font-semibold">
           General
         </a>
       </div>
 
       <div class="<%= active === 'visuals' ? activeClass : inactiveClass %>">
-        <a href="<%= `/${_context.locale}/article_revisions/${settings.id}/visuals/edit` %>" class="text-raketa-primary font-semibold">
+        <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${settings.id}/visuals/edit` %>" class="text-raketa-primary font-semibold">
           Visuals
         </a>
       </div>
 
       <div class="<%= active === 'codes' ? activeClass : inactiveClass %>">
-        <a href="<%= `/${_context.locale}/article_revisions/${settings.id}/codes/edit` %>" class="text-raketa-primary font-semibold">
+        <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${settings.id}/codes/edit` %>" class="text-raketa-primary font-semibold">
           Code customizations
         </a>
       </div>
 
       <div class="<%= active === 'meta' ? activeClass : inactiveClass %>">
-        <a href="<%= `/${_context.locale}/article_revisions/${settings.id}/meta/edit` %>" class="text-raketa-primary font-semibold">
+        <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${settings.id}/meta/edit` %>" class="text-raketa-primary font-semibold">
           Open graph & meta tags
         </a>
       </div>
 
       <div class="<%= active === 'tags' ? activeClass : inactiveClass %>">
-        <a href="<%= `/${_context.locale}/article_revisions/${settings.id}/tags/edit` %>" class="text-raketa-primary font-semibold">
+        <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${settings.id}/tags/edit` %>" class="text-raketa-primary font-semibold">
           Content tags
         </a>
       </div>

package/src/views/article_revisions/codes/edit_form.ejs

@@ -8,14 +8,14 @@
   <div class="grid gap-4 md:grid-cols-3">
     <div>
       <% form_for({ code_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/article_revisions/${code_settings.id}/codes` %>" method="POST" class="form">
+      <form action="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${code_settings.id}/codes` %>" method="POST" class="form">
         <%- f.field('code_settings.scripts', { as: 'textarea', }) %>
         <%- f.field('code_settings.structured_data', { label: 'Structured data (JSON)', as: 'textarea', hint: 'Click here for a structured data verification tool' }) %>
 
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-            <a href="<%= `/${_context.locale}/articles/${code_settings.originalId}` %>" class="btn-secondary">Back</a>
+            <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleTypePlural}/${code_settings.originalId}` %>" class="btn-secondary">Back</a>
           </div>
         </div>
       </form>

package/src/views/article_revisions/general/edit_form.ejs

@@ -8,19 +8,18 @@
   <div class="grid gap-4 md:grid-cols-3">
     <div>
       <% form_for({ general_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/article_revisions/${general_settings.id}/general` %>" method="POST" class="form">
+      <form action="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${general_settings.id}/general` %>" method="POST" class="form">
         <%- f.field('general_settings.title', { required: true }) %>
         <%- f.field('general_settings.slug', { label: "URL", required: true }) %>
         <%- f.field('general_settings.publish_at', { required: true, type: 'datetime-local', label: 'Publish at (UTC)' }) %>
         <%- f.field('general_settings.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
-
         <%- f.field('general_settings.username', { required: true }) %>
         <%- f.field('general_settings.password', { required: true }) %>
 
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-            <a href="<%= `/${_context.locale}/articles/${general_settings.originalId}` %>" class="btn-secondary">Back</a>
+            <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleTypePlural}/${general_settings.originalId}` %>" class="btn-secondary">Back</a>
           </div>
         </div>
       </form>

package/src/views/article_revisions/locks/create_form.ejs

@@ -6,12 +6,12 @@
   <div class="grid gap-4 md:grid-cols-3">
     <div>
       <% form_for({ lock_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/article_revisions/${lock_settings.revision.id}/locks` %>" method="POST" class="form">
+      <form action="<%= `/${_context.locale}/${_context.handlerOpts.articleType}_revisions/${lock_settings.revision.id}/locks` %>" method="POST" class="form">
         <%- f.field('lock_settings.message', { as: 'textarea', label: 'Lock Message', required: true }) %>
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Lock revision', { class: 'btn-primary' }) %>
-            <a href="<%= `/${_context.locale}/articles/${lock_settings.revision.originalId}` %>" class="btn-secondary">Cancel</a>
+            <a href="<%= `/${_context.locale}/${_context.handlerOpts.articleTypePlural}/${lock_settings.revision.originalId}` %>" class="btn-secondary">Cancel</a>
           </div>
         </div>
       </form>