@raketa-cloud/admin 0.0.30 → 0.0.33

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: [],
       },

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

@@ -6,7 +6,7 @@ import { remoteConfig } from "../../../support/handlersHelper";
 function buildCtx(event) {
   return {
     client: {
-      events: new Events({}, "token"),
+      events: new Events(() => ({}), "token"),
     },
     params: { parent_id: event.id },
     locale: "en",
@@ -33,7 +33,7 @@ describe("Event delete", () => {
 
     expect(result).toEqual({
       assigns: {
-        deleteAction: {
+        resource: {
           id: event.id,
           redirect: "",
         },

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

@@ -8,8 +8,8 @@ describe("Events Handler", () => {
   function buildCtx(params) {
     return {
       client: {
-        events: new Events({}, "token"),
-        tags: new Tags({}, "token"),
+        events: new Events(() => ({}), "token"),
+        tags: new Tags(() => ({}), "token"),
       },
       resourceParams: {
         resource: params,
@@ -28,15 +28,21 @@ describe("Events Handler", () => {
       title: "event title",
       slug: "url",
       visibility: "public",
-      publish_at: "2024-10-10T06:40",
-      starts_at: "2024-10-10T06:50",
-      ends_at: "2024-10-10T06:59",
-      layout: "default",
-      meta_title: "Meta title",
-      meta_description: "Meta description",
-      meta_image: JSON.stringify({ id: 42 }),
-      username: "admin",
-      password: "admin123!@#",
+      publishAt: "2024-10-10T06:40",
+      startsAt: "2024-10-10T06:50",
+      endsAt: "2024-10-10T06:59",
+      settings: {
+        layout: "default",
+        meta: {
+          title: "Meta title",
+          description: "Meta description",
+          image: JSON.stringify({ id: 42 }),
+        },
+        credentials: {
+          user: "admin",
+          password: "admin123!@#",
+        },
+      },
       tags: [tag.id],
     };
 
@@ -57,15 +63,10 @@ describe("Events Handler", () => {
         startsAt: "2024-10-10T06:50:00Z",
         endsAt: "2024-10-10T06:59:00Z",
         settings: {
-          layout: params.layout,
+          ...params.settings,
           meta: {
-            title: params.meta_title,
-            description: params.meta_description,
-            image: JSON.parse(params.meta_image || "{}"),
-          },
-          credentials: {
-            user: params.username,
-            password: params.password,
+            ...params.settings.meta,
+            image: { id: 42 },
           },
         },
         widgets: [],
@@ -86,16 +87,22 @@ describe("Events Handler", () => {
     const params = {
       title: "event title",
       slug: "",
-      publish_at: "2024-10-10T06:40",
-      starts_at: "2024-10-10T06:50",
-      ends_at: "2024-10-10T06:59",
+      publishAt: "2024-10-10T06:40",
+      startsAt: "2024-10-10T06:50",
+      endsAt: "2024-10-10T06:59",
       visibility: "public",
-      layout: "default",
-      meta_title: "Meta title",
-      meta_description: "Meta description",
-      meta_image: JSON.stringify({ id: 42 }),
-      username: "admin",
-      password: "admin123!@#",
+      settings: {
+        layout: "default",
+        meta: {
+          title: "Meta title",
+          description: "Meta description",
+          image: JSON.stringify({ id: 42 }),
+        },
+        credentials: {
+          user: "admin",
+          password: "admin123!@#",
+        },
+      },
       tags: [tag.id],
     };
 
@@ -124,15 +131,10 @@ describe("Events Handler", () => {
         startsAt: "2024-10-10T06:50:00Z",
         endsAt: "2024-10-10T06:59:00Z",
         settings: {
-          layout: params.layout,
+          ...params.settings,
           meta: {
-            title: params.meta_title,
-            description: params.meta_description,
-            image: JSON.parse(params.meta_image || "{}"),
-          },
-          credentials: {
-            user: params.username,
-            password: params.password,
+            ...params.settings.meta,
+            image: { id: 42 },
           },
         },
         widgets: [],
@@ -145,7 +147,21 @@ describe("Events Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        resource: { ...params, meta_image: JSON.parse(params.meta_image) },
+        resource: {
+          ...params,
+          publishAt: "2024-10-10T06:40:00",
+          startsAt: "2024-10-10T06:50:00",
+          endsAt: "2024-10-10T06:59:00",
+          settings: {
+            ...params.settings,
+            meta: {
+              ...params.settings.meta,
+              image: { id: 42 },
+            },
+          },
+          widgets: [],
+          categories: [],
+        },
         tags: [tag],
         errors: { resource: { slug: "cannot be blank" } },
         visibilityOptions: ctx.client.events.visibilityOptions(),

package/src/tests/handlers/events/EventsHandler.test/create_form.test.js

@@ -8,8 +8,8 @@ describe("Events Handler", () => {
   function buildCtx() {
     return {
       client: {
-        events: new Events({}, "token"),
-        tags: new Tags({}, "token"),
+        events: new Events(() => ({}), "token"),
+        tags: new Tags(() => ({}), "token"),
       },
       query: { foo: "bar" },
       locale: "en",
@@ -34,7 +34,7 @@ describe("Events Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        resource: { ...ctx.client.events.defaults(), meta_image: {} },
+        resource: { ...ctx.client.events.defaults() },
         tags: tags,
         errors: {},
         visibilityOptions: ctx.client.events.visibilityOptions(),

package/src/tests/handlers/events/EventsHandler.test/index.test.js

@@ -8,8 +8,8 @@ describe("Events Handler", () => {
   function buildCtx() {
     return {
       client: {
-        events: new Events({}, "token"),
-        tags: new Tags({}, "token"),
+        events: new Events(() => ({}), "token"),
+        tags: new Tags(() => ({}), "token"),
       },
       query: { foo: "bar" },
       locale: "en",

package/src/tests/handlers/events/EventsHandler.test/show.test.js

@@ -9,9 +9,9 @@ describe("Events Handler", () => {
   function buildCtx(event) {
     return {
       client: {
-        events: new Events({}, "token"),
-        eventChanges: new EventChanges({}, "token"),
-        eventRevisions: new EventRevisions({}, "token"),
+        events: new Events(() => ({}), "token"),
+        eventChanges: new EventChanges(() => ({}), "token"),
+        eventRevisions: new EventRevisions(() => ({}), "token"),
       },
       params: { id: event.id },
       locale: "en",

package/src/tests/handlers/events/URLsHandler.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: {
-      change: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     remoteConfig: remoteConfig(),
@@ -88,8 +88,8 @@ describe("Event change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { ...updateSettings, id: event.id },
-        errors: { change: { slug: "has already been taken" } },
+        resource: { ...updateSettings, id: event.id },
+        errors: { resource: { slug: "has already been taken" } },
         _translations: [],
       },
     });
@@ -137,8 +137,8 @@ describe("Event change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { ...updateSettings, id: event.id },
-        errors: { change: { redirect: "url: has already been taken" } },
+        resource: { ...updateSettings, id: event.id },
+        errors: { resource: { redirect: "url: has already been taken" } },
         _translations: [],
       },
     });

package/src/tests/handlers/events/URLsHandler.test/create_form.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",
@@ -31,7 +31,7 @@ describe("Event change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { slug: event.slug, id: event.id, redirect: null },
+        resource: { slug: event.slug, id: event.id, redirect: null },
         errors: {},
         _translations: [],
       },

package/src/tests/handlers/page_revisions/CodesHandler.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,14 @@ function buildCtx(revision) {
 
 describe("Page revision code settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("page_revision");
+    const revision = Factory.build("page_revision", {
+      settings: {
+        codes: {
+          structured_data: {},
+          scripts: [],
+        },
+      },
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,12 +35,7 @@ describe("Page revision code settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          scripts: JSON.stringify([]),
-          structured_data: JSON.stringify({}),
-        },
+        resource: revision,
         errors: {},
         _translations: [],
       },