@raketa-cloud/admin 0.0.30 → 0.0.31

package/src/tests/handlers/event_revisions/GeneralHandler.test/update.test.js

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      events: new Events({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      general_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -30,11 +30,15 @@ describe("Event revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      starts_at: "2024-08-30T19:10",
-      ends_at: "2024-08-30T19:15",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      startsAt: "2024-08-30T19:10",
+      endsAt: "2024-08-30T19:15",
+      settings: {
+        credentials: {
+          username: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -60,16 +64,13 @@ describe("Event revision general settings", () => {
       publishAt: "2024-08-30T19:05:00Z",
       startsAt: "2024-08-30T19:10:00Z",
       endsAt: "2024-08-30T19:15:00Z",
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        credentials: {
-          user: updateSettings.username,
-          password: updateSettings.password,
-        },
-      }),
+        ...updateSettings.settings,
+      },
     });
 
     expect(result).toEqual({
@@ -84,11 +85,15 @@ describe("Event revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      starts_at: "2024-08-30T19:10",
-      ends_at: "2024-08-30T19:15",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      startsAt: "2024-08-30T19:10",
+      endsAt: "2024-08-30T19:15",
+      settings: {
+        credentials: {
+          username: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -114,27 +119,32 @@ describe("Event revision general settings", () => {
       publishAt: "2024-08-30T19:05:00Z",
       startsAt: "2024-08-30T19:10:00Z",
       endsAt: "2024-08-30T19:15:00Z",
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        credentials: {
-          user: updateSettings.username,
-          password: updateSettings.password,
-        },
-      }),
+        ...updateSettings.settings,
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          slug: updateSettings.slug,
+          title: updateSettings.title,
+          visibility: updateSettings.visibility,
+          settings: {
+            ...revision.settings,
+            ...updateSettings.settings,
+          },
+          publishAt: "2024-08-30T19:05:00",
+          startsAt: "2024-08-30T19:10:00",
+          endsAt: "2024-08-30T19:15:00",
         },
         errors: {
-          general_settings: { slug: "has invalid format" },
+          resource: { slug: "has invalid format" },
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
         _translations: [],

package/src/tests/handlers/event_revisions/MetaHandler.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,11 @@ function buildCtx(revision) {
 
 describe("Event revision meta settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+      startsAt: "2024-10-10T07:15:00Z",
+      endsAt: "2024-10-10T07:25:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,12 +32,11 @@ describe("Event revision meta settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        meta_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          title: revision.settings.meta.title,
-          description: revision.settings.meta.description,
-          image: revision.settings.meta.image,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
+          startsAt: "2024-10-10T07:15:00",
+          endsAt: "2024-10-10T07:25:00",
         },
         errors: {},
         _translations: [],

package/src/tests/handlers/event_revisions/MetaHandler.test/update.test.js

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      meta_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,12 +22,20 @@ function buildCtx(revision, updateSettings) {
 
 describe("Event revision meta settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+      startsAt: "2024-10-10T07:15:00Z",
+      endsAt: "2024-10-10T07:25:00Z",
+    });
 
     const updateSettings = {
-      title: "An open graph title",
-      description: "An open graph description",
-      image: JSON.stringify({ id: 42 }),
+      settings: {
+        meta: {
+          title: "An open graph title",
+          description: "An open graph description",
+          image: JSON.stringify({ id: 42 }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -53,17 +61,16 @@ describe("Event revision meta settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
         meta: {
-          title: updateSettings.title,
-          description: updateSettings.description,
+          ...updateSettings.settings.meta,
           image: { id: 42 },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -72,12 +79,20 @@ describe("Event revision meta settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T07:05:00",
+      startsAt: "2024-10-10T07:15:00",
+      endsAt: "2024-10-10T07:25:00",
+    });
 
     const updateSettings = {
-      title: "An open graph title",
-      description: "An open graph description",
-      image: JSON.stringify({ id: 42 }),
+      settings: {
+        meta: {
+          title: "An open graph title",
+          description: "An open graph description",
+          image: JSON.stringify({ id: 42 }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -103,28 +118,35 @@ describe("Event revision meta settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
         meta: {
-          title: updateSettings.title,
-          description: updateSettings.description,
+          ...updateSettings.settings.meta,
           image: { id: 42 },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        meta_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
+          startsAt: "2024-10-10T07:15:00",
+          endsAt: "2024-10-10T07:25:00",
+          settings: {
+            ...revision.settings,
+            meta: {
+              ...updateSettings.settings.meta,
+              image: { id: 42 },
+            },
+          },
         },
         errors: {
-          meta_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

package/src/tests/handlers/event_revisions/PublishesHandler.test/create.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, resourceParams) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      events: new Events({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams,

package/src/tests/handlers/event_revisions/PublishesHandler.test/create_form.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      events: new Events({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",

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

@@ -4,7 +4,7 @@ import EventRevisions from "../../../../cloud/EventRevisions";
 function buildCtx(eventID, version) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
     },
     params: { parent_id: eventID },
     resourceParams: { version },

package/src/tests/handlers/event_revisions/TagHandler.test/edit_form.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -21,7 +21,12 @@ describe("Event revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("event_revision", { tags: [tags[0]] });
+    const revision = Factory.build("event_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
@@ -41,10 +46,12 @@ describe("Event revision tags settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        tag_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          tags: revision.tags.map((t) => t.id),
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:00:00",
+          startsAt: "2024-10-10T07:05:00",
+          endsAt: "2024-10-10T07:15:00",
+          tags: [tags[0].id],
         },
         tags: tags,
         errors: {},

package/src/tests/handlers/event_revisions/TagHandler.test/update.test.js

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      tag_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -28,7 +28,12 @@ describe("Event revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("event_revision", { tags: [tags[0]] });
+    const revision = Factory.build("event_revision", {
+      tags: [tags[0]],
+      publishAt: "2024-10-10T07:00:00Z",
+      startsAt: "2024-10-10T07:05:00Z",
+      endsAt: "2024-10-10T07:15:00Z",
+    });
 
     const updateSettings = {
       tags: [tags.map((t) => t.id)],
@@ -57,10 +62,10 @@ describe("Event revision tags settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: updateSettings.tags,
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify(revision.settings),
+      settings: revision.settings,
     });
 
     expect(result).toEqual({
@@ -73,7 +78,12 @@ describe("Event revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("event_revision", { tags: [tags[0]] });
+    const revision = Factory.build("event_revision", {
+      tags: [tags[0]],
+      publishAt: "2024-10-10T07:00:00Z",
+      startsAt: "2024-10-10T07:05:00Z",
+      endsAt: "2024-10-10T07:15:00Z",
+    });
 
     const updateSettings = {
       tags: [tags.map((t) => t.id)],
@@ -108,22 +118,24 @@ describe("Event revision tags settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: updateSettings.tags,
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify(revision.settings),
+      settings: revision.settings,
     });
     expect(mockTags).toHaveBeenCalledWith("en");
 
     expect(result).toEqual({
       assigns: {
-        tag_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:00:00",
+          startsAt: "2024-10-10T07:05:00",
+          endsAt: "2024-10-10T07:15:00",
+          tags: updateSettings.tags,
         },
         errors: {
-          tag_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         tags: tags,
         _translations: [],

package/src/tests/handlers/event_revisions/VisualHandler.test.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,11 @@ function buildCtx(revision) {
 
 describe("Event revision visuals settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T21:00:00Z",
+      startsAt: "2024-10-10T21:05:00Z",
+      endsAt: "2024-10-10T21:10:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,10 +32,11 @@ describe("Event revision visuals settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        visual_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          layout: revision.settings.layout,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T21:00:00",
+          startsAt: "2024-10-10T21:05:00",
+          endsAt: "2024-10-10T21:10:00",
         },
         errors: {},
         _translations: [],

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

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      visual_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,10 +22,16 @@ function buildCtx(revision, updateSettings) {
 
 describe("Event revision visuals settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T07:00:00Z",
+      startsAt: "2024-10-10T07:05:00Z",
+      endsAt: "2024-10-10T07:10:00Z",
+    });
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -51,13 +57,13 @@ describe("Event revision visuals settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        layout: updateSettings.layout,
-      }),
+        layout: updateSettings.settings.layout,
+      },
     });
 
     expect(result).toEqual({
@@ -66,10 +72,16 @@ describe("Event revision visuals settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("event_revision");
+    const revision = Factory.build("event_revision", {
+      publishAt: "2024-10-10T07:00:00Z",
+      startsAt: "2024-10-10T07:05:00Z",
+      endsAt: "2024-10-10T07:10:00Z",
+    });
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -95,24 +107,29 @@ describe("Event revision visuals settings", () => {
       publishAt: revision.publishAt,
       startsAt: revision.startsAt,
       endsAt: revision.endsAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        layout: updateSettings.layout,
-      }),
+        layout: updateSettings.settings.layout,
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        visual_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:00:00",
+          startsAt: "2024-10-10T07:05:00",
+          endsAt: "2024-10-10T07:10:00",
+          settings: {
+            ...revision.settings,
+            layout: updateSettings.settings.layout,
+          },
         },
         errors: {
-          visual_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

package/src/tests/handlers/event_revisions/WidgetHandler.test/show.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      settings: new Settings({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      settings: new Settings(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",

package/src/tests/handlers/event_revisions/WidgetHandler.test/update.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, newWidgets) {
   return {
     client: {
-      eventRevisions: new EventRevisions({}, "token"),
-      settings: new Settings({}, "token"),
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+      settings: new Settings(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {

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

@@ -5,7 +5,7 @@ import Factory from "../../../support/factory";
 function buildCtx(event) {
   return {
     client: {
-      events: new Events({}, "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: event.id },
     locale: "en",

package/src/tests/handlers/events/DeletesHandler.test/create.test.js

@@ -6,11 +6,11 @@ import { remoteConfig } from "../../../support/handlersHelper";
 function buildCtx(event, updateSettings) {
   return {
     client: {
-      events: new Events({}, "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: event.id },
     resourceParams: {
-      deleteAction: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     remoteConfig: remoteConfig(),
@@ -90,9 +90,9 @@ describe("Event delete", () => {
 
     expect(result).toEqual({
       assigns: {
-        deleteAction: { ...updateSettings, id: event.id },
+        resource: { ...updateSettings, id: event.id },
         errors: {
-          deleteAction: { redirect: "url: has already been taken" },
+          resource: { redirect: "url: has already been taken" },
         },
         _translations: [],
       },