underpost 2.95.3 → 2.96.0

package/src/client/services/default/default.management.js

@@ -465,6 +465,13 @@ const DefaultManagement = {
               const selectedRows = AgGrid.grids[gridId].getSelectedRows();
               logger.info('selectedRows', selectedRows);
             },
+            onRowEditingStarted: async (...args) => {
+              // Show only save button when editing starts
+              s(`.management-table-btn-save-${id}`).classList.remove('hide');
+              if (permissions.add) s(`.management-table-btn-add-${id}`).classList.add('hide');
+              if (permissions.remove) s(`.management-table-btn-clean-${id}`).classList.add('hide');
+              if (permissions.reload) s(`.management-table-btn-reload-${id}`).classList.add('hide');
+            },
             onRowValueChanged: async (...args) => {
               const [event] = args;
               logger.info('onRowValueChanged', args);

package/src/index.js

@@ -36,7 +36,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.95.3';
+  static version = 'v2.96.0';
   /**
    * Repository cli API
    * @static

package/src/server/backup.js

@@ -7,7 +7,6 @@
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
-import { getCronBackUpFolder } from './conf.js';
 import dotenv from 'dotenv';
 
 dotenv.config();
@@ -25,70 +24,22 @@ class BackUp {
    * @description Initiates a backup operation for the specified deployment list.
    * @param {string} deployList - The list of deployments to backup.
    * @param {Object} options - The options for the backup operation.
-   * @param {boolean} options.itc - Whether to backup inside container data.
    * @param {boolean} options.git - Whether to backup data using Git.
    * @memberof BackUp
    */
-  static callback = async function (deployList, options = { itc: false, git: false }) {
+  static callback = async function (deployList, options = { git: false }) {
     if ((!deployList || deployList === 'dd') && fs.existsSync(`./engine-private/deploy/dd.router`))
-      deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
+      deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').trim();
 
     logger.info('init backups callback', deployList);
     await logger.setUpInfo();
-    const currentDate = new Date().getTime();
-    const maxBackupRetention = 5;
-
-    if (!fs.existsSync('./engine-private/cron-backups'))
-      fs.mkdirSync('./engine-private/cron-backups', { recursive: true });
 
     for (const _deployId of deployList.split(',')) {
       const deployId = _deployId.trim();
       if (!deployId) continue;
 
-      if (!(options.itc === true)) {
-        shellExec(`node bin db ${options.git ? '--git ' : ''}--export ${deployId}`);
-        continue;
-      }
-
-      const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
-
-      for (const host of Object.keys(confServer))
-        for (const path of Object.keys(confServer[host])) {
-          // retention policy
-          const { db } = confServer[host][path];
-          if (!db) continue;
-          logger.info('Init backup', { host, path, db });
-
-          const backUpPath = `${process.cwd()}/engine-private/cron-backups/${getCronBackUpFolder(host, path)}`;
-          if (!fs.existsSync(backUpPath)) fs.mkdirSync(`${backUpPath}`, { recursive: true });
-          // .isDirectory()
-          const files = await fs.readdir(backUpPath, { withFileTypes: true });
-
-          const currentBackupsDirs = files
-            .map((fileObj) => parseInt(fileObj.name))
-            .sort((a, b) => a - b)
-            .reverse();
-
-          for (const retentionPath of currentBackupsDirs.filter((t, i) => i >= maxBackupRetention - 1)) {
-            const removePathRetention = `${backUpPath}/${retentionPath}`;
-            logger.info('Remove backup folder', removePathRetention);
-            fs.removeSync(removePathRetention);
-          }
-
-          fs.mkdirSync(`${backUpPath}/${currentDate}`, { recursive: true });
-
-          shellExec(`node bin/db ${host}${path} export ${deployId} ${backUpPath}/${currentDate}`);
-        }
-      shellExec(
-        `cd ./engine-private/cron-backups` +
-          ` && underpost pull . ${process.env.GITHUB_USERNAME}/cron-backups` +
-          ` && git add .` +
-          ` && underpost cmt . backup cron-job '${new Date().toLocaleDateString()}'` +
-          ` && underpost push . ${process.env.GITHUB_USERNAME}/cron-backups`,
-        {
-          silent: true,
-        },
-      );
+      logger.info('Executing database export for', deployId);
+      shellExec(`node bin db ${options.git ? '--git ' : ''}--export ${deployId}`);
     }
   };
 }

package/src/server/conf.js

@@ -1227,13 +1227,12 @@ const Cmd = {
    * @param {string} name - The name.
    * @param {string} expression - The expression.
    * @param {object} options - The options.
+   * @param {number} instances - The number of PM2 instances (default: 1).
    * @returns {string} - The cron command.
    * @memberof Cmd
    */
-  cron: (deployList, jobList, name, expression, options) =>
-    `pm2 start ./bin/index.js --no-autorestart --instances 1 --cron "${expression}" --name ${name} -- cron ${
-      options?.itc ? `--itc ` : ''
-    }${options?.git ? `--git ` : ''}${deployList} ${jobList}`,
+  cron: (deployList, jobList, name, expression, options, instances = 1) =>
+    `pm2 start ./bin/index.js --no-autorestart --instances ${instances} --cron "${expression}" --name ${name} -- cron ${options?.git ? `--git ` : ''}${deployList} ${jobList}`,
 };
 
 /**

package/examples/static-config-example.json

@@ -1,183 +0,0 @@
-{
-  "_comment": "Example static site configuration file for Underpost Static Generator",
-  "_usage": "Use with: underpost static --config-file ./static-config-example.json",
-
-  "page": "./src/client/ssr/body/DefaultSplashScreen.js",
-  "outputPath": "./dist/index.html",
-  "env": "production",
-  "minify": true,
-  "lang": "en",
-  "dir": "ltr",
-
-  "metadata": {
-    "_comment": "SEO and social media metadata",
-    "title": "My Awesome Application",
-    "description": "A comprehensive example of a static site with full metadata customization",
-    "keywords": ["static site", "generator", "underpost", "seo", "progressive web app"],
-    "author": "Your Name or Company",
-    "themeColor": "#4CAF50",
-    "canonicalURL": "https://example.com",
-    "thumbnail": "https://example.com/images/og-thumbnail.png",
-    "locale": "en-US",
-    "siteName": "My Awesome Site",
-    "openGraph": {
-      "_comment": "Additional Open Graph properties",
-      "type": "website",
-      "image:width": "1200",
-      "image:height": "630"
-    },
-    "twitter": {
-      "_comment": "Twitter card specific metadata",
-      "site": "@yourhandle",
-      "creator": "@creatorhandle"
-    }
-  },
-
-  "scripts": {
-    "_comment": "Scripts to inject into head and body sections",
-    "head": [
-      {
-        "_comment": "External analytics script with async loading",
-        "src": "https://www.googletagmanager.com/gtag/js?id=GA_MEASUREMENT_ID",
-        "async": true
-      },
-      {
-        "_comment": "Inline configuration script",
-        "content": "window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'GA_MEASUREMENT_ID');",
-        "type": "text/javascript"
-      },
-      {
-        "_comment": "App configuration as inline script",
-        "content": "window.appConfig = { apiUrl: 'https://api.example.com', version: '1.0.0', features: { analytics: true, debugging: false } };",
-        "type": "text/javascript"
-      }
-    ],
-    "body": [
-      {
-        "_comment": "Main application bundle as ES module",
-        "src": "/dist/app.js",
-        "type": "module",
-        "defer": true
-      },
-      {
-        "_comment": "Service worker registration",
-        "content": "if ('serviceWorker' in navigator) { navigator.serviceWorker.register('/sw.js').then(reg => console.log('SW registered', reg)).catch(err => console.log('SW error', err)); }",
-        "type": "text/javascript"
-      }
-    ]
-  },
-
-  "styles": [
-    {
-      "_comment": "Main stylesheet",
-      "href": "/styles/main.css"
-    },
-    {
-      "_comment": "External font",
-      "href": "https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap"
-    },
-    {
-      "_comment": "Critical inline CSS for faster rendering",
-      "content": "body { margin: 0; padding: 0; font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; } * { box-sizing: border-box; }"
-    },
-    {
-      "_comment": "Print stylesheet",
-      "href": "/styles/print.css",
-      "media": "print"
-    }
-  ],
-
-  "icons": {
-    "_comment": "Icon configuration for various platforms",
-    "favicon": "/favicon.ico",
-    "appleTouchIcon": "/apple-touch-icon.png",
-    "manifest": "/manifest.json",
-    "additional": [
-      {
-        "rel": "icon",
-        "type": "image/png",
-        "sizes": "32x32",
-        "href": "/favicon-32x32.png"
-      },
-      {
-        "rel": "icon",
-        "type": "image/png",
-        "sizes": "16x16",
-        "href": "/favicon-16x16.png"
-      },
-      {
-        "rel": "mask-icon",
-        "href": "/safari-pinned-tab.svg",
-        "color": "#4CAF50"
-      }
-    ]
-  },
-
-  "_headComponents_comment": "SSR components disabled in this example - they require specific data structures",
-  "headComponents": [],
-
-  "_bodyComponents_comment": "Additional SSR components to include in body section",
-  "bodyComponents": [],
-
-  "microdata": [
-    {
-      "_comment": "Organization schema for better SEO",
-      "@context": "https://schema.org",
-      "@type": "Organization",
-      "name": "My Organization",
-      "url": "https://example.com",
-      "logo": "https://example.com/logo.png",
-      "contactPoint": {
-        "@type": "ContactPoint",
-        "telephone": "+1-555-123-4567",
-        "contactType": "Customer Service"
-      },
-      "sameAs": [
-        "https://twitter.com/yourhandle",
-        "https://linkedin.com/company/yourcompany",
-        "https://github.com/yourorg"
-      ]
-    },
-    {
-      "_comment": "WebSite schema",
-      "@context": "https://schema.org",
-      "@type": "WebSite",
-      "name": "My Awesome Site",
-      "url": "https://example.com",
-      "potentialAction": {
-        "@type": "SearchAction",
-        "target": "https://example.com/search?q={search_term_string}",
-        "query-input": "required name=search_term_string"
-      }
-    },
-    {
-      "_comment": "WebPage schema",
-      "@context": "https://schema.org",
-      "@type": "WebPage",
-      "name": "Home Page",
-      "description": "Welcome to our awesome site",
-      "url": "https://example.com"
-    }
-  ],
-
-  "customPayload": {
-    "_comment": "Custom data injected into window.renderPayload",
-    "apiEndpoint": "https://api.example.com",
-    "cdnUrl": "https://cdn.example.com",
-    "features": {
-      "chat": true,
-      "notifications": true,
-      "darkMode": true
-    },
-    "externalServices": {
-      "analytics": "GA_MEASUREMENT_ID",
-      "maps": "GOOGLE_MAPS_API_KEY"
-    }
-  },
-
-  "buildPath": "/",
-  "deployId": "",
-  "buildHost": "",
-  "build": false,
-  "dev": false
-}

package/src/client/ssr/pages/404.js

@@ -1,12 +0,0 @@
-import { e404 } from '../common/Alert.js';
-import { append } from '../common/SsrCore.js';
-import { Translate } from '../common/Translate.js';
-import { Worker } from '../common/Worker.js';
-/*imports*/
-
-window.onload = () =>
-  Worker.instance({
-    render: async () => {
-      append('.page-render', await e404({ Translate }));
-    },
-  });

package/src/client/ssr/pages/500.js

@@ -1,12 +0,0 @@
-import { e500 } from '../common/Alert.js';
-import { append } from '../common/SsrCore.js';
-import { Translate } from '../common/Translate.js';
-import { Worker } from '../common/Worker.js';
-/*imports*/
-
-window.onload = () =>
-  Worker.instance({
-    render: async () => {
-      append('.page-render', await e500({ Translate }));
-    },
-  });

package/src/client/ssr/pages/maintenance.js

@@ -1,14 +0,0 @@
-import { htmls, loggerFactory } from '../common/SsrCore.js';
-import { Alert } from '../common/Alert.js';
-import { Translate } from '../common/Translate.js';
-import { Worker } from '../common/Worker.js';
-/*imports*/
-
-const logger = loggerFactory({ url: location.toString() });
-
-window.onload = () =>
-  Worker.instance({
-    render: async () => {
-      htmls(`.page-render`, html`${await Alert.maintenance({ Translate })}`);
-    },
-  });

package/src/client/ssr/pages/offline.js

@@ -1,21 +0,0 @@
-import { htmls, loggerFactory } from '../common/SsrCore.js';
-import { Alert } from '../common/Alert.js';
-import { Translate } from '../common/Translate.js';
-import { Worker } from '../common/Worker.js';
-/*imports*/
-
-const logger = loggerFactory({ url: location.toString() });
-
-window.onload = () =>
-  Worker.instance({
-    render: async () => {
-      window.ononline = async () => {
-        location.href = location.pathname.split('/')[1] ? `/${location.pathname.split('/')[1].split('.')[0]}` : '/';
-      };
-      window.onoffline = async () => {
-        htmls(`.page-render`, html`${await Alert.noInternet({ Translate })}`);
-      };
-      if (navigator.onLine && !location.hostname.match('localhost')) window.ononline();
-      else window.onoffline();
-    },
-  });