@raketa-cloud/admin 1.8.4 → 1.8.7

package/src/tests/handlers/_shared/getResourceUpdateDestination.test.js

@@ -0,0 +1,63 @@
+import getResourceUpdateDestination from "../../../handlers/_shared/getResourceUpdateDestination";
+
+describe("getResourceUpdateDestination", () => {
+  function buildCtx(body) {
+    return {
+      locale: "en",
+      resourceConfig: {
+        resourceType: "article",
+      },
+      body,
+    };
+  }
+
+  test("returns edit destination with success flag when _next is not publish", () => {
+    const ctx = buildCtx({ _next: "save" });
+
+    const result = getResourceUpdateDestination(ctx, "42", "general");
+
+    expect(result).toBe("/en/article_revisions/42/general/edit?success=1");
+  });
+
+  test("returns publishes/new destination when _next is publish", () => {
+    const ctx = buildCtx({ _next: "publish" });
+
+    const result = getResourceUpdateDestination(ctx, "42", "general");
+
+    expect(result).toBe("/en/article_revisions/42/publishes/new");
+  });
+
+  test("returns edit destination when body is missing", () => {
+    const ctx = buildCtx(undefined);
+
+    const result = getResourceUpdateDestination(ctx, "42", "meta");
+
+    expect(result).toBe("/en/article_revisions/42/meta/edit?success=1");
+  });
+
+  test("returns edit destination when body has no _next", () => {
+    const ctx = buildCtx({});
+
+    const result = getResourceUpdateDestination(ctx, "7", "visuals");
+
+    expect(result).toBe("/en/article_revisions/7/visuals/edit?success=1");
+  });
+
+  test("uses locale from ctx", () => {
+    const ctx = buildCtx({});
+    ctx.locale = "bg";
+
+    const result = getResourceUpdateDestination(ctx, "42", "tags");
+
+    expect(result).toBe("/bg/article_revisions/42/tags/edit?success=1");
+  });
+
+  test("uses resourceType from ctx.resourceConfig", () => {
+    const ctx = buildCtx({});
+    ctx.resourceConfig.resourceType = "event";
+
+    const result = getResourceUpdateDestination(ctx, "42", "codes");
+
+    expect(result).toBe("/en/event_revisions/42/codes/edit?success=1");
+  });
+});

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

@@ -1,45 +1,45 @@
 import Factory from "../../../support/factory";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
-import CancelSchedulesHandler from "../../../../handlers/article_revisions/CancelSchedulesHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import CancelSchedulesHandler from "../../../../handlers/resource_revisions/CancelSchedulesHandler";
 
 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 schedule cancel", () => {
+describe("Resource revision schedule cancel", () => {
   test("cancel of schedule 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, "cancelSchedule")
+    const mockCancel = jest
+      .spyOn(ctx.client.resourceRevisions, "cancelSchedule")
       .mockImplementation(() => ({
-        revision: revision,
+        revision,
         errors: null,
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await CancelSchedulesHandler.create(ctx);
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockCancel).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       redirect: `/en/articles/${revision.originalId}`,
     });
   });
 
-  test("unlock failed with errors", async () => {
-    const revision = Factory.build("article_revision");
+  test("cancel failed with errors", async () => {
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
     const errors = [
       {
@@ -48,43 +48,43 @@ describe("Article revision schedule cancel", () => {
       },
     ];
 
-    const mockUnlock = jest
-      .spyOn(ctx.client.articleRevisions, "cancelSchedule")
+    const mockCancel = jest
+      .spyOn(ctx.client.resourceRevisions, "cancelSchedule")
       .mockImplementation(() => ({
         revision: null,
         errors,
-        articleErrors: null,
+        resourceErrors: null,
       }));
 
     await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
       `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
     );
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockCancel).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 
-  test("unlock failed with article errors", async () => {
-    const revision = Factory.build("article_revision");
+  test("cancel failed with resource errors", async () => {
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
-    const articleErrors = [
+    const resourceErrors = [
       {
         key: "generalError",
         message: "Failed to cancel schedule for revision",
       },
     ];
 
-    const mockUnlock = jest
-      .spyOn(ctx.client.articleRevisions, "cancelSchedule")
+    const mockCancel = jest
+      .spyOn(ctx.client.resourceRevisions, "cancelSchedule")
       .mockImplementation(() => ({
         revision: null,
         errors: null,
-        articleErrors,
+        resourceErrors,
       }));
 
     await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
-      `Failed to cancel schedule for revision: ${JSON.stringify(articleErrors)}`
+      `Failed to cancel schedule for revision: ${JSON.stringify(resourceErrors)}`
     );
 
-    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockCancel).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 });

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

@@ -1,37 +1,34 @@
-import CodeHandler from "../../../../handlers/page_revisions/CodeHandler";
-import PageRevisions from "../../../../cloud/PageRevisions";
+import CodeHandler from "../../../../handlers/resource_revisions/CodeHandler";
+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 code settings", () => {
+describe("Resource revision code settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("page_revision", {
-      settings: {
-        codes: {
-          structured_json: {},
-          scripts: [],
-        },
-      },
-    });
+    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 CodeHandler.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 code settings", () => {
     const ctx = buildCtx({ id: "42" });
 
     const mockFind = jest
-      .spyOn(ctx.client.pageRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await CodeHandler.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/CodesHandler.test → resource_revisions/CodeHandler.test}/update.test.js

@@ -1,12 +1,12 @@
-import CodeHandler from "../../../../handlers/article_revisions/CodeHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
+import CodeHandler from "../../../../handlers/resource_revisions/CodeHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
@@ -14,17 +14,15 @@ function buildCtx(revision, updateSettings) {
     },
     locale: "en",
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article revision code settings", () => {
+describe("Resource revision code settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("article_revision", {
-      publishAt: "2024-10-10T07:05:00Z",
-    });
+    const revision = Factory.build("resource_revision");
 
     const updateSettings = {
       settings: {
@@ -38,35 +36,39 @@ describe("Article revision code 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 CodeHandler.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: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: {
-        ...revision.settings,
-        codes: {
-          scripts: [{ type: "bla" }],
-          structured_json: { type: "article" },
+    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,
+          codes: {
+            scripts: [{ type: "bla" }],
+            structured_json: { type: "article" },
+          },
         },
       },
-    });
+      "article"
+    );
 
     expect(result).toEqual({
       redirect: `/en/article_revisions/${revision.id}/codes/edit?success=1`,
@@ -74,9 +76,7 @@ describe("Article revision code settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("article_revision", {
-      publishAt: "2024-10-10T07:05:00Z",
-    });
+    const revision = Factory.build("resource_revision");
 
     const updateSettings = {
       settings: {
@@ -90,41 +90,24 @@ describe("Article revision code 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 result = await CodeHandler.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: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: {
-        ...revision.settings,
-        codes: {
-          scripts: [{ type: "bla" }],
-          structured_json: { type: "article" },
-        },
-      },
-    });
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
         resource: {
           ...revision,
-          publishAt: "2024-10-10",
           settings: {
             ...revision.settings,
             codes: {
@@ -142,20 +125,18 @@ describe("Article revision code settings", () => {
   });
 
   test("update when a revision does not exist", async () => {
-    const revision = Factory.build("article_revision");
-
-    const updateSettings = {};
+    const revision = Factory.build("resource_revision");
 
-    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 CodeHandler.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/resource_revisions/GeneralHandler.test/edit_form.test.js

@@ -0,0 +1,58 @@
+import GeneralHandler from "../../../../handlers/resource_revisions/GeneralHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
+
+import Factory from "../../../support/factory";
+
+function buildCtx(revision) {
+  return {
+    client: {
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
+    },
+    params: { parent_id: revision.id },
+    locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+  };
+}
+
+describe("Resource revision general settings", () => {
+  test("edit_form when a revision exists", async () => {
+    const revision = Factory.build("resource_revision");
+    const ctx = buildCtx(revision);
+
+    const mockFind = jest
+      .spyOn(ctx.client.resourceRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const result = await GeneralHandler.edit_form(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+
+    expect(result).toEqual({
+      assigns: {
+        resource: revision,
+        errors: {},
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
+        _translations: [],
+      },
+    });
+  });
+
+  test("edit_form when a revision does not exist", async () => {
+    const ctx = buildCtx({ id: "42" });
+
+    const mockFind = jest
+      .spyOn(ctx.client.resourceRevisions, "find")
+      .mockImplementation(() => null);
+
+    expect(async () => {
+      await GeneralHandler.edit_form(ctx);
+    }).rejects.toThrow("Missing revision #42");
+
+    expect(mockFind).toHaveBeenCalledWith("42", "en", "article");
+  });
+});

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

@@ -1,14 +1,14 @@
-import GeneralHandler from "../../../../handlers/article_revisions/GeneralHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
-import Articles from "../../../../cloud/Articles";
+import GeneralHandler from "../../../../handlers/resource_revisions/GeneralHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import Resources from "../../../../cloud/Resources";
 
 import Factory from "../../../support/factory";
 
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions(() => ({}), "token"),
-      articles: new Articles(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
@@ -16,21 +16,20 @@ function buildCtx(revision, updateSettings) {
     },
     locale: "en",
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article revision general settings", () => {
+describe("Resource revision general settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
 
     const updateSettings = {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publishAt: "2024-08-30",
       settings: {
         credentials: {
           user: "user",
@@ -42,32 +41,36 @@ describe("Article revision general 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 GeneralHandler.update(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
-      slug: updateSettings.slug,
-      title: updateSettings.title,
-      visibility: updateSettings.visibility,
-      publishAt: "2024-08-30T00:00:00Z",
-      widgets: revision.widgets,
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: {
-        ...revision.settings,
-        ...updateSettings.settings,
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
+    expect(mockUpdate).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        slug: updateSettings.slug,
+        title: updateSettings.title,
+        visibility: updateSettings.visibility,
+        widgets: revision.widgets,
+        tags: revision.tags.map((t) => t.id),
+        categories: revision.categories.map((c) => c.id),
+        settings: {
+          ...revision.settings,
+          ...updateSettings.settings,
+        },
       },
-    });
+      "article"
+    );
 
     expect(result).toEqual({
       redirect: `/en/article_revisions/${revision.id}/general/edit?success=1`,
@@ -75,13 +78,12 @@ describe("Article revision general settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("resource_revision");
 
     const updateSettings = {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publishAt: "2024-08-30",
       settings: {
         credentials: {
           user: "user",
@@ -93,32 +95,19 @@ describe("Article revision general 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: "slug", message: "has invalid format" }],
       }));
 
     const result = await GeneralHandler.update(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
-      slug: updateSettings.slug,
-      title: updateSettings.title,
-      visibility: updateSettings.visibility,
-      publishAt: "2024-08-30T00:00:00Z",
-      widgets: revision.widgets,
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: {
-        ...revision.settings,
-        ...updateSettings.settings,
-      },
-    });
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
@@ -127,7 +116,6 @@ describe("Article revision general settings", () => {
           slug: updateSettings.slug,
           title: updateSettings.title,
           visibility: updateSettings.visibility,
-          publishAt: "2024-08-30",
           settings: {
             ...revision.settings,
             ...updateSettings.settings,
@@ -136,27 +124,25 @@ describe("Article revision general settings", () => {
         errors: {
           resource: { slug: "has invalid format" },
         },
-        visibilityOptions: ctx.client.articles.visibilityOptions(),
+        visibilityOptions: ctx.client.resources.visibilityOptions(),
         _translations: [],
       },
     });
   });
 
   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 GeneralHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 });