@raketa-cloud/admin 0.0.30 → 0.0.31

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: {

package/src/tests/handlers/pages/ConesHandler.test/create.test.js

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

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

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

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

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

package/src/tests/handlers/pages/PagesHandler.test/create.test.js

@@ -8,8 +8,8 @@ describe("Pages Handler", () => {
   function buildCtx(params) {
     return {
       client: {
-        pages: new Pages({}, "token"),
-        tags: new Tags({}, "token"),
+        pages: new Pages(() => ({}), "token"),
+        tags: new Tags(() => ({}), "token"),
       },
       resourceParams: {
         resource: params,
@@ -28,12 +28,18 @@ describe("Pages Handler", () => {
       title: "Page title",
       slug: "url",
       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],
     };
 
@@ -51,15 +57,15 @@ describe("Pages Handler", () => {
         slug: params.slug,
         visibility: params.visibility,
         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: [],
@@ -81,12 +87,18 @@ describe("Pages Handler", () => {
       title: "Page title",
       slug: "",
       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],
     };
 
@@ -112,15 +124,15 @@ describe("Pages Handler", () => {
         slug: "",
         visibility: params.visibility,
         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: [],
@@ -133,7 +145,18 @@ describe("Pages Handler", () => {
 
     expect(result).toEqual({
       assigns: {
-        resource: { ...params, meta_image: JSON.parse(params.meta_image) },
+        resource: {
+          widgets: [],
+          categories: [],
+          ...params,
+          settings: {
+            ...params.settings,
+            meta: {
+              ...params.settings.meta,
+              image: JSON.parse(params.settings.meta.image),
+            },
+          },
+        },
         tags: [tag],
         errors: { resource: { slug: "cannot be blank" } },
         visibilityOptions: ctx.client.pages.visibilityOptions(),

package/src/tests/handlers/pages/PagesHandler.test/create_form.test.js

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

package/src/tests/handlers/pages/PagesHandler.test/index.test.js

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

package/src/tests/handlers/pages/PagesHandler.test/show.test.js

@@ -9,9 +9,9 @@ describe("Pages Handler", () => {
   function buildCtx(page) {
     return {
       client: {
-        pages: new Pages({}, "token"),
-        pageChanges: new PageChanges({}, "token"),
-        pageRevisions: new PageRevisions({}, "token"),
+        pages: new Pages(() => ({}), "token"),
+        pageChanges: new PageChanges(() => ({}), "token"),
+        pageRevisions: new PageRevisions(() => ({}), "token"),
       },
       params: { id: page.id },
       locale: "en",

package/src/tests/handlers/pages/URLsHandler.test/create.test.js

@@ -6,11 +6,11 @@ import { remoteConfig } from "../../../support/handlersHelper";
 function buildCtx(page, updateSettings) {
   return {
     client: {
-      pages: new Pages({}, "token"),
+      pages: new Pages(() => ({}), "token"),
     },
     params: { parent_id: page.id },
     resourceParams: {
-      change: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     remoteConfig: remoteConfig(),
@@ -88,8 +88,8 @@ describe("Page change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { ...updateSettings, id: page.id },
-        errors: { change: { slug: "has already been taken" } },
+        resource: { ...updateSettings, id: page.id },
+        errors: { resource: { slug: "has already been taken" } },
         _translations: [],
       },
     });
@@ -137,8 +137,8 @@ describe("Page change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { ...updateSettings, id: page.id },
-        errors: { change: { redirect: "url: has already been taken" } },
+        resource: { ...updateSettings, id: page.id },
+        errors: { resource: { redirect: "url: has already been taken" } },
         _translations: [],
       },
     });

package/src/tests/handlers/pages/URLsHandler.test/create_form.test.js

@@ -5,7 +5,7 @@ import Factory from "../../../support/factory";
 function buildCtx(page) {
   return {
     client: {
-      pages: new Pages({}, "token"),
+      pages: new Pages(() => ({}), "token"),
     },
     params: { parent_id: page.id },
     locale: "en",
@@ -34,7 +34,7 @@ describe("Page change url", () => {
 
     expect(result).toEqual({
       assigns: {
-        change: { slug: page.slug, id: page.id, redirect: null },
+        resource: { slug: page.slug, id: page.id, redirect: null },
         errors: {},
         _translations: [],
       },

package/src/utils.js

@@ -28,3 +28,15 @@ export function toDateTimeInput(initialDate = null) {
     now.getMinutes().toString().padStart(2, "0"),
   ].join("");
 }
+
+export function checkboxesToArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  }
+
+  if (!value) {
+    return [];
+  }
+
+  return [value];
+}

package/src/views/_shared/_credentials_input.ejs

@@ -0,0 +1,31 @@
+<%- f.field('resource.settings.credentials.user', { required: true, label: "Username" }) %>
+<%- f.field('resource.settings.credentials.password', { required: true }) %>
+
+<script>
+  function onVisibilityChange(event) {
+    const newValue = event.target.value;
+
+    const userInput = document.getElementById("f_resource_settings_credentials_user");
+    const passInput = document.getElementById("f_resource_settings_credentials_password");
+
+    if (newValue === "protected") {
+      userInput.parentElement.style.display = "block";
+      userInput.required = true;
+      passInput.parentElement.style.display = "block";
+      passInput.required = true;
+    } else {
+      userInput.parentElement.style.display = "none";
+      userInput.required = false;
+      passInput.parentElement.style.display = "none";
+      passInput.required = false;
+    }
+  }
+
+  onVisibilityChange({
+    target: {
+      value: '<%= resource.visibility %>'
+    }
+  })
+
+  document.getElementById('<%= visibilityFieldId %>').addEventListener("change", onVisibilityChange)
+</script>

package/src/views/_shared/_layout_input.ejs

@@ -0,0 +1,5 @@
+<%- f.field('resource.settings.layout', { as: 'select', required: true, options: [
+  ["default", "Default"],
+  ["landing", "Landing page"],
+  ["headless", "Headless"],
+] }) %>