@raketa-cloud/admin 1.8.4 → 1.8.6

package/src/tests/handlers/{event_revisions → resource_revisions}/WidgetHandler.test/update.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,7 +7,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, newWidgets) {
   return {
     client: {
-      eventRevisions: new EventRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
       settings: new Settings(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
@@ -15,12 +15,16 @@ function buildCtx(revision, newWidgets) {
       widgets: newWidgets,
     },
     locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("WidgetHandler", () => {
+describe("Resource revision WidgetHandler", () => {
   test("update successful", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("resource_revision");
     const settings = Factory.build("settings");
     const newWidgets = [
       {
@@ -33,7 +37,7 @@ describe("WidgetHandler", () => {
     const ctx = buildCtx(revision, newWidgets);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockSettings = jest
@@ -41,7 +45,7 @@ describe("WidgetHandler", () => {
       .mockImplementation(() => settings);
 
     const mockUpdate = jest
-      .spyOn(ctx.client.eventRevisions, "updateWidgets")
+      .spyOn(ctx.client.resourceRevisions, "updateWidgets")
       .mockImplementation(() => ({
         revision: { ...revision, widgets: newWidgets },
         errors: [],
@@ -49,8 +53,13 @@ describe("WidgetHandler", () => {
 
     const result = await WidgetHandler.update(ctx);
 
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", newWidgets);
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      newWidgets,
+      "article"
+    );
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockSettings).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({
@@ -66,7 +75,7 @@ describe("WidgetHandler", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("resource_revision");
     const newWidgets = [
       {
         component: "SectionTitle",
@@ -78,11 +87,11 @@ describe("WidgetHandler", () => {
     const ctx = buildCtx(revision, newWidgets);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockUpdate = jest
-      .spyOn(ctx.client.eventRevisions, "updateWidgets")
+      .spyOn(ctx.client.resourceRevisions, "updateWidgets")
       .mockImplementation(() => ({
         revision: null,
         errors: [{ key: "widgets", message: "Wrong format" }],
@@ -90,8 +99,13 @@ describe("WidgetHandler", () => {
 
     const result = await WidgetHandler.update(ctx);
 
-    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", newWidgets);
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      newWidgets,
+      "article"
+    );
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       json: {

package/src/tests/handlers/resources/ChangeHandler.test/show.test.js

@@ -0,0 +1,57 @@
+import Resources from "../../../../cloud/Resources";
+import ChangeHandler from "../../../../handlers/resources/ChangeHandler";
+
+import Factory from "../../../support/factory";
+
+describe("Resource ChangeHandler", () => {
+  function buildCtx(resource) {
+    return {
+      client: {
+        resources: new Resources(() => ({}), "token"),
+      },
+      params: { parent_id: resource.id },
+      query: { version: 49 },
+      locale: "en",
+      resourceConfig: {
+        resourceType: "article",
+        resourceTypePlural: "articles",
+      },
+    };
+  }
+
+  test("show for existing resource", async () => {
+    const resource = Factory.build("resource");
+    const ctx = buildCtx(resource);
+
+    const mockedGetChangePreview = jest
+      .spyOn(ctx.client.resources, "getChangePreview")
+      .mockImplementation(() => [resource]);
+
+    const result = await ChangeHandler.show(ctx);
+
+    expect(mockedGetChangePreview).toHaveBeenCalledWith(
+      resource.id,
+      49,
+      "en",
+      "article"
+    );
+
+    expect(result).toEqual({
+      json: { ...[resource] },
+    });
+  });
+
+  test("show for non existing resource", async () => {
+    const ctx = buildCtx({ id: "42" });
+
+    const mockedGetChangePreview = jest
+      .spyOn(ctx.client.resources, "getChangePreview")
+      .mockImplementation(() => null);
+
+    expect(async () => {
+      await ChangeHandler.show(ctx);
+    }).rejects.toThrow("Missing article #42");
+
+    expect(mockedGetChangePreview).toHaveBeenCalledWith("42", 49, "en", "article");
+  });
+});

package/src/tests/handlers/resources/ClonesHandler.test/create.test.js

@@ -0,0 +1,57 @@
+import Resources from "../../../../cloud/Resources";
+import ClonesHandler from "../../../../handlers/resources/ClonesHandler";
+import Factory from "../../../support/factory";
+
+function buildCtx(resource) {
+  return {
+    client: {
+      resources: new Resources(() => ({}), "token"),
+    },
+    params: { parent_id: resource.id },
+    locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+  };
+}
+
+describe("Clone resource", () => {
+  test("clone successful", async () => {
+    const resource = Factory.build("resource");
+    const ctx = buildCtx(resource);
+
+    const mockClone = jest
+      .spyOn(ctx.client.resources, "clone")
+      .mockImplementation(() => ({ resource, errors: null }));
+
+    const result = await ClonesHandler.create(ctx);
+
+    expect(mockClone).toHaveBeenCalledWith(resource.id, "en", "article");
+
+    expect(result).toEqual({
+      redirect: "/en/articles",
+    });
+  });
+
+  test("clone failed", async () => {
+    const resource = Factory.build("resource");
+    const ctx = buildCtx(resource);
+
+    const errors = [{ key: "generalError", message: "some error" }];
+    const mockClone = jest
+      .spyOn(ctx.client.resources, "clone")
+      .mockImplementation(() => ({
+        resource: null,
+        errors,
+      }));
+
+    expect(async () => {
+      await ClonesHandler.create(ctx);
+    }).rejects.toThrow(
+      `Error cloning article: ${JSON.stringify(errors)}`
+    );
+
+    expect(mockClone).toHaveBeenCalledWith(resource.id, "en", "article");
+  });
+});

package/src/tests/handlers/{articles → resources}/DeletesHandler.test/create.test.js

@@ -1,48 +1,48 @@
-import DeletesHandler from "../../../../handlers/articles/DeletesHandler";
-import Articles from "../../../../cloud/Articles";
+import DeletesHandler from "../../../../handlers/resources/DeletesHandler";
+import Resources from "../../../../cloud/Resources";
 import Factory from "../../../support/factory";
 import { remoteConfig } from "../../../support/handlersHelper";
 
-function buildCtx(article, updateSettings) {
+function buildCtx(resource, updateSettings) {
   return {
     client: {
-      articles: new Articles(() => ({}), "token"),
+      resources: new Resources(() => ({}), "token"),
     },
-    params: { parent_id: article.id },
+    params: { parent_id: resource.id },
     resourceParams: {
       resource: updateSettings,
     },
     locale: "en",
     remoteConfig: remoteConfig(),
     resourceConfig: {
-      articleType: "article",
-      articleTypePlural: "articles",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Article delete", () => {
+describe("Resource delete", () => {
   test("create successful", async () => {
-    const article = Factory.build("article");
+    const resource = Factory.build("resource");
     const updateSettings = {
       redirect: "301",
       destination: "/test-dest",
     };
-    const ctx = buildCtx(article, updateSettings);
+    const ctx = buildCtx(resource, updateSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.articles, "find")
-      .mockImplementation(() => article);
+      .spyOn(ctx.client.resources, "find")
+      .mockImplementation(() => resource);
 
     const mockDelete = jest
-      .spyOn(ctx.client.articles, "delete")
-      .mockImplementation(() => ({ article, errors: null }));
+      .spyOn(ctx.client.resources, "delete")
+      .mockImplementation(() => ({ resource, errors: null }));
 
     const result = await DeletesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(article.id, "en");
-    expect(mockDelete).toHaveBeenCalledWith(article.id, "en", {
-      url: `/en/blog/${article.slug}`,
+    expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
+    expect(mockDelete).toHaveBeenCalledWith(resource.id, "en", "article", {
+      url: `/en/blog/${resource.slug}`,
       destination: updateSettings.destination,
       httpResponseCode: 301,
       note: "Created via article deletion process",
@@ -54,21 +54,21 @@ describe("Article delete", () => {
   });
 
   test("create failed due to redirect create", async () => {
-    const article = Factory.build("article");
+    const resource = Factory.build("resource");
     const updateSettings = {
       redirect: "410",
       destination: "/test-dest",
     };
-    const ctx = buildCtx(article, updateSettings);
+    const ctx = buildCtx(resource, updateSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.articles, "find")
-      .mockImplementation(() => article);
+      .spyOn(ctx.client.resources, "find")
+      .mockImplementation(() => resource);
 
     const mockDelete = jest
-      .spyOn(ctx.client.articles, "delete")
+      .spyOn(ctx.client.resources, "delete")
       .mockImplementation(() => ({
-        article: null,
+        resource: null,
         errors: [
           {
             codes: [],
@@ -80,9 +80,9 @@ describe("Article delete", () => {
 
     const result = await DeletesHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(article.id, "en");
-    expect(mockDelete).toHaveBeenCalledWith(article.id, "en", {
-      url: `/en/blog/${article.slug}`,
+    expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
+    expect(mockDelete).toHaveBeenCalledWith(resource.id, "en", "article", {
+      url: `/en/blog/${resource.slug}`,
       destination: "/",
       httpResponseCode: 410,
       note: "Created via article deletion process",
@@ -90,7 +90,7 @@ describe("Article delete", () => {
 
     expect(result).toEqual({
       assigns: {
-        resource: { ...updateSettings, id: article.id },
+        resource: { ...updateSettings, id: resource.id },
         errors: {
           resource: { redirect: "url: has already been taken" },
         },
@@ -99,17 +99,17 @@ describe("Article delete", () => {
     });
   });
 
-  test("create for non existing article", async () => {
+  test("create for non existing resource", async () => {
     const ctx = buildCtx({ id: "42" }, {});
 
     const mockFind = jest
-      .spyOn(ctx.client.articles, "find")
+      .spyOn(ctx.client.resources, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await DeletesHandler.create(ctx);
     }).rejects.toThrow("Missing article #42");
 
-    expect(mockFind).toHaveBeenCalledWith("42", "en");
+    expect(mockFind).toHaveBeenCalledWith("42", "en", "article");
   });
 });

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

@@ -0,0 +1,60 @@
+import Resources from "../../../../cloud/Resources";
+import DeletesHandler from "../../../../handlers/resources/DeletesHandler";
+import Factory from "../../../support/factory";
+import { remoteConfig } from "../../../support/handlersHelper";
+
+function buildCtx(resource) {
+  return {
+    client: {
+      resources: new Resources(() => ({}), "token"),
+    },
+    params: { parent_id: resource.id },
+    locale: "en",
+    remoteConfig: remoteConfig(),
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
+  };
+}
+
+describe("Resource delete", () => {
+  test("create_form for existing resource", async () => {
+    const resource = Factory.build("resource");
+    const ctx = buildCtx(resource);
+
+    const mockFind = jest
+      .spyOn(ctx.client.resources, "find")
+      .mockImplementation(() => resource);
+
+    const result = await DeletesHandler.create_form(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
+
+    expect(result).toEqual({
+      assigns: {
+        record: resource,
+        resource: {
+          id: resource.id,
+          redirect: "",
+        },
+        errors: {},
+        _translations: [],
+      },
+    });
+  });
+
+  test("create_form for non existing resource", async () => {
+    const ctx = buildCtx({ id: "42" });
+
+    const mockFind = jest
+      .spyOn(ctx.client.resources, "find")
+      .mockImplementation(() => null);
+
+    expect(async () => {
+      await DeletesHandler.create_form(ctx);
+    }).rejects.toThrow("Missing article #42");
+
+    expect(mockFind).toHaveBeenCalledWith("42", "en", "article");
+  });
+});

package/src/tests/handlers/{articles → resources}/ExportsHandler.test/index.test.js

@@ -1,16 +1,16 @@
-import ExportsHandler from "../../../../handlers/articles/ExportsHandler";
-import Articles from "../../../../cloud/Articles";
+import ExportsHandler from "../../../../handlers/resources/ExportsHandler";
+import Resources from "../../../../cloud/Resources";
 
-describe("Articles ExportsHandler", () => {
+describe("Resources ExportsHandler", () => {
   function buildCtx(query = {}) {
     return {
       params: {},
-      query: query,
+      query,
       client: {
-        articles: new Articles(() => ({}), "token"),
+        resources: new Resources(() => ({}), "token"),
       },
       resourceConfig: {
-        articleType: "article",
+        resourceType: "article",
       },
       remoteConfig: {
         resourceUrl: (item) => item.slug,
@@ -19,20 +19,20 @@ describe("Articles ExportsHandler", () => {
   }
 
   describe("index (exportCSV)", () => {
-    test("exports articles to CSV with default locale", async () => {
-      const mockArticles = [
+    test("exports resources to CSV with default locale", async () => {
+      const mockResources = [
         {
           id: 1,
-          title: "Article 1",
-          slug: "/article-1",
+          title: "Resource 1",
+          slug: "/resource-1",
           visibility: "public",
           insertedAt: "2024-01-01",
           updatedAt: "2024-01-02",
         },
         {
           id: 2,
-          title: "Article 2",
-          slug: "/article-2",
+          title: "Resource 2",
+          slug: "/resource-2",
           visibility: "private",
           insertedAt: "2024-01-03",
           updatedAt: "2024-01-04",
@@ -41,25 +41,25 @@ describe("Articles ExportsHandler", () => {
 
       const ctx = buildCtx({});
 
-      const mockedlistAll = jest
-        .spyOn(ctx.client.articles, "listAll")
-        .mockImplementation(() => ({ list: mockArticles }));
+      const mockedListAll = jest
+        .spyOn(ctx.client.resources, "listAll")
+        .mockImplementation(() => ({ list: mockResources }));
 
       const mockDate = new Date("2024-08-30T10:30:00");
       jest.spyOn(global, "Date").mockImplementation(() => mockDate);
 
       const result = await ExportsHandler.index(ctx);
 
-      expect(mockedlistAll).toHaveBeenCalledWith({}, "en", "article");
+      expect(mockedListAll).toHaveBeenCalledWith({}, "en", "article");
 
       expect(result.text).toContain(
-        "id,type,locale,title,URL,visibility,created_at,updated_at",
+        "id,type,locale,title,URL,visibility,created_at,updated_at"
       );
       expect(result.text).toContain(
-        "1,article,en,Article 1,/article-1,public,2024-01-01,2024-01-02",
+        "1,article,en,Resource 1,/resource-1,public,2024-01-01,2024-01-02"
       );
       expect(result.text).toContain(
-        "2,article,en,Article 2,/article-2,private,2024-01-03,2024-01-04",
+        "2,article,en,Resource 2,/resource-2,private,2024-01-03,2024-01-04"
       );
 
       expect(result.headers).toEqual({
@@ -71,12 +71,12 @@ describe("Articles ExportsHandler", () => {
       global.Date.mockRestore();
     });
 
-    test("exports articles to CSV with specified locale", async () => {
-      const mockArticles = [
+    test("exports resources to CSV with specified locale", async () => {
+      const mockResources = [
         {
           id: 1,
-          title: "Artículo 1",
-          slug: "/articulo-1",
+          title: "Recurso 1",
+          slug: "/recurso-1",
           visibility: "public",
           insertedAt: "2024-01-01",
           updatedAt: "2024-01-02",
@@ -85,37 +85,37 @@ describe("Articles ExportsHandler", () => {
 
       const ctx = buildCtx({ locale: "es" });
 
-      const mockedlistAll = jest
-        .spyOn(ctx.client.articles, "listAll")
-        .mockImplementation(() => ({ list: mockArticles }));
+      const mockedListAll = jest
+        .spyOn(ctx.client.resources, "listAll")
+        .mockImplementation(() => ({ list: mockResources }));
 
       const result = await ExportsHandler.index(ctx);
 
-      expect(mockedlistAll).toHaveBeenCalledWith(
+      expect(mockedListAll).toHaveBeenCalledWith(
         { locale: "es" },
         "es",
-        "article",
+        "article"
       );
 
       expect(result.text).toContain(
-        "1,article,es,Artículo 1,/articulo-1,public,2024-01-01,2024-01-02",
+        "1,article,es,Recurso 1,/recurso-1,public,2024-01-01,2024-01-02"
       );
     });
 
-    test("exports articles with CSV special characters properly escaped", async () => {
-      const mockArticles = [
+    test("exports resources with CSV special characters properly escaped", async () => {
+      const mockResources = [
         {
           id: 1,
-          title: 'Article with, comma and "quotes"',
-          slug: "/article-1",
+          title: 'Resource with, comma and "quotes"',
+          slug: "/resource-1",
           visibility: "public",
           insertedAt: "2024-01-01",
           updatedAt: "2024-01-02",
         },
         {
           id: 2,
-          title: "Article with\nnewline",
-          slug: "/article-2",
+          title: "Resource with\nnewline",
+          slug: "/resource-2",
           visibility: "private",
           insertedAt: "2024-01-03",
           updatedAt: "2024-01-04",
@@ -125,26 +125,26 @@ describe("Articles ExportsHandler", () => {
       const ctx = buildCtx({});
 
       jest
-        .spyOn(ctx.client.articles, "listAll")
-        .mockImplementation(() => ({ list: mockArticles }));
+        .spyOn(ctx.client.resources, "listAll")
+        .mockImplementation(() => ({ list: mockResources }));
 
       const result = await ExportsHandler.index(ctx);
 
-      expect(result.text).toContain('"Article with, comma and ""quotes"""');
-      expect(result.text).toContain('"Article with\nnewline"');
+      expect(result.text).toContain('"Resource with, comma and ""quotes"""');
+      expect(result.text).toContain('"Resource with\nnewline"');
     });
 
-    test("exports empty list when no articles found", async () => {
+    test("exports empty list when no resources found", async () => {
       const ctx = buildCtx({});
 
       jest
-        .spyOn(ctx.client.articles, "listAll")
+        .spyOn(ctx.client.resources, "listAll")
         .mockImplementation(() => ({ list: [] }));
 
       const result = await ExportsHandler.index(ctx);
 
       expect(result.text).toBe(
-        "id,type,locale,title,URL,visibility,created_at,updated_at,translations",
+        "id,type,locale,title,URL,visibility,created_at,updated_at,translations"
       );
     });
 
@@ -157,21 +157,21 @@ describe("Articles ExportsHandler", () => {
 
       const ctx = buildCtx(query);
 
-      const mockedlistAll = jest
-        .spyOn(ctx.client.articles, "listAll")
+      const mockedListAll = jest
+        .spyOn(ctx.client.resources, "listAll")
         .mockImplementation(() => ({ list: [] }));
 
       await ExportsHandler.index(ctx);
 
-      expect(mockedlistAll).toHaveBeenCalledWith(query, "en", "article");
+      expect(mockedListAll).toHaveBeenCalledWith(query, "en", "article");
     });
 
-    test("uses articleType from resourceConfig", async () => {
+    test("uses resourceType from resourceConfig", async () => {
       const ctx = buildCtx({});
-      ctx.resourceConfig.articleType = "custom-article-type";
+      ctx.resourceConfig.resourceType = "custom-resource-type";
 
-      const mockedlistAll = jest
-        .spyOn(ctx.client.articles, "listAll")
+      const mockedListAll = jest
+        .spyOn(ctx.client.resources, "listAll")
         .mockImplementation(() => ({ list: [] }));
 
       const mockDate = new Date("2024-08-30T10:30:00");
@@ -179,24 +179,24 @@ describe("Articles ExportsHandler", () => {
 
       const result = await ExportsHandler.index(ctx);
 
-      expect(mockedlistAll).toHaveBeenCalledWith(
+      expect(mockedListAll).toHaveBeenCalledWith(
         {},
         "en",
-        "custom-article-type",
+        "custom-resource-type"
       );
 
       expect(result.headers["Content-Disposition"]).toContain(
-        "custom-article-type_export.csv",
+        "custom-resource-type_export.csv"
       );
 
       global.Date.mockRestore();
     });
 
     test("exports all results without pagination", async () => {
-      const mockArticles = Array.from({ length: 150 }, (_, i) => ({
+      const mockResources = Array.from({ length: 150 }, (_, i) => ({
         id: i + 1,
-        title: `Article ${i + 1}`,
-        slug: `/article-${i + 1}`,
+        title: `Resource ${i + 1}`,
+        slug: `/resource-${i + 1}`,
         visibility: "public",
         insertedAt: "2024-01-01",
         updatedAt: "2024-01-02",
@@ -205,8 +205,8 @@ describe("Articles ExportsHandler", () => {
       const ctx = buildCtx({});
 
       jest
-        .spyOn(ctx.client.articles, "listAll")
-        .mockImplementation(() => ({ list: mockArticles }));
+        .spyOn(ctx.client.resources, "listAll")
+        .mockImplementation(() => ({ list: mockResources }));
 
       const result = await ExportsHandler.index(ctx);