@raketa-cloud/admin 1.8.3 → 1.8.6

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");
   });
 });

package/src/tests/handlers/{event_revisions → resource_revisions}/LocksHandler.test/create.test.js

@@ -1,11 +1,11 @@
 import Factory from "../../../support/factory";
-import EventRevisions from "../../../../cloud/EventRevisions";
-import LocksHandler from "../../../../handlers/event_revisions/LocksHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import LocksHandler from "../../../../handlers/resource_revisions/LocksHandler";
 
 function buildCtx(revision, lockSettings) {
   return {
     client: {
-      eventRevisions: new EventRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
@@ -13,69 +13,71 @@ function buildCtx(revision, lockSettings) {
     },
     locale: "en",
     resourceConfig: {
-      eventType: "event",
-      eventTypePlural: "events",
+      resourceType: "article",
+      resourceTypePlural: "articles",
     },
   };
 }
 
-describe("Event revision lock ", () => {
+describe("Resource revision lock", () => {
   test("lock successful", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("resource_revision");
     const lockSettings = { message: "Some lock message" };
     const ctx = buildCtx(revision, lockSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockLock = jest
-      .spyOn(ctx.client.eventRevisions, "lock")
+      .spyOn(ctx.client.resourceRevisions, "lock")
       .mockImplementation(() => ({
         revision,
         errors: null,
-        eventErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await LocksHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockLock).toHaveBeenCalledWith(
       revision.id,
       "en",
-      lockSettings.message
+      lockSettings.message,
+      "article"
     );
 
     expect(result).toEqual({
-      redirect: `/en/events/${revision.originalId}`,
+      redirect: `/en/articles/${revision.originalId}`,
     });
   });
 
   test("lock failed with errors", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("resource_revision");
     const lockSettings = { message: "" };
     const ctx = buildCtx(revision, lockSettings);
     const errors = [{ key: "message", message: "Cannot be blank" }];
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockLock = jest
-      .spyOn(ctx.client.eventRevisions, "lock")
+      .spyOn(ctx.client.resourceRevisions, "lock")
       .mockImplementation(() => ({
         revision: null,
         errors,
-        eventErrors: null,
+        resourceErrors: null,
       }));
 
     const result = await LocksHandler.create(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockLock).toHaveBeenCalledWith(
       revision.id,
       "en",
-      lockSettings.message
+      lockSettings.message,
+      "article"
     );
 
     expect(result).toEqual({
@@ -93,50 +95,51 @@ describe("Event revision lock ", () => {
     });
   });
 
-  test("lock failed with event errors", async () => {
-    const revision = Factory.build("event_revision");
+  test("lock failed with resource errors", async () => {
+    const revision = Factory.build("resource_revision");
     const lockSettings = { message: "Some lock message" };
     const ctx = buildCtx(revision, lockSettings);
-    const eventErrors = [
+    const resourceErrors = [
       { key: "generalError", message: "Failed to lock revision" },
     ];
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const mockLock = jest
-      .spyOn(ctx.client.eventRevisions, "lock")
+      .spyOn(ctx.client.resourceRevisions, "lock")
       .mockImplementation(() => ({
         revision: null,
         errors: null,
-        eventErrors,
+        resourceErrors,
       }));
 
     await expect(LocksHandler.create(ctx)).rejects.toThrow(
-      `Failed to lock revision: ${JSON.stringify(eventErrors)}`
+      `Failed to lock revision: ${JSON.stringify(resourceErrors)}`
     );
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
     expect(mockLock).toHaveBeenCalledWith(
       revision.id,
       "en",
-      lockSettings.message
+      lockSettings.message,
+      "article"
     );
   });
 
-  test("create for non existing event revision", async () => {
+  test("create for non existing resource revision", async () => {
     const lockSettings = { message: "Some lock message" };
     const ctx = buildCtx({ id: 42 }, lockSettings);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     await expect(LocksHandler.create(ctx)).rejects.toThrow(
       `Missing revision #42`
     );
 
-    expect(mockFind).toHaveBeenCalledWith(42, "en");
+    expect(mockFind).toHaveBeenCalledWith(42, "en", "article");
   });
 });

package/src/tests/handlers/{event_revisions → resource_revisions}/LocksHandler.test/create_form.test.js

@@ -1,29 +1,33 @@
 import Factory from "../../../support/factory";
-import EventRevisions from "../../../../cloud/EventRevisions";
-import LocksHandler from "../../../../handlers/event_revisions/LocksHandler";
+import ResourceRevisions from "../../../../cloud/ResourceRevisions";
+import LocksHandler from "../../../../handlers/resource_revisions/LocksHandler";
 
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions(() => ({}), "token"),
+      resourceRevisions: new ResourceRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    resourceConfig: {
+      resourceType: "article",
+      resourceTypePlural: "articles",
+    },
   };
 }
 
-describe("New event revision lock", () => {
-  test("create_form for locking event revision", async () => {
-    const revision = Factory.build("event_revision");
+describe("New resource revision lock", () => {
+  test("create_form for locking resource revision", async () => {
+    const revision = Factory.build("resource_revision");
     const ctx = buildCtx(revision);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => revision);
 
     const result = await LocksHandler.create_form(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
@@ -38,18 +42,18 @@ describe("New event revision lock", () => {
     });
   });
 
-  test("create_form for non existing event revision", async () => {
-    const nonExistentRevision = Factory.build("event_revision");
+  test("create_form for non existing resource revision", async () => {
+    const nonExistentRevision = Factory.build("resource_revision");
     const ctx = buildCtx(nonExistentRevision);
 
     const mockFind = jest
-      .spyOn(ctx.client.eventRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     await expect(LocksHandler.create_form(ctx)).rejects.toThrow(
       `Missing revision #${nonExistentRevision.id}`
     );
 
-    expect(mockFind).toHaveBeenCalledWith(nonExistentRevision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(nonExistentRevision.id, "en", "article");
   });
 });

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

@@ -1,30 +1,34 @@
-import MetaHandler from "../../../../handlers/page_revisions/MetaHandler";
-import PageRevisions from "../../../../cloud/PageRevisions";
+import MetaHandler from "../../../../handlers/resource_revisions/MetaHandler";
+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 meta settings", () => {
+describe("Resource revision meta settings", () => {
   test("edit_form when a revision exists", 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 MetaHandler.edit_form(ctx);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
@@ -39,13 +43,13 @@ describe("Page revision meta settings", () => {
     const ctx = buildCtx({ id: "42" });
 
     const mockFind = jest
-      .spyOn(ctx.client.pageRevisions, "find")
+      .spyOn(ctx.client.resourceRevisions, "find")
       .mockImplementation(() => null);
 
     expect(async () => {
       await MetaHandler.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}/MetaHandler.test/update.test.js

@@ -1,12 +1,12 @@
-import MetaHandler from "../../../../handlers/article_revisions/MetaHandler";
-import ArticleRevisions from "../../../../cloud/ArticleRevisions";
+import MetaHandler from "../../../../handlers/resource_revisions/MetaHandler";
+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 meta settings", () => {
+describe("Resource revision meta 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: {
@@ -39,35 +37,39 @@ describe("Article revision meta 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 MetaHandler.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,
-        meta: {
-          ...updateSettings.settings.meta,
-          image: { id: 42 },
+    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,
+          meta: {
+            ...updateSettings.settings.meta,
+            image: { id: 42 },
+          },
         },
       },
-    });
+      "article"
+    );
 
     expect(result).toEqual({
       redirect: `/en/article_revisions/${revision.id}/meta/edit?success=1`,
@@ -75,9 +77,7 @@ describe("Article revision meta 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: {
@@ -92,41 +92,24 @@ describe("Article revision meta 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 MetaHandler.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,
-        meta: {
-          ...updateSettings.settings.meta,
-          image: { id: 42 },
-        },
-      },
-    });
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
 
     expect(result).toEqual({
       assigns: {
         resource: {
           ...revision,
-          publishAt: "2024-10-10",
           settings: {
             ...revision.settings,
             meta: {
@@ -144,20 +127,18 @@ describe("Article revision meta 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 MetaHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
-    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en", "article");
   });
 });