@raketa-cloud/admin 0.0.30 → 0.0.33

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

package/src/tests/handlers/page_revisions/PageRevisionsHandler.test/create.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(pageID) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
     },
     params: { parent_id: pageID },
     locale: "en",

package/src/tests/handlers/page_revisions/PageRevisionsHandler.test/destroy.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revisionID) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
     },
     params: { id: revisionID },
     locale: "en",

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

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

package/src/tests/handlers/page_revisions/PublishesHandler.test/create_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",

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

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

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

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -41,11 +41,7 @@ describe("Page revision tags settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        tag_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          tags: revision.tags.map((t) => t.id),
-        },
+        resource: revision,
         tags: tags,
         errors: {},
         _translations: [],

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

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      pageRevisions: new PageRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      pageRevisions: new PageRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      tag_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -54,10 +54,10 @@ describe("Page revision tags settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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({
@@ -102,22 +102,21 @@ describe("Page revision tags settings", () => {
       slug: revision.slug,
       title: revision.title,
       visibility: revision.visibility,
-      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,
+          tags: updateSettings.tags,
         },
         errors: {
-          tag_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         tags: tags,
         _translations: [],

package/src/tests/handlers/page_revisions/VisualHandler.test.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 visuals settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("page_revision");
+    const revision = Factory.build("page_revision", {
+      settings: {
+        layout: "default",
+        meta: {
+          title: "Meta title",
+        },
+      },
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,11 +35,7 @@ describe("Page revision visuals settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        visual_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          layout: revision.settings.layout,
-        },
+        resource: revision,
         errors: {},
         _translations: [],
       },

package/src/tests/handlers/page_revisions/VisualHandler.test.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: {
-      visual_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -25,7 +25,9 @@ describe("Page revision visuals settings", () => {
     const revision = Factory.build("page_revision");
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -48,13 +50,13 @@ describe("Page revision visuals 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,
-        layout: updateSettings.layout,
-      }),
+        layout: "bla",
+      },
     });
 
     expect(result).toEqual({
@@ -66,7 +68,9 @@ describe("Page revision visuals settings", () => {
     const revision = Factory.build("page_revision");
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -89,24 +93,26 @@ describe("Page revision visuals 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,
-        layout: updateSettings.layout,
-      }),
+        layout: "bla",
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        visual_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          settings: {
+            ...revision.settings,
+            layout: "bla",
+          },
         },
         errors: {
-          visual_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

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

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

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

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