@raketa-cloud/admin 1.8.9 → 1.8.11

package/src/routeNestedMember.js

@@ -1,17 +1,28 @@
-const routeNestedMember = (adapter, parent, resource, handler, resourceConfig = {}) => {
+const routeNestedMember = (
+  adapter,
+  parent,
+  resource,
+  handler,
+  resourceConfig = {},
+) => {
   const views = resourceConfig.views ?? `${parent}/${resource}`;
   const basePath = `/${parent}/:parent_id/${resource}`;
-  
+
   // Create route definitions
   const routes = [
-    ["GET",  basePath,         "show",      handler.show],
-    ["GET",  `${basePath}/edit`, "edit_form", handler.edit_form],
-    ["POST", basePath,         "edit_form", handler.update]
+    ["GET", basePath, "show", handler.show],
+    ["GET", `${basePath}/edit`, "edit_form", handler.edit_form],
+    ["POST", basePath, "edit_form", handler.update],
   ];
 
   // Map routes to full configuration
   const mapping = routes.map(([verb, path, action, fn]) => [
-    verb, path, resource, views, action, fn
+    verb,
+    path,
+    resource,
+    views,
+    action,
+    fn,
   ]);
 
   adapter.routeNestedMember(mapping, resourceConfig);

package/src/{routeResource.js → routeResourceModule.js}

@@ -23,15 +23,20 @@ import routeCollection from "./routeCollection";
 import routeNestedCollection from "./routeNestedCollection";
 import routeNestedMember from "./routeNestedMember";
 
-function routeResource(
+function routeResourceModule(
   adapter,
   resourceType,
   resourceTypePlural,
   { dateFields = [] } = {},
 ) {
+  const viewsType = "resource";
+  const viewsTypePlural = "resources";
+
   const baseResource = resourceTypePlural;
   const revisionsBaseResource = `${resourceType}_revisions`;
   const changesBaseResource = `${resourceType}_changes`;
+  const viewsRevisions = `${viewsType}_revisions`;
+  const viewsChanges = `${viewsType}_changes`;
 
   const resourceConfig = {
     resourceType,
@@ -44,7 +49,7 @@ function routeResource(
       "GET",
       `/${baseResource}/exports`,
       "exports",
-      "resources/exports",
+      `${viewsTypePlural}/exports`,
       "index",
       ExportsHandler.index,
     ],
@@ -53,7 +58,7 @@ function routeResource(
 
   routeCollection(adapter, baseResource, ResourcesHandler, {
     ...resourceConfig,
-    views: "resources",
+    viewsFallback: "resources",
   });
 
   routeNestedCollection(
@@ -61,12 +66,12 @@ function routeResource(
     baseResource,
     "translations",
     TranslationsHandler,
-    { ...resourceConfig, views: "resources/translations" },
+    { ...resourceConfig, viewsFallback: "resources/translations" },
   );
 
   routeNestedCollection(adapter, baseResource, "history", HistoryHandler, {
     ...resourceConfig,
-    views: "resources/history",
+    viewsFallback: "resources/history",
   });
 
   routeNestedCollection(
@@ -76,38 +81,38 @@ function routeResource(
     ResourceRevisionsHandler,
     {
       ...resourceConfig,
-      views: "resource_revisions",
+      views: `${viewsTypePlural}/${viewsRevisions}`,
     },
   );
 
   routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
     ...resourceConfig,
-    views: "resource_revisions/general",
+    viewsFallback: "resource_revisions/general",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
     ...resourceConfig,
-    views: "resource_revisions/visuals",
+    viewsFallback: "resource_revisions/visuals",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
     ...resourceConfig,
-    views: "resource_revisions/codes",
+    viewsFallback: "resource_revisions/codes",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
     ...resourceConfig,
-    views: "resource_revisions/meta",
+    viewsFallback: "resource_revisions/meta",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
     ...resourceConfig,
-    views: "resource_revisions/tags",
+    viewsFallback: "resource_revisions/tags",
   });
 
   routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
     ...resourceConfig,
-    views: "resource_revisions/locks",
+    viewsFallback: "resource_revisions/locks",
   });
 
   routeNestedCollection(
@@ -117,23 +122,23 @@ function routeResource(
     UnlocksHandler,
     {
       ...resourceConfig,
-      views: "resource_revisions/unlocks",
+      views: `${viewsRevisions}/unlocks`,
     },
   );
 
   routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
     ...resourceConfig,
-    views: "resources/clones",
+    views: `${viewsTypePlural}/clones`,
   });
 
   routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
     ...resourceConfig,
-    views: "resources/urls",
+    viewsFallback: "resources/urls",
   });
 
   routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
     ...resourceConfig,
-    views: "resources/deletes",
+    viewsFallback: "resources/deletes",
   });
 
   routeNestedCollection(
@@ -143,7 +148,7 @@ function routeResource(
     RevertsHandler,
     {
       ...resourceConfig,
-      views: "resource_changes/reverts",
+      views: `${viewsChanges}/reverts`,
     },
   );
 
@@ -154,7 +159,7 @@ function routeResource(
     PublishesHandler,
     {
       ...resourceConfig,
-      views: "resource_revisions/publishes",
+      viewsFallback: "resource_revisions/publishes",
     },
   );
 
@@ -165,7 +170,7 @@ function routeResource(
     CancelSchedulesHandler,
     {
       ...resourceConfig,
-      views: "resource_revisions/cancel_schedules",
+      views: `${viewsRevisions}/cancel_schedules`,
     },
   );
 
@@ -192,4 +197,4 @@ function routeResource(
   );
 }
 
-export default routeResource;
+export default routeResourceModule;

package/src/routeStandard.js

@@ -3,8 +3,9 @@ import RedirectsHandler from "./handlers/RedirectsHandler";
 import TagsAPIHandler from "./handlers/TagsAPIHandler";
 import TagsHandler from "./handlers/TagsHandler";
 import routeCollection from "./routeCollection";
-import routeResource from "./routeResource";
+import routeResourceModule from "./routeResourceModule";
 import routeSettings from "./routeSettings";
+import ContentTasksHandler from "./handlers/content_tasks/ContentTasksHandler";
 
 function routeStandard(adapter) {
   adapter.routeCollection(
@@ -25,11 +26,14 @@ function routeStandard(adapter) {
 
   routeCollection(adapter, "redirects", RedirectsHandler);
   routeCollection(adapter, "tags", TagsHandler);
+  routeCollection(adapter, "content_tasks", ContentTasksHandler);
   routeCollection(adapter, "api/tags", TagsAPIHandler);
   routeSettings(adapter);
-  routeResource(adapter, "page", "pages", { dateFields: [] });
-  routeResource(adapter, "article", "articles", { dateFields: ["publish_at"] });
-  routeResource(adapter, "event", "events", {
+  routeResourceModule(adapter, "page", "pages", { dateFields: [] });
+  routeResourceModule(adapter, "article", "articles", {
+    dateFields: ["publish_at"],
+  });
+  routeResourceModule(adapter, "event", "events", {
     dateFields: ["publish_at", "starts_at", "ends_at"],
   });
 }

package/src/setupAuthentication.js

@@ -134,7 +134,7 @@ const setupAuthentication = (app, config) => {
         c.req.query().redirect_to,
         "&snapshot=",
         ot,
-      ].join("")
+      ].join(""),
     );
   });
 

package/src/setupCloud.js

@@ -1,4 +1,5 @@
 import Categories from "./cloud/Categories";
+import ContentTasks from "./cloud/ContentTasks";
 import Redirects from "./cloud/Redirects";
 import ResourceChanges from "./cloud/ResourceChanges";
 import ResourceRevisions from "./cloud/ResourceRevisions";
@@ -25,6 +26,10 @@ function setupCloud(ctx, getConfig) {
     ctx.authentication.token,
   );
   ctx.client.categories = new Categories(getConfig, ctx.authentication.token);
+  ctx.client.contentTasks = new ContentTasks(
+    getConfig,
+    ctx.authentication.token,
+  );
 }
 
 export default setupCloud;

package/src/tests/Adapter.test.js

@@ -15,7 +15,7 @@ describe("HonoAdapter parseFormBody", () => {
         "order[items][2][name]": "A t-shirt",
         "order[items][2][price]": 20,
         "order[items][2][qty]": 1,
-      })
+      }),
     ).toEqual({
       order: {
         email: "john@example.com",
@@ -36,4 +36,4 @@ describe("HonoAdapter parseFormBody", () => {
       },
     });
   });
-});
+});

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

@@ -60,7 +60,7 @@ describe("HonoAdapter constructor", () => {
     expect(router.get).toHaveBeenCalledWith("/", expect.any(Function));
 
     const redirectHandler = router.get.mock.calls.find(
-      ([path]) => path === "/"
+      ([path]) => path === "/",
     )[1];
     const c = { redirect: jest.fn().mockReturnValue("redirected") };
     expect(redirectHandler(c)).toBe("redirected");
@@ -86,15 +86,15 @@ describe("HonoAdapter.getActionPath", () => {
   test("returns app path when it exists", () => {
     existsSync.mockReturnValue(true);
 
-    const result = adapter.getActionPath("resources", "index");
+    const result = adapter.getActionPath("authors", "resources", "index");
 
-    expect(result).toBe(`${process.cwd()}/src/views/resources/index.ejs`);
+    expect(result).toBe(`${process.cwd()}/src/views/authors/index.ejs`);
   });
 
   test("returns package path when app missing", () => {
     existsSync.mockReturnValue(false);
 
-    const result = adapter.getActionPath("resources", "index");
+    const result = adapter.getActionPath("widget-sets", "resources", "index");
 
     expect(result).toContain("/views/resources/index.ejs");
   });
@@ -139,7 +139,7 @@ describe("HonoAdapter.renderPartial", () => {
     expect(ejs.render).toHaveBeenCalledWith(
       "<%= foo %>",
       expect.objectContaining({ foo: "bar", extra: 1 }),
-      expect.objectContaining({ filename: expect.any(String) })
+      expect.objectContaining({ filename: expect.any(String) }),
     );
   });
 
@@ -228,7 +228,7 @@ describe("HonoAdapter.renderLayout", () => {
     expect(result).toBe("<html>ok</html>");
     expect(ejs.renderFile).toHaveBeenCalledWith(
       expect.stringContaining("/views/layouts/application.ejs"),
-      { foo: "bar", body: "<p>body</p>" }
+      { foo: "bar", body: "<p>body</p>" },
     );
   });
 });
@@ -291,7 +291,13 @@ describe("HonoAdapter.createContext", () => {
     const adapter = new HonoAdapter(makeRouter(), makeConfig());
     const routerCtx = makeRouterCtx();
 
-    const ctx = await adapter.createContext(routerCtx, () => {}, "GET", "pages", "index");
+    const ctx = await adapter.createContext(
+      routerCtx,
+      () => {},
+      "GET",
+      "pages",
+      "index",
+    );
 
     expect(ctx).toBeInstanceOf(RaketaContext);
     expect(ctx.body).toEqual({ foo: "bar" });
@@ -307,7 +313,13 @@ describe("HonoAdapter.createContext", () => {
       },
     });
 
-    const ctx = await adapter.createContext(routerCtx, () => {}, "GET", "pages", "index");
+    const ctx = await adapter.createContext(
+      routerCtx,
+      () => {},
+      "GET",
+      "pages",
+      "index",
+    );
 
     expect(ctx.body).toBe("plain text");
   });
@@ -317,14 +329,18 @@ describe("HonoAdapter.createContext", () => {
     const formBody = { "user[name]": "Jane" };
     const routerCtx = makeRouterCtx({
       req: {
-        header: jest
-          .fn()
-          .mockReturnValue("application/x-www-form-urlencoded"),
+        header: jest.fn().mockReturnValue("application/x-www-form-urlencoded"),
         parseBody: jest.fn().mockResolvedValue(formBody),
       },
     });
 
-    const ctx = await adapter.createContext(routerCtx, () => {}, "POST", "pages", "create");
+    const ctx = await adapter.createContext(
+      routerCtx,
+      () => {},
+      "POST",
+      "pages",
+      "create",
+    );
 
     expect(ctx.resourceParams).toEqual({ user: { name: "Jane" } });
   });
@@ -338,7 +354,13 @@ describe("HonoAdapter.createContext", () => {
       },
     });
 
-    const ctx = await adapter.createContext(routerCtx, () => {}, "POST", "pages", "create");
+    const ctx = await adapter.createContext(
+      routerCtx,
+      () => {},
+      "POST",
+      "pages",
+      "create",
+    );
 
     expect(ctx.body).toEqual({ raw: "data" });
   });
@@ -386,7 +408,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "resources", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -407,7 +429,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["POST", "/pages", "pages", "pages", "create_form", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -425,7 +447,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/api/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/api/pages");
@@ -443,7 +465,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/exports", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/exports");
@@ -463,7 +485,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -482,7 +504,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -502,7 +524,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -522,7 +544,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -542,7 +564,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -561,7 +583,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -580,7 +602,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");
@@ -598,7 +620,7 @@ describe("HonoAdapter.createAction", () => {
 
     await adapter.createAction(
       ["GET", "/pages", "pages", "pages", "index", handler],
-      {}
+      {},
     );
 
     const registered = getRegisteredHandler(adapter, "/en/pages");

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

@@ -4,37 +4,47 @@ jest.mock("../setupAuthentication", () => jest.fn());
 
 describe("HonoAdapter Global Filters", () => {
   let adapter;
-  
+
   beforeEach(() => {
-    adapter = new HonoAdapter({
-      get: jest.fn(), post: jest.fn(), put: jest.fn(), delete: jest.fn(),
-      router: { routes: [] }
-    }, {
-      i18n: { locales: { en: "English" }, defaultLocale: "en", timezones: {} },
-      remoteConfig: {},
-      layout: {}
-    });
+    adapter = new HonoAdapter(
+      {
+        get: jest.fn(),
+        post: jest.fn(),
+        put: jest.fn(),
+        delete: jest.fn(),
+        router: { routes: [] },
+      },
+      {
+        i18n: {
+          locales: { en: "English" },
+          defaultLocale: "en",
+          timezones: {},
+        },
+        remoteConfig: {},
+        layout: {},
+      },
+    );
   });
-  
+
   test("setBeforeFilter adds filters to the globalBeforeFilters array", () => {
     expect(adapter.globalBeforeFilters).toEqual([]);
-    
+
     const pattern = /\/settings\/content/;
     const filter = () => ({ assigns: { foo: "bar" } });
-    
+
     adapter.setBeforeFilter(pattern, filter);
-    
+
     expect(adapter.globalBeforeFilters).toEqual([{ pattern, filter }]);
   });
-  
+
   test("setAfterFilter adds filters to the globalAfterFilters array", () => {
     expect(adapter.globalAfterFilters).toEqual([]);
-    
+
     const pattern = /\/settings\/content/;
     const filter = () => ({ assigns: { foo: "bar" } });
-    
+
     adapter.setAfterFilter(pattern, filter);
-    
+
     expect(adapter.globalAfterFilters).toEqual([{ pattern, filter }]);
   });
-});
+});

package/src/tests/HonoAdapter.test.js

@@ -58,7 +58,7 @@ describe("HonoAdapter", () => {
         "order[items][2][name]": "A t-shirt",
         "order[items][2][price]": 20,
         "order[items][2][qty]": 1,
-      })
+      }),
     ).toEqual({
       order: {
         email: "john@example.com",
@@ -122,7 +122,7 @@ describe("HonoAdapter", () => {
     expect(
       adapter.parseFormBody({
         "tags[]": ["javascript", "react", "node"],
-      })
+      }),
     ).toEqual({
       tags: ["javascript", "react", "node"],
     });
@@ -157,7 +157,7 @@ describe("HonoAdapter", () => {
           },
         },
       },
-      "<h1>Hi</h1>"
+      "<h1>Hi</h1>",
     );
 
     expect(typeof result).toBe("string");