underpost 2.85.1 → 2.89.0

package/src/cli/repository.js

@@ -140,13 +140,20 @@ class UnderpostRepository {
           .join('');
         if (history[0]) {
           for (const commit of history) {
+            console.log(
+              shellExec(`git show -s --format=%ci ${commit.hash}`, {
+                stdout: true,
+                silent: true,
+                disableLog: true,
+              }).trim().green,
+            );
             console.log(commit.hash.yellow, commit.message);
             console.log(
               shellExec(`git show --name-status --pretty="" ${commit.hash}`, {
                 stdout: true,
                 silent: true,
                 disableLog: true,
-              }).red,
+              }).trim().red,
             );
           }
           if (options.copy) pbcopy(chainCmd);
@@ -213,60 +220,50 @@ class UnderpostRepository {
     },
 
     /**
-     * Creates a new Underpost project, service, or configuration.
-     * @param {string} repositoryName - The name of the new project or service, or a deployId.
-     * @param {object} [options={ dev: false, deployId: false, cluster: false, subConf: '' }] - Creation options.
-     * @param {boolean} [options.dev=false] - If true, sets up a development project.
-     * @param {boolean} [options.deployId=false] - If true, creates deploy ID configuration files.
-     * @param {boolean} [options.cluster=false] - If true, creates cluster configuration files.
-     * @param {string} [options.subConf=''] - If provided, creates a sub-configuration for a deployId.
-     * @returns {Promise<void>} A promise that resolves when the operation is complete.
+     * Initializes a new Underpost repository, optionally setting up a deploy ID or sub-configuration.
+     * @param {string} [projectName=''] - The name of the project to create.
+     * @param {object} [options={ deployId: '', subConf: '', cluster: false, dev: false }] - Initialization options.
+     * @param {string} [options.deployId=''] - The deployment ID to set up.
+     * @param {string} [options.subConf=''] - The sub-configuration to create.
+     * @param {boolean} [options.cluster=false] - If true, sets up a clustered configuration.
+     * @param {boolean} [options.dev=false] - If true, uses development settings.
+     * @returns {Promise<boolean>} A promise that resolves when the initialization is complete.
      * @memberof UnderpostRepository
      */
-    new(repositoryName, options = { dev: false, deployId: false, cluster: false, subConf: '' }) {
+    new(projectName, options = { deployId: '', subConf: '', cluster: false, dev: false }) {
       return new Promise(async (resolve, reject) => {
         try {
           await logger.setUpInfo();
           actionInitLog();
-          if (options.subConf && typeof options.subConf === 'string') {
-            const deployId = repositoryName;
-            logger.info('Creating sub conf', {
-              deployId,
-              subConf: options.subConf,
-            });
-            fs.copySync(
-              `./engine-private/conf/${deployId}/conf.server.json`,
-              `./engine-private/conf/${deployId}/conf.server.dev.${options.subConf}.json`,
-            );
-            return resolve();
+          if (options.deployId) {
+            Config.deployIdFactory(options.deployId, options);
+            return resolve(true);
           }
-          if (repositoryName === 'service')
-            return resolve(
-              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), ':'),
-            );
-          if (options.deployId === true) return Config.deployIdFactory(repositoryName, options);
-          const npmRoot = getNpmRootPath();
-          const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
-          const destFolder = `./${repositoryName}`;
-          logger.info('Note: This process may take several minutes to complete');
-          logger.info('build app', { destFolder });
-          if (fs.existsSync(destFolder)) fs.removeSync(destFolder);
-          fs.mkdirSync(destFolder, { recursive: true });
-          if (!options.dev) {
-            fs.copySync(underpostRoot, destFolder);
-            fs.writeFileSync(
-              `${destFolder}/.gitignore`,
-              fs.readFileSync(`${underpostRoot}/.dockerignore`, 'utf8'),
-              'utf8',
-            );
-            shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
+          if (projectName) {
+            const npmRoot = getNpmRootPath();
+            const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
+            const destFolder = `./${projectName}`;
+            logger.info('Note: This process may take several minutes to complete');
+            logger.info('build app', { destFolder });
+            if (fs.existsSync(destFolder)) fs.removeSync(destFolder);
+            fs.mkdirSync(destFolder, { recursive: true });
+            if (!options.dev) {
+              fs.copySync(underpostRoot, destFolder);
+              fs.writeFileSync(
+                `${destFolder}/.gitignore`,
+                fs.readFileSync(`${underpostRoot}/.dockerignore`, 'utf8'),
+                'utf8',
+              );
+              shellExec(`cd ${destFolder} && git init && git add . && git commit -m "Base template implementation"`);
+            }
+            shellExec(`cd ${destFolder} && npm run build`);
+            shellExec(`cd ${destFolder} && npm run dev`);
           }
-          shellExec(`cd ${destFolder} && npm run build`);
-          shellExec(`cd ${destFolder} && npm run dev`);
-          return resolve();
+          return resolve(true);
         } catch (error) {
+          console.log(error);
           logger.error(error, error.stack);
-          return reject(error.message);
+          return reject(false);
         }
       });
     },

package/src/cli/run.js

@@ -5,7 +5,14 @@
  */
 
 import { daemonProcess, getTerminalPid, openTerminal, pbcopy, shellCd, shellExec } from '../server/process.js';
-import { getNpmRootPath, getUnderpostRootPath, isDeployRunnerContext } from '../server/conf.js';
+import {
+  awaitDeployMonitor,
+  Config,
+  getNpmRootPath,
+  getUnderpostRootPath,
+  isDeployRunnerContext,
+  writeEnv,
+} from '../server/conf.js';
 import { actionInitLog, loggerFactory } from '../server/logger.js';
 import UnderpostTest from './test.js';
 import fs from 'fs-extra';
@@ -15,6 +22,7 @@ import UnderpostRootEnv from './env.js';
 import UnderpostRepository from './repository.js';
 import os from 'os';
 import Underpost from '../index.js';
+import dotenv from 'dotenv';
 
 const logger = loggerFactory(import.meta);
 
@@ -44,6 +52,14 @@ class UnderpostRun {
    * @property {boolean} k3s - Whether to run in k3s mode.
    * @property {boolean} kubeadm - Whether to run in kubeadm mode.
    * @property {boolean} force - Whether to force the operation.
+   * @property {boolean} reset - Whether to reset the operation.
+   * @property {boolean} tls - Whether to use TLS.
+   * @property {string} tty - The TTY option for the container.
+   * @property {string} stdin - The stdin option for the container.
+   * @property {string} restartPolicy - The restart policy for the container.
+   * @property {boolean} terminal - Whether to open a terminal.
+   * @property {number} devProxyPortOffset - The port offset for the development proxy.
+   * @property {string} confServerPath - The configuration server path.
    * @memberof UnderpostRun
    */
   static DEFAULT_OPTION = {
@@ -59,6 +75,14 @@ class UnderpostRun {
     k3s: false,
     kubeadm: false,
     force: false,
+    reset: false,
+    tls: false,
+    tty: '',
+    stdin: '',
+    restartPolicy: '',
+    terminal: false,
+    devProxyPortOffset: 0,
+    confServerPath: '',
   };
   /**
    * @static
@@ -106,13 +130,21 @@ class UnderpostRun {
     },
     /**
      * @method kill
-     * @description Kills the process running on the specified port by finding its PID using `lsof -t -i:${path}`.
+     * @description Kills processes listening on the specified port(s). If the `path` contains a `+`, it treats it as a range of ports to kill.
      * @param {string} path - The input value, identifier, or path for the operation (used as the port number).
      * @param {Object} options - The default underpost runner options for customizing workflow
      * @memberof UnderpostRun
      */
-    kill: (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      shellExec(`sudo kill -9 $(lsof -t -i:${path})`);
+    kill: (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      for (const _path of path.split(',')) {
+        if (_path.split('+')[1]) {
+          let [port, sumPortOffSet] = _path.split('+');
+          port = parseInt(port);
+          sumPortOffSet = parseInt(sumPortOffSet);
+          for (const sumPort of range(0, sumPortOffSet))
+            shellExec(`sudo kill -9 $(lsof -t -i:${parseInt(port) + parseInt(sumPort)})`);
+        } else shellExec(`sudo kill -9 $(lsof -t -i:${_path})`);
+      }
     },
     /**
      * @method secret
@@ -228,30 +260,6 @@ class UnderpostRun {
       shellExec(`node bin deploy --restore-hosts`);
     },
 
-    /**
-     * @method cyberia-ide
-     * @description Starts the development environment (IDE) for both `cyberia-server` and `cyberia-client` repositories.
-     * @param {string} path - The input value, identifier, or path for the operation.
-     * @param {Object} options - The default underpost runner options for customizing workflow
-     * @memberof UnderpostRun
-     */
-    'cyberia-ide': (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      const baseCommand = options.dev ? 'node bin' : 'underpost';
-      shellExec(`${baseCommand} run ide /home/dd/cyberia-server`);
-      shellExec(`${baseCommand} run ide /home/dd/cyberia-client`);
-    },
-    /**
-     * @method engine-ide
-     * @description Starts the development environment (IDE) for the `engine` and `engine-private` repositories.
-     * @param {string} path - The input value, identifier, or path for the operation.
-     * @param {Object} options - The default underpost runner options for customizing workflow
-     * @memberof UnderpostRun
-     */
-    'engine-ide': (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      const baseCommand = options.dev ? 'node bin' : 'underpost';
-      shellExec(`${baseCommand} run ide /home/dd/engine`);
-      shellExec(`${baseCommand} run ide /home/dd/engine/engine-private`);
-    },
     /**
      * @method cluster-build
      * @description Build configuration for cluster deployment.
@@ -264,8 +272,12 @@ class UnderpostRun {
       shellExec(`node bin run --dev sync-replica template-deploy`);
       shellExec(`node bin run sync-replica template-deploy`);
       shellExec(`node bin env clean`);
-      shellExec(`git add . && underpost cmt . build cluster-build`);
-      shellExec(`cd engine-private && git add . && underpost cmt . build cluster-build`);
+      for (const deployId of fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').split(','))
+        shellExec(`node bin/deploy update-default-conf ${deployId.trim()}`);
+      if (path === 'cmt') {
+        shellExec(`git add . && underpost cmt . build cluster-build`);
+        shellExec(`cd engine-private && git add . && underpost cmt . build cluster-build`);
+      }
     },
     /**
      * @method template-deploy
@@ -330,7 +342,9 @@ class UnderpostRun {
       if (!fs.existsSync(`/home/dd/engine/engine-private`))
         shellExec(`cd /home/dd/engine && underpost clone ${process.env.GITHUB_USERNAME}/engine-private`);
       else
-        shellExec(`cd /home/dd/engine/engine-private underpost pull . ${process.env.GITHUB_USERNAME}/engine-private`);
+        shellExec(
+          `cd /home/dd/engine/engine-private && underpost pull . ${process.env.GITHUB_USERNAME}/engine-private`,
+        );
     },
     /**
      * @method release-deploy
@@ -392,6 +406,7 @@ class UnderpostRun {
       // Dev usage: node bin run --dev --build sync dd-default
       const env = options.dev ? 'development' : 'production';
       const baseCommand = options.dev ? 'node bin' : 'underpost';
+      const baseClusterCommand = options.dev ? ' --dev' : '';
       const defaultPath = [
         'dd-default',
         1,
@@ -409,6 +424,8 @@ class UnderpostRun {
       if (isDeployRunnerContext(path, options)) {
         const { validVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
         if (!validVersion) throw new Error('Version mismatch');
+        shellExec(`${baseCommand} run${baseClusterCommand} tz`);
+        shellExec(`${baseCommand} run${baseClusterCommand} cron`);
       }
 
       const currentTraffic = isDeployRunnerContext(path, options)
@@ -430,6 +447,39 @@ class UnderpostRun {
         UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
       } else logger.info('current traffic', UnderpostDeploy.API.getCurrentTraffic(deployId));
     },
+
+    /**
+     * @method tz
+     * @description Sets the system timezone using `timedatectl set-timezone` command.
+     * @param {string} path - The input value, identifier, or path for the operation (used as the timezone string).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    tz: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const tz = path
+        ? path
+        : UnderpostRootEnv.API.get('TIME_ZONE', undefined, { disableLog: true })
+          ? UnderpostRootEnv.API.get('TIME_ZONE')
+          : process.env.TIME_ZONE
+            ? process.env.TIME_ZONE
+            : 'America/New_York';
+      shellExec(`sudo timedatectl set-timezone ${tz}`);
+    },
+
+    /**
+     * @method cron
+     * @description Sets up and starts the `dd-cron` environment by writing environment variables, starting the cron service, and cleaning up.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    cron: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const env = options.dev ? 'development' : 'production';
+      shellExec(`node bin env ${path ? path : 'dd-cron'} ${env}`);
+      shellExec(`npm start`);
+      shellExec(`node bin env clean`);
+    },
+
     /**
      * @method ls-deployments
      * @description Retrieves and logs a table of Kubernetes deployments using `UnderpostDeploy.API.get`.
@@ -440,6 +490,16 @@ class UnderpostRun {
     'ls-deployments': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       console.table(await UnderpostDeploy.API.get(path, 'deployments'));
     },
+    /**
+     * @method ls-images
+     * @description Retrieves and logs a table of currently loaded Docker images in the 'kind-worker' node using `UnderpostDeploy.API.getCurrentLoadedImages`.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'ls-images': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      console.table(UnderpostDeploy.API.getCurrentLoadedImages('kind-worker', false));
+    },
 
     /**
      * @method host-update
@@ -608,10 +668,16 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'git-conf': (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
-      const defaultUsername = UnderpostRootEnv.API.get('GITHUB_USERNAME', '', { disableLog: true });
-      const defaultEmail = UnderpostRootEnv.API.get('GITHUB_EMAIL', '', { disableLog: true });
-      const [username, email] = path && path.split(',').length > 0 ? path.split(',') : [defaultUsername, defaultEmail];
-
+      const defaultUsername = UnderpostRootEnv.API.get('GITHUB_USERNAME');
+      const defaultEmail = UnderpostRootEnv.API.get('GITHUB_EMAIL');
+      const validPath = path && path.split(',').length;
+      const [username, email] = validPath ? path.split(',') : [defaultUsername, defaultEmail];
+      if (validPath) {
+        UnderpostRootEnv.API.set('GITHUB_USERNAME', username);
+        UnderpostRootEnv.API.set('GITHUB_EMAIL', email);
+        UnderpostRootEnv.API.get('GITHUB_USERNAME');
+        UnderpostRootEnv.API.get('GITHUB_EMAIL');
+      }
       shellExec(
         `git config --global credential.helper "" && ` +
           `git config credential.helper "" && ` +
@@ -750,6 +816,63 @@ class UnderpostRun {
       UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
     },
 
+    /**
+     * @method dev
+     * @description Starts development servers for client, API, and proxy based on provided parameters (deployId, host, path, clientHostPort).
+     * @param {string} path - The input value, identifier, or path for the operation (formatted as `deployId,subConf,host,path,clientHostPort`).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    dev: async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
+      let [deployId, subConf, host, _path, clientHostPort] = path.split(',');
+      if (options.confServerPath) {
+        const confServer = JSON.parse(fs.readFileSync(options.confServerPath, 'utf8'));
+        fs.writeFileSync(
+          `./engine-private/conf/${deployId}/conf.server.dev.${subConf}.json`,
+          JSON.stringify(
+            {
+              [host]: {
+                [_path]: confServer[host][_path],
+              },
+            },
+            null,
+            4,
+          ),
+          'utf8',
+        );
+      }
+      if (!deployId) deployId = 'dd-default';
+      if (!host) host = 'default.net';
+      if (!_path) _path = '/';
+      if (!clientHostPort) clientHostPort = 'localhost:4004';
+      if (!subConf) subConf = 'local';
+      if (options.reset && fs.existsSync(`./engine-private/conf/${deployId}`))
+        fs.removeSync(`./engine-private/conf/${deployId}`);
+      if (!fs.existsSync(`./engine-private/conf/${deployId}`)) Config.deployIdFactory(deployId, { subConf });
+      if (options.devProxyPortOffset) {
+        const envPath = `./engine-private/conf/${deployId}/.env.development`;
+        const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
+        envObj.DEV_PROXY_PORT_OFFSET = options.devProxyPortOffset;
+        writeEnv(envPath, envObj);
+      }
+      shellExec(`node bin run dev-cluster expose`, { async: true });
+      {
+        const cmd = `npm run dev-api ${deployId} ${subConf} ${host} ${_path} ${clientHostPort}${options.tls ? ' tls' : ''}`;
+        options.terminal ? openTerminal(cmd) : shellExec(cmd, { async: true });
+      }
+      await awaitDeployMonitor(true);
+      {
+        const cmd = `npm run dev-client ${deployId} ${subConf} ${host} ${_path} proxy${options.tls ? ' tls' : ''}`;
+        options.terminal
+          ? openTerminal(cmd)
+          : shellExec(cmd, {
+              async: true,
+            });
+      }
+      await awaitDeployMonitor(true);
+      shellExec(`npm run dev-proxy ${deployId} ${subConf} ${host} ${_path}${options.tls ? ' tls' : ''}`);
+    },
+
     /**
      * @method service
      * @description Deploys and exposes specific services (like `mongo-express-service`) on the cluster, updating deployment configurations and monitoring status.
@@ -808,6 +931,49 @@ class UnderpostRun {
       }
     },
 
+    /**
+     * @method sh
+     * @description Enables remote control for the Kitty terminal emulator.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    sh: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(`kitty -o allow_remote_control=yes`);
+    },
+
+    /**
+     * @method log
+     * @description Searches and highlights keywords in a specified log file, optionally showing surrounding lines.
+     * @param {string} path - The input value, identifier, or path for the operation (formatted as `filePath,keywords,lines`).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    log: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const [filePath, keywords, lines] = path.split(',');
+      let result = shellExec(`grep -i -E ${lines ? `-C ${lines} ` : ''}'${keywords}' ${filePath}`, {
+        stdout: true,
+        silent: true,
+      }).replaceAll(`--`, `==============================`.green.bold);
+      for (const keyword of keywords.split('|')) result = result.replaceAll(keyword, keyword.bgYellow.black.bold);
+      console.log(result);
+    },
+
+    /**
+     * @method release-cmt
+     * @description Commits and pushes a new release for the `engine` repository with a message indicating the new version.
+     * @param {string} path - The input value, identifier, or path for the operation.
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'release-cmt': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(`underpost run pull`);
+      shellExec(`underpost run secret`);
+      shellCd(`/home/dd/engine`);
+      shellExec(`underpost cmt --empty . ci engine ' New engine release $(underpost --version)'`);
+      shellExec(`underpost push . ${process.env.GITHUB_USERNAME}/engine`);
+    },
+
     /**
      * @method sync-replica
      * @description Syncs a replica for the dd.router
@@ -824,15 +990,13 @@ class UnderpostRun {
         const _path = '/single-replica';
         const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
         shellExec(`${baseCommand} env ${deployId} ${env}`);
-        for (const host of Object.keys(confServer)) {
-          if (!(_path in confServer[host])) continue;
-          shellExec(`node bin/deploy build-single-replica ${deployId} ${host} ${_path}`);
-          shellExec(`node bin/deploy build-full-client ${deployId}`);
-          const node = options.dev || !isDeployRunnerContext(path, options) ? 'kind-control-plane' : os.hostname();
-          // deployId, replicas, versions, image, node
-          let defaultPath = [deployId, 1, ``, ``, node];
-          shellExec(`${baseCommand} run${options.dev === true ? ' --dev' : ''} --build sync ${defaultPath}`);
-        }
+        for (const host of Object.keys(confServer))
+          if (_path in confServer[host]) shellExec(`node bin/deploy build-single-replica ${deployId} ${host} ${_path}`);
+        const node = options.dev || !isDeployRunnerContext(path, options) ? 'kind-control-plane' : os.hostname();
+        // deployId, replicas, versions, image, node
+        let defaultPath = [deployId, 1, ``, ``, node];
+        shellExec(`${baseCommand} run${options.dev === true ? ' --dev' : ''} --build sync ${defaultPath}`);
+        shellExec(`node bin/deploy build-full-client ${deployId}`);
       }
       if (isDeployRunnerContext(path, options)) shellExec(`${baseCommand} run promote ${path} production`);
     },
@@ -896,6 +1060,9 @@ class UnderpostRun {
       const volumeMountPath = options.volumeMountPath || path;
       const volumeHostPath = options.volumeHostPath || path;
       const enableVolumeMount = volumeHostPath && volumeMountPath;
+      const tty = options.tty ? 'true' : 'false';
+      const stdin = options.stdin ? 'true' : 'false';
+      const restartPolicy = options.restartPolicy || 'Never';
 
       if (options.volumeType === 'dev') options.volumeType = 'FileOrCreate';
       const volumeType =
@@ -909,15 +1076,17 @@ kind: Pod
 metadata:
   name: ${podName}
   namespace: ${namespace}
+  labels:
+    app: ${podName}
 spec:
-  restartPolicy: Never
+  restartPolicy: ${restartPolicy}
 ${runtimeClassName ? `  runtimeClassName: ${runtimeClassName}` : ''}
   containers:
     - name: ${containerName}
       image: ${imageName}
       imagePullPolicy: IfNotPresent
-      tty: true
-      stdin: true
+      tty: ${tty}
+      stdin: ${stdin}
       command: ${JSON.stringify(options.command ? options.command : ['/bin/bash', '-c'])}
 ${
   args.length > 0
@@ -953,7 +1122,7 @@ ${
     : ''
 }
 EOF`;
-      shellExec(`kubectl delete pod ${podName}`);
+      shellExec(`kubectl delete pod ${podName} --ignore-not-found`);
       console.log(cmd);
       shellExec(cmd, { disableLog: true });
       const successInstance = await UnderpostTest.API.statusMonitor(podName);

package/src/client/components/core/AgGrid.js

@@ -11,7 +11,7 @@ const AgGrid = {
   grids: {},
   theme: `ag-theme-alpine`, // quartz
   Render: async function (options) {
-    let { id } = options;
+    let { id, paginationOptions } = options;
     setTimeout(() => {
       // Grid Options: Contains all of the grid configurations
       const gridOptions = {
@@ -34,6 +34,38 @@ const AgGrid = {
             return params.data && params.data._new;
           },
         },
+        // Cell rendering events
+        onFirstDataRendered: options?.onFirstDataRendered,
+        onViewportChanged: options?.onViewportChanged,
+        onModelUpdated: options?.onModelUpdated,
+        onVirtualRowRemoved: options?.onVirtualRowRemoved,
+        // Cell interaction events
+        onCellClicked: options?.onCellClicked,
+        onCellDoubleClicked: options?.onCellDoubleClicked,
+        onCellFocused: options?.onCellFocused,
+        onCellMouseOver: options?.onCellMouseOver,
+        onCellMouseOut: options?.onCellMouseOut,
+        onCellValueChanged: options?.onCellValueChanged,
+        // set background colour on every row, this is probably bad, should be using CSS classes
+        // rowStyle: { background: 'black' },
+
+        // set background colour on even rows again, this looks bad, should be using CSS classes
+        // getRowStyle: (params) => {
+        //   if (params.node.rowIndex % 2 === 0) {
+        //     return { background: 'red' };
+        //   }
+        // },
+
+        // all rows assigned CSS class 'my-green-class'
+        // rowClass: 'my-green-class',
+
+        // all even rows assigned 'my-shaded-effect'
+        // getRowClass: (params) => {
+        //   if (params.node.rowIndex % 2 === 0) {
+        //     return 'my-shaded-effect';
+        //   }
+        // },
+
         // domLayout: 'autoHeight', || 'normal'
         // Column Definitions: Defines & controls grid columns.
         columnDefs: options?.gridOptions?.rowData?.[0]
@@ -62,7 +94,9 @@ const AgGrid = {
       if (!options.style || !options.style.height) {
         if (options.parentModal && Modal.Data[options.parentModal].options.observer) {
           Modal.Data[options.parentModal].onObserverListener[id + '-observer'] = ({ width, height }) => {
-            if (s(`.${id}`)) s(`.${id}`).style.height = `${height - 180}px`;
+            if (s(`.${id}`))
+              s(`.${id}`).style.height =
+                `${height - 180 + (options.customHeightOffset ? options.customHeightOffset : 0)}px`;
             else delete Modal.Data[options.parentModal].onObserverListener[id + '-observer'];
           };
           s(`.${id}`).style.height = `${s(`.${options.parentModal}`).offsetHeight - 180}px`;
@@ -70,6 +104,9 @@ const AgGrid = {
       }
     });
     const usePagination = options?.usePagination;
+    const limitOptionsAttr = paginationOptions?.limitOptions
+      ? `limit-options='${JSON.stringify(paginationOptions.limitOptions)}'`
+      : '';
     return html`
       <div
         class="${id} ${this.theme}${options?.darkTheme ? `-dark` : ''}"
@@ -77,7 +114,7 @@ const AgGrid = {
           ? Object.keys(options.style).map((styleKey) => `${styleKey}: ${options.style[styleKey]}; `)
           : ''}"
       ></div>
-      ${usePagination ? `<ag-pagination id="ag-pagination-${id}"></ag-pagination>` : ''}
+      ${usePagination ? `<ag-pagination id="ag-pagination-${id}" ${limitOptionsAttr}></ag-pagination>` : ''}
     `;
   },
   RenderStyle: async function (
@@ -159,6 +196,7 @@ const AgGrid = {
           ${darkTheme
             ? html`
                 <style>
+                  .row-new-highlight,
                   .ag-row.row-new-highlight {
                     background-color: #6d68ff !important;
                     transition: background-color 1s ease-out;
@@ -172,6 +210,7 @@ const AgGrid = {
                 </style>
               `
             : html`<style>
+                .row-new-highlight,
                 .ag-row.row-new-highlight {
                   background-color: #d0eaf8 !important;
                   transition: background-color 1s ease-out;

package/src/client/components/core/CommonJs.js

@@ -101,6 +101,7 @@ const cap = (str) =>
 
 const capFirst = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 
+// Other option: Array.from(new Set(arr))
 const uniqueArray = (arr) => arr.filter((item, pos) => arr.indexOf(item) == pos);
 
 const orderArrayFromAttrInt = (arr, attr, type) =>
@@ -946,6 +947,8 @@ const emotionsData = [
 const userRoleEnum = ['admin', 'moderator', 'user', 'guest'];
 const commonAdminGuard = (role) => userRoleEnum.indexOf(role) === userRoleEnum.indexOf('admin');
 const commonModeratorGuard = (role) => userRoleEnum.indexOf(role) <= userRoleEnum.indexOf('moderator');
+const commonUserGuard = (role) => userRoleEnum.indexOf(role) <= userRoleEnum.indexOf('user');
+const commonGuestGuard = (role) => userRoleEnum.indexOf(role) <= userRoleEnum.indexOf('guest');
 
 export {
   s4,
@@ -1002,6 +1005,8 @@ export {
   generateRandomPasswordSelection,
   commonAdminGuard,
   commonModeratorGuard,
+  commonUserGuard,
+  commonGuestGuard,
   isChileanIdentityDocument,
   getCurrentTrace,
   userRoleEnum,