@raketa-cloud/admin 1.8.4 → 1.8.6

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

@@ -1,28 +1,28 @@
-import PublishesHandler from "../../../../handlers/article_revisions/PublishesHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
-import Articles from "../../../../cloud/Articles";
+import PublishesHandler from "../../../../handlers/resource_revisions/PublishesHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revision, resourceParams) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
-      articles: new Articles(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams,
     locale: "en",
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Publish article revision", () => {
+describe("Publish resource revision", () => {
   test("create successful for publishing", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const publishing = {
       title: "A new revision!",
       description: "Nice!",
@@ -32,11 +32,9 @@ describe("Publish article revision", () => {
       type: "now",
     };
 
-    const ctx = buildCtx(revision, {
-      publishing,
-    });
+    const ctx = buildCtx(revision, { publishing });
 
-    const updatedArticle = Factory.build("article", {
+    const updatedResource = Factory.build("resource", {
       id: revision.originalId,
       settings: {
         credentials: {
@@ -47,16 +45,16 @@ describe("Publish article revision", () => {
     });
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockPublish = jest
-      .spyOn(ctx.client.articleRevisions, "publish")
-      .mockImplementation(() => ({ article: updatedArticle, errors: null }));
+      .spyOn(ctx.client.resourceRevisions, "publish")
+      .mockImplementation(() => ({ resource: updatedResource, errors: null }));
 
     const result = await PublishesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockPublish).toHaveBeenCalledWith(
       revision.id,
       "en",
@@ -73,16 +71,17 @@ describe("Publish article revision", () => {
             password: publishing.password,
           },
         }),
-      }
+      },
+      "article"
     );
 
     expect(result).toEqual({
-      redirect: `/en/articles/${updatedArticle.id}`,
+      redirect: `/en/articles/${revision.originalId}`,
     });
   });
 
   test("create failed for publishing", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const publishing = {
       title: "A new revision!",
       description: "Nice!",
@@ -90,24 +89,22 @@ describe("Publish article revision", () => {
       type: "now",
     };
 
-    const ctx = buildCtx(revision, {
-      publishing,
-    });
+    const ctx = buildCtx(revision, { publishing });
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockPublish = jest
-      .spyOn(ctx.client.articleRevisions, "publish")
+      .spyOn(ctx.client.resourceRevisions, "publish")
       .mockImplementation(() => ({
-        article: null,
+        resource: null,
         errors: [{ key: "url", message: "Oops" }],
       }));
 
     const result = await PublishesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockPublish).toHaveBeenCalledWith(
       revision.id,
       "en",
@@ -117,7 +114,8 @@ describe("Publish article revision", () => {
       },
       {
         visibility: publishing.visibility,
-      }
+      },
+      "article"
     );
 
     expect(result).toEqual({
@@ -132,19 +130,16 @@ describe("Publish article revision", () => {
           password: publishing.password,
           type: publishing.type,
         },
-        visibilityOptions: ctx.client.articles.visibilityOptions(),
-        errors: {
-          url: "Oops",
-        },
-        articleErrors: null,
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
+        errors: { url: "Oops" },
+        resourceErrors: null,
         _translations: [],
       },
     });
   });
 
   test("create successful for scheduling", async () => {
-    const revision = Factory.build("article_revision");
-    const schedule = Factory.build("revision_schedule");
+    const revision = Factory.build("resource_revision");
     const publishing = {
       mergeAt: "2024-12-20T20:20",
       title: "A new revision!",
@@ -155,27 +150,25 @@ describe("Publish article revision", () => {
       type: "later",
     };
 
-    const ctx = buildCtx(revision, {
-      publishing,
-    });
+    const ctx = buildCtx(revision, { publishing });
 
-    const updatedRevision = { ...revision, schedule: { ...schedule } };
+    const updatedRevision = { ...revision };
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockSchedule = jest
-      .spyOn(ctx.client.articleRevisions, "schedule")
+      .spyOn(ctx.client.resourceRevisions, "schedule")
       .mockImplementation(() => ({
         revision: updatedRevision,
         errors: null,
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await PublishesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockSchedule).toHaveBeenCalledWith(
       revision.id,
       "en",
@@ -193,7 +186,8 @@ describe("Publish article revision", () => {
             password: publishing.password,
           },
         }),
-      }
+      },
+      "article"
     );
 
     expect(result).toEqual({
@@ -201,8 +195,8 @@ describe("Publish article revision", () => {
     });
   });
 
-  test("create failed for scheduling - articleErrors", async () => {
-    const revision = Factory.build("article_revision");
+  test("create failed for scheduling - resourceErrors", async () => {
+    const revision = Factory.build("resource_revision");
     const publishing = {
       mergeAt: "2024-12-20T20:20",
       title: "A new revision!",
@@ -211,25 +205,23 @@ describe("Publish article revision", () => {
       type: "later",
     };
 
-    const ctx = buildCtx(revision, {
-      publishing,
-    });
+    const ctx = buildCtx(revision, { publishing });
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockSchedule = jest
-      .spyOn(ctx.client.articleRevisions, "schedule")
+      .spyOn(ctx.client.resourceRevisions, "schedule")
       .mockImplementation(() => ({
         revision: null,
-        articleErrors: [{ key: "slug", message: "Oops" }],
+        resourceErrors: [{ key: "slug", message: "Oops" }],
         errors: null,
       }));
 
     const result = await PublishesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockSchedule).toHaveBeenCalledWith(
       revision.id,
       "en",
@@ -240,7 +232,8 @@ describe("Publish article revision", () => {
       },
       {
         visibility: publishing.visibility,
-      }
+      },
+      "article"
     );
 
     expect(result).toEqual({
@@ -256,10 +249,8 @@ describe("Publish article revision", () => {
           password: publishing.password,
           type: publishing.type,
         },
-        visibilityOptions: ctx.client.articles.visibilityOptions(),
-        articleErrors: {
-          slug: "Oops",
-        },
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
+        resourceErrors: { slug: "Oops" },
         errors: null,
         _translations: [],
       },
@@ -267,7 +258,7 @@ describe("Publish article revision", () => {
   });
 
   test("create failed for scheduling - errors", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const publishing = {
       mergeAt: "2024-12-20T20:20",
       title: "A new revision!",
@@ -276,25 +267,23 @@ describe("Publish article revision", () => {
       type: "later",
     };
 
-    const ctx = buildCtx(revision, {
-      publishing,
-    });
+    const ctx = buildCtx(revision, { publishing });
 
     const mockFind = jest
-      .spyOn(ctx.client.articleRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockSchedule = jest
-      .spyOn(ctx.client.articleRevisions, "schedule")
+      .spyOn(ctx.client.resourceRevisions, "schedule")
       .mockImplementation(() => ({
         revision: null,
         errors: [{ key: "slug", message: "Oops" }],
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await PublishesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockSchedule).toHaveBeenCalledWith(
       revision.id,
       "en",
@@ -305,7 +294,8 @@ describe("Publish article revision", () => {
       },
       {
         visibility: publishing.visibility,
-      }
+      },
+      "article"
     );
 
     expect(result).toEqual({
@@ -321,11 +311,9 @@ describe("Publish article revision", () => {
           password: publishing.password,
           type: publishing.type,
         },
-        visibilityOptions: ctx.client.articles.visibilityOptions(),
-        errors: {
-          slug: "Oops",
-        },
-        articleErrors: null,
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
+        errors: { slug: "Oops" },
+        resourceErrors: null,
         _translations: [],
       },
     });

package/src/tests/handlers/{page_revisions → resource_revisions}/PublishesHandler.test/create_form.test.js

@@ -1,31 +1,35 @@
-import PublishesHandler from "../../../../handlers/page_revisions/PublishesHandler";
-import PageRevisions from "../../../../cloud/PageRevisions";
-import Pages from "../../../../cloud/Pages";
+import PublishesHandler from "../../../../handlers/resource_revisions/PublishesHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revision) {
   return {
     client: {
-      pageRevisions: new PageRevisions(() => ({}), "token"),
-      pages: new Pages(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("Publish page revision", () => {
+describe("Publish resource revision", () => {
   test("create_form", async () => {
-    const revision = Factory.build("page_revision");
+    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 PublishesHandler.create_form(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
@@ -39,7 +43,7 @@ describe("Publish page revision", () => {
           password: revision.settings?.credentials?.password,
           type: "now",
         },
-        visibilityOptions: ctx.client.pages.visibilityOptions(),
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
         errors: {},
         _translations: [],
       },

package/src/tests/handlers/resource_revisions/ResourceRevisionsHandler.test/create.test.js

@@ -0,0 +1,87 @@
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
+import ResourceRevisionsHandler from "../../../../handlers/resource_revisions/ResourceRevisionsHandler";
+import Factory from "../../../support/factory";
+
+function buildCtx(resourceID) {
+  return {
+    client: {
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
+    },
+    params: { parent_id: resourceID },
+    locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+    maxOpenRevisions: 1,
+  };
+}
+
+describe("Resource revisions", () => {
+  test("create successful", async () => {
+    const resource = Factory.build("resource", { id: 1, revisionsCount: 0 });
+    const revision = Factory.build("resource_revision", { originalId: 1 });
+    const ctx = buildCtx(resource.id);
+
+    jest.spyOn(ctx.client.resources, "find").mockResolvedValue(resource);
+
+    jest
+      .spyOn(ctx.client.resourceRevisions, "create")
+      .mockResolvedValue({ revision, errors: null, resourceErrors: null });
+
+    const result = await ResourceRevisionsHandler.create(ctx);
+
+    expect(result).toEqual({
+      redirect: `/en/articles/${resource.id}`,
+    });
+  });
+
+  test("create failed when there is an opened revision for the resource", async () => {
+    const resource = Factory.build("resource", { id: 1, revisionsCount: 2 });
+    const ctx = buildCtx(resource.id);
+
+    jest.spyOn(ctx.client.resources, "find").mockResolvedValue(resource);
+
+    const result = await ResourceRevisionsHandler.create(ctx);
+
+    expect(result).toEqual({
+      redirect: `/en/articles/${resource.id}?revisions_count_error=1`,
+    });
+  });
+
+  test("create failed with errors", async () => {
+    const resource = Factory.build("resource", { id: 1, revisionsCount: 0 });
+    const errors = [{ key: "generalError", message: "something went wrong" }];
+    const ctx = buildCtx(resource.id);
+
+    jest.spyOn(ctx.client.resources, "find").mockResolvedValue(resource);
+
+    jest
+      .spyOn(ctx.client.resourceRevisions, "create")
+      .mockResolvedValue({ revision: null, errors, resourceErrors: null });
+
+    await expect(ResourceRevisionsHandler.create(ctx)).rejects.toThrow(
+      `Failed to start revision: ${JSON.stringify(errors)}`
+    );
+  });
+
+  test("create failed with resource errors", async () => {
+    const resource = Factory.build("resource", { id: 1, revisionsCount: 0 });
+    const errors = [{ key: "generalError", message: "something went wrong" }];
+    const ctx = buildCtx(resource.id);
+
+    jest.spyOn(ctx.client.resources, "find").mockResolvedValue(resource);
+
+    jest.spyOn(ctx.client.resourceRevisions, "create").mockResolvedValue({
+      revision: null,
+      errors: null,
+      resourceErrors: errors,
+    });
+
+    await expect(ResourceRevisionsHandler.create(ctx)).rejects.toThrow(
+      `Failed to start revision: ${JSON.stringify(errors)}`
+    );
+  });
+});

package/src/tests/handlers/{article_revisions/ArticleRevisionsHandler.test → resource_revisions/ResourceRevisionsHandler.test}/destroy.test.js

@@ -1,34 +1,34 @@
-import ArticleRevisionsHandler from "../../../../handlers/article_revisions/ArticleRevisionsHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
+import ResourceRevisionsHandler from "../../../../handlers/resource_revisions/ResourceRevisionsHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revisionID) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { id: revisionID },
     locale: "en",
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article revisions", () => {
+describe("Resource revisions", () => {
   test("destroy successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(1);
 
     const mockDelete = jest
-      .spyOn(ctx.client.articleRevisions, "delete")
+      .spyOn(ctx.client.resourceRevisions, "delete")
       .mockImplementation(() => ({ revision, errors: null }));
 
-    const result = await ArticleRevisionsHandler.destroy(ctx);
+    const result = await ResourceRevisionsHandler.destroy(ctx);
 
-    expect(mockDelete).toHaveBeenCalledWith(1, "en");
+    expect(mockDelete).toHaveBeenCalledWith(1, "en", "article");
 
     expect(result).toEqual({
       headers: {
@@ -43,15 +43,15 @@ describe("Article revisions", () => {
     const errors = [{ key: "generalError", message: "something went wrong" }];
 
     const mockDelete = jest
-      .spyOn(ctx.client.articleRevisions, "delete")
+      .spyOn(ctx.client.resourceRevisions, "delete")
       .mockImplementation(() => ({ revision: null, errors }));
 
     expect(async () => {
-      await ArticleRevisionsHandler.destroy(ctx);
+      await ResourceRevisionsHandler.destroy(ctx);
     }).rejects.toThrow(
       `Failed to delete revision#${1}: ${JSON.stringify(errors)}`
     );
 
-    expect(mockDelete).toHaveBeenCalledWith(1, "en");
+    expect(mockDelete).toHaveBeenCalledWith(1, "en", "article");
   });
 });

package/src/tests/handlers/resource_revisions/RevertsHandler.test/create.test.js

@@ -0,0 +1,83 @@
+import RevertsHandler from "../../../../handlers/resource_revisions/RevertsHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+
+function buildCtx(resourceID, version) {
+  return {
+    client: {
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+    },
+    params: { parent_id: resourceID },
+    resourceParams: { version },
+    locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+  };
+}
+
+describe("Resource revision revert", () => {
+  test("create successful", async () => {
+    const resourceId = 42;
+    const version = 2;
+    const ctx = buildCtx(resourceId, version);
+
+    const mockRevert = jest
+      .spyOn(ctx.client.resourceRevisions, "revert")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+        resourceErrors: null,
+      }));
+
+    const result = await RevertsHandler.create(ctx);
+
+    expect(mockRevert).toHaveBeenCalledWith(resourceId, version, "en", "article");
+
+    expect(result).toEqual({
+      redirect: `/en/articles/${resourceId}`,
+    });
+  });
+
+  test("create failed with errors", async () => {
+    const resourceId = 42;
+    const version = 2;
+    const ctx = buildCtx(resourceId, version);
+    const errors = [{ key: "generalError", message: "Some error" }];
+
+    const mockRevert = jest
+      .spyOn(ctx.client.resourceRevisions, "revert")
+      .mockImplementation(() => ({
+        revision: null,
+        errors,
+        resourceErrors: null,
+      }));
+
+    expect(async () => {
+      await RevertsHandler.create(ctx);
+    }).rejects.toThrow(`Failed to start revision: ${JSON.stringify(errors)}`);
+
+    expect(mockRevert).toHaveBeenCalledWith(resourceId, version, "en", "article");
+  });
+
+  test("create failed with resource errors", async () => {
+    const resourceId = 42;
+    const version = 2;
+    const ctx = buildCtx(resourceId, version);
+    const errors = [{ key: "generalError", message: "Some error" }];
+
+    const mockRevert = jest
+      .spyOn(ctx.client.resourceRevisions, "revert")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: null,
+        resourceErrors: errors,
+      }));
+
+    expect(async () => {
+      await RevertsHandler.create(ctx);
+    }).rejects.toThrow(`Failed to start revision: ${JSON.stringify(errors)}`);
+
+    expect(mockRevert).toHaveBeenCalledWith(resourceId, version, "en", "article");
+  });
+});