@raketa-cloud/admin 1.8.4 → 1.8.7

package/src/tests/handlers/{event_revisions → resource_revisions}/TagHandler.test/edit_form.test.js

@@ -1,5 +1,6 @@
-import TagHandler from "../../../../handlers/event_revisions/TagHandler";
-import EventRevisions from "../../../../cloud/EventRevisions";
+import TagHandler from "../../../../handlers/resource_revisions/TagHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
 import Tags from "../../../../cloud/Tags";
 
 import Factory from "../../../support/factory";
@@ -7,55 +8,58 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
       tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    defaultLocale: "en",
+    locales: {
+      en: { name: "English", code: "en-gb" },
+    },
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("Event revision tags settings", () => {
+describe("Resource revision tags settings", () => {
   test("edit_form when a revision exists", async () => {
     const tags = [
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("event_revision", {
+    const revision = Factory.build("resource_revision", {
       tags: [tags[0]],
-      publishAt: "2024-10-10T07:00:00Z",
-      startsAt: "2024-10-10T07:05:00Z",
-      endsAt: "2024-10-10T07:15:00Z",
     });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockTags = jest
       .spyOn(ctx.client.tags, "all")
-      .mockImplementation(() => ({
-        list: tags,
-      }));
+      .mockImplementation(() => ({ list: tags }));
 
     const result = await TagHandler.edit_form(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockTags).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({
       assigns: {
         resource: {
           ...revision,
-          publishAt: "2024-10-10",
-          startsAt: "2024-10-10T07:05:00",
-          endsAt: "2024-10-10T07:15:00",
           tags: [tags[0].id],
         },
-        tags: tags,
+        tags,
         errors: {},
         _translations: [],
+        defaultLocaleTags: [],
+        defaultLocaleName: "",
       },
     });
   });
@@ -64,13 +68,13 @@ describe("Event revision tags settings", () => {
     const ctx = buildCtx({ id: "42" });
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await TagHandler.edit_form(ctx);
     }).rejects.toThrow("Missing revision #42");
 
-    expect(mockFind).toHaveBeenCalledWith("42", "en");
+    expect(mockFind).toHaveBeenCalledWith("42", "en", "article");
   });
 });

package/src/tests/handlers/{article_revisions → resource_revisions}/TagHandler.test/update.test.js

@@ -1,5 +1,6 @@
-import TagHandler from "../../../../handlers/article_revisions/TagHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
+import TagHandler from "../../../../handlers/resource_revisions/TagHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
 import Tags from "../../../../cloud/Tags";
 
 import Factory from "../../../support/factory";
@@ -7,7 +8,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
       tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
@@ -15,22 +17,25 @@ function buildCtx(revision, updateSettings) {
       resource: updateSettings,
     },
     locale: "en",
+    defaultLocale: "en",
+    locales: {
+      en: { name: "English", code: "en-gb" },
+    },
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article revision tags settings", () => {
+describe("Resource revision tags settings", () => {
   test("update successful", async () => {
     const tags = [
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("article_revision", {
+    const revision = Factory.build("resource_revision", {
       tags: [tags[0]],
-      publishAt: "2024-10-10T07:00:00Z",
     });
 
     const updateSettings = {
@@ -40,29 +45,33 @@ describe("Article revision tags settings", () => {
     const ctx = buildCtx(revision, updateSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockUpdate = jest
-      .spyOn(ctx.client.articleRevisions, "update")
+      .spyOn(ctx.client.resourceRevisions, "update")
       .mockImplementation(() => ({
-        revision: {},
+        resource: {},
         errors: null,
       }));
 
     const result = await TagHandler.update(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      publishAt: revision.publishAt,
-      widgets: revision.widgets,
-      tags: updateSettings.tags,
-      categories: revision.categories.map((c) => c.id),
-      settings: revision.settings,
-    });
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+    expect(mockUpdate).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        slug: revision.slug,
+        title: revision.title,
+        visibility: revision.visibility,
+        widgets: revision.widgets,
+        tags: updateSettings.tags,
+        categories: revision.categories.map((c) => c.id),
+        settings: revision.settings,
+      },
+      "article"
+    );
 
     expect(result).toEqual({
       redirect: `/en/article_revisions/${revision.id}/tags/edit?success=1`,
@@ -74,9 +83,8 @@ describe("Article revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("article_revision", {
+    const revision = Factory.build("resource_revision", {
       tags: [tags[0]],
-      publishAt: "2024-10-10T07:00:00Z",
     });
 
     const updateSettings = {
@@ -86,35 +94,23 @@ describe("Article revision tags settings", () => {
     const ctx = buildCtx(revision, updateSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockUpdate = jest
-      .spyOn(ctx.client.articleRevisions, "update")
+      .spyOn(ctx.client.resourceRevisions, "update")
       .mockImplementation(() => ({
-        revision: {},
+        resource: {},
         errors: [{ key: "generalError", message: "some error" }],
       }));
 
     const mockTags = jest
       .spyOn(ctx.client.tags, "all")
-      .mockImplementation(() => ({
-        list: tags,
-      }));
+      .mockImplementation(() => ({ list: tags }));
 
     const result = await TagHandler.update(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      publishAt: revision.publishAt,
-      widgets: revision.widgets,
-      tags: updateSettings.tags,
-      categories: revision.categories.map((c) => c.id),
-      settings: revision.settings,
-    });
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockTags).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({
@@ -122,32 +118,31 @@ describe("Article revision tags settings", () => {
         resource: {
           ...revision,
           tags: updateSettings.tags,
-          publishAt: "2024-10-10",
         },
         errors: {
           resource: { generalError: "some error" },
         },
-        tags: tags,
+        tags,
         _translations: [],
+        defaultLocaleTags: [],
+        defaultLocaleName: "",
       },
     });
   });
 
   test("update when a revision does not exist", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
 
-    const updateSettings = {};
-
-    const ctx = buildCtx(revision, updateSettings);
+    const ctx = buildCtx(revision, {});
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await TagHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 });

package/src/tests/handlers/{article_revisions → resource_revisions}/UnlocksHandler.test/create.test.js

@@ -1,37 +1,37 @@
 import Factory from "../../../support/factory";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
-import UnlocksHandler from "../../../../handlers/article_revisions/UnlocksHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import UnlocksHandler from "../../../../handlers/resource_revisions/UnlocksHandler";
 
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article revision unlock", () => {
+describe("Resource revision unlock", () => {
   test("unlock successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
 
     const mockUnlock = jest
-      .spyOn(ctx.client.articleRevisions, "unlock")
+      .spyOn(ctx.client.resourceRevisions, "unlock")
       .mockImplementation(() => ({
-        revision: revision,
+        revision,
         errors: null,
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await UnlocksHandler.create(ctx);
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       redirect: `/en/articles/${revision.originalId}`,
@@ -39,46 +39,46 @@ describe("Article revision unlock", () => {
   });
 
   test("unlock failed with errors", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
     const errors = [
       { key: "generalError", message: "Failed to unlock revision" },
     ];
 
     const mockUnlock = jest
-      .spyOn(ctx.client.articleRevisions, "unlock")
+      .spyOn(ctx.client.resourceRevisions, "unlock")
       .mockImplementation(() => ({
         revision: null,
         errors,
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     await expect(UnlocksHandler.create(ctx)).rejects.toThrow(
       `Failed to unlock revision: ${JSON.stringify(errors)}`
     );
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 
-  test("unlock failed with article errors", async () => {
-    const revision = Factory.build("article_revision");
+  test("unlock failed with resource errors", async () => {
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
-    const articleErrors = [
+    const resourceErrors = [
       { key: "generalError", message: "Failed to unlock revision" },
     ];
 
     const mockUnlock = jest
-      .spyOn(ctx.client.articleRevisions, "unlock")
+      .spyOn(ctx.client.resourceRevisions, "unlock")
       .mockImplementation(() => ({
         revision: null,
         errors: null,
-        articleErrors,
+        resourceErrors,
       }));
 
     await expect(UnlocksHandler.create(ctx)).rejects.toThrow(
-      `Failed to unlock revision: ${JSON.stringify(articleErrors)}`
+      `Failed to unlock revision: ${JSON.stringify(resourceErrors)}`
     );
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 });

package/src/tests/handlers/{page_revisions/VisualHandler.test.test → resource_revisions/VisualHandler.test}/edit_form.test.js

@@ -1,37 +1,34 @@
-import VisualHandler from "../../../../handlers/page_revisions/VisualHandler";
-import PageRevisions from "../../../../cloud/PageRevisions";
+import VisualHandler from "../../../../handlers/resource_revisions/VisualHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revision) {
   return {
     client: {
-      pageRevisions: new PageRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("Page revision visuals settings", () => {
+describe("Resource revision visuals settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("page_revision", {
-      settings: {
-        layout: "default",
-        meta: {
-          title: "Meta title",
-        },
-      },
-    });
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
 
     const mockFind = jest
-      .spyOn(ctx.client.pageRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const result = await VisualHandler.edit_form(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
@@ -46,13 +43,13 @@ describe("Page revision visuals settings", () => {
     const ctx = buildCtx({ id: "42" });
 
     const mockFind = jest
-      .spyOn(ctx.client.pageRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await VisualHandler.edit_form(ctx);
     }).rejects.toThrow("Missing revision #42");
 
-    expect(mockFind).toHaveBeenCalledWith("42", "en");
+    expect(mockFind).toHaveBeenCalledWith("42", "en", "article");
   });
 });

package/src/tests/handlers/resource_revisions/VisualHandler.test/update.test.js

@@ -0,0 +1,130 @@
+import VisualHandler from "../../../../handlers/resource_revisions/VisualHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+
+import Factory from "../../../support/factory";
+
+function buildCtx(revision, updateSettings) {
+  return {
+    client: {
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+    },
+    params: { parent_id: revision.id },
+    resourceParams: {
+      resource: updateSettings,
+    },
+    locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+  };
+}
+
+describe("Resource revision visuals settings", () => {
+  test("update successful", async () => {
+    const revision = Factory.build("resource_revision");
+
+    const updateSettings = {
+      settings: {
+        layout: "bla",
+      },
+    };
+
+    const ctx = buildCtx(revision, updateSettings);
+
+    const mockFind = jest
+      .spyOn(ctx.client.resourceRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.resourceRevisions, "update")
+      .mockImplementation(() => ({
+        resource: {},
+        errors: null,
+      }));
+
+    const result = await VisualHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+    expect(mockUpdate).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        slug: revision.slug,
+        title: revision.title,
+        visibility: revision.visibility,
+        widgets: revision.widgets,
+        tags: revision.tags.map((t) => t.id),
+        categories: revision.categories.map((c) => c.id),
+        settings: {
+          ...revision.settings,
+          layout: updateSettings.settings.layout,
+        },
+      },
+      "article"
+    );
+
+    expect(result).toEqual({
+      redirect: `/en/article_revisions/${revision.id}/visuals/edit?success=1`,
+    });
+  });
+
+  test("update failed", async () => {
+    const revision = Factory.build("resource_revision");
+
+    const updateSettings = {
+      settings: {
+        layout: "bla",
+      },
+    };
+
+    const ctx = buildCtx(revision, updateSettings);
+
+    const mockFind = jest
+      .spyOn(ctx.client.resourceRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.resourceRevisions, "update")
+      .mockImplementation(() => ({
+        resource: {},
+        errors: [{ key: "generalError", message: "some error" }],
+      }));
+
+    const result = await VisualHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+
+    expect(result).toEqual({
+      assigns: {
+        resource: {
+          ...revision,
+          settings: {
+            ...revision.settings,
+            layout: "bla",
+          },
+        },
+        errors: {
+          resource: { generalError: "some error" },
+        },
+        _translations: [],
+      },
+    });
+  });
+
+  test("update when a revision does not exist", async () => {
+    const revision = Factory.build("resource_revision");
+
+    const ctx = buildCtx(revision, {});
+
+    const mockFind = jest
+      .spyOn(ctx.client.resourceRevisions, "find")
+      .mockImplementation(() => null);
+
+    expect(async () => {
+      await VisualHandler.update(ctx);
+    }).rejects.toThrow(`Missing revision #${revision.id}`);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+  });
+});

package/src/tests/handlers/{event_revisions → resource_revisions}/WidgetHandler.test/show.test.js

@@ -1,5 +1,5 @@
-import WidgetHandler from "../../../../handlers/event_revisions/WidgetHandler";
-import EventRevisions from "../../../../cloud/EventRevisions";
+import WidgetHandler from "../../../../handlers/resource_revisions/WidgetHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
 import Settings from "../../../../cloud/Settings";
 
 import Factory from "../../../support/factory";
@@ -7,22 +7,26 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
       settings: new Settings(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("WidgetHandler", () => {
+describe("Resource revision WidgetHandler", () => {
   test("show", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("resource_revision");
     const settings = Factory.build("settings");
     const ctx = buildCtx(revision);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockSettings = jest
@@ -31,7 +35,7 @@ describe("WidgetHandler", () => {
 
     const result = await WidgetHandler.show(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockSettings).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({