@raketa-cloud/admin 0.0.16 → 0.0.18

package/src/tests/handlers/pages/DeletesHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/pages/DeletesHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(page, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(page, updateSettings) {
       deleteAction: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -33,11 +34,14 @@ describe("Page delete", () => {
       .spyOn(ctx.client.pages, "delete")
       .mockImplementation(() => ({ page, errors: null }));
 
-    const result = await DeletesHandler.create(ctx);
+    const result = await DeletesHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(page.id, "en", {
-      url: `/${page.slug}`,
+      url: `/en/${page.slug}`,
       destination: updateSettings.destination,
       httpResponseCode: 301,
       note: "Created via page deletion process",
@@ -73,11 +77,14 @@ describe("Page delete", () => {
         ],
       }));
 
-    const result = await DeletesHandler.create(ctx);
+    const result = await DeletesHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(page.id, "en", {
-      url: `/${page.slug}`,
+      url: `/en/${page.slug}`,
       destination: "/",
       httpResponseCode: 410,
       note: "Created via page deletion process",
@@ -102,7 +109,10 @@ describe("Page delete", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await DeletesHandler.create(ctx);
+      await DeletesHandler.create(ctx, {
+        pageType: "page",
+        pageTypePlural: "pages",
+      });
     }).rejects.toThrow("Missing page #42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");

package/src/tests/handlers/pages/DeletesHandler.test/create_form.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/pages/DeletesHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(page) {
   return {
@@ -10,6 +10,7 @@ function buildCtx(page) {
     },
     params: { parent_id: page.id },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -22,7 +23,10 @@ describe("Page delete", () => {
       .spyOn(ctx.client.pages, "find")
       .mockImplementation(() => page);
 
-    const result = await DeletesHandler.create_form(ctx);
+    const result = await DeletesHandler.create_form(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
 
@@ -46,7 +50,10 @@ describe("Page delete", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await DeletesHandler.create_form(ctx);
+      await DeletesHandler.create_form(ctx, {
+        pageType: "page",
+        pageTypePlural: "pages",
+      });
     }).rejects.toThrow("Missing page #42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");

package/src/tests/handlers/pages/PagesHandler.test/create.test.js

@@ -12,7 +12,7 @@ describe("Pages Handler", () => {
         tags: new Tags(testConfig, "token"),
       },
       resourceParams: {
-        page: params,
+        resource: params,
       },
       locale: "en",
     };
@@ -39,7 +39,10 @@ describe("Pages Handler", () => {
       .spyOn(ctx.client.pages, "create")
       .mockImplementation(() => ({ page: {}, errors: null }));
 
-    const result = await PagesHandler.create(ctx);
+    const result = await PagesHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockedCreate).toHaveBeenCalledWith(
       {
@@ -99,7 +102,10 @@ describe("Pages Handler", () => {
         errors: [{ key: "slug", message: "cannot be blank" }],
       }));
 
-    const result = await PagesHandler.create(ctx);
+    const result = await PagesHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockedTagsList).toHaveBeenCalledWith("en");
     expect(mockedCreate).toHaveBeenCalledWith(
@@ -129,9 +135,9 @@ describe("Pages Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        page: { ...params, meta_image: JSON.parse(params.meta_image) },
+        resource: { ...params, meta_image: JSON.parse(params.meta_image) },
         tags: [tag],
-        errors: { page: { slug: "cannot be blank" } },
+        errors: { resource: { slug: "cannot be blank" } },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         _translations: [],
       },

package/src/tests/handlers/pages/PagesHandler.test/create_form.test.js

@@ -30,7 +30,7 @@ describe("Pages Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        page: { ...ctx.client.pages.defaults(), meta_image: {} },
+        resource: { ...ctx.client.pages.defaults(), meta_image: {} },
         tags: tags,
         errors: {},
         visibilityOptions: ctx.client.pages.visibilityOptions(),

package/src/tests/handlers/pages/PagesHandler.test/index.test.js

@@ -30,9 +30,12 @@ describe("Pages Handler", () => {
       .spyOn(ctx.client.tags, "all")
       .mockImplementation(() => ({ list: tags, pagination: null }));
 
-    const result = await PagesHandler.index(ctx);
+    const result = await PagesHandler.index(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
-    expect(mockedPageList).toHaveBeenCalledWith({ foo: "bar" }, "en");
+    expect(mockedPageList).toHaveBeenCalledWith({ foo: "bar" }, "en", "page");
     expect(mockedTagList).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({

package/src/tests/handlers/pages/PagesHandler.test/show.test.js

@@ -62,7 +62,10 @@ describe("Pages Handler", () => {
       .spyOn(ctx.client.pageChanges, "all")
       .mockImplementation(() => ({ list: [change] }));
 
-    const result = await PagesHandler.show(ctx);
+    const result = await PagesHandler.show(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockedPageFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockedPageRevisions).toHaveBeenCalledWith(page.id, "en");
@@ -70,7 +73,7 @@ describe("Pages Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        page,
+        resource: page,
         revisions: [revision],
         changes: [change],
         _translations: [
@@ -95,7 +98,10 @@ describe("Pages Handler", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await PagesHandler.show(ctx);
+      await PagesHandler.show(ctx, {
+        pageType: "page",
+        pageTypePlural: "pages",
+      });
     }).rejects.toThrow("Missing page #42");
 
     expect(mockedPageFind).toHaveBeenCalledWith("42", "en");

package/src/tests/handlers/pages/URLsHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import URLsHandler from "../../../../handlers/pages/URLsHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test/handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test/handlersHelper";
 
 function buildCtx(page, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(page, updateSettings) {
       change: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -33,7 +34,10 @@ describe("Page change url", () => {
       .spyOn(ctx.client.pages, "updateSlug")
       .mockImplementation(() => ({ page, errors: null }));
 
-    const result = await URLsHandler.create(ctx);
+    const result = await URLsHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockChange).toHaveBeenCalledWith(
@@ -41,7 +45,7 @@ describe("Page change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${page.slug}`,
+        url: `/en/${page.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a page",
@@ -71,7 +75,10 @@ describe("Page change url", () => {
         errors: [{ codes: [], key: "slug", message: "has already been taken" }],
       }));
 
-    const result = await URLsHandler.create(ctx);
+    const result = await URLsHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockChange).toHaveBeenCalledWith(
@@ -115,7 +122,10 @@ describe("Page change url", () => {
         ],
       }));
 
-    const result = await URLsHandler.create(ctx);
+    const result = await URLsHandler.create(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockChange).toHaveBeenCalledWith(
@@ -123,7 +133,7 @@ describe("Page change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${page.slug}`,
+        url: `/en/${page.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a page",
@@ -147,7 +157,10 @@ describe("Page change url", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await URLsHandler.create(ctx);
+      await URLsHandler.create(ctx, {
+        pageType: "page",
+        pageTypePlural: "pages",
+      });
     }).rejects.toThrow("Cannot find page with id 42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");

package/src/tests/handlers/pages/URLsHandler.test/create_form.test.js

@@ -22,7 +22,10 @@ describe("Page change url", () => {
       .spyOn(ctx.client.pages, "find")
       .mockImplementation(() => page);
 
-    const result = await URLsHandler.create_form(ctx);
+    const result = await URLsHandler.create_form(ctx, {
+      pageType: "page",
+      pageTypePlural: "pages",
+    });
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
 
@@ -43,7 +46,10 @@ describe("Page change url", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await URLsHandler.create_form(ctx);
+      await URLsHandler.create_form(ctx, {
+        pageType: "page",
+        pageTypePlural: "pages",
+      });
     }).rejects.toThrow("Cannot find page with id 42");
 
     expect(mockFind).toHaveBeenCalledWith("42", "en");

package/src/tests/routeCollection.test.js

@@ -32,119 +32,132 @@ describe("routeCollection", () => {
   test("Valid handler mapping is passed to router", () => {
     routeCollection(honoAdapter, "users", UsersHandler);
 
-    expect(adapterSpy).toHaveBeenCalledWith([
-      ["GET", "/users", "users", "users", "index", UsersHandler.index],
+    expect(adapterSpy).toHaveBeenCalledWith(
       [
-        "GET",
-        "/users/new",
-        "users",
-        "users",
-        "create_form",
-        UsersHandler.create_form,
+        ["GET", "/users", "users", "users", "index", UsersHandler.index],
+        [
+          "GET",
+          "/users/new",
+          "users",
+          "users",
+          "create_form",
+          UsersHandler.create_form,
+        ],
+        ["GET", "/users/:id", "users", "users", "show", UsersHandler.show],
+        [
+          "GET",
+          "/users/:id/edit",
+          "users",
+          "users",
+          "edit_form",
+          UsersHandler.edit_form,
+        ],
+        [
+          "POST",
+          "/users",
+          "users",
+          "users",
+          "create_form",
+          UsersHandler.create,
+        ],
+        [
+          "POST",
+          "/users/:id",
+          "users",
+          "users",
+          "edit_form",
+          UsersHandler.update,
+        ],
+        [
+          "DELETE",
+          "/users/:id",
+          "users",
+          "users",
+          "destroy",
+          UsersHandler.destroy,
+        ],
       ],
-      ["GET", "/users/:id", "users", "users", "show", UsersHandler.show],
-      [
-        "GET",
-        "/users/:id/edit",
-        "users",
-        "users",
-        "edit_form",
-        UsersHandler.edit_form,
-      ],
-      ["POST", "/users", "users", "users", "create_form", UsersHandler.create],
-      [
-        "POST",
-        "/users/:id",
-        "users",
-        "users",
-        "edit_form",
-        UsersHandler.update,
-      ],
-      [
-        "DELETE",
-        "/users/:id",
-        "users",
-        "users",
-        "destroy",
-        UsersHandler.destroy,
-      ],
-    ]);
+      {}
+    );
   });
 
   test("Valid handler mapping is passed to router with filters", () => {
     routeCollection(honoAdapter, "users", UsersHandlerWithFilters);
 
-    expect(adapterSpy).toHaveBeenCalledWith([
-      [
-        "GET",
-        "/users",
-        "users",
-        "users",
-        "index",
-        UsersHandlerWithFilters.index,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
-      [
-        "GET",
-        "/users/new",
-        "users",
-        "users",
-        "create_form",
-        UsersHandlerWithFilters.create_form,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
-      [
-        "GET",
-        "/users/:id",
-        "users",
-        "users",
-        "show",
-        UsersHandlerWithFilters.show,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
-      [
-        "GET",
-        "/users/:id/edit",
-        "users",
-        "users",
-        "edit_form",
-        UsersHandlerWithFilters.edit_form,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
-      [
-        "POST",
-        "/users",
-        "users",
-        "users",
-        "create_form",
-        UsersHandlerWithFilters.create,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
-      [
-        "POST",
-        "/users/:id",
-        "users",
-        "users",
-        "edit_form",
-        UsersHandlerWithFilters.update,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
-      ],
+    expect(adapterSpy).toHaveBeenCalledWith(
       [
-        "DELETE",
-        "/users/:id",
-        "users",
-        "users",
-        "destroy",
-        UsersHandlerWithFilters.destroy,
-        UsersHandlerWithFilters.before_filter,
-        UsersHandlerWithFilters.after_filter,
+        [
+          "GET",
+          "/users",
+          "users",
+          "users",
+          "index",
+          UsersHandlerWithFilters.index,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "GET",
+          "/users/new",
+          "users",
+          "users",
+          "create_form",
+          UsersHandlerWithFilters.create_form,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "GET",
+          "/users/:id",
+          "users",
+          "users",
+          "show",
+          UsersHandlerWithFilters.show,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "GET",
+          "/users/:id/edit",
+          "users",
+          "users",
+          "edit_form",
+          UsersHandlerWithFilters.edit_form,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "POST",
+          "/users",
+          "users",
+          "users",
+          "create_form",
+          UsersHandlerWithFilters.create,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "POST",
+          "/users/:id",
+          "users",
+          "users",
+          "edit_form",
+          UsersHandlerWithFilters.update,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
+        [
+          "DELETE",
+          "/users/:id",
+          "users",
+          "users",
+          "destroy",
+          UsersHandlerWithFilters.destroy,
+          UsersHandlerWithFilters.before_filter,
+          UsersHandlerWithFilters.after_filter,
+        ],
       ],
-    ]);
+      {}
+    );
   });
 });

package/src/tests/routeMember.test.js

@@ -24,68 +24,74 @@ describe("routeMember", () => {
   test("Valid handler mapping is passed to router", () => {
     routeMember(honoAdapter, "profile", ProfileHandWithFilters);
 
-    expect(adapterSpy).toHaveBeenCalledWith([
+    expect(adapterSpy).toHaveBeenCalledWith(
       [
-        "GET",
-        "/profile",
-        "profile",
-        "profile",
-        "show",
-        ProfileHandWithFilters.show,
+        [
+          "GET",
+          "/profile",
+          "profile",
+          "profile",
+          "show",
+          ProfileHandWithFilters.show,
+        ],
+        [
+          "GET",
+          "/profile/edit",
+          "profile",
+          "profile",
+          "edit_form",
+          ProfileHandWithFilters.edit_form,
+        ],
+        [
+          "POST",
+          "/profile",
+          "profile",
+          "profile",
+          "edit_form",
+          ProfileHandWithFilters.update,
+        ],
       ],
-      [
-        "GET",
-        "/profile/edit",
-        "profile",
-        "profile",
-        "edit_form",
-        ProfileHandWithFilters.edit_form,
-      ],
-      [
-        "POST",
-        "/profile",
-        "profile",
-        "profile",
-        "edit_form",
-        ProfileHandWithFilters.update,
-      ],
-    ]);
+      {}
+    );
   });
 
   test("Valid handler mapping is passed to router with filters", () => {
     routeMember(honoAdapter, "profile", ProfileHandWithFiltersWithFilters);
 
-    expect(adapterSpy).toHaveBeenCalledWith([
-      [
-        "GET",
-        "/profile",
-        "profile",
-        "profile",
-        "show",
-        ProfileHandWithFiltersWithFilters.show,
-        ProfileHandWithFiltersWithFilters.before_filter,
-        ProfileHandWithFiltersWithFilters.after_filter,
-      ],
-      [
-        "GET",
-        "/profile/edit",
-        "profile",
-        "profile",
-        "edit_form",
-        ProfileHandWithFiltersWithFilters.edit_form,
-        ProfileHandWithFiltersWithFilters.before_filter,
-        ProfileHandWithFiltersWithFilters.after_filter,
-      ],
+    expect(adapterSpy).toHaveBeenCalledWith(
       [
-        "POST",
-        "/profile",
-        "profile",
-        "profile",
-        "edit_form",
-        ProfileHandWithFiltersWithFilters.update,
-        ProfileHandWithFiltersWithFilters.before_filter,
-        ProfileHandWithFiltersWithFilters.after_filter,
+        [
+          "GET",
+          "/profile",
+          "profile",
+          "profile",
+          "show",
+          ProfileHandWithFiltersWithFilters.show,
+          ProfileHandWithFiltersWithFilters.before_filter,
+          ProfileHandWithFiltersWithFilters.after_filter,
+        ],
+        [
+          "GET",
+          "/profile/edit",
+          "profile",
+          "profile",
+          "edit_form",
+          ProfileHandWithFiltersWithFilters.edit_form,
+          ProfileHandWithFiltersWithFilters.before_filter,
+          ProfileHandWithFiltersWithFilters.after_filter,
+        ],
+        [
+          "POST",
+          "/profile",
+          "profile",
+          "profile",
+          "edit_form",
+          ProfileHandWithFiltersWithFilters.update,
+          ProfileHandWithFiltersWithFilters.before_filter,
+          ProfileHandWithFiltersWithFilters.after_filter,
+        ],
       ],
-    ]);
+      {}
+    );
   });
 });