@raketa-cloud/admin 0.0.30 → 0.0.31

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

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

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      code_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -25,8 +25,12 @@ describe("Page revision code settings", () => {
     const revision = Factory.build("page_revision");
 
     const updateSettings = {
-      scripts: JSON.stringify([{ type: "bla" }]),
-      structured_data: JSON.stringify({ type: "article" }),
+      settings: {
+        codes: {
+          scripts: JSON.stringify([{ type: "bla" }]),
+          structured_data: JSON.stringify({ type: "article" }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -49,16 +53,16 @@ describe("Page revision code settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -70,8 +74,12 @@ describe("Page revision code settings", () => {
     const revision = Factory.build("page_revision");
 
     const updateSettings = {
-      scripts: JSON.stringify([{ type: "bla" }]),
-      structured_data: JSON.stringify({ type: "article" }),
+      settings: {
+        codes: {
+          scripts: JSON.stringify([{ type: "bla" }]),
+          structured_data: JSON.stringify({ type: "article" }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -94,27 +102,32 @@ describe("Page revision code settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          settings: {
+            ...revision.settings,
+            codes: {
+              scripts: [{ type: "bla" }],
+              structured_data: { type: "article" },
+            },
+          },
         },
         errors: {
-          code_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

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

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
-      pages: new Pages({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
+      pages: new Pages(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -30,15 +30,7 @@ describe("Page revision genereal settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          title: revision.title,
-          slug: revision.slug,
-          visibility: revision.visibility,
-          username: revision.settings?.credentials?.user || "",
-          password: revision.settings?.credentials?.password || "",
-        },
+        resource: revision,
         errors: {},
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         _translations: [],

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

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
-      pages: new Pages({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
+      pages: new Pages(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      general_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -30,8 +30,12 @@ describe("Page revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      username: "user",
-      password: "admin123!@#",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -54,16 +58,16 @@ describe("Page revision general settings", () => {
       slug: updateSettings.slug,
       title: updateSettings.title,
       visibility: updateSettings.visibility,
-      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,
+          user: updateSettings.settings.credentials.user,
+          password: updateSettings.settings.credentials.password,
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -78,8 +82,12 @@ describe("Page revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      username: "user",
-      password: "admin123!@#",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -102,27 +110,35 @@ describe("Page revision general settings", () => {
       slug: updateSettings.slug,
       title: updateSettings.title,
       visibility: updateSettings.visibility,
-      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,
+          user: updateSettings.settings.credentials.user,
+          password: updateSettings.settings.credentials.password,
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          title: updateSettings.title,
+          slug: updateSettings.slug,
+          visibility: updateSettings.visibility,
+          settings: {
+            ...revision.settings,
+            credentials: {
+              user: updateSettings.settings.credentials.user,
+              password: updateSettings.settings.credentials.password,
+            },
+          },
         },
         errors: {
-          general_settings: { slug: "has invalid format" },
+          resource: { slug: "has invalid format" },
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         _translations: [],

package/src/tests/handlers/page_revisions/MetaHandler.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",
@@ -28,13 +28,7 @@ describe("Page 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,
         errors: {},
         _translations: [],
       },

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

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      meta_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -25,9 +25,13 @@ describe("Page revision meta settings", () => {
     const revision = Factory.build("page_revision");
 
     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);
@@ -50,17 +54,17 @@ describe("Page revision meta settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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,
+          title: updateSettings.settings.meta.title,
+          description: updateSettings.settings.meta.description,
           image: { id: 42 },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -72,9 +76,13 @@ describe("Page revision meta settings", () => {
     const revision = Factory.build("page_revision");
 
     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);
@@ -97,28 +105,34 @@ describe("Page revision meta settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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,
+          title: updateSettings.settings.meta.title,
+          description: updateSettings.settings.meta.description,
           image: { id: 42 },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        meta_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          settings: {
+            ...revision.settings,
+            meta: {
+              title: updateSettings.settings.meta.title,
+              description: updateSettings.settings.meta.description,
+              image: { id: 42 },
+            },
+          },
         },
         errors: {
-          meta_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },