@raketa-cloud/admin 0.0.30 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/cloud/ArticleRevisions.js

@@ -11,8 +11,32 @@ import {
   UpdateArticleWidgetsDocument,
   ReopenArticleChangeDocument,
 } from "./documents/articlesDocuments";
+import { toUTCISO8601String } from "../utils";
 
 export default class ArticleRevisions extends RaketaClient {
+  selectUpdateParams(revision) {
+    return {
+      title: revision.title,
+      slug: revision.slug,
+      publishAt: revision.publishAt,
+      widgets: [...revision.widgets],
+      settings: {
+        ...revision.settings,
+      },
+      visibility: revision.visibility,
+      tags: revision.tags.map((t) => (t.id ? t.id : t)),
+      categories: revision.categories.map((c) => (c.id ? c.id : c)),
+    };
+  }
+
+  formatDates(params) {
+    if (params.publishAt) {
+      params.publishAt = toUTCISO8601String(params.publishAt);
+    }
+
+    return { ...params };
+  }
+
   async all(articleId, locale) {
     const { articleRevisions: items } = await this.query(
       ArticleRevisionsDocument,
@@ -69,13 +93,18 @@ export default class ArticleRevisions extends RaketaClient {
   }
 
   async update(id, locale, params) {
+    const copyParams = { ...params };
+
+    copyParams.widgets = JSON.stringify(params.widgets || []);
+    copyParams.settings = JSON.stringify(params.settings || {});
+
     const {
       updateArticle: { errors, article },
     } = await this.query(UpdateArticleDocument, {
       input: {
         id,
         locale,
-        article: params,
+        article: copyParams,
       },
     });
 

package/src/cloud/Articles.js

@@ -8,19 +8,30 @@ import {
   TranslateArticleDocument,
   ChangeArticleSlugDocument,
 } from "./documents/articlesDocuments";
-import { toDateTimeInput } from "../utils";
+import { toDateTimeInput, toUTCISO8601String } from "../utils";
 
 export default class Articles extends RaketaClient {
   defaults() {
     return {
       visibility: "private",
-      layout: "default",
-      publish_at: toDateTimeInput(new Date()),
+      publishAt: toDateTimeInput(new Date()),
+      settings: {
+        layout: "default",
+      },
+      widgets: [],
       tags: [],
       categories: [],
     };
   }
 
+  formatDates(params) {
+    if (params.publishAt) {
+      params.publishAt = toUTCISO8601String(params.publishAt);
+    }
+
+    return { ...params };
+  }
+
   visibilityOptions() {
     return [
       ["private", "Private"],
@@ -68,15 +79,16 @@ export default class Articles extends RaketaClient {
   }
 
   async create(params, locale, articleTypeSlug) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const paramsCopy = { ...params };
+    paramsCopy.widgets = JSON.stringify(paramsCopy.widgets);
+    paramsCopy.settings = JSON.stringify(paramsCopy.settings);
 
     const {
       createArticle: { errors, article },
     } = await this.query(CreateArticleDocument, {
       input: {
         locale,
-        article: params,
+        article: paramsCopy,
         articleTypeSlug,
       },
     });
@@ -112,8 +124,9 @@ export default class Articles extends RaketaClient {
   }
 
   async translate(id, locale, params) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const paramsCopy = { ...params };
+    paramsCopy.widgets = JSON.stringify(paramsCopy.widgets);
+    paramsCopy.settings = JSON.stringify(paramsCopy.settings);
 
     const {
       translateArticle: { errors, article },
@@ -121,7 +134,7 @@ export default class Articles extends RaketaClient {
       input: {
         locale,
         sourceArticleId: id,
-        article: params,
+        article: paramsCopy,
       },
     });
 

package/src/cloud/EventRevisions.js

@@ -11,8 +11,42 @@ import {
   UpdateEventWidgetsDocument,
   ReopenEventChangeDocument,
 } from "./documents/eventsDocuments";
+import { toUTCISO8601String } from "../utils";
 
 export default class EventRevisions extends RaketaClient {
+  selectUpdateParams(revision) {
+    return {
+      title: revision.title,
+      slug: revision.slug,
+      publishAt: revision.publishAt,
+      startsAt: revision.startsAt,
+      endsAt: revision.endsAt,
+      widgets: [...revision.widgets],
+      settings: {
+        ...revision.settings,
+      },
+      visibility: revision.visibility,
+      tags: revision.tags.map((t) => (t.id ? t.id : t)),
+      categories: revision.categories.map((c) => (c.id ? c.id : c)),
+    };
+  }
+
+  formatDates(params) {
+    if (params.publishAt) {
+      params.publishAt = toUTCISO8601String(params.publishAt);
+    }
+
+    if (params.startsAt) {
+      params.startsAt = toUTCISO8601String(params.startsAt);
+    }
+
+    if (params.endsAt) {
+      params.endsAt = toUTCISO8601String(params.endsAt);
+    }
+
+    return { ...params };
+  }
+
   async all(eventId, locale) {
     const { eventRevisions: items } = await this.query(EventRevisionsDocument, {
       input: {
@@ -66,13 +100,18 @@ export default class EventRevisions extends RaketaClient {
   }
 
   async update(id, locale, params) {
+    const copyParams = { ...params };
+
+    copyParams.widgets = JSON.stringify(params.widgets || []);
+    copyParams.settings = JSON.stringify(params.settings || {});
+
     const {
       updateEvent: { errors, event },
     } = await this.query(UpdateEventDocument, {
       input: {
         id,
         locale,
-        event: params,
+        event: copyParams,
       },
     });
 

package/src/cloud/Events.js

@@ -8,21 +8,40 @@ import {
   TranslateEventDocument,
   ChangeEventSlugDocument,
 } from "./documents/eventsDocuments";
-import { toDateTimeInput } from "../utils";
+import { toDateTimeInput, toUTCISO8601String } from "../utils";
 
 export default class Events extends RaketaClient {
   defaults() {
     return {
       visibility: "private",
-      layout: "default",
-      publish_at: toDateTimeInput(),
-      starts_at: toDateTimeInput(),
-      ends_at: toDateTimeInput(),
+      publishAt: toDateTimeInput(),
+      startsAt: toDateTimeInput(),
+      endsAt: toDateTimeInput(),
+      settings: {
+        layout: "default",
+      },
+      widgets: [],
       tags: [],
       categories: [],
     };
   }
 
+  formatDates(params) {
+    if (params.publishAt) {
+      params.publishAt = toUTCISO8601String(params.publishAt);
+    }
+
+    if (params.startsAt) {
+      params.startsAt = toUTCISO8601String(params.startsAt);
+    }
+
+    if (params.endsAt) {
+      params.endsAt = toUTCISO8601String(params.endsAt);
+    }
+
+    return { ...params };
+  }
+
   visibilityOptions() {
     return [
       ["private", "Private"],
@@ -70,15 +89,16 @@ export default class Events extends RaketaClient {
   }
 
   async create(params, locale, eventTypeSlug) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const paramsCopy = { ...params };
+    paramsCopy.widgets = JSON.stringify(paramsCopy.widgets);
+    paramsCopy.settings = JSON.stringify(paramsCopy.settings);
 
     const {
       createEvent: { errors, event },
     } = await this.query(CreateEventDocument, {
       input: {
         locale,
-        event: params,
+        event: paramsCopy,
         eventTypeSlug,
       },
     });
@@ -114,8 +134,9 @@ export default class Events extends RaketaClient {
   }
 
   async translate(id, locale, params) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const paramsCopy = { ...params };
+    paramsCopy.widgets = JSON.stringify(paramsCopy.widgets);
+    paramsCopy.settings = JSON.stringify(paramsCopy.settings);
 
     const {
       translateEvent: { errors, event },
@@ -123,7 +144,7 @@ export default class Events extends RaketaClient {
       input: {
         locale,
         sourceEventId: id,
-        event: params,
+        event: paramsCopy,
       },
     });
 

package/src/cloud/PageRevisions.js

@@ -13,6 +13,20 @@ import {
 } from "./documents/pagesDocuments";
 
 export default class PageRevisions extends RaketaClient {
+  selectUpdateParams(revision) {
+    return {
+      title: revision.title,
+      slug: revision.slug,
+      widgets: [...revision.widgets],
+      settings: {
+        ...revision.settings,
+      },
+      visibility: revision.visibility,
+      tags: revision.tags.map((t) => (t.id ? t.id : t)),
+      categories: revision.categories.map((c) => (c.id ? c.id : c)),
+    };
+  }
+
   async all(pageId, locale) {
     const { pageRevisions: items } = await this.query(PageRevisionsDocument, {
       input: {
@@ -66,13 +80,18 @@ export default class PageRevisions extends RaketaClient {
   }
 
   async update(id, locale, params) {
+    const copyParams = { ...params };
+
+    copyParams.widgets = JSON.stringify(params.widgets || []);
+    copyParams.settings = JSON.stringify(params.settings || {});
+
     const {
       updatePage: { errors, page },
     } = await this.query(UpdatePageDocument, {
       input: {
         id,
         locale,
-        page: params,
+        page: copyParams,
       },
     });
 

package/src/cloud/Pages.js

@@ -13,9 +13,12 @@ export default class Pages extends RaketaClient {
   defaults() {
     return {
       visibility: "private",
-      layout: "default",
       tags: [],
       categories: [],
+      widgets: [],
+      settings: {
+        layout: "default",
+      },
     };
   }
 
@@ -66,15 +69,16 @@ export default class Pages extends RaketaClient {
   }
 
   async create(params, locale, pageTypeSlug) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const paramsCopy = { ...params };
+    paramsCopy.widgets = JSON.stringify(paramsCopy.widgets);
+    paramsCopy.settings = JSON.stringify(paramsCopy.settings);
 
     const {
       createPage: { errors, page },
     } = await this.query(CreatePageDocument, {
       input: {
         locale,
-        page: params,
+        page: paramsCopy,
         pageTypeSlug,
       },
     });
@@ -110,8 +114,10 @@ export default class Pages extends RaketaClient {
   }
 
   async translate(id, locale, params) {
-    params.widgets = JSON.stringify(params.widgets);
-    params.settings = JSON.stringify(params.settings);
+    const copyParams = { ...params };
+
+    copyParams.widgets = JSON.stringify(copyParams.widgets);
+    copyParams.settings = JSON.stringify(copyParams.settings);
 
     const {
       translatePage: { errors, page },
@@ -119,7 +125,7 @@ export default class Pages extends RaketaClient {
       input: {
         locale,
         sourcePageId: id,
-        page: params,
+        page: copyParams,
       },
     });
 

package/src/cloud/RaketaClient.js

@@ -8,6 +8,78 @@ function isObjectEmpty(obj) {
   return true;
 }
 
+function deepMerge(target, updates) {
+  if (typeof target !== "object" || target === null) {
+    return updates;
+  }
+
+  if (typeof updates !== "object" || updates === null) {
+    return target;
+  }
+
+  for (let key of Object.keys(updates)) {
+    if (Array.isArray(updates[key])) {
+      if (!Array.isArray(target[key])) {
+        target[key] = [];
+      }
+      target[key] = updates[key];
+    } else if (typeof updates[key] === "object" && updates[key] !== null) {
+      if (!target[key] || typeof target[key] !== "object") {
+        target[key] = {};
+      }
+      target[key] = deepMerge(target[key], updates[key]);
+    } else {
+      target[key] = updates[key];
+    }
+  }
+
+  return target;
+}
+
+function parseJson(str) {
+  if (!str) {
+    return str;
+  }
+
+  try {
+    const res = JSON.parse(str);
+
+    if (typeof res === "object") {
+      return res;
+    }
+
+    return str;
+  } catch (e) {
+    return str;
+  }
+}
+
+function parseJsonFields(params) {
+  if (!params) {
+    return params;
+  }
+
+  if (typeof params === "string") {
+    return parseJson(params);
+  }
+
+  for (let key of Object.keys(params)) {
+    if (typeof params[key] === "string") {
+      params[key] = parseJson(params[key]);
+    }
+
+    if (Array.isArray(params[key])) {
+      params[key] = params[key].map((item) => parseJsonFields(item));
+    }
+
+    if (typeof params[key] === "object") {
+      params[key] = parseJsonFields(params[key]);
+    }
+  }
+
+  return params;
+}
+
 export default class RaketaClient {
   constructor(getConfig, token) {
     this.getConfig = getConfig;
@@ -134,4 +206,8 @@ export default class RaketaClient {
 
     return variables;
   }
+
+  deepMerge(target, source) {
+    return parseJsonFields(deepMerge(structuredClone(target), source));
+  }
 }

package/src/handlers/article_revisions/CodeHandler.js

@@ -1,27 +1,23 @@
+import { toDateTimeInput } from "../../utils";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.articleRevisions.find(
+  const resource = await ctx.client.articleRevisions.find(
     parent_id,
     ctx.locale
   );
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const code_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    scripts: JSON.stringify(revision.settings.codes?.scripts || []),
-    structured_data: JSON.stringify(
-      revision.settings.codes?.structured_data || {}
-    ),
-  };
-
   return {
     assigns: {
-      code_settings,
+      resource: {
+        ...resource,
+        publishAt: toDateTimeInput(resource.publishAt),
+      },
       errors: {},
       _translations: [],
     },
@@ -40,39 +36,27 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.code_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.articleRevisions.deepMerge(
+    revision,
+    ctx.client.articleRevisions.formatDates(params)
+  );
 
   const { errors } = await ctx.client.articleRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      publishAt: revision.publishAt,
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        codes: {
-          scripts: JSON.parse(params.scripts),
-          structured_data: JSON.parse(params.structured_data),
-        },
-      }),
-    }
+    ctx.client.articleRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        code_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...resource,
+          publishAt: toDateTimeInput(resource.publishAt),
         },
         errors: {
-          code_settings: ctx.client.articleRevisions.formatErrors(errors),
+          resource: ctx.client.articleRevisions.formatErrors(errors),
         },
         _translations: [],
       },

package/src/handlers/article_revisions/GeneralHandler.js

@@ -1,32 +1,25 @@
-import { toDateTimeInput, toUTCISO8601String } from "../../utils";
+import { toDateTimeInput } from "../../utils";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.articleRevisions.find(
+  const resource = await ctx.client.articleRevisions.find(
     parent_id,
     ctx.locale
   );
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const general_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    title: revision.title,
-    slug: revision.slug,
-    publish_at: toDateTimeInput(revision.publishAt),
-    visibility: revision.visibility,
-    username: revision.settings?.credentials?.user || "",
-    password: revision.settings?.credentials?.password || "",
-  };
-
   return {
     assigns: {
-      general_settings,
-      errors: {},
+      resource: {
+        ...resource,
+        publishAt: toDateTimeInput(resource.publishAt),
+      },
       visibilityOptions: ctx.client.articles.visibilityOptions(),
+      errors: {},
       _translations: [],
     },
   };
@@ -44,39 +37,27 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.general_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.articleRevisions.deepMerge(
+    revision,
+    ctx.client.articleRevisions.formatDates(params)
+  );
 
   const { errors } = await ctx.client.articleRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: params.slug,
-      title: params.title,
-      visibility: params.visibility,
-      publishAt: toUTCISO8601String(params.publish_at),
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        credentials: {
-          user: params.username,
-          password: params.password,
-        },
-      }),
-    }
+    ctx.client.articleRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        general_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...resource,
+          publishAt: toDateTimeInput(resource.publishAt),
         },
         errors: {
-          general_settings: ctx.client.articleRevisions.formatErrors(errors),
+          resource: ctx.client.articleRevisions.formatErrors(errors),
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         _translations: [],

package/src/handlers/article_revisions/LocksHandler.js

@@ -6,14 +6,15 @@ const create_form = async (ctx) => {
     ctx.locale
   );
 
-  const lock_settings = {
-    revision,
+  const resource = {
+    id: revision.id,
+    originalId: revision.originalId,
     message: "",
   };
 
   return {
     assigns: {
-      lock_settings,
+      resource,
       errors: {},
       _translations: [],
     },
@@ -22,7 +23,7 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
-  const { message } = ctx.resourceParams.lock_settings;
+  const { message } = ctx.resourceParams.resource;
 
   const { revision, errors, articleErrors } =
     await ctx.client.articleRevisions.lock(parent_id, ctx.locale, message);
@@ -30,9 +31,13 @@ const create = async (ctx) => {
   if (errors) {
     return {
       assigns: {
-        lock_settings: { revision, message },
+        resource: {
+          id: revision.id,
+          originalId: revision.originalId,
+          message,
+        },
         errors: {
-          lock_settings: ctx.client.articles.formatErrors(errors, "message"),
+          resource: ctx.client.articles.formatErrors(errors, "message"),
         },
         _translations: [],
       },