@raketa-cloud/admin 0.0.29 → 0.0.31

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

@@ -35,15 +35,15 @@
     const newValue = event.target.value;
 
     if (newValue === "protected") {
-      document.getElementById("f_username").parentElement.style.display = "block";
-      document.getElementById("f_username").required = true;
-      document.getElementById("f_password").parentElement.style.display = "block";
-      document.getElementById("f_password").required = true;
+      document.getElementById("f_publishing_username").parentElement.style.display = "block";
+      document.getElementById("f_publishing_username").required = true;
+      document.getElementById("f_publishing_password").parentElement.style.display = "block";
+      document.getElementById("f_publishing_password").required = true;
     } else {
-      document.getElementById("f_username").parentElement.style.display = "none";
-      document.getElementById("f_username").required = false;
-      document.getElementById("f_password").parentElement.style.display = "none";
-      document.getElementById("f_password").required = false;
+      document.getElementById("f_publishing_username").parentElement.style.display = "none";
+      document.getElementById("f_publishing_username").required = false;
+      document.getElementById("f_publishing_password").parentElement.style.display = "none";
+      document.getElementById("f_publishing_password").required = false;
     }
   }
 
@@ -53,5 +53,5 @@
     }
   })
 
-  document.getElementById("f_visibility").addEventListener("change", onVisibilityChange)
+  document.getElementById("f_publishing_visibility").addEventListener("change", onVisibilityChange)
 </script>

package/src/views/page_revisions/tags/edit_form.ejs

@@ -3,18 +3,18 @@
     <h1 class="heading-1">Edit revision / Content tags</h1>
   </div>
 
-  <%- render_partial('../_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
+  <%- render_partial('../_nav.ejs', { resource, active: 'tags' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
-      <% form_for({ tag_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${tag_settings.id}/tags` %>" method="POST" class="form">
-        <%- f.field('tag_settings.tags', { as: 'checkbox_group', required: true, options: tags.map(tag => [tag.id, tag.name]) }) %>
+      <% form_for({ resource }, errors, (f) => { %>
+      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${resource.id}/tags` %>" method="POST" class="form">
+        <%- f.field('resource.tags', { as: 'checkbox_group', options: tags.map(tag => [tag.id, tag.name]) }) %>
 
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-            <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${tag_settings.originalId}` %>" class="btn-secondary">Back</a>
+            <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
           </div>
         </div>
       </form>

package/src/views/page_revisions/visuals/edit_form.ejs

@@ -3,22 +3,18 @@
     <h1 class="heading-1">Edit revision / Visuals</h1>
   </div>
 
-  <%- render_partial('../_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
+  <%- render_partial('../_nav.ejs', { resource, active: 'visuals' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
-      <% form_for({ visual_settings }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${visual_settings.id}/visuals` %>" method="POST" class="form">
-        <%- f.field('visual_settings.layout', { as: 'select', required: true, options: [
-          ["default", "Default"],
-          ["landing", "Landing page"],
-          ["headless", "Headless"],
-        ] }) %>
+      <% form_for({ resource }, errors, (f) => { %>
+      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${resource.id}/visuals` %>" method="POST" class="form">
+        <%- include('../../_shared/_layout_input.ejs', { f }) %>
 
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-            <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${visual_settings.originalId}` %>" class="btn-secondary">Back</a>
+            <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
           </div>
         </div>
       </form>

package/src/views/pages/_form.ejs

@@ -3,19 +3,14 @@
   <%- f.field('resource.title', { required: true }) %>
   <%- f.field('resource.slug', { label: "URL", required: true }) %>
   <%- f.field('resource.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
-  <%- f.field('resource.username', { required: true }) %>
-  <%- f.field('resource.password', { required: true }) %>
 
-  <%- f.field('resource.layout', { as: 'select', required: true, options: [
-      ["default", "Default"],
-      ["landing", "Landing page"],
-      ["headless", "Headless"],
-    ] }) %>
+  <%- include('../_shared/_credentials_input.ejs', { f, visibilityFieldId: "f_resource_visibility"}) %>
+  <%- include('../_shared/_layout_input.ejs', { f }) %>
 
-  <%- f.field('resource.meta_title', { required: true }) %>
-  <%- f.field('resource.meta_description', { as: "textarea", required: true }) %>
+  <%- f.field('resource.settings.meta.title', { required: true, label: "Meta title" }) %>
+  <%- f.field('resource.settings.meta.description', { as: "textarea", required: true, label: "Meta description" }) %>
 
-  <raketa-image-picker name="resource[meta_image]" value="<%= JSON.stringify(resource.meta_image) %>"></raketa-image-picker>
+  <raketa-image-picker name="resource[settings][meta][image]" value="<%= JSON.stringify(resource.settings?.meta?.image || {}) %>" label="Meta image"></raketa-image-picker>
 
   <%- f.field('resource.tags', { as: 'checkbox_group', required: true, options: tags.map(tag => [tag.id, tag.name]) }) %>
 
@@ -52,29 +47,3 @@
     <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempore nostrum fugit sint sunt distinctio ut cum, corrupti ad error, quo labore minima. Reprehenderit quasi maxime repudiandae voluptatum commodi saepe molestiae?</p>
   </div>
 </div>
-
-<script>
-  function onVisibilityChange(event) {
-    const newValue = event.target.value;
-
-    if (newValue === "protected") {
-      document.getElementById("f_username").parentElement.style.display = "block";
-      document.getElementById("f_username").required = true;
-      document.getElementById("f_password").parentElement.style.display = "block";
-      document.getElementById("f_password").required = true;
-    } else {
-      document.getElementById("f_username").parentElement.style.display = "none";
-      document.getElementById("f_username").required = false;
-      document.getElementById("f_password").parentElement.style.display = "none";
-      document.getElementById("f_password").required = false;
-    }
-  }
-
-  onVisibilityChange({
-    target: {
-      value: '<%= resource.visibility %>'
-    }
-  })
-
-  document.getElementById("f_visibility").addEventListener("change", onVisibilityChange)
-</script>

package/src/views/pages/deletes/create_form.ejs

@@ -5,15 +5,15 @@
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
-      <% form_for({ deleteAction }, errors, (f) => { %>
-      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${deleteAction.id}/deletes` %>" method="POST" class="form">
-        <%- f.field('deleteAction.redirect', { as: 'select', required: true,options: [['301', 'Redirect to another page'], ['404', 'Return 404'],['410', 'Return 410']] }) %>
-        <%- f.field('deleteAction.destination', {label: 'Destination URL', required: true}) %>
+      <% form_for({ resource }, errors, (f) => { %>
+      <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}/deletes` %>" method="POST" class="form">
+        <%- f.field('resource.redirect', { as: 'select', required: true,options: [['301', 'Redirect to another page'], ['404', 'Return 404'],['410', 'Return 410']] }) %>
+        <%- f.field('resource.destination', {label: 'Destination URL', required: true}) %>
 
         <div class="form-actions">
           <div class="btn-toolbar">
             <%- f.submit('Proceed', { class: 'btn-primary' }) %>
-            <a href="<%=`/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${deleteAction.id}`%>" class="btn-secondary">Back</a>
+            <a href="<%=`/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}`%>" class="btn-secondary">Back</a>
           </div>
         </div>
       </form>
@@ -41,15 +41,15 @@
     const newValue = event.target.value;
     const requiresRedirect = newValue === "301"
 
-    document.getElementById("f_destination").parentElement.style.display = requiresRedirect ? "block" : "none";
-    document.getElementById("f_destination").required = requiresRedirect;
+    document.getElementById("f_resource_destination").parentElement.style.display = requiresRedirect ? "block" : "none";
+    document.getElementById("f_resource_destination").required = requiresRedirect;
   }
 
   onDestinationChange({
     target: {
-      value: '<%= deleteAction.redirect %>'
+      value: '<%= resource.redirect %>'
     }
   })
 
-  document.getElementById("f_redirect").addEventListener("change", onDestinationChange)
+  document.getElementById("f_resource_redirect").addEventListener("change", onDestinationChange)
 </script>

package/src/views/pages/translations/_form.ejs

@@ -1,35 +1,29 @@
-<% form_for({ translation }, errors, (f) => { %>
-<form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}/translations` %>" method="post" class="form">
+<% form_for({ resource }, errors, (f) => { %>
+<form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${blueprint.id}/translations` %>" method="post" class="form">
   <input type="hidden" name="target_locale" value="<%= targetLocale %>" />
 
-  <%- f.field('translation.title', { required: true }) %>
-  <%- f.field('translation.slug', { label: "URL", required: true }) %>
-  <%- f.field('translation.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
+  <%- f.field('resource.title', { required: true }) %>
+  <%- f.field('resource.slug', { label: "URL", required: true }) %>
+  <%- f.field('resource.visibility', { as: 'select', required: true, options: visibilityOptions }) %>
 
-  <%- f.field('translation.username', { required: true }) %>
-  <%- f.field('translation.password', { required: true }) %>
+  <%- include('../../_shared/_credentials_input.ejs', { f, visibilityFieldId: "f_resource_visibility"}) %>
+  <%- include('../../_shared/_layout_input.ejs', { f }) %>
 
-  <%- f.field('translation.layout', { as: 'select', required: true, options: [
-      ["default", "Default"],
-      ["landing", "Landing page"],
-      ["headless", "Headless"],
-    ] }) %>
+  <%- f.field('resource.settings.meta.title', { required: true, label: "Meta title" }) %>
+  <%- f.field('resource.settings.meta.description', { as: "textarea", required: true, label: "Meta description" }) %>
 
-  <%- f.field('translation.meta_title', { required: true }) %>
-  <%- f.field('translation.meta_description', { as: "textarea", required: true }) %>
-
-  <raketa-image-picker name="translation[meta_image]" value="<%= JSON.stringify(translation.meta_image) %>"></raketa-image-picker>
+  <raketa-image-picker name="resource[settings][meta][image]" value="<%= JSON.stringify(resource.settings?.meta?.image || {}) %>" label="Meta image"></raketa-image-picker>
 
   <h6>Original tags:</h6>
-  <div><%= blueprint_tags.map((tag) => tag.name).join(", ")%></div>
+  <div><%= blueprint.tags.map((tag) => tag.name).join(", ")%></div>
 
-  <%- f.field('translation.tags', { as: 'checkbox_group', required: true, options: tags.map(tag => [tag.id, tag.name])}) %>
+  <%- f.field('resource.tags', { as: 'checkbox_group', required: true, options: tags.map(tag => [tag.id, tag.name]) }) %>
 
   <div class="form-actions">
     <div class="btn-toolbar">
       <%- f.submit('Save record', { class: 'btn-primary' }) %>
 
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}` %>" class="btn-secondary">Cancel</a>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${blueprint.id}` %>" class="btn-secondary">Cancel</a>
     </div>
   </div>
 </form>
@@ -48,29 +42,3 @@
     <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempore nostrum fugit sint sunt distinctio ut cum, corrupti ad error, quo labore minima. Reprehenderit quasi maxime repudiandae voluptatum commodi saepe molestiae?</p>
   </div>
 </div>
-
-<script>
-  function onVisibilityChange(event) {
-    const newValue = event.target.value;
-
-    if (newValue === "protected") {
-      document.getElementById("f_username").parentElement.style.display = "block";
-      document.getElementById("f_username").required = true;
-      document.getElementById("f_password").parentElement.style.display = "block";
-      document.getElementById("f_password").required = true;
-    } else {
-      document.getElementById("f_username").parentElement.style.display = "none";
-      document.getElementById("f_username").required = false;
-      document.getElementById("f_password").parentElement.style.display = "none";
-      document.getElementById("f_password").required = false;
-    }
-  }
-
-  onVisibilityChange({
-    target: {
-      value: '<%= resource.visibility %>'
-    }
-  })
-
-  document.getElementById("f_visibility").addEventListener("change", onVisibilityChange)
-</script>

package/src/views/pages/urls/create_form.ejs

@@ -4,13 +4,13 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <% form_for({ change }, errors, (f) => { %>
-    <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${change.id}/urls` %>" method="post" class="form">
-      <%- f.field('change.slug', { label: "URL", required: true }) %>
-      <%- f.field('change.redirect', { as: "checkbox", value: "1", label: "Create 301 redirect for the old URL" }) %>
+    <% form_for({ resource }, errors, (f) => { %>
+    <form action="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}/urls` %>" method="post" class="form">
+      <%- f.field('resource.slug', { label: "URL", required: true }) %>
+      <%- f.field('resource.redirect', { as: "checkbox", value: "1", label: "Create 301 redirect for the old URL" }) %>
 
       <%- f.submit('Save record', { class: 'btn-primary' }) %>
-      <a href="<%=`/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${change.id}`%>" class="btn-secondary">Back</a>
+      <a href="<%=`/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.id}`%>" class="btn-secondary">Back</a>
     </form>
     <% }) %>