@raketa-cloud/admin 0.0.30 → 0.0.33

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

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      meta_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,12 +22,18 @@ function buildCtx(revision, updateSettings) {
 
 describe("Article revision meta settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05: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);
@@ -51,17 +57,16 @@ describe("Article revision meta settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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({
@@ -70,12 +75,18 @@ describe("Article revision meta settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05: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);
@@ -99,28 +110,33 @@ describe("Article revision meta settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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",
+          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/article_revisions/PublishesHandler.test/create.test.js

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

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

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

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

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

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

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -21,7 +21,10 @@ describe("Article revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("article_revision", { tags: [tags[0]] });
+    const revision = Factory.build("article_revision", {
+      tags: [tags[0]],
+      publishAt: "2024-10-10T07:00:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -41,10 +44,10 @@ describe("Article 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",
+          tags: [tags[0].id],
         },
         tags: tags,
         errors: {},

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

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
-      tags: new Tags({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      tags: new Tags(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      tag_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -28,7 +28,10 @@ describe("Article revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("article_revision", { tags: [tags[0]] });
+    const revision = Factory.build("article_revision", {
+      tags: [tags[0]],
+      publishAt: "2024-10-10T07:00:00Z",
+    });
 
     const updateSettings = {
       tags: [tags.map((t) => t.id)],
@@ -55,10 +58,10 @@ describe("Article revision tags settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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({
@@ -71,7 +74,10 @@ describe("Article revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
-    const revision = Factory.build("article_revision", { tags: [tags[0]] });
+    const revision = Factory.build("article_revision", {
+      tags: [tags[0]],
+      publishAt: "2024-10-10T07:00:00Z",
+    });
 
     const updateSettings = {
       tags: [tags.map((t) => t.id)],
@@ -104,22 +110,22 @@ describe("Article revision tags settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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,
+          publishAt: "2024-10-10T07:00:00",
         },
         errors: {
-          tag_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         tags: tags,
         _translations: [],

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

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,9 @@ function buildCtx(revision) {
 
 describe("Article revision visuals settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T21:00:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,10 +30,9 @@ describe("Article 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",
         },
         errors: {},
         _translations: [],

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

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      visual_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,10 +22,14 @@ function buildCtx(revision, updateSettings) {
 
 describe("Article revision visuals settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:00:00Z",
+    });
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -49,13 +53,13 @@ describe("Article revision visuals settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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({
@@ -64,10 +68,14 @@ describe("Article revision visuals settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:00:00Z",
+    });
 
     const updateSettings = {
-      layout: "bla",
+      settings: {
+        layout: "bla",
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -91,24 +99,27 @@ describe("Article revision visuals settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      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",
+          settings: {
+            ...revision.settings,
+            layout: "bla",
+          },
         },
         errors: {
-          visual_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

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

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

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

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

package/src/tests/handlers/articles/ArticlesHandler.test/create.test.js

@@ -8,8 +8,8 @@ describe("Articles Handler", () => {
   function buildCtx(params) {
     return {
       client: {
-        articles: new Articles({}, "token"),
-        tags: new Tags({}, "token"),
+        articles: new Articles(() => ({}), "token"),
+        tags: new Tags(() => ({}), "token"),
       },
       resourceParams: {
         resource: params,
@@ -28,13 +28,19 @@ describe("Articles Handler", () => {
       title: "Article title",
       slug: "url",
       visibility: "public",
-      publish_at: "2024-10-10T06:58",
-      layout: "default",
-      meta_title: "Meta title",
-      meta_description: "Meta description",
-      meta_image: JSON.stringify({ id: 42 }),
-      username: "admin",
-      password: "admin123!@#",
+      publishAt: "2024-10-10T06:58",
+      settings: {
+        layout: "default",
+        meta: {
+          title: "Meta title",
+          description: "Meta description",
+          image: JSON.stringify({ id: 42 }),
+        },
+        credentials: {
+          user: "admin",
+          password: "admin123!@#",
+        },
+      },
       tags: [tag.id],
     };
 
@@ -53,15 +59,15 @@ describe("Articles Handler", () => {
         visibility: params.visibility,
         publishAt: "2024-10-10T06:58:00Z",
         settings: {
-          layout: params.layout,
+          layout: params.settings.layout,
           meta: {
-            title: params.meta_title,
-            description: params.meta_description,
-            image: JSON.parse(params.meta_image || "{}"),
+            title: params.settings.meta.title,
+            description: params.settings.meta.description,
+            image: JSON.parse(params.settings.meta.image || "{}"),
           },
           credentials: {
-            user: params.username,
-            password: params.password,
+            user: params.settings.credentials.user,
+            password: params.settings.credentials.password,
           },
         },
         widgets: [],
@@ -82,14 +88,20 @@ describe("Articles Handler", () => {
     const params = {
       title: "Article title",
       slug: "",
-      publish_at: "2024-10-10T06:58",
+      publishAt: "2024-10-10T06:58",
       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],
     };
 
@@ -116,15 +128,15 @@ describe("Articles Handler", () => {
         visibility: params.visibility,
         publishAt: "2024-10-10T06:58:00Z",
         settings: {
-          layout: params.layout,
+          layout: params.settings.layout,
           meta: {
-            title: params.meta_title,
-            description: params.meta_description,
-            image: JSON.parse(params.meta_image || "{}"),
+            title: params.settings.meta.title,
+            description: params.settings.meta.description,
+            image: JSON.parse(params.settings.meta.image || "{}"),
           },
           credentials: {
-            user: params.username,
-            password: params.password,
+            user: params.settings.credentials.user,
+            password: params.settings.credentials.password,
           },
         },
         widgets: [],
@@ -137,7 +149,19 @@ describe("Articles Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        resource: { ...params, meta_image: JSON.parse(params.meta_image) },
+        resource: {
+          ...params,
+          publishAt: "2024-10-10T06:58:00",
+          settings: {
+            ...params.settings,
+            meta: {
+              ...params.settings.meta,
+              image: { id: 42 },
+            },
+          },
+          widgets: [],
+          categories: [],
+        },
         tags: [tag],
         errors: { resource: { slug: "cannot be blank" } },
         visibilityOptions: ctx.client.articles.visibilityOptions(),

package/src/tests/handlers/articles/ArticlesHandler.test/create_form.test.js

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

package/src/tests/handlers/articles/ArticlesHandler.test/index.test.js

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

package/src/tests/handlers/articles/ArticlesHandler.test/show.test.js

@@ -9,9 +9,9 @@ describe("Articles Handler", () => {
   function buildCtx(article) {
     return {
       client: {
-        articles: new Articles({}, "token"),
-        articleChanges: new ArticleChanges({}, "token"),
-        articleRevisions: new ArticleRevisions({}, "token"),
+        articles: new Articles(() => ({}), "token"),
+        articleChanges: new ArticleChanges(() => ({}), "token"),
+        articleRevisions: new ArticleRevisions(() => ({}), "token"),
       },
       params: { id: article.id },
       locale: "en",

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

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

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

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