@raketa-cloud/admin 0.0.29 → 0.0.31

package/src/tests/handlers/RedirectsHandler.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
   };

package/src/tests/handlers/RedirectsHandler.test/index.test.js

@@ -7,7 +7,7 @@ describe("Redirects", () => {
   function buildCtx() {
     return {
       client: {
-        redirects: new Redirects({}, "token"),
+        redirects: new Redirects(() => ({}), "token"),
       },
       query: { foo: "bar" },
       req: {

package/src/tests/handlers/RedirectsHandler.test/show.test.js

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
   };

package/src/tests/handlers/RedirectsHandler.test/update.test.js

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx(redirect) {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: redirect.id },
     resourceParams: {

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

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

package/src/tests/handlers/article_revisions/ArticleRevisionsHandler.test/destroy.test.js

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

package/src/tests/handlers/article_revisions/CodesHandler.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 code settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,11 +30,9 @@ describe("Article revision code settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          scripts: JSON.stringify([]),
-          structured_data: JSON.stringify({}),
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
         },
         errors: {},
         _translations: [],

package/src/tests/handlers/article_revisions/CodesHandler.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: {
-      code_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,11 +22,17 @@ function buildCtx(revision, updateSettings) {
 
 describe("Article revision code 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 = {
-      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);
@@ -50,16 +56,16 @@ describe("Article revision code 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,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -68,11 +74,17 @@ describe("Article revision code 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 = {
-      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);
@@ -96,27 +108,33 @@ describe("Article revision code 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,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
+          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/article_revisions/GeneralHandler.test/edit_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",
@@ -32,15 +32,9 @@ describe("Article revision genereal settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          title: revision.title,
-          slug: revision.slug,
-          visibility: revision.visibility,
-          publish_at: "2024-08-30T16:05:00",
-          username: revision.settings?.credentials?.user || "",
-          password: revision.settings?.credentials?.password || "",
+        resource: {
+          ...revision,
+          publishAt: "2024-08-30T16:05:00",
         },
         errors: {},
         visibilityOptions: ctx.client.articles.visibilityOptions(),

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

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
-      articles: new Articles({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      articles: new Articles(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      general_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -30,9 +30,13 @@ describe("Article revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -56,16 +60,13 @@ describe("Article revision general settings", () => {
       title: updateSettings.title,
       visibility: updateSettings.visibility,
       publishAt: "2024-08-30T19:05: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({
@@ -80,9 +81,13 @@ describe("Article revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -106,27 +111,30 @@ describe("Article revision general settings", () => {
       title: updateSettings.title,
       visibility: updateSettings.visibility,
       publishAt: "2024-08-30T19:05: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,
+          publishAt: "2024-08-30T19:05:00",
+          settings: {
+            ...revision.settings,
+            ...updateSettings.settings,
+          },
         },
         errors: {
-          general_settings: { slug: "has invalid format" },
+          resource: { slug: "has invalid format" },
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         _translations: [],

package/src/tests/handlers/article_revisions/MetaHandler.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 meta settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,12 +30,9 @@ describe("Article 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",
         },
         errors: {},
         _translations: [],

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