@raketa-cloud/admin 0.0.79 → 0.0.82

package/src/routePagesModule.js

@@ -17,6 +17,7 @@ import URLsHandler from "./handlers/pages/URLsHandler";
 import routeCollection from "./routeCollection";
 import routeNestedCollection from "./routeNestedCollection";
 import routeNestedMember from "./routeNestedMember";
+import CancelSchedulesHandler from "./handlers/page_revisions/CancelSchedulesHandler";
 
 function routePagesModule(
   adapter,
@@ -133,6 +134,17 @@ function routePagesModule(
     }
   );
 
+  routeNestedCollection(
+    adapter,
+    revisionsBaseResource,
+    "cancel_schedules",
+    CancelSchedulesHandler,
+    {
+      ...resourceConfig,
+      viewsFallback: "page_revisions/cancel_schedules",
+    }
+  );
+
   routeNestedMember(
     adapter,
     `api/${revisionsBaseResource}`,

package/src/styles/application.css

@@ -30,7 +30,6 @@ body {
 }
 
 @layer components {
-
   /* Utils */
   .dbg {
     @apply outline-1 outline-dashed outline-red-500;
@@ -289,7 +288,7 @@ body {
   .pagination {
     @apply text-center py-8 text-raketa-foreground/50;
 
-    &>div {
+    & > div {
       @apply inline-flex items-center gap-4;
     }
 

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

@@ -0,0 +1,90 @@
+import Factory from "../../../support/factory";
+import ArticleRevisions from "../../../../cloud/ArticleRevisions";
+import CancelSchedulesHandler from "../../../../handlers/article_revisions/CancelSchedulesHandler";
+
+function buildCtx(revision) {
+  return {
+    client: {
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+    },
+    params: { parent_id: revision.id },
+    locale: "en",
+    resourceConfig: {
+      articleType: "article",
+      articleTypePlural: "articles",
+    },
+  };
+}
+
+describe("Article revision schedule cancel", () => {
+  test("cancel of schedule successful", async () => {
+    const revision = Factory.build("article_revision");
+    const ctx = buildCtx(revision);
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.articleRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: revision,
+        errors: null,
+        articleErrors: null,
+      }));
+
+    const result = await CancelSchedulesHandler.create(ctx);
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+
+    expect(result).toEqual({
+      redirect: `/en/articles/${revision.originalId}`,
+    });
+  });
+
+  test("unlock failed with errors", async () => {
+    const revision = Factory.build("article_revision");
+    const ctx = buildCtx(revision);
+    const errors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.articleRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors,
+        articleErrors: null,
+      }));
+
+    await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
+      `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
+    );
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+  });
+
+  test("unlock failed with article errors", async () => {
+    const revision = Factory.build("article_revision");
+    const ctx = buildCtx(revision);
+    const articleErrors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.articleRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: null,
+        articleErrors,
+      }));
+
+    await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
+      `Failed to cancel schedule for revision: ${JSON.stringify(articleErrors)}`
+    );
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+  });
+});

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

@@ -21,7 +21,7 @@ function buildCtx(revision, resourceParams) {
 }
 
 describe("Publish article revision", () => {
-  test("create successful", async () => {
+  test("create successful for publishing", async () => {
     const revision = Factory.build("article_revision");
     const publishing = {
       title: "A new revision!",
@@ -80,7 +80,7 @@ describe("Publish article revision", () => {
     });
   });
 
-  test("create failed", async () => {
+  test("create failed for publishing", async () => {
     const revision = Factory.build("article_revision");
     const publishing = {
       title: "A new revision!",
@@ -133,6 +133,191 @@ describe("Publish article revision", () => {
         errors: {
           url: "Oops",
         },
+        articleErrors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create successful for scheduling", async () => {
+    const revision = Factory.build("article_revision");
+    const schedule = Factory.build("revision_schedule");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "protected",
+      username: "admin",
+      password: "admin123!@#",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const updatedRevision = { ...revision, schedule: { ...schedule } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.articleRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.articleRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: updatedRevision,
+        errors: null,
+        articleErrors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+        settings: JSON.stringify({
+          ...revision.settings,
+          credentials: {
+            user: publishing.username,
+            password: publishing.password,
+          },
+        }),
+      }
+    );
+
+    expect(result).toEqual({
+      redirect: `/en/articles/${updatedRevision.originalId}`,
+    });
+  });
+
+  test("create failed for scheduling - articleErrors", async () => {
+    const revision = Factory.build("article_revision");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "public",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const mockFind = jest
+      .spyOn(ctx.client.articleRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.articleRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        articleErrors: [{ key: "slug", message: "Oops" }],
+        errors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+      }
+    );
+
+    expect(result).toEqual({
+      assigns: {
+        publishing: {
+          id: revision.id,
+          originalId: revision.originalId,
+          title: publishing.title,
+          mergeAt: "2024-12-20T20:20",
+          description: publishing.description,
+          visibility: publishing.visibility,
+          username: publishing.username,
+          password: publishing.password,
+        },
+        visibilityOptions: ctx.client.articles.visibilityOptions(),
+        articleErrors: {
+          slug: "Oops",
+        },
+        errors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create failed for scheduling - errors", async () => {
+    const revision = Factory.build("article_revision");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "public",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const mockFind = jest
+      .spyOn(ctx.client.articleRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.articleRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: [{ key: "slug", message: "Oops" }],
+        articleErrors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+      }
+    );
+
+    expect(result).toEqual({
+      assigns: {
+        publishing: {
+          id: revision.id,
+          originalId: revision.originalId,
+          title: publishing.title,
+          mergeAt: "2024-12-20T20:20",
+          description: publishing.description,
+          visibility: publishing.visibility,
+          username: publishing.username,
+          password: publishing.password,
+        },
+        visibilityOptions: ctx.client.articles.visibilityOptions(),
+        errors: {
+          slug: "Oops",
+        },
+        articleErrors: null,
         _translations: [],
       },
     });

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

@@ -64,7 +64,7 @@ describe("Article revision unlock", () => {
     const revision = Factory.build("article_revision");
     const ctx = buildCtx(revision);
     const articleErrors = [
-      { key: "generalError", message: "Failed to start revision" },
+      { key: "generalError", message: "Failed to unlock revision" },
     ];
 
     const mockUnlock = jest
@@ -76,7 +76,7 @@ describe("Article revision unlock", () => {
       }));
 
     await expect(UnlocksHandler.create(ctx)).rejects.toThrow(
-      `Failed to start revision: ${JSON.stringify(articleErrors)}`
+      `Failed to unlock revision: ${JSON.stringify(articleErrors)}`
     );
 
     expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");

package/src/tests/handlers/event_revisions/CancelScheduledHandler.test/create.test.js

@@ -0,0 +1,90 @@
+import Factory from "../../../support/factory";
+import EventRevisions from "../../../../cloud/EventRevisions";
+import CancelSchedulesHandler from "../../../../handlers/event_revisions/CancelSchedulesHandler";
+
+function buildCtx(revision) {
+  return {
+    client: {
+      eventRevisions: new EventRevisions(() => ({}), "token"),
+    },
+    params: { parent_id: revision.id },
+    locale: "en",
+    resourceConfig: {
+      eventType: "event",
+      eventTypePlural: "events",
+    },
+  };
+}
+
+describe("Event revision schedule cancel", () => {
+  test("cancel of schedule successful", async () => {
+    const revision = Factory.build("event_revision");
+    const ctx = buildCtx(revision);
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.eventRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: revision,
+        errors: null,
+        eventErrors: null,
+      }));
+
+    const result = await CancelSchedulesHandler.create(ctx);
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+
+    expect(result).toEqual({
+      redirect: `/en/events/${revision.originalId}`,
+    });
+  });
+
+  test("unlock failed with errors", async () => {
+    const revision = Factory.build("event_revision");
+    const ctx = buildCtx(revision);
+    const errors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.eventRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors,
+        eventErrors: null,
+      }));
+
+    await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
+      `Failed to cancel schedule for revision: ${JSON.stringify(errors)}`
+    );
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+  });
+
+  test("unlock failed with event errors", async () => {
+    const revision = Factory.build("event_revision");
+    const ctx = buildCtx(revision);
+    const eventErrors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.eventRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: null,
+        eventErrors,
+      }));
+
+    await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
+      `Failed to cancel schedule for revision: ${JSON.stringify(eventErrors)}`
+    );
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+  });
+});

package/src/tests/handlers/event_revisions/PublishesHandler.test/create.test.js

@@ -21,7 +21,7 @@ function buildCtx(revision, resourceParams) {
 }
 
 describe("Publish event revision", () => {
-  test("create successful", async () => {
+  test("create successful for publishing", async () => {
     const revision = Factory.build("event_revision");
     const publishing = {
       title: "A new revision!",
@@ -80,7 +80,7 @@ describe("Publish event revision", () => {
     });
   });
 
-  test("create failed", async () => {
+  test("create failed for publishing", async () => {
     const revision = Factory.build("event_revision");
     const publishing = {
       title: "A new revision!",
@@ -133,6 +133,191 @@ describe("Publish event revision", () => {
         errors: {
           url: "Oops",
         },
+        eventErrors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create successful for scheduling", async () => {
+    const revision = Factory.build("event_revision");
+    const schedule = Factory.build("revision_schedule");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "protected",
+      username: "admin",
+      password: "admin123!@#",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const updatedRevision = { ...revision, schedule: { ...schedule } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.eventRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.eventRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: updatedRevision,
+        errors: null,
+        eventErrors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+        settings: JSON.stringify({
+          ...revision.settings,
+          credentials: {
+            user: publishing.username,
+            password: publishing.password,
+          },
+        }),
+      }
+    );
+
+    expect(result).toEqual({
+      redirect: `/en/events/${updatedRevision.originalId}`,
+    });
+  });
+
+  test("create failed for scheduling - eventErrors", async () => {
+    const revision = Factory.build("event_revision");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "public",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const mockFind = jest
+      .spyOn(ctx.client.eventRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.eventRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        eventErrors: [{ key: "slug", message: "Oops" }],
+        errors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+      }
+    );
+
+    expect(result).toEqual({
+      assigns: {
+        publishing: {
+          id: revision.id,
+          originalId: revision.originalId,
+          title: publishing.title,
+          mergeAt: "2024-12-20T20:20",
+          description: publishing.description,
+          visibility: publishing.visibility,
+          username: publishing.username,
+          password: publishing.password,
+        },
+        visibilityOptions: ctx.client.events.visibilityOptions(),
+        eventErrors: {
+          slug: "Oops",
+        },
+        errors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create failed for scheduling - errors", async () => {
+    const revision = Factory.build("event_revision");
+    const publishing = {
+      mergeAt: "2024-12-20T20:20",
+      title: "A new revision!",
+      description: "Nice!",
+      visibility: "public",
+    };
+
+    const ctx = buildCtx(revision, {
+      publishing,
+    });
+
+    const mockFind = jest
+      .spyOn(ctx.client.eventRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.eventRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: [{ key: "slug", message: "Oops" }],
+        eventErrors: null,
+      }));
+
+    const result = await PublishesHandler.create(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockSchedule).toHaveBeenCalledWith(
+      revision.id,
+      "en",
+      {
+        title: publishing.title,
+        description: publishing.description,
+        mergeAt: "2024-12-20T20:20:00Z",
+      },
+      {
+        visibility: publishing.visibility,
+      }
+    );
+
+    expect(result).toEqual({
+      assigns: {
+        publishing: {
+          id: revision.id,
+          originalId: revision.originalId,
+          title: publishing.title,
+          mergeAt: "2024-12-20T20:20",
+          description: publishing.description,
+          visibility: publishing.visibility,
+          username: publishing.username,
+          password: publishing.password,
+        },
+        visibilityOptions: ctx.client.events.visibilityOptions(),
+        errors: {
+          slug: "Oops",
+        },
+        eventErrors: null,
         _translations: [],
       },
     });

package/src/tests/handlers/event_revisions/UnlocksHandler.test/create.test.js

@@ -64,7 +64,7 @@ describe("Event revision unlock", () => {
     const revision = Factory.build("event_revision");
     const ctx = buildCtx(revision);
     const eventErrors = [
-      { key: "generalError", message: "Failed to start revision" },
+      { key: "generalError", message: "Failed to unlock revision" },
     ];
 
     const mockUnlock = jest
@@ -76,7 +76,7 @@ describe("Event revision unlock", () => {
       }));
 
     await expect(UnlocksHandler.create(ctx)).rejects.toThrow(
-      `Failed to start revision: ${JSON.stringify(eventErrors)}`
+      `Failed to unlock revision: ${JSON.stringify(eventErrors)}`
     );
 
     expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");