@raketa-cloud/admin 0.0.91 → 0.0.92

package/package.json

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