@raketa-cloud/admin 0.0.79 → 0.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.79",
+  "version": "0.0.81",
   "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

@@ -3,6 +3,8 @@ import {
   DeleteArticleDocument,
   LockArticleRevisionDocument,
   MergeArticleRevisionDocument,
+  ScheduleArticleRevisionDocument,
+  CancelArticleRevisionScheduleDocument,
   ArticleRevisionDocument,
   ArticleRevisionsDocument,
   StartArticleRevisionDocument,
@@ -77,6 +79,34 @@ export default class ArticleRevisions extends RaketaClient {
     return { article, errors };
   }
 
+  async schedule(id, locale, params, articleParams) {
+    const {
+      scheduleArticleRevision: { revision, errors, articleErrors },
+    } = await this.query(ScheduleArticleRevisionDocument, {
+      input: {
+        id,
+        locale,
+        ...params,
+        article: { ...articleParams },
+      },
+    });
+
+    return { revision, errors, articleErrors };
+  }
+
+  async cancelSchedule(id, locale) {
+    const {
+      cancelArticleRevisionSchedule: { revision, errors, articleErrors },
+    } = await this.query(CancelArticleRevisionScheduleDocument, {
+      input: {
+        revisionId: id,
+        locale: locale,
+      },
+    });
+
+    return { revision, errors, articleErrors };
+  }
+
   async create(articleId, locale) {
     const {
       startArticleRevision: { revision, errors, articleErrors },

package/src/cloud/EventRevisions.js

@@ -3,6 +3,8 @@ import {
   DeleteEventDocument,
   LockEventRevisionDocument,
   MergeEventRevisionDocument,
+  ScheduleEventRevisionDocument,
+  CancelEventRevisionScheduleDocument,
   EventRevisionDocument,
   EventRevisionsDocument,
   StartEventRevisionDocument,
@@ -84,6 +86,34 @@ export default class EventRevisions extends RaketaClient {
     return { event, errors };
   }
 
+  async schedule(id, locale, params, eventParams) {
+    const {
+      scheduleEventRevision: { revision, errors, eventErrors },
+    } = await this.query(ScheduleEventRevisionDocument, {
+      input: {
+        id,
+        locale,
+        ...params,
+        event: { ...eventParams },
+      },
+    });
+
+    return { revision, errors, eventErrors };
+  }
+
+  async cancelSchedule(id, locale) {
+    const {
+      cancelEventRevisionSchedule: { revision, errors, eventErrors },
+    } = await this.query(CancelEventRevisionScheduleDocument, {
+      input: {
+        revisionId: id,
+        locale: locale,
+      },
+    });
+
+    return { revision, errors, eventErrors };
+  }
+
   async create(eventId, locale) {
     const {
       startEventRevision: { revision, errors, eventErrors },

package/src/cloud/PageRevisions.js

@@ -3,6 +3,8 @@ import {
   DeletePageDocument,
   LockPageRevisionDocument,
   MergePageRevisionDocument,
+  SchedulePageRevisionDocument,
+  CancelPageRevisionScheduleDocument,
   PageRevisionDocument,
   PageRevisionsDocument,
   StartPageRevisionDocument,
@@ -64,6 +66,34 @@ export default class PageRevisions extends RaketaClient {
     return { page, errors };
   }
 
+  async schedule(id, locale, params, pageParams) {
+    const {
+      schedulePageRevision: { revision, errors, pageErrors },
+    } = await this.query(SchedulePageRevisionDocument, {
+      input: {
+        id,
+        locale,
+        ...params,
+        page: { ...pageParams },
+      },
+    });
+
+    return { revision, errors, pageErrors };
+  }
+
+  async cancelSchedule(id, locale) {
+    const {
+      cancelPageRevisionSchedule: { revision, errors, pageErrors },
+    } = await this.query(CancelPageRevisionScheduleDocument, {
+      input: {
+        revisionId: id,
+        locale: locale,
+      },
+    });
+
+    return { revision, errors, pageErrors };
+  }
+
   async create(pageId, locale) {
     const {
       startPageRevision: { revision, errors, pageErrors },

package/src/cloud/documents/articlesDocuments.js

@@ -7,6 +7,7 @@ import {
   revisionMetaFragment,
   tagFragment,
   summaryChangeFragment,
+  revisionScheduleFragment,
 } from "./common";
 
 function minimalArticleFragment() {
@@ -59,6 +60,7 @@ function articleRevisionFragment() {
       tags ${tagFragment()}
       articleType ${articleTypeFragment()}
       meta ${revisionMetaFragment()}
+      schedule ${revisionScheduleFragment()}
       categories ${categoryFragment()}
     }
   `;
@@ -202,6 +204,26 @@ const MergeArticleRevisionDocument = gql`
   }
 `;
 
+const ScheduleArticleRevisionDocument = gql`
+  mutation($input: ScheduleArticleRevisionInput!) {
+    scheduleArticleRevision(input: $input) {
+      revision ${articleRevisionFragment()}
+      errors ${errorsFragment()}
+      articleErrors ${errorsFragment()}
+    }
+  }
+`;
+
+const CancelArticleRevisionScheduleDocument = gql`
+  mutation($input: CancelArticleRevisionScheduleInput!) {
+    cancelArticleRevisionSchedule(input: $input) {
+      revision ${articleRevisionFragment()}
+      errors ${errorsFragment()}
+      articleErrors ${errorsFragment()}
+    }
+  }
+`;
+
 const ChangeArticleSlugDocument = gql`
   mutation ($input: ChangeArticleSlugInput!) {
     changeArticleSlug(input: $input) {
@@ -257,6 +279,8 @@ export {
   ArticleRevisionsDocument,
   StartArticleRevisionDocument,
   MergeArticleRevisionDocument,
+  ScheduleArticleRevisionDocument,
+  CancelArticleRevisionScheduleDocument,
   ArticleChangesDocument,
   ChangeArticleSlugDocument,
   ReopenArticleChangeDocument,

package/src/cloud/documents/common.js

@@ -78,6 +78,19 @@ export function revisionMetaFragment() {
   `;
 }
 
+export function revisionScheduleFragment() {
+  return gql`
+    {
+      id
+      mergeAt
+      title
+      description
+      operator
+      operatorMeta
+    }
+  `;
+}
+
 export function revisionFragment() {
   return gql`
     {

package/src/cloud/documents/eventsDocuments.js

@@ -7,6 +7,7 @@ import {
   revisionMetaFragment,
   tagFragment,
   summaryChangeFragment,
+  revisionScheduleFragment,
 } from "./common";
 
 function minimalEventFragment() {
@@ -65,6 +66,7 @@ function eventRevisionFragment() {
       tags ${tagFragment()}
       eventType ${eventTypeFragment()}
       meta ${revisionMetaFragment()}
+      schedule ${revisionScheduleFragment()}
       categories ${categoryFragment()}
     }
   `;
@@ -210,6 +212,26 @@ const MergeEventRevisionDocument = gql`
   }
 `;
 
+const ScheduleEventRevisionDocument = gql`
+  mutation($input: ScheduleEventRevisionInput!) {
+    scheduleEventRevision(input: $input) {
+      revision ${eventRevisionFragment()}
+      errors ${errorsFragment()}
+      eventErrors ${errorsFragment()}
+    }
+  }
+`;
+
+const CancelEventRevisionScheduleDocument = gql`
+  mutation($input: CancelEventRevisionScheduleInput!) {
+    cancelEventRevisionSchedule(input: $input) {
+      revision ${eventRevisionFragment()}
+      errors ${errorsFragment()}
+      eventErrors ${errorsFragment()}
+    }
+  }
+`;
+
 const ChangeEventSlugDocument = gql`
   mutation ($input: ChangeEventSlugInput!) {
     changeEventSlug(input: $input) {
@@ -265,6 +287,8 @@ export {
   EventRevisionsDocument,
   StartEventRevisionDocument,
   MergeEventRevisionDocument,
+  ScheduleEventRevisionDocument,
+  CancelEventRevisionScheduleDocument,
   EventChangesDocument,
   ChangeEventSlugDocument,
   ReopenEventChangeDocument,

package/src/cloud/documents/pagesDocuments.js

@@ -7,6 +7,7 @@ import {
   revisionMetaFragment,
   tagFragment,
   summaryChangeFragment,
+  revisionScheduleFragment,
 } from "./common";
 
 function minimalPageFragment() {
@@ -56,6 +57,7 @@ function pageRevisionFragment() {
       tags ${tagFragment()}
       pageType ${pageTypeFragment()}
       meta ${revisionMetaFragment()}
+      schedule ${revisionScheduleFragment()}
       categories ${categoryFragment()}
     }
   `;
@@ -198,6 +200,26 @@ const MergePageRevisionDocument = gql`
   }
 `;
 
+const SchedulePageRevisionDocument = gql`
+  mutation($input: SchedulePageRevisionInput!) {
+    schedulePageRevision(input: $input) {
+      revision ${pageRevisionFragment()}
+      errors ${errorsFragment()}
+      pageErrors ${errorsFragment()}
+    }
+  }
+`;
+
+const CancelPageRevisionScheduleDocument = gql`
+  mutation($input: CancelPageRevisionScheduleInput!) {
+    cancelPageRevisionSchedule(input: $input) {
+      revision ${pageRevisionFragment()}
+      errors ${errorsFragment()}
+      pageErrors ${errorsFragment()}
+    }
+  }
+`;
+
 const ChangePageSlugDocument = gql`
   mutation ($input: ChangePageSlugInput!) {
     changePageSlug(input: $input) {
@@ -253,6 +275,8 @@ export {
   PageRevisionsDocument,
   StartPageRevisionDocument,
   MergePageRevisionDocument,
+  SchedulePageRevisionDocument,
+  CancelPageRevisionScheduleDocument,
   PageChangesDocument,
   ChangePageSlugDocument,
   ReopenPageChangeDocument,

package/src/handlers/article_revisions/CancelSchedulesHandler.js

@@ -0,0 +1,26 @@
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+
+  const { revision, errors, articleErrors } =
+    await ctx.client.articleRevisions.cancelSchedule(parent_id, ctx.locale);
+
+  if (errors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
+    );
+  }
+
+  if (articleErrors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(articleErrors)}`
+    );
+  }
+
+  return {
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${revision.originalId}`,
+  };
+};
+
+export default {
+  create,
+};

package/src/handlers/article_revisions/PublishesHandler.js

@@ -1,3 +1,5 @@
+import { toUTCISO8601String } from "../../utils";
+
 const create_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -46,15 +48,21 @@ function publishArticleParams(
   return { visibility };
 }
 
-const create = async (ctx) => {
-  const { parent_id } = ctx.params;
-  const publishing = ctx.resourceParams.publishing;
+async function publishRevision(ctx, revision, publishing) {
+  if (publishing.mergeAt) {
+    return await ctx.client.articleRevisions.schedule(
+      revision.id,
+      ctx.locale,
+      {
+        title: publishing.title || "",
+        description: publishing.description || "",
+        mergeAt: toUTCISO8601String(publishing.mergeAt),
+      },
+      publishArticleParams(publishing, revision.settings)
+    );
+  }
 
-  const revision = await ctx.client.articleRevisions.find(
-    parent_id,
-    ctx.locale
-  );
-  const { errors } = await ctx.client.articleRevisions.publish(
+  return await ctx.client.articleRevisions.publish(
     revision.id,
     ctx.locale,
     {
@@ -63,8 +71,24 @@ const create = async (ctx) => {
     },
     publishArticleParams(publishing, revision.settings)
   );
+}
+
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const publishing = ctx.resourceParams.publishing;
+
+  const revision = await ctx.client.articleRevisions.find(
+    parent_id,
+    ctx.locale
+  );
+
+  const { errors, articleErrors } = await publishRevision(
+    ctx,
+    revision,
+    publishing
+  );
 
-  if (errors) {
+  if (errors || articleErrors) {
     return {
       assigns: {
         publishing: {
@@ -73,7 +97,12 @@ const create = async (ctx) => {
           originalId: revision.originalId,
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
-        errors: ctx.client.articleRevisions.formatErrors(errors),
+        errors: errors
+          ? ctx.client.articleRevisions.formatErrors(errors)
+          : null,
+        articleErrors: articleErrors
+          ? ctx.client.articleRevisions.formatErrors(articleErrors)
+          : null,
         _translations: [],
       },
     };

package/src/handlers/article_revisions/UnlocksHandler.js

@@ -10,7 +10,7 @@ const create = async (ctx) => {
 
   if (articleErrors) {
     throw new Error(
-      `Failed to start revision: ${JSON.stringify(articleErrors)}`
+      `Failed to unlock revision: ${JSON.stringify(articleErrors)}`
     );
   }
 

package/src/handlers/event_revisions/CancelSchedulesHandler.js

@@ -0,0 +1,26 @@
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+
+  const { revision, errors, eventErrors } =
+    await ctx.client.eventRevisions.cancelSchedule(parent_id, ctx.locale);
+
+  if (errors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
+    );
+  }
+
+  if (eventErrors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(eventErrors)}`
+    );
+  }
+
+  return {
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventTypePlural}/${revision.originalId}`,
+  };
+};
+
+export default {
+  create,
+};

package/src/handlers/event_revisions/PublishesHandler.js

@@ -1,3 +1,5 @@
+import { toUTCISO8601String } from "../../utils";
+
 const create_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -43,12 +45,21 @@ function publishEventParams(
   return { visibility };
 }
 
-const create = async (ctx) => {
-  const { parent_id } = ctx.params;
-  const publishing = ctx.resourceParams.publishing;
+async function publishRevision(ctx, revision, publishing) {
+  if (publishing.mergeAt) {
+    return await ctx.client.eventRevisions.schedule(
+      revision.id,
+      ctx.locale,
+      {
+        title: publishing.title || "",
+        description: publishing.description || "",
+        mergeAt: toUTCISO8601String(publishing.mergeAt),
+      },
+      publishEventParams(publishing, revision.settings)
+    );
+  }
 
-  const revision = await ctx.client.eventRevisions.find(parent_id, ctx.locale);
-  const { errors } = await ctx.client.eventRevisions.publish(
+  return await ctx.client.eventRevisions.publish(
     revision.id,
     ctx.locale,
     {
@@ -57,8 +68,21 @@ const create = async (ctx) => {
     },
     publishEventParams(publishing, revision.settings)
   );
+}
+
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const publishing = ctx.resourceParams.publishing;
+
+  const revision = await ctx.client.eventRevisions.find(parent_id, ctx.locale);
+
+  const { errors, eventErrors } = await publishRevision(
+    ctx,
+    revision,
+    publishing
+  );
 
-  if (errors) {
+  if (errors || eventErrors) {
     return {
       assigns: {
         publishing: {
@@ -67,7 +91,10 @@ const create = async (ctx) => {
           originalId: revision.originalId,
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
-        errors: ctx.client.eventRevisions.formatErrors(errors),
+        errors: errors ? ctx.client.eventRevisions.formatErrors(errors) : null,
+        eventErrors: eventErrors
+          ? ctx.client.eventRevisions.formatErrors(eventErrors)
+          : null,
         _translations: [],
       },
     };

package/src/handlers/event_revisions/UnlocksHandler.js

@@ -9,7 +9,9 @@ const create = async (ctx) => {
   }
 
   if (eventErrors) {
-    throw new Error(`Failed to start revision: ${JSON.stringify(eventErrors)}`);
+    throw new Error(
+      `Failed to unlock revision: ${JSON.stringify(eventErrors)}`
+    );
   }
 
   return {

package/src/handlers/page_revisions/CancelSchedulesHandler.js

@@ -0,0 +1,26 @@
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+
+  const { revision, errors, pageErrors } =
+    await ctx.client.pageRevisions.cancelSchedule(parent_id, ctx.locale);
+
+  if (errors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
+    );
+  }
+
+  if (pageErrors) {
+    throw new Error(
+      `Failed to cancel schedule for revision: ${JSON.stringify(pageErrors)}`
+    );
+  }
+
+  return {
+    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageTypePlural}/${revision.originalId}`,
+  };
+};
+
+export default {
+  create,
+};

package/src/handlers/page_revisions/PublishesHandler.js

@@ -1,3 +1,5 @@
+import { toUTCISO8601String } from "../../utils";
+
 const create_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -43,12 +45,21 @@ function publishPageParams(
   return { visibility };
 }
 
-const create = async (ctx) => {
-  const { parent_id } = ctx.params;
-  const publishing = ctx.resourceParams.publishing;
+async function publishRevision(ctx, revision, publishing) {
+  if (publishing.mergeAt) {
+    return await ctx.client.pageRevisions.schedule(
+      revision.id,
+      ctx.locale,
+      {
+        title: publishing.title || "",
+        description: publishing.description || "",
+        mergeAt: toUTCISO8601String(publishing.mergeAt),
+      },
+      publishPageParams(publishing, revision.settings)
+    );
+  }
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
-  const { errors } = await ctx.client.pageRevisions.publish(
+  return await ctx.client.pageRevisions.publish(
     revision.id,
     ctx.locale,
     {
@@ -57,8 +68,21 @@ const create = async (ctx) => {
     },
     publishPageParams(publishing, revision.settings)
   );
+}
+
+const create = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const publishing = ctx.resourceParams.publishing;
+
+  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+
+  const { errors, pageErrors } = await publishRevision(
+    ctx,
+    revision,
+    publishing
+  );
 
-  if (errors) {
+  if (errors || pageErrors) {
     return {
       assigns: {
         publishing: {
@@ -67,7 +91,10 @@ const create = async (ctx) => {
           originalId: revision.originalId,
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
-        errors: ctx.client.pageRevisions.formatErrors(errors),
+        errors: errors ? ctx.client.pageRevisions.formatErrors(errors) : null,
+        pageErrors: pageErrors
+          ? ctx.client.pageRevisions.formatErrors(pageErrors)
+          : null,
         _translations: [],
       },
     };

package/src/handlers/page_revisions/UnlocksHandler.js

@@ -9,7 +9,7 @@ const create = async (ctx) => {
   }
 
   if (pageErrors) {
-    throw new Error(`Failed to start revision: ${JSON.stringify(pageErrors)}`);
+    throw new Error(`Failed to unlock revision: ${JSON.stringify(pageErrors)}`);
   }
 
   return {

package/src/routeArticlesModule.js

@@ -17,6 +17,7 @@ import RevertsHandler from "./handlers/article_revisions/RevertsHandler";
 import PublishesHandler from "./handlers/article_revisions/PublishesHandler";
 import WidgetHandler from "./handlers/article_revisions/WidgetHandler";
 import ArticlesHandler from "./handlers/articles/ArticlesHandler";
+import CancelSchedulesHandler from "./handlers/article_revisions/CancelSchedulesHandler";
 
 function routeArticlesModule(
   adapter,
@@ -121,6 +122,17 @@ function routeArticlesModule(
     { ...resourceConfig, viewsFallback: "article_revisions/publishes" }
   );
 
+  routeNestedCollection(
+    adapter,
+    revisionsBaseResource,
+    "cancel_schedules",
+    CancelSchedulesHandler,
+    {
+      ...resourceConfig,
+      viewsFallback: "article_revisions/cancel_schedules",
+    }
+  );
+
   routeNestedMember(
     adapter,
     `api/${revisionsBaseResource}`,

package/src/routeEventsModule.js

@@ -17,6 +17,7 @@ import RevertsHandler from "./handlers/event_revisions/RevertsHandler";
 import PublishesHandler from "./handlers/event_revisions/PublishesHandler";
 import WidgetHandler from "./handlers/event_revisions/WidgetHandler";
 import EventsHandler from "./handlers/events/EventsHandler";
+import CancelSchedulesHandler from "./handlers/event_revisions/CancelSchedulesHandler";
 
 function routeEventsModule(
   adapter,
@@ -136,6 +137,17 @@ function routeEventsModule(
     }
   );
 
+  routeNestedCollection(
+    adapter,
+    revisionsBaseResource,
+    "cancel_schedules",
+    CancelSchedulesHandler,
+    {
+      ...resourceConfig,
+      viewsFallback: "event_revisions/cancel_schedules",
+    }
+  );
+
   routeNestedMember(
     adapter,
     `api/${revisionsBaseResource}`,