@raketa-cloud/admin 0.0.90 → 0.0.92

package/package.json

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

package/src/handlers/article_revisions/PublishesHandler.js

@@ -18,6 +18,7 @@ const create_form = async (ctx) => {
         visibility: revision.visibility,
         username: revision.settings?.credentials?.user,
         password: revision.settings?.credentials?.password,
+        type: "now",
       },
       visibilityOptions: ctx.client.articles.visibilityOptions(),
       errors: {},
@@ -49,7 +50,7 @@ function publishArticleParams(
 }
 
 async function publishRevision(ctx, revision, publishing) {
-  if (publishing.mergeAt) {
+  if (publishing.mergeAt && publishing.type === "later") {
     return await ctx.client.articleRevisions.schedule(
       revision.id,
       ctx.locale,

package/src/handlers/event_revisions/PublishesHandler.js

@@ -15,6 +15,7 @@ const create_form = async (ctx) => {
         visibility: revision.visibility,
         username: revision.settings?.credentials?.user,
         password: revision.settings?.credentials?.password,
+        type: "now",
       },
       visibilityOptions: ctx.client.events.visibilityOptions(),
       errors: {},
@@ -46,7 +47,7 @@ function publishEventParams(
 }
 
 async function publishRevision(ctx, revision, publishing) {
-  if (publishing.mergeAt) {
+  if (publishing.mergeAt && publishing.type === "later") {
     return await ctx.client.eventRevisions.schedule(
       revision.id,
       ctx.locale,

package/src/handlers/page_revisions/PublishesHandler.js

@@ -15,6 +15,7 @@ const create_form = async (ctx) => {
         visibility: revision.visibility,
         username: revision.settings?.credentials?.user,
         password: revision.settings?.credentials?.password,
+        type: "now",
       },
       visibilityOptions: ctx.client.pages.visibilityOptions(),
       errors: {},
@@ -46,7 +47,7 @@ function publishPageParams(
 }
 
 async function publishRevision(ctx, revision, publishing) {
-  if (publishing.mergeAt) {
+  if (publishing.mergeAt && publishing.type === "later") {
     return await ctx.client.pageRevisions.schedule(
       revision.id,
       ctx.locale,

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

@@ -29,6 +29,7 @@ describe("Publish article revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -86,6 +87,7 @@ describe("Publish article revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -128,6 +130,7 @@ describe("Publish article revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         errors: {
@@ -149,6 +152,7 @@ describe("Publish article revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -204,6 +208,7 @@ describe("Publish article revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -249,6 +254,7 @@ describe("Publish article revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         articleErrors: {
@@ -267,6 +273,7 @@ describe("Publish article revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -312,6 +319,7 @@ describe("Publish article revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         errors: {

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

@@ -37,6 +37,7 @@ describe("Publish article revision", () => {
           visibility: revision.visibility,
           username: revision.settings?.credentials?.user,
           password: revision.settings?.credentials?.password,
+          type: "now",
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         errors: {},

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

@@ -29,6 +29,7 @@ describe("Publish event revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -86,6 +87,7 @@ describe("Publish event revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -128,6 +130,7 @@ describe("Publish event revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
         errors: {
@@ -149,6 +152,7 @@ describe("Publish event revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -204,6 +208,7 @@ describe("Publish event revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -249,6 +254,7 @@ describe("Publish event revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
         eventErrors: {
@@ -267,6 +273,7 @@ describe("Publish event revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -312,6 +319,7 @@ describe("Publish event revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
         errors: {

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

@@ -37,6 +37,7 @@ describe("Publish event revision", () => {
           visibility: revision.visibility,
           username: revision.settings?.credentials?.user,
           password: revision.settings?.credentials?.password,
+          type: "now",
         },
         visibilityOptions: ctx.client.events.visibilityOptions(),
         errors: {},

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

@@ -29,6 +29,7 @@ describe("Publish page revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -86,6 +87,7 @@ describe("Publish page revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "now",
     };
 
     const ctx = buildCtx(revision, {
@@ -128,6 +130,7 @@ describe("Publish page revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         errors: {
@@ -149,6 +152,7 @@ describe("Publish page revision", () => {
       visibility: "protected",
       username: "admin",
       password: "admin123!@#",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -204,6 +208,7 @@ describe("Publish page revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -249,6 +254,7 @@ describe("Publish page revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         pageErrors: {
@@ -267,6 +273,7 @@ describe("Publish page revision", () => {
       title: "A new revision!",
       description: "Nice!",
       visibility: "public",
+      type: "later",
     };
 
     const ctx = buildCtx(revision, {
@@ -312,6 +319,7 @@ describe("Publish page revision", () => {
           visibility: publishing.visibility,
           username: publishing.username,
           password: publishing.password,
+          type: publishing.type,
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         errors: {

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

@@ -37,6 +37,7 @@ describe("Publish page revision", () => {
           visibility: revision.visibility,
           username: revision.settings?.credentials?.user,
           password: revision.settings?.credentials?.password,
+          type: "now",
         },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         errors: {},

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

@@ -4,11 +4,11 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- 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.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
+  <%- 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.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
   <%- f.field('publishing.username', { required: true }) %>
   <%- f.field('publishing.password', { required: true }) %>
@@ -23,6 +23,33 @@
 </form>
 <% }) %>
 
+<script>
+  // Takes care of the publishint time!
+  const typeEl = document.getElementById("f_publishing_type")
+  const mergeAtEl = document.getElementById("f_publishing_mergeAt")
+
+  function radioGroupValue(radioGroup) {
+    let val = "";
+    radioGroup.querySelectorAll('input[type="radio"]').forEach(input => {
+      if (input.checked) {
+        val = input.value
+      }
+    })
+    return val;
+  }
+
+  function handleTypeChange(value) {
+    const shouldShowMergeAt = value === "later"
+    if (shouldShowMergeAt) {
+      mergeAtEl.parentNode.classList.remove('hidden')
+    } else {
+      mergeAtEl.parentNode.classList.add('hidden')
+    }
+  }
+  typeEl.addEventListener("change", (e) => handleTypeChange(e.target.value))
+  handleTypeChange(radioGroupValue(typeEl))
+</script>
+
 <script>
   const visibilityEl = document.getElementById("f_publishing_visibility");
   const usernameEl = document.getElementById("f_publishing_username").parentElement;

package/src/views/articles/_shared/_revision_toolbar.ejs

@@ -6,6 +6,15 @@
     Edit content
   </a>
 
+  <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
+      <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+    </svg>
+
+    Edit settings
+  </a>
+
   <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}/publishes/new` %>" class="btn-text 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="M15.59 14.37a6 6 0 0 1-5.84 7.38v-4.8m5.84-2.58a14.98 14.98 0 0 0 6.16-12.12A14.98 14.98 0 0 0 9.631 8.41m5.96 5.96a14.926 14.926 0 0 1-5.841 2.58m-.119-8.54a6 6 0 0 0-7.381 5.84h4.8m2.581-5.84a14.927 14.927 0 0 0-2.58 5.84m2.699 2.7c-.103.021-.207.041-.311.06a15.09 15.09 0 0 1-2.448-2.448 14.9 14.9 0 0 1 .06-.312m-2.24 2.39a4.493 4.493 0 0 0-1.757 4.306 4.493 4.493 0 0 0 4.306-1.758M16.5 9a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z" />
@@ -22,15 +31,6 @@
     </summary>
 
     <div class="absolute border bg-raketa-background p-4 right-4 z-20 mt-2 flex flex-col gap-4 shadow-md rounded dark:border-neutral-500">
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
-          <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
-        </svg>
-
-        Edit settings
-      </a>
-
       <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.articleType %>-revisions/<%= revision.id %>/preview" target="_blank" class="btn-text 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="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" />

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

@@ -4,11 +4,11 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- 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.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
+  <%- 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.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
   <%- f.field('publishing.username', { required: true }) %>
   <%- f.field('publishing.password', { required: true }) %>
@@ -23,6 +23,40 @@
 </form>
 <% }) %>
 
+
+<script>
+  // Takes care of the publishint time!
+  const typeEl = document.getElementById("f_publishing_type")
+  const mergeAtEl = document.getElementById("f_publishing_mergeAt")
+
+  function radioGroupValue(radioGroup) {
+    let val = "";
+
+    radioGroup.querySelectorAll('input[type="radio"]').forEach(input => {
+
+      if (input.checked) {
+        val = input.value
+      }
+
+    })
+
+    return val;
+  }
+
+  function handleTypeChange(value) {
+    const shouldShowMergeAt = value === "later"
+
+    if (shouldShowMergeAt) {
+      mergeAtEl.parentNode.classList.remove('hidden')
+    } else {
+      mergeAtEl.parentNode.classList.add('hidden')
+    }
+  }
+
+  typeEl.addEventListener("change", (e) => handleTypeChange(e.target.value))
+  handleTypeChange(radioGroupValue(typeEl))
+</script>
+
 <script>
   const visibilityEl = document.getElementById("f_publishing_visibility");
   const usernameEl = document.getElementById("f_publishing_username").parentElement;

package/src/views/events/_shared/_revision_toolbar.ejs

@@ -6,6 +6,15 @@
     Edit content
   </a>
 
+  <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
+      <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+    </svg>
+
+    Edit settings
+  </a>
+
   <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventType}_revisions/${revision.id}/publishes/new` %>" class="btn-text 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="M15.59 14.37a6 6 0 0 1-5.84 7.38v-4.8m5.84-2.58a14.98 14.98 0 0 0 6.16-12.12A14.98 14.98 0 0 0 9.631 8.41m5.96 5.96a14.926 14.926 0 0 1-5.841 2.58m-.119-8.54a6 6 0 0 0-7.381 5.84h4.8m2.581-5.84a14.927 14.927 0 0 0-2.58 5.84m2.699 2.7c-.103.021-.207.041-.311.06a15.09 15.09 0 0 1-2.448-2.448 14.9 14.9 0 0 1 .06-.312m-2.24 2.39a4.493 4.493 0 0 0-1.757 4.306 4.493 4.493 0 0 0 4.306-1.758M16.5 9a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z" />
@@ -22,15 +31,6 @@
     </summary>
 
     <div class="absolute border bg-raketa-background p-4 right-4 z-20 mt-2 flex flex-col gap-4 shadow-md rounded dark:border-neutral-500">
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
-          <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
-        </svg>
-
-        Edit settings
-      </a>
-
       <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.eventType %>-revisions/<%= revision.id %>/preview" target="_blank" class="btn-text 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="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" />

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

@@ -4,11 +4,11 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- 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.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
+  <%- 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.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
   <%- f.field('publishing.username', { required: true }) %>
   <%- f.field('publishing.password', { required: true }) %>
@@ -23,6 +23,39 @@
 </form>
 <% }) %>
 
+<script>
+  // Takes care of the publishint time!
+  const typeEl = document.getElementById("f_publishing_type")
+  const mergeAtEl = document.getElementById("f_publishing_mergeAt")
+
+  function radioGroupValue(radioGroup) {
+    let val = "";
+
+    radioGroup.querySelectorAll('input[type="radio"]').forEach(input => {
+
+      if (input.checked) {
+        val = input.value
+      }
+
+    })
+
+    return val;
+  }
+
+  function handleTypeChange(value) {
+    const shouldShowMergeAt = value === "later"
+
+    if (shouldShowMergeAt) {
+      mergeAtEl.parentNode.classList.remove('hidden')
+    } else {
+      mergeAtEl.parentNode.classList.add('hidden')
+    }
+  }
+
+  typeEl.addEventListener("change", (e) => handleTypeChange(e.target.value))
+  handleTypeChange(radioGroupValue(typeEl))
+</script>
+
 <script>
   const visibilityEl = document.getElementById("f_publishing_visibility");
   const usernameEl = document.getElementById("f_publishing_username").parentElement;

package/src/views/pages/_shared/_revision_toolbar.ejs

@@ -6,6 +6,15 @@
     Edit content
   </a>
 
+  <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
+      <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+    </svg>
+
+    Edit settings
+  </a>
+
   <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${revision.id}/publishes/new` %>" class="btn-text 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="M15.59 14.37a6 6 0 0 1-5.84 7.38v-4.8m5.84-2.58a14.98 14.98 0 0 0 6.16-12.12A14.98 14.98 0 0 0 9.631 8.41m5.96 5.96a14.926 14.926 0 0 1-5.841 2.58m-.119-8.54a6 6 0 0 0-7.381 5.84h4.8m2.581-5.84a14.927 14.927 0 0 0-2.58 5.84m2.699 2.7c-.103.021-.207.041-.311.06a15.09 15.09 0 0 1-2.448-2.448 14.9 14.9 0 0 1 .06-.312m-2.24 2.39a4.493 4.493 0 0 0-1.757 4.306 4.493 4.493 0 0 0 4.306-1.758M16.5 9a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z" />
@@ -22,15 +31,6 @@
     </summary>
 
     <div class="absolute border bg-raketa-background p-4 right-4 z-20 mt-2 flex flex-col gap-4 shadow-md rounded dark:border-neutral-500">
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${revision.id}/general/edit` %>" class="btn-text 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="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
-          <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
-        </svg>
-
-        Edit settings
-      </a>
-
       <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.pageType %>-revisions/<%= revision.id %>/preview" target="_blank" class="btn-text 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="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" />