@raketa-cloud/admin 1.7.6 → 1.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.7.6",
+  "version": "1.7.9",
   "main": "src/index.js",
   "files": [
     "src/",

package/src/HonoAdapter.js

@@ -319,6 +319,9 @@ export default class HonoAdapter {
         // Build context object
         const _context = {
           timezones: i18n.timezones,
+          timeLocale: i18n.timeLocale,
+          dateTimeFormat: i18n.dateTimeFormat,
+          dateFormat: i18n.dateFormat,
           locales: ctx.locales,
           locale: ctx.locale,
           defaultLocale: ctx.defaultLocale,

package/src/cloud/documents/articlesDocuments.js

@@ -20,6 +20,7 @@ function minimalArticleFragment() {
       publishAt
       insertedAt
       updatedAt
+      translations
     }
   `;
 }

package/src/cloud/documents/eventsDocuments.js

@@ -22,6 +22,7 @@ function minimalEventFragment() {
       endsAt
       insertedAt
       updatedAt
+      translations
     }
   `;
 }

package/src/cloud/documents/pagesDocuments.js

@@ -19,6 +19,7 @@ function minimalPageFragment() {
       visibility
       insertedAt
       updatedAt
+      translations
     }
   `;
 }

package/src/handlers/pages/ExportsHandler.js

@@ -18,7 +18,7 @@ const exportCSV = async (ctx) => {
   const csv = CSVExportHelper.formatDataAsCSV(
     pages.list,
     headers,
-    fieldMapping,
+    fieldMapping
   );
 
   return {

package/src/helpers/CSVExportHelper.js

@@ -72,6 +72,10 @@ const extractResourceType = (resource, type) => {
   return type;
 };
 
+function formatTranslations(item) {
+  return Object.keys(item?.translations || {}).map(locale => locale).join(";")
+}
+
 const standardFieldMapping = (remoteConfig, locale, type) => ({
   id: "id",
   type: (item) => extractResourceType(item, type),
@@ -81,6 +85,7 @@ const standardFieldMapping = (remoteConfig, locale, type) => ({
   visibility: "visibility",
   created_at: "insertedAt",
   updated_at: "updatedAt",
+  translations: formatTranslations
 });
 
 const standardHeaders = [
@@ -92,6 +97,7 @@ const standardHeaders = [
   "visibility",
   "created_at",
   "updated_at",
+  "translations"
 ];
 
 export default {

package/src/tests/handlers/articles/ExportsHandler.test/index.test.js

@@ -144,7 +144,7 @@ describe("Articles ExportsHandler", () => {
       const result = await ExportsHandler.index(ctx);
 
       expect(result.text).toBe(
-        "id,type,locale,title,URL,visibility,created_at,updated_at",
+        "id,type,locale,title,URL,visibility,created_at,updated_at,translations",
       );
     });
 

package/src/tests/handlers/events/ExportsHandler.test/index.test.js

@@ -143,7 +143,7 @@ describe("Events ExportsHandler", () => {
       const result = await ExportsHandler.index(ctx);
 
       expect(result.text).toBe(
-        "id,type,locale,title,URL,visibility,created_at,updated_at",
+        "id,type,locale,title,URL,visibility,created_at,updated_at,translations",
       );
     });
 

package/src/tests/handlers/pages/ExportsHandler.test/index.test.js

@@ -143,7 +143,7 @@ describe("Pages ExportsHandler", () => {
       const result = await ExportsHandler.index(ctx);
 
       expect(result.text).toBe(
-        "id,type,locale,title,URL,visibility,created_at,updated_at",
+        "id,type,locale,title,URL,visibility,created_at,updated_at,translations",
       );
     });
 

package/src/tests/helpers/CSVExportHelper.test.js

@@ -206,6 +206,10 @@ describe("CSVExportHelper", () => {
           visibility: "public",
           insertedAt: "2024-01-01",
           updatedAt: "2024-01-02",
+          translations: {
+            es: {},
+            de: {}
+          }
         },
       ];
       const headers = [...CSVExportHelper.standardHeaders];
@@ -222,8 +226,8 @@ describe("CSVExportHelper", () => {
       );
 
       expect(result).toBe(
-        "id,type,locale,title,URL,visibility,created_at,updated_at\r\n" +
-          "1,article,en,Test Article,/en/article/1,public,2024-01-01,2024-01-02",
+        "id,type,locale,title,URL,visibility,created_at,updated_at,translations\r\n" +
+          "1,article,en,Test Article,/en/article/1,public,2024-01-01,2024-01-02,es;de",
       );
     });
   });
@@ -297,6 +301,7 @@ describe("CSVExportHelper", () => {
         visibility: "visibility",
         created_at: "insertedAt",
         updated_at: "updatedAt",
+        translations: expect.any(Function),
       });
     });
 
@@ -358,6 +363,7 @@ describe("CSVExportHelper", () => {
         "visibility",
         "created_at",
         "updated_at",
+        "translations"
       ]);
     });
   });

package/src/views/_shared/_translations_search_input.ejs

@@ -0,0 +1,31 @@
+<div class="mb-4">
+  <label for="" class="font-semibold hover:cursor-pointer body-3">Translations</label>
+  <div class="checkbox-group mb-4">
+    <% translations.filter(item => item.code !== _context.locale).forEach((item,idx)=> { %>
+    <div class="flex items-center gap-1">
+      <% if (utils.includedInCollection(item.code, _context.query["f:translations"])) { %>
+          <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' checked value="<%= item.code %>" class="hover:cursor-pointer">
+      <% } else { %>
+      <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' value="<%= item.code %>" class="hover:cursor-pointer">
+      <% } %>
+      <label for='locale-<%= item.code %>' class="body-2 hover:cursor-pointer"><%= item.name %></label>
+    </div>
+    <% }); %>
+  </div>
+</div>
+
+<div class="mb-4">
+  <label for="" class="font-semibold hover:cursor-pointer body-3">Without translations</label>
+  <div class="checkbox-group mb-4">
+    <% translations.filter(item => item.code !== _context.locale).forEach((item,idx)=> { %>
+    <div class="flex items-center gap-1">
+      <% if (utils.includedInCollection(item.code, _context.query["f:without_translations"])) { %>
+          <input type="checkbox" name="f:without_translations" id='n-locale-<%= item.code %>' checked value="<%= item.code %>" class="hover:cursor-pointer">
+      <% } else { %>
+      <input type="checkbox" name="f:without_translations" id='n-locale-<%= item.code %>' value="<%= item.code %>" class="hover:cursor-pointer">
+      <% } %>
+      <label for='n-locale-<%= item.code %>' class="body-2 hover:cursor-pointer"><%= item.name %></label>
+    </div>
+    <% }); %>
+  </div>
+</div>

package/src/views/_shared/_visibility_search_input.ejs

@@ -0,0 +1,30 @@
+<div class="mb-4">
+  <label for="visibility" class="font-semibold hover:cursor-pointer body-3">Visibility</label>
+  <select name="f:visibility">
+    <option value="">Please select...</option>
+
+    <% if (_context.query["f:visibility"] === "PRIVATE") { %>
+        <option value="PRIVATE" selected>Private</option>
+    <% } else { %>
+        <option value="PRIVATE">Private</option>
+    <% } %>
+
+    <% if (_context.query["f:visibility"] === "PUBLIC") { %>
+        <option value="PUBLIC" selected>Public</option>
+    <% } else { %>
+        <option value="PUBLIC">Public</option>
+    <% } %>
+
+    <% if (_context.query["f:visibility"] === "UNLISTED") { %>
+        <option value="UNLISTED" selected>Unlisted</option>
+    <% } else { %>
+        <option value="UNLISTED">Unlisted</option>
+    <% } %>
+
+    <% if (_context.query["f:visibility"] === "PROTECTED") { %>
+        <option value="PROTECTED" selected>Protected</option>
+    <% } else { %>
+        <option value="PROTECTED">Protected</option>
+    <% } %>
+  </select>
+</div>

package/src/views/articles/index.ejs

@@ -139,6 +139,8 @@
       <input type="text" name="f:keyword" value="<%= _context.query["f:keyword"] %>" />
     </div>
 
+    <%- include('./../_shared/_visibility_search_input.ejs') %>
+
     <div class="mb-4">
       <label for="widget" class="font-semibold hover:cursor-pointer body-3">Widget</label>
       <input type="text" name="f:widget" value="<%= _context.query["f:widget"] %>" />
@@ -159,21 +161,7 @@
         <input type="datetime-local" name="f:last_updated_to" value="<%= _context.query["f:last_updated_to"] %>" data-no-hints="true" />
     </div>
 
-    <div class="mb-4">
-      <label for="" class="font-semibold hover:cursor-pointer body-3">Translations</label>
-      <div class="checkbox-group mb-4">
-        <% translations.filter(item => item.code !== _context.locale).forEach((item,idx)=> { %>
-        <div class="flex items-center gap-1">
-          <% if (utils.includedInCollection(item.code, _context.query["f:translations"])) { %>
-              <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' checked value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } else { %>
-          <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } %>
-          <label for='locale-<%= item.code %>' class="body-2 hover:cursor-pointer"><%= item.name %></label>
-        </div>
-        <% }); %>
-      </div>
-    </div>
+    <%- include('./../_shared/_translations_search_input.ejs') %>
 
     <div class="mb-4">
       <label for="" class="font-semibold hover:cursor-pointer body-3">Tags</label>

package/src/views/events/index.ejs

@@ -139,6 +139,8 @@
       <input type="text" name="f:keyword" value="<%= _context.query["f:keyword"] %>" />
     </div>
 
+    <%- include('./../_shared/_visibility_search_input.ejs') %>
+
     <div class="mb-4">
       <label for="widget" class="font-semibold hover:cursor-pointer body-3">Widget</label>
       <input type="text" name="f:widget" value="<%= _context.query["f:widget"] %>" />
@@ -159,21 +161,7 @@
         <input type="datetime-local" name="f:last_updated_to" value="<%= _context.query["f:last_updated_to"] %>" />
     </div>
 
-    <div class="mb-4">
-      <label for="" class="font-semibold hover:cursor-pointer body-3">Translations</label>
-      <div class="checkbox-group mb-4">
-        <% translations.filter(item => item.code !== _context.locale).forEach((item,idx)=> { %>
-        <div class="flex items-center gap-1">
-          <% if (utils.includedInCollection(item.code, _context.query["f:translations"])) { %>
-              <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' checked value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } else { %>
-          <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } %>
-          <label for='locale-<%= item.code %>' class="body-2 hover:cursor-pointer"><%= item.name %></label>
-        </div>
-        <% }); %>
-      </div>
-    </div>
+    <%- include('./../_shared/_translations_search_input.ejs') %>
 
     <div class="mb-4">
       <label for="" class="font-semibold hover:cursor-pointer body-3">Tags</label>

package/src/views/layouts/application.ejs

@@ -143,7 +143,6 @@
     <%- body %>
   </div>
 
-
   <script>
     const toggleEl = document.getElementById('expand');
     const sidebarEl = document.getElementById('sidebar');
@@ -163,8 +162,10 @@
   </script>
 
   <script>
-    // Don't ask
     const TIMEZONES = JSON.parse("<%= JSON.stringify(_context.timezones) %>".replaceAll("&#34;", '"'))
+    const TIME_LOCALE = JSON.parse("<%= JSON.stringify(_context.timeLocale || 'en-GB') %>".replaceAll("&#34;", '"'))
+    const TIME_FORMAT = JSON.parse("<%= JSON.stringify(_context.dateTimeFormat || { dateStyle: 'short', timeStyle: 'short' }) %>".replaceAll("&#34;", '"'))
+    const DATE_FORMAT = JSON.parse("<%= JSON.stringify(_context.dateFormat || { dateStyle: 'short' }) %>".replaceAll("&#34;", '"'))
 
     function enhanceDateTimeInputs(input) {
       // skew the date so it is like in UTC for the user...
@@ -176,7 +177,7 @@
       parent.querySelectorAll('[data-auto="1"]').forEach(node => node.remove())
 
       // Add user's localtime
-      const strTime = fakeUTCDate.toLocaleString("en-GB", {});
+      const strTime = fakeUTCDate.toLocaleString(TIME_LOCALE, {});
 
       const hint = document.createElement("div");
 
@@ -187,7 +188,7 @@
       parent.appendChild(hint)
 
       TIMEZONES.forEach(timeZone => {
-        const strTime = fakeUTCDate.toLocaleString("en-GB", {
+        const strTime = fakeUTCDate.toLocaleString(TIME_LOCALE, {
           timeZone: `${timeZone.value}`
         });
 
@@ -239,18 +240,13 @@
       document.querySelectorAll('time[data-pretty-datetime]').forEach(item => {
         const dateStr = item.getAttribute("datetime");
 
-        item.innerText = new Date(dateStr).toLocaleString('en-GB', {
-          dateStyle: "short",
-          timeStyle: "short"
-        })
+        item.innerText = new Date(dateStr).toLocaleString(TIME_LOCALE, TIME_FORMAT)
       })
 
       document.querySelectorAll('time[data-pretty-date]').forEach(item => {
         const dateStr = item.getAttribute("datetime");
 
-        item.innerText = new Date(dateStr).toLocaleString('en-GB', {
-          dateStyle: "short"
-        })
+        item.innerText = new Date(dateStr).toLocaleString(TIME_LOCALE, DATE_FORMAT)
       })
 
       document.querySelectorAll('time[data-pretty-expiration-time]').forEach(item => {
@@ -258,10 +254,7 @@
 
         const expTime = new Date(dateStr)
 
-        item.innerText = expTime.toLocaleString('en-GB', {
-          dateStyle: "short",
-          timeStyle: "short"
-        })
+        item.innerText = expTime.toLocaleString(TIME_LOCALE, TIME_FORMAT)
 
         if (new Date() > expTime) {
           item.style.color = 'red';

package/src/views/pages/index.ejs

@@ -134,6 +134,8 @@
       <input type="text" name="f:keyword" value="<%= _context.query["f:keyword"] %>" />
     </div>
 
+    <%- include('./../_shared/_visibility_search_input.ejs') %>
+
     <div class="mb-4">
       <label for="widget" class="font-semibold hover:cursor-pointer body-3">Widget</label>
       <input type="text" name="f:widget" value="<%= _context.query["f:widget"] %>" />
@@ -154,21 +156,7 @@
         <input type="datetime-local" name="f:last_updated_to" value="<%= _context.query["f:last_updated_to"] %>" />
     </div>
 
-    <div class="mb-4">
-      <label for="" class="font-semibold hover:cursor-pointer body-3">Translations</label>
-      <div class="checkbox-group mb-4">
-        <% translations.filter(item => item.code !== _context.locale).forEach((item,idx)=> { %>
-        <div class="flex items-center gap-1">
-          <% if (utils.includedInCollection(item.code, _context.query["f:translations"])) { %>
-              <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' checked value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } else { %>
-          <input type="checkbox" name="f:translations" id='locale-<%= item.code %>' value="<%= item.code %>" class="hover:cursor-pointer">
-          <% } %>
-          <label for='locale-<%= item.code %>' class="body-2 hover:cursor-pointer"><%= item.name %></label>
-        </div>
-        <% }); %>
-      </div>
-    </div>
+    <%- include('./../_shared/_translations_search_input.ejs') %>
 
     <div class="mb-4">
       <label for="" class="font-semibold hover:cursor-pointer body-3">Tags</label>