@raketa-cloud/admin 0.0.91 → 0.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "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/helpers/FormBuilder.js

@@ -385,7 +385,12 @@ export default class FormBuilder extends HTMLBuilder {
       });
     }
 
-    const defaultLabel = opts?.label || this.__getDefaultLabel(name);
+    let defaultLabel = this.__getDefaultLabel(name);
+
+    if (Object.hasOwn(opts, "label")) {
+      defaultLabel = opts?.label;
+    }
+
     const htmlID = this.__getID(name);
     const error = this.__getError(name);
 

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', label: "", 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/show.ejs

@@ -191,14 +191,6 @@
                 <%- 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=/<%= _context.locale %>/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" />

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', label: "", 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/show.ejs

@@ -191,14 +191,6 @@
                 <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
               </form>
 
-              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.eventType}_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=/<%= _context.locale %>/admin/<%= _context.resourceConfig.eventType %>-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" />

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', label: "", 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/show.ejs

@@ -192,14 +192,6 @@
                 <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
               </form>
 
-              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_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=/<%= _context.locale %>/admin/<%= _context.resourceConfig.pageType %>-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" />