@raketa-cloud/admin 1.8.7 → 1.8.9

package/dist/application.css

@@ -1665,10 +1665,6 @@ select {
   margin-bottom: 2rem;
 }
 
-.-mt-4 {
-  margin-top: -1rem;
-}
-
 .mb-0 {
   margin-bottom: 0px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "main": "src/index.js",
   "files": [
     "src/",

package/src/HonoAdapter.js

@@ -65,13 +65,19 @@ function putIn(result, key, value) {
 const sanitizePath = (filePath) =>
   path.normalize(path.join("/", ...filePath.split("/")));
 
-// Find template path with fallbacks
-function getPartialPath(partialPath, views, viewsFallback) {
+function packageFallbackPaths(views, suffix) {
+  const rest = views.split("/").slice(1);
+  return ["resources", "resource_revisions"].map((base) =>
+    sanitizePath(`${currentPath}/views/${[base, ...rest].join("/")}/${suffix}`),
+  );
+}
+
+// Find template path, preferring an app override over the package template
+function getPartialPath(partialPath, views) {
   const paths = [
     sanitizePath(`${process.cwd()}/src/views/${views}/${partialPath}`),
     sanitizePath(`${currentPath}/views/${views}/${partialPath}`),
-    viewsFallback &&
-      sanitizePath(`${currentPath}/views/${viewsFallback}/${partialPath}`),
+    ...packageFallbackPaths(views, partialPath),
   ].filter(Boolean);
 
   // Return first existing path
@@ -80,7 +86,7 @@ function getPartialPath(partialPath, views, viewsFallback) {
   if (existingPath) return existingPath;
 
   throw new Error(
-    `Template not found: "${partialPath}"\nSearched in:\n${paths.join("\n")}`
+    `Template not found: "${partialPath}"\nSearched in:\n${paths.join("\n")}`,
   );
 }
 
@@ -137,14 +143,17 @@ export default class HonoAdapter {
     this.globalAfterFilters.push({ pattern, filter });
   }
 
-  getActionPath(views, viewsFallback, action) {
-    const packagePath = viewsFallback
-      ? `${currentPath}/views/${viewsFallback}/${action}.ejs`
-      : `${currentPath}/views/${views}/${action}.ejs`;
-
+  getActionPath(views, action) {
     const appPath = `${process.cwd()}/src/views/${views}/${action}.ejs`;
+    if (existsSync(appPath)) return appPath;
 
-    return existsSync(appPath) ? appPath : packagePath;
+    const packagePath = `${currentPath}/views/${views}/${action}.ejs`;
+    if (existsSync(packagePath)) return packagePath;
+
+    const fallback = packageFallbackPaths(views, `${action}.ejs`).find(
+      existsSync,
+    );
+    return fallback ?? packagePath;
   }
 
   getHelpers(viewHelpersConfig) {
@@ -172,9 +181,9 @@ export default class HonoAdapter {
     });
   }
 
-  renderPartial(assigns, views, viewsFallback) {
+  renderPartial(assigns, views) {
     return function render(relativePath, localAssigns) {
-      const partialPath = getPartialPath(relativePath, views, viewsFallback);
+      const partialPath = getPartialPath(relativePath, views);
 
       try {
         // Synchronously read the partial file as ejs does not support async/await
@@ -185,7 +194,7 @@ export default class HonoAdapter {
             ...assigns,
             ...localAssigns,
           },
-          { filename: partialPath }
+          { filename: partialPath },
         );
 
         return rendered;
@@ -198,18 +207,11 @@ export default class HonoAdapter {
     };
   }
 
-  async renderAction(
-    { views, viewsFallback, action, assigns },
-    viewHelpersConfig = {}
-  ) {
+  async renderAction({ views, action, assigns }, viewHelpersConfig = {}) {
     // Pick the parent here in the views so we can reuse stuff...
-    const fullTemplatePath = this.getActionPath(views, viewsFallback, action);
+    const fullTemplatePath = this.getActionPath(views, action);
     const renderAssigns = { ...this.getHelpers(viewHelpersConfig), ...assigns };
-    const renderPartialHelper = this.renderPartial(
-      renderAssigns,
-      views,
-      viewsFallback
-    );
+    const renderPartialHelper = this.renderPartial(renderAssigns, views);
 
     try {
       // Synchronously read the full template file
@@ -222,7 +224,7 @@ export default class HonoAdapter {
           ...renderAssigns,
           render_partial: renderPartialHelper,
         },
-        { filename: fullTemplatePath }
+        { filename: fullTemplatePath },
       );
 
       const fullPage = this.renderLayout(renderAssigns, rendered);
@@ -288,7 +290,7 @@ export default class HonoAdapter {
 
   async createAction(
     [verb, path, resource, views, action, handler],
-    resourceConfig
+    resourceConfig,
   ) {
     const { i18n } = this.globalConfig;
 
@@ -302,7 +304,7 @@ export default class HonoAdapter {
           next,
           verb,
           resource,
-          action
+          action,
         );
 
         // Set context properties
@@ -336,7 +338,7 @@ export default class HonoAdapter {
         };
 
         ctx.logger.info(
-          `${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
+          `${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`,
         );
 
         const assigns = {
@@ -381,7 +383,7 @@ export default class HonoAdapter {
 
             Object.assign(
               assigns.afterFilterAssigns,
-              afterResult.assigns || {}
+              afterResult.assigns || {},
             );
           }
         }
@@ -399,11 +401,10 @@ export default class HonoAdapter {
         const rendered = this.renderAction(
           {
             views,
-            viewsFallback: resourceConfig.viewsFallback,
             action,
             assigns: fullAssigns,
           },
-          this.globalConfig?.helpers || {}
+          this.globalConfig?.helpers || {},
         );
 
         return routerCtx.html(rendered);
@@ -414,7 +415,7 @@ export default class HonoAdapter {
   // Single method to handle all route types
   routeCollection(mapping, resourceConfig) {
     mapping.forEach((handlerMap) =>
-      this.createAction(handlerMap, resourceConfig)
+      this.createAction(handlerMap, resourceConfig),
     );
   }
 
@@ -436,7 +437,7 @@ export default class HonoAdapter {
   applyHeaders(headers, router) {
     if (!headers) return;
     Object.entries(headers).forEach(([key, value]) =>
-      router.header(key, value)
+      router.header(key, value),
     );
   }
 

package/src/index.js

@@ -5,9 +5,6 @@ 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";
 export { default as routeSettings } from "./routeSettings";
 export { default as setupCloud } from "./setupCloud";
 export { default as routeStandard } from "./routeStandard";

package/src/routeCategoriesModule.js

@@ -9,7 +9,7 @@ function routeCategoriesModule(adapter, categoryType, categoryTypePlural) {
 
   routeCollection(adapter, categoryTypePlural, CategoriesHandler, {
     ...resourceConfig,
-    viewsFallback: "categories",
+    views: "categories",
   });
 }
 

package/src/routeCollection.js

@@ -1,18 +1,25 @@
 const routeCollection = (adapter, resource, handler, resourceConfig = {}) => {
+  const views = resourceConfig.views ?? resource;
+
   // Create route definitions
   const routes = [
-    ["GET",    `/${resource}`,         "index",      handler.index],
-    ["GET",    `/${resource}/new`,     "create_form", handler.create_form],
-    ["GET",    `/${resource}/:id`,     "show",       handler.show],
-    ["GET",    `/${resource}/:id/edit`, "edit_form",  handler.edit_form],
-    ["POST",   `/${resource}`,         "create_form", handler.create],
-    ["POST",   `/${resource}/:id`,     "edit_form",  handler.update],
-    ["DELETE", `/${resource}/:id`,     "destroy",    handler.destroy]
+    ["GET", `/${resource}`, "index", handler.index],
+    ["GET", `/${resource}/new`, "create_form", handler.create_form],
+    ["GET", `/${resource}/:id`, "show", handler.show],
+    ["GET", `/${resource}/:id/edit`, "edit_form", handler.edit_form],
+    ["POST", `/${resource}`, "create_form", handler.create],
+    ["POST", `/${resource}/:id`, "edit_form", handler.update],
+    ["DELETE", `/${resource}/:id`, "destroy", handler.destroy],
   ];
 
   // Map routes to full configuration
   const mapping = routes.map(([verb, path, action, fn]) => [
-    verb, path, resource, resource, action, fn
+    verb,
+    path,
+    resource,
+    views,
+    action,
+    fn,
   ]);
 
   adapter.routeCollection(mapping, resourceConfig);

package/src/routeNestedCollection.js

@@ -1,5 +1,5 @@
 const routeNestedCollection = (adapter, parent, resource, handler, resourceConfig = {}) => {
-  const views = `${parent}/${resource}`;
+  const views = resourceConfig.views ?? `${parent}/${resource}`;
 
   // Define routes exactly as they were in the original implementation
   // to maintain compatibility with the tests

package/src/routeNestedMember.js

@@ -1,5 +1,5 @@
 const routeNestedMember = (adapter, parent, resource, handler, resourceConfig = {}) => {
-  const views = `${parent}/${resource}`;
+  const views = resourceConfig.views ?? `${parent}/${resource}`;
   const basePath = `/${parent}/:parent_id/${resource}`;
   
   // Create route definitions

package/src/routeResource.js

@@ -27,13 +27,11 @@ function routeResource(
   adapter,
   resourceType,
   resourceTypePlural,
-  { dateFields = [], viewsType, viewsTypePlural } = {},
+  { dateFields = [] } = {},
 ) {
   const baseResource = resourceTypePlural;
   const revisionsBaseResource = `${resourceType}_revisions`;
   const changesBaseResource = `${resourceType}_changes`;
-  const viewsRevisions = `${viewsType}_revisions`;
-  const viewsChanges = `${viewsType}_changes`;
 
   const resourceConfig = {
     resourceType,
@@ -46,7 +44,7 @@ function routeResource(
       "GET",
       `/${baseResource}/exports`,
       "exports",
-      `${viewsTypePlural}/exports`,
+      "resources/exports",
       "index",
       ExportsHandler.index,
     ],
@@ -55,7 +53,7 @@ function routeResource(
 
   routeCollection(adapter, baseResource, ResourcesHandler, {
     ...resourceConfig,
-    viewsFallback: viewsTypePlural,
+    views: "resources",
   });
 
   routeNestedCollection(
@@ -63,12 +61,12 @@ function routeResource(
     baseResource,
     "translations",
     TranslationsHandler,
-    { ...resourceConfig, viewsFallback: `${viewsTypePlural}/translations` },
+    { ...resourceConfig, views: "resources/translations" },
   );
 
   routeNestedCollection(adapter, baseResource, "history", HistoryHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsTypePlural}/history`,
+    views: "resources/history",
   });
 
   routeNestedCollection(
@@ -78,38 +76,38 @@ function routeResource(
     ResourceRevisionsHandler,
     {
       ...resourceConfig,
-      viewsFallback: `${viewsTypePlural}/${viewsRevisions}`,
+      views: "resource_revisions",
     },
   );
 
   routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/general`,
+    views: "resource_revisions/general",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/visuals`,
+    views: "resource_revisions/visuals",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/codes`,
+    views: "resource_revisions/codes",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/meta`,
+    views: "resource_revisions/meta",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/tags`,
+    views: "resource_revisions/tags",
   });
 
   routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsRevisions}/locks`,
+    views: "resource_revisions/locks",
   });
 
   routeNestedCollection(
@@ -119,23 +117,23 @@ function routeResource(
     UnlocksHandler,
     {
       ...resourceConfig,
-      viewsFallback: `${viewsRevisions}/unlocks`,
+      views: "resource_revisions/unlocks",
     },
   );
 
   routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsTypePlural}/clones`,
+    views: "resources/clones",
   });
 
   routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsTypePlural}/urls`,
+    views: "resources/urls",
   });
 
   routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
     ...resourceConfig,
-    viewsFallback: `${viewsTypePlural}/deletes`,
+    views: "resources/deletes",
   });
 
   routeNestedCollection(
@@ -145,7 +143,7 @@ function routeResource(
     RevertsHandler,
     {
       ...resourceConfig,
-      viewsFallback: `${viewsChanges}/reverts`,
+      views: "resource_changes/reverts",
     },
   );
 
@@ -156,7 +154,7 @@ function routeResource(
     PublishesHandler,
     {
       ...resourceConfig,
-      viewsFallback: `${viewsRevisions}/publishes`,
+      views: "resource_revisions/publishes",
     },
   );
 
@@ -167,7 +165,7 @@ function routeResource(
     CancelSchedulesHandler,
     {
       ...resourceConfig,
-      viewsFallback: `${viewsRevisions}/cancel_schedules`,
+      views: "resource_revisions/cancel_schedules",
     },
   );
 

package/src/routeStandard.js

@@ -2,10 +2,8 @@ import DashboardsHandler from "./handlers/DashboardsHandler";
 import RedirectsHandler from "./handlers/RedirectsHandler";
 import TagsAPIHandler from "./handlers/TagsAPIHandler";
 import TagsHandler from "./handlers/TagsHandler";
-import routeArticlesModule from "./routeArticlesModule";
 import routeCollection from "./routeCollection";
-import routeEventsModule from "./routeEventsModule";
-import routePagesModule from "./routePagesModule";
+import routeResource from "./routeResource";
 import routeSettings from "./routeSettings";
 
 function routeStandard(adapter) {
@@ -29,9 +27,11 @@ function routeStandard(adapter) {
   routeCollection(adapter, "tags", TagsHandler);
   routeCollection(adapter, "api/tags", TagsAPIHandler);
   routeSettings(adapter);
-  routePagesModule(adapter);
-  routeArticlesModule(adapter);
-  routeEventsModule(adapter);
+  routeResource(adapter, "page", "pages", { dateFields: [] });
+  routeResource(adapter, "article", "articles", { dateFields: ["publish_at"] });
+  routeResource(adapter, "event", "events", {
+    dateFields: ["publish_at", "starts_at", "ends_at"],
+  });
 }
 
 export default routeStandard;

package/src/tests/HonoAdapter.coverage.test.js

@@ -86,25 +86,17 @@ describe("HonoAdapter.getActionPath", () => {
   test("returns app path when it exists", () => {
     existsSync.mockReturnValue(true);
 
-    const result = adapter.getActionPath("pages", "pages", "index");
+    const result = adapter.getActionPath("resources", "index");
 
-    expect(result).toBe(`${process.cwd()}/src/views/pages/index.ejs`);
+    expect(result).toBe(`${process.cwd()}/src/views/resources/index.ejs`);
   });
 
-  test("returns package path with viewsFallback when app missing", () => {
+  test("returns package path when app missing", () => {
     existsSync.mockReturnValue(false);
 
-    const result = adapter.getActionPath("pages", "fallback", "index");
+    const result = adapter.getActionPath("resources", "index");
 
-    expect(result).toContain("/views/fallback/index.ejs");
-  });
-
-  test("returns package path with views when no fallback", () => {
-    existsSync.mockReturnValue(false);
-
-    const result = adapter.getActionPath("pages", null, "index");
-
-    expect(result).toContain("/views/pages/index.ejs");
+    expect(result).toContain("/views/resources/index.ejs");
   });
 });
 
@@ -140,7 +132,7 @@ describe("HonoAdapter.renderPartial", () => {
     readFileSync.mockReturnValue("<%= foo %>");
     ejs.render.mockReturnValue("rendered");
 
-    const render = adapter.renderPartial({ foo: "bar" }, "pages", null);
+    const render = adapter.renderPartial({ foo: "bar" }, "resources");
     const result = render("_partial.ejs", { extra: 1 });
 
     expect(result).toBe("rendered");
@@ -159,7 +151,7 @@ describe("HonoAdapter.renderPartial", () => {
       throw err;
     });
 
-    const render = adapter.renderPartial({}, "pages", null);
+    const render = adapter.renderPartial({}, "resources");
     const result = render("_partial.ejs", {});
 
     expect(result).toContain("Error rendering");
@@ -170,7 +162,7 @@ describe("HonoAdapter.renderPartial", () => {
   test("throws when partial cannot be located", () => {
     existsSync.mockReturnValue(false);
 
-    const render = adapter.renderPartial({}, "pages", "fallback");
+    const render = adapter.renderPartial({}, "resources");
 
     expect(() => render("_missing.ejs", {})).toThrow(/Template not found/);
   });
@@ -195,8 +187,7 @@ describe("HonoAdapter.renderAction", () => {
     ejs.renderFile.mockResolvedValue("<html>...</html>");
 
     const result = await adapter.renderAction({
-      views: "pages",
-      viewsFallback: null,
+      views: "resources",
       action: "index",
       assigns: { title: "Hi" },
     });
@@ -215,8 +206,7 @@ describe("HonoAdapter.renderAction", () => {
     });
 
     const result = await adapter.renderAction({
-      views: "pages",
-      viewsFallback: null,
+      views: "resources",
       action: "index",
       assigns: {},
     });
@@ -395,8 +385,8 @@ describe("HonoAdapter.createAction", () => {
     const handler = jest.fn().mockResolvedValue({ assigns: { title: "Hi" } });
 
     await adapter.createAction(
-      ["GET", "/pages", "pages", "pages", "index", handler],
-      { viewsFallback: "pages" }
+      ["GET", "/pages", "pages", "resources", "index", handler],
+      {}
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -631,10 +621,10 @@ describe("HonoAdapter.routeCollection (instance)", () => {
       ["POST", "/a", "a", "a", "create", handler],
     ];
 
-    adapter.routeCollection(mapping, { viewsFallback: "a" });
+    adapter.routeCollection(mapping, { views: "a" });
 
     expect(createSpy).toHaveBeenCalledTimes(2);
-    expect(createSpy).toHaveBeenCalledWith(mapping[0], { viewsFallback: "a" });
-    expect(createSpy).toHaveBeenCalledWith(mapping[1], { viewsFallback: "a" });
+    expect(createSpy).toHaveBeenCalledWith(mapping[0], { views: "a" });
+    expect(createSpy).toHaveBeenCalledWith(mapping[1], { views: "a" });
   });
 });

package/src/tests/routeCategoriesModule.test.js

@@ -9,7 +9,7 @@ describe("routeCategoriesModule", () => {
     routeCollection.mockClear();
   });
 
-  test("registers categories collection with categoryType + plural + viewsFallback", () => {
+  test("registers categories collection with categoryType + plural + views", () => {
     const adapter = {};
 
     routeCategoriesModule(adapter, "tag", "tags");
@@ -17,7 +17,7 @@ describe("routeCategoriesModule", () => {
     expect(routeCollection).toHaveBeenCalledWith(adapter, "tags", CategoriesHandler, {
       categoryType: "tag",
       categoryTypePlural: "tags",
-      viewsFallback: "categories",
+      views: "categories",
     });
   });
 });