@raketa-cloud/admin 0.0.79 → 0.0.82

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

@@ -0,0 +1,86 @@
+import Factory from "../../../support/factory";
+import PageRevisions from "../../../../cloud/PageRevisions";
+import CancelSchedulesHandler from "../../../../handlers/page_revisions/CancelSchedulesHandler";
+
+function buildCtx(revision) {
+  return {
+    client: {
+      pageRevisions: new PageRevisions(() => ({}), "token"),
+    },
+    params: { parent_id: revision.id },
+    locale: "en",
+    resourceConfig: {
+      pageType: "page",
+      pageTypePlural: "pages",
+    },
+  };
+}
+
+describe("Page revision schedule cancel", () => {
+  test("cancel of schedule successful", async () => {
+    const revision = Factory.build("page_revision");
+    const ctx = buildCtx(revision);
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.pageRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: revision,
+        errors: null,
+        pageErrors: null,
+      }));
+
+    const result = await CancelSchedulesHandler.create(ctx);
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+
+    expect(result).toEqual({
+      redirect: `/en/pages/${revision.originalId}`,
+    });
+  });
+
+  test("unlock failed with errors", async () => {
+    const revision = Factory.build("page_revision");
+    const ctx = buildCtx(revision);
+    const errors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.pageRevisions, "cancelSchedule")
+      .mockImplementation(() => ({ revision: null, errors, pageErrors: 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 page errors", async () => {
+    const revision = Factory.build("page_revision");
+    const ctx = buildCtx(revision);
+    const pageErrors = [
+      {
+        key: "generalError",
+        message: "Failed to cancel schedule for revision",
+      },
+    ];
+
+    const mockUnlock = jest
+      .spyOn(ctx.client.pageRevisions, "cancelSchedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: null,
+        pageErrors,
+      }));
+
+    await expect(CancelSchedulesHandler.create(ctx)).rejects.toThrow(
+      `Failed to cancel schedule for revision: ${JSON.stringify(pageErrors)}`
+    );
+
+    expect(mockUnlock).toHaveBeenCalledWith(revision.id, "en");
+  });
+});

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

@@ -21,7 +21,7 @@ function buildCtx(revision, resourceParams) {
 }
 
 describe("Publish page revision", () => {
-  test("create successful", async () => {
+  test("create successful for publishing", async () => {
     const revision = Factory.build("page_revision");
     const publishing = {
       title: "A new revision!",
@@ -80,7 +80,7 @@ describe("Publish page revision", () => {
     });
   });
 
-  test("create failed", async () => {
+  test("create failed for publishing", async () => {
     const revision = Factory.build("page_revision");
     const publishing = {
       title: "A new revision!",
@@ -133,6 +133,191 @@ describe("Publish page revision", () => {
         errors: {
           url: "Oops",
         },
+        pageErrors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create successful for scheduling", async () => {
+    const revision = Factory.build("page_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.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.pageRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: updatedRevision,
+        errors: null,
+        pageErrors: 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/pages/${updatedRevision.originalId}`,
+    });
+  });
+
+  test("create failed for scheduling - pageErrors", async () => {
+    const revision = Factory.build("page_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.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.pageRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        pageErrors: [{ 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.pages.visibilityOptions(),
+        pageErrors: {
+          slug: "Oops",
+        },
+        errors: null,
+        _translations: [],
+      },
+    });
+  });
+
+  test("create failed for scheduling - errors", async () => {
+    const revision = Factory.build("page_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.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockSchedule = jest
+      .spyOn(ctx.client.pageRevisions, "schedule")
+      .mockImplementation(() => ({
+        revision: null,
+        errors: [{ key: "slug", message: "Oops" }],
+        pageErrors: 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.pages.visibilityOptions(),
+        errors: {
+          slug: "Oops",
+        },
+        pageErrors: null,
         _translations: [],
       },
     });

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

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

package/src/tests/support/factory.js

@@ -13,6 +13,21 @@ const REVISION_META = {
   },
 };
 
+const REVISION_SCHEDULE = {
+  id: "1",
+  title: "New Schedule",
+  description: "Scheduled due to some campaign",
+  operator: "7a456cdd-7278-4610-8b82-5b93cfcae396",
+  operatorMeta: {
+    name: "Jane Doe",
+    roles: [],
+    active: true,
+    avatar: "",
+    user_pool: "Raketa",
+    user_pool_id: "some-user-pool-slug",
+  },
+};
+
 const PAGE = {
   id: "2",
   slug: "page-revision",
@@ -140,6 +155,7 @@ const FIXTURES = {
     createdAt: "2024-08-30T19:00:00Z",
   },
   revision_meta: { ...REVISION_META },
+  revision_schedule: { ...REVISION_SCHEDULE },
   page: { ...PAGE },
   page_revision: { ...PAGE, meta: { ...REVISION_META }, originalId: "1" },
   page_change: { ...PAGE_CHANGE },

package/src/views/article_revisions/publishes/_form.ejs

@@ -6,6 +6,9 @@
 
   <%- f.field('publishing.title'), { required: true, hint: "Appears in the history of changes" } %>
   <%- f.field('publishing.description', { as: "textarea", hint: "Provide optional details" }) %>
+
+  <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
+
   <%- f.field('publishing.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
   <%- f.field('publishing.username', { required: true }) %>
   <%- f.field('publishing.password', { required: true }) %>
@@ -37,4 +40,4 @@
 
   visibilityEl.addEventListener("change", (e) => handleVisibilityChange(e.target.value));
   handleVisibilityChange(visibilityEl.value);
-</script>
+</script>

package/src/views/articles/show.ejs

@@ -34,7 +34,20 @@
     <% } %>
   </div>
 
-  <% if (revisions.length) { %>
+  <%
+    const openedRevisions = []
+    const scheduledRevisions = []
+
+    revisions.forEach(r => {
+      if (r.schedule) {
+        scheduledRevisions.push(r)
+      } else {
+        openedRevisions.push(r)
+      }
+    })
+  %>
+
+  <% if (openedRevisions.length) { %>
   <div class="pb-8">
     <h4 class="pb-4 heading-3 flex items-center gap-2">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-4 text-raketa-primary">
@@ -56,9 +69,9 @@
       </thead>
 
       <tbody>
-        <% revisions.forEach((revision, idx)=> { %>
+        <% openedRevisions.forEach((revision, idx)=> { %>
         <tr class="border-b border-mono-25">
-          <td class="py-4 pl-2 w-full">
+          <td class="py-4 pl-2 w-1/2">
             <div class="flex gap-1 items-center">
               <% if (revision.meta && revision.meta.locked) { %>
               <div title="<%= revision.meta.lockMessage %>">
@@ -75,7 +88,9 @@
           <td class="whitespace-nowrap">
             <div class="body-3 text-raketa-foreground/50">
               <div class="flex items-center gap-1" title="<%= revision.meta.operatorMeta.name %>">
+                <% if (revision.meta.operatorMeta.avatar) { %>
                 <img src="<%= revision.meta.operatorMeta.avatar %>" class="size-4 rounded-full">
+                <% } %>
                 <%= revision.meta.operatorMeta.name %>
               </div>
             </div>
@@ -103,6 +118,104 @@
   </div>
   <% } %>
 
+  <% if (scheduledRevisions.length) { %>
+  <div class="pb-8">
+    <h4 class="pb-4 heading-3 flex items-center gap-2">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-4 text-raketa-primary">
+        <path fill-rule="evenodd" d="M5.625 1.5c-1.036 0-1.875.84-1.875 1.875v17.25c0 1.035.84 1.875 1.875 1.875h12.75c1.035 0 1.875-.84 1.875-1.875V12.75A3.75 3.75 0 0 0 16.5 9h-1.875a1.875 1.875 0 0 1-1.875-1.875V5.25A3.75 3.75 0 0 0 9 1.5H5.625ZM7.5 15a.75.75 0 0 1 .75-.75h7.5a.75.75 0 0 1 0 1.5h-7.5A.75.75 0 0 1 7.5 15Zm.75 2.25a.75.75 0 0 0 0 1.5H12a.75.75 0 0 0 0-1.5H8.25Z" clip-rule="evenodd" />
+        <path d="M12.971 1.816A5.23 5.23 0 0 1 14.25 5.25v1.875c0 .207.168.375.375.375H16.5a5.23 5.23 0 0 1 3.434 1.279 9.768 9.768 0 0 0-6.963-6.963Z" />
+      </svg>
+
+      Scheduled for publication
+    </h4>
+
+    <table class="data-grid alt">
+      <thead>
+        <tr>
+          <th>Title</th>
+          <th>Created by</th>
+          <th>Scheduled by</th>
+          <th>Publish on</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% scheduledRevisions.forEach((revision, idx)=> { %>
+        <tr class="border-b border-mono-25">
+          <td class="py-4 pl-2 w-1/2">
+            <div class="flex gap-1 items-center">
+              <%= revision.title %>
+            </div>
+          </td>
+
+          <td class="whitespace-nowrap">
+            <div class="body-3 text-raketa-foreground/50">
+              <div class="flex items-center gap-1" title="<%= revision.meta.operatorMeta.name %>">
+                <% if (revision.meta.operatorMeta.avatar) { %>
+                <img src="<%= revision.meta.operatorMeta.avatar %>" class="size-4 rounded-full">
+                <% } %>
+                <%= revision.meta.operatorMeta.name %>
+              </div>
+            </div>
+          </td>
+
+          <td class="whitespace-nowrap">
+            <div class="body-3 text-raketa-foreground/50">
+              <div class="flex items-center gap-1" title="<%= revision.schedule.operatorMeta.name %>">
+                <% if (revision.schedule.operatorMeta.avatar) { %>
+                <img src="<%= revision.schedule.operatorMeta.avatar %>" class="size-4 rounded-full">
+                <% } %>
+                <%= revision.schedule.operatorMeta.name %>
+              </div>
+            </div>
+          </td>
+
+          <td class="whitespace-nowrap">
+            <div class="body-3 text-raketa-foreground/50">
+              <div class="flex items-center gap-1">
+                <svg xmlns="http://www.w3.org/2000/svg" class="size-4 text-raketa-foreground" viewBox="0 0 512 512">
+                  <path d="M112.91 128A191.85 191.85 0 0064 254c-1.18 106.35 85.65 193.8 192 194 106.2.2 192-85.83 192-192 0-104.54-83.55-189.61-187.5-192a4.36 4.36 0 00-4.5 4.37V152" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" />
+                  <path d="M233.38 278.63l-79-113a8.13 8.13 0 0111.32-11.32l113 79a32.5 32.5 0 01-37.25 53.26 33.21 33.21 0 01-8.07-7.94z" />
+                </svg>
+
+
+                <time data-pretty-expiration-time datetime="<%= revision.schedule.mergeAt %>"><%= revision.schedule.mergeAt %></time>
+              </div>
+            </div>
+          </td>
+
+          <td class="whitespace-nowrap">
+            <div class="actions-toolbar justify-end">
+              <form action="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}/cancel_schedules` %>" method="post" class="inline-flex gap-2 items-center">
+                <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
+              </form>
+
+              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}` %>" hx-confirm="Are you sure?" type="button" class="btn-danger has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                </svg>
+
+                Delete
+              </button>
+
+              <a href="/remote-login?redirect_to=/admin/<%= _context.resourceConfig.articleType %>-revisions/<%= revision.id %>/preview" target="_blank" class="btn-text has-icon">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+                </svg>
+
+                Preview
+              </a>
+            </div>
+          </td>
+        </tr>
+        <% }); %>
+      </tbody>
+    </table>
+  </div>
+  <% } %>
+
   <div>
     <h4 class="pb-4 heading-3 items-center gap-2 flex">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-4 text-raketa-primary">
@@ -166,4 +279,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

package/src/views/event_revisions/publishes/_form.ejs

@@ -6,6 +6,9 @@
 
   <%- f.field('publishing.title'), { required: true, hint: "Appears in the history of changes" } %>
   <%- f.field('publishing.description', { as: "textarea", hint: "Provide optional details" }) %>
+
+  <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
+
   <%- f.field('publishing.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
   <%- f.field('publishing.username', { required: true }) %>
   <%- f.field('publishing.password', { required: true }) %>
@@ -37,4 +40,4 @@
 
   visibilityEl.addEventListener("change", (e) => handleVisibilityChange(e.target.value));
   handleVisibilityChange(visibilityEl.value);
-</script>
+</script>