@underpostnet/underpost 2.8.1 → 2.8.31

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

@@ -1,4 +1,4 @@
-import { getId } from './CommonJs.js';
+import { getId, isValidDate, newInstance } from './CommonJs.js';
 import { LoadingAnimation } from '../core/LoadingAnimation.js';
 import { Validator } from '../core/Validator.js';
 import { Input } from '../core/Input.js';
@@ -51,8 +51,6 @@ const Panel = {
       <i style="font-size: 25px" class="fa-solid fa-cloud"></i>
     </div>`;
 
-    let editId;
-
     const openPanelForm = () => {
       s(`.${idPanel}-form-body`).classList.remove('hide');
       s(`.btn-${idPanel}-add`).classList.add('hide');
@@ -72,7 +70,7 @@ const Panel = {
     };
 
     const renderPanel = async (payload) => {
-      const obj = payload;
+      const obj = newInstance(payload);
       if ('_id' in obj) obj.id = obj._id;
       const { id } = obj;
 
@@ -98,8 +96,8 @@ const Panel = {
         });
         EventsUI.onClick(`.${idPanel}-btn-edit-${id}`, async () => {
           logger.warn('edit', obj);
-          if (obj._id) editId = obj._id;
-          else if (obj.id) editId = obj.id;
+          if (obj._id) Panel.Tokens[idPanel].editId = obj._id;
+          else if (obj.id) Panel.Tokens[idPanel].editId = obj.id;
 
           s(`.btn-${idPanel}-label-edit`).classList.remove('hide');
           s(`.btn-${idPanel}-label-add`).classList.add('hide');
@@ -171,6 +169,10 @@ const Panel = {
                   const valueIcon = formObjData?.panel?.icon?.value ? formObjData.panel.icon.value : '';
                   const keyIcon = formObjData?.panel?.icon?.key ? formObjData.panel.icon.key : '';
 
+                  if (formObjData && ['datetime-local'].includes(formObjData.inputType) && isValidDate(obj[infoKey])) {
+                    obj[infoKey] = `${obj[infoKey]}`.replace('T', ' ').replace('.000Z', '');
+                  }
+
                   if (formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'tags')) {
                     setTimeout(async () => {
                       let tagRender = html``;
@@ -186,22 +188,50 @@ const Panel = {
                     });
                     return html``;
                   }
+                  {
+                    const formDataObj = formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'list');
+                    if (obj[infoKey] && obj[infoKey].length > 0 && formDataObj)
+                      return html`<div class="in ${idPanel}-row">
+                        <span class="${idPanel}-row-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
+                          ${keyIcon} ${Translate.Render(infoKey)}:</span
+                        >
+                        <span class="${idPanel}-row-value"
+                          >${valueIcon} ${obj[infoKey].map((k) => Translate.Render(k)).join(', ')}</span
+                        >
+                      </div> `;
+                  }
 
-                  if (formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'info-row-pin'))
-                    return html`<div class="in ${idPanel}-row">
-                      <span class="${idPanel}-row-pin-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
-                        ${keyIcon} ${infoKey}:</span
-                      >
-                      <span class="${idPanel}-row-pin-value">${valueIcon} ${obj[infoKey]}</span>
-                    </div> `;
+                  {
+                    const formDataObj = formData.find(
+                      (f) => f.model === infoKey && f.panel && f.panel.type === 'info-row-pin',
+                    );
+                    if (obj[infoKey] && formDataObj)
+                      return html`<div class="in ${idPanel}-row">
+                        <span class="${idPanel}-row-pin-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
+                          ${keyIcon}
+                          ${formDataObj.translateCode
+                            ? Translate.Render(formDataObj.translateCode)
+                            : Translate.Render(infoKey)}:</span
+                        >
+                        <span class="${idPanel}-row-pin-value">${valueIcon} ${obj[infoKey]}</span>
+                      </div> `;
+                  }
 
-                  if (formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'info-row'))
-                    return html`<div class="in ${idPanel}-row">
-                      <span class="${idPanel}-row-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
-                        ${keyIcon} ${infoKey}:</span
-                      >
-                      <span class="${idPanel}-row-value"> ${valueIcon} ${obj[infoKey]}</span>
-                    </div> `;
+                  {
+                    const formDataObj = formData.find(
+                      (f) => f.model === infoKey && f.panel && f.panel.type === 'info-row',
+                    );
+                    if (obj[infoKey] && formDataObj)
+                      return html`<div class="in ${idPanel}-row">
+                        <span class="${idPanel}-row-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
+                          ${keyIcon}
+                          ${formDataObj.translateCode
+                            ? Translate.Render(formDataObj.translateCode)
+                            : Translate.Render(infoKey)}:</span
+                        >
+                        <span class="${idPanel}-row-value"> ${valueIcon} ${obj[infoKey]}</span>
+                      </div> `;
+                  }
 
                   return html``;
                 })
@@ -224,6 +254,30 @@ const Panel = {
     for (const modelData of formData) {
       if (modelData.disableRender) continue;
       switch (modelData.inputType) {
+        case 'dropdown-checkbox': {
+          renderForm += html`<div class="in section-mp">
+            ${await DropDown.Render({
+              id: `${modelData.id}`,
+              label: html`${Translate.Render(modelData.model)}`,
+              type: 'checkbox',
+              value: modelData.dropdown.options[0],
+              resetOption: true,
+              containerClass: `${idPanel}-dropdown-checkbox`,
+              data: modelData.dropdown.options.map((dKey) => {
+                return {
+                  value: dKey,
+                  data: dKey,
+                  checked: false,
+                  display: html`${Translate.Render(dKey)}`,
+                  onClick: function () {
+                    logger.info('DropDown onClick', this.checked);
+                  },
+                };
+              }),
+            })}
+          </div>`;
+          break;
+        }
         case 'dropdown':
           renderForm += html` <div class="in section-mp">
             ${await DropDown.Render({
@@ -418,21 +472,23 @@ const Panel = {
         obj.id = `${data.length}`;
         let documents;
         if (options && options.on && options.on.add) {
-          const { status, data } = await options.on.add({ data: obj, editId });
+          const { status, data } = await options.on.add({ data: obj, editId: Panel.Tokens[idPanel].editId });
           if (status === 'error') return;
           documents = data;
         }
         s(`.btn-${idPanel}-clean`).click();
-        if (editId && s(`.${idPanel}-${editId}`)) s(`.${idPanel}-${editId}`).remove();
+        if (Panel.Tokens[idPanel].editId && s(`.${idPanel}-${Panel.Tokens[idPanel].editId}`))
+          s(`.${idPanel}-${Panel.Tokens[idPanel].editId}`).remove();
         if (Array.isArray(documents)) {
           htmls(`.${idPanel}-render`, '');
           for (const doc of documents) {
             append(`.${idPanel}-render`, await renderPanel(doc));
           }
-        } else htmls(`.${idPanel}-render`, await renderPanel(obj));
+        } else htmls(`.${idPanel}-render`, await renderPanel({ ...obj, ...documents }));
         Input.cleanValues(formData);
         s(`.btn-${idPanel}-close`).click();
         s(`.${scrollClassContainer}`).scrollTop = 0;
+        if (s(`.${scrollClassContainer}`)) s(`.${scrollClassContainer}`).style.overflow = 'auto';
       });
       s(`.btn-${idPanel}-clean`).onclick = () => {
         Input.cleanValues(formData);
@@ -458,13 +514,14 @@ const Panel = {
       s(`.btn-${idPanel}-add`).onclick = (e) => {
         e.preventDefault();
         // s(`.btn-${idPanel}-clean`).click();
-        editId = undefined;
+        Panel.Tokens[idPanel].editId = undefined;
         s(`.btn-${idPanel}-label-add`).classList.remove('hide');
         s(`.btn-${idPanel}-label-edit`).classList.add('hide');
         s(`.${scrollClassContainer}`).scrollTop = 0;
 
         openPanelForm();
       };
+      if (s(`.${scrollClassContainer}`)) s(`.${scrollClassContainer}`).style.overflow = 'auto';
     });
 
     if (data.length > 0) for (const obj of data) render += await renderPanel(obj);

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

@@ -90,16 +90,7 @@ const PanelForm = {
         },
       },
     ];
-    const dateFormat = (date) =>
-      html`<span
-        style="${renderCssAttr({
-          style: {
-            'font-size': '14px',
-            color: '#888',
-          },
-        })}"
-        >${new Date(date).toLocaleString().replaceAll(',', '')}</span
-      >`;
+
     const titleIcon = html`<i class="fa-solid fa-quote-left"></i>`;
     const panelRender = async ({ data }) =>
       await Panel.Render({
@@ -271,7 +262,7 @@ const PanelForm = {
                 fileId: file ? URL.createObjectURL(file) : undefined,
                 _id: documentData._id,
                 id: documentData._id,
-                createdAt: dateFormat(documentData.createdAt),
+                createdAt: documentData.createdAt,
               };
 
               if (documentStatus === 'error') status = 'error';
@@ -376,7 +367,7 @@ const PanelForm = {
           PanelForm.Data[idPanel].data.push({
             id: documentObject._id,
             title: documentObject.title,
-            createdAt: dateFormat(documentObject.createdAt),
+            createdAt: documentObject.createdAt,
             tags: documentObject.tags.filter((t) => !prefixTags.includes(t)),
             mdFileId: marked.parse(mdFileId),
             userId: documentObject.userId._id,
@@ -431,14 +422,9 @@ const PanelForm = {
         })),
       });
 
-    let lastCid;
-    let lasUserId;
     this.Data[idPanel].updatePanel = async () => {
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
-      if (lastCid === cid && lasUserId === Elements.Data.user.main.model.user._id) return;
       if (options.route === 'home') Modal.homeCid = newInstance(cid);
-      lastCid = cid;
-      lasUserId = newInstance(Elements.Data.user.main.model.user._id);
       htmls(`.${options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body'}`, await renderSrrPanelData());
       await getPanelData();
       htmls(
@@ -451,7 +437,7 @@ const PanelForm = {
         id: options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body',
         routeId: options.route,
         event: async (path) => {
-          await this.Data[idPanel].updatePanel();
+          if (!PanelForm.Data[idPanel].sessionIn) await this.Data[idPanel].updatePanel();
         },
       });
 

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

@@ -16,30 +16,43 @@ const Translate = {
     Object.keys(this.Token).map((translateHash) => {
       if (translateHash in this.Token && lang in this.Token[translateHash]) {
         if (!('placeholder' in this.Token[translateHash]) && s(`.${translateHash}`))
-          htmls(`.${translateHash}`, textFormatted(this.Token[translateHash][lang]));
+          htmls(
+            `.${translateHash}`,
+            this.Token[translateHash].options?.disableTextFormat
+              ? this.Token[translateHash][lang]
+              : textFormatted(this.Token[translateHash][lang]),
+          );
         else if ('placeholder' in this.Token[translateHash] && s(this.Token[translateHash].placeholder))
-          s(this.Token[translateHash].placeholder).placeholder = textFormatted(this.Token[translateHash][lang]);
+          s(this.Token[translateHash].placeholder).placeholder = this.Token[translateHash].options?.disableTextFormat
+            ? this.Token[translateHash][lang]
+            : textFormatted(this.Token[translateHash][lang]);
       }
     });
     for (const keyEvent of Object.keys(this.Event)) this.Event[keyEvent]();
   },
-  Render: function (keyLang, placeholder) {
+  Render: function (keyLang, placeholder, options = { disableTextFormat: false }) {
     if (!(keyLang in this.Data)) {
       // TODO: add translate package or library for this case
       logger.warn('translate key lang does not exist: ', keyLang);
-      return textFormatted(keyLang);
+      return options.disableTextFormat ? keyLang : textFormatted(keyLang);
     }
+    this.Data[keyLang].options = options;
     if (placeholder) this.Data[keyLang].placeholder = placeholder;
     keyLang = this.Data[keyLang];
     const translateHash = getId(this.Token, 'trans');
     this.Token[translateHash] = newInstance(keyLang);
     if ('placeholder' in keyLang) {
-      if (s('html').lang in keyLang) return textFormatted(keyLang[s('html').lang]);
-      return textFormatted(keyLang['en']);
+      if (s('html').lang in keyLang)
+        return options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang]);
+      return options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en']);
     }
     if (s('html').lang in keyLang)
-      return html`<span class="${translateHash}">${textFormatted(keyLang[s('html').lang])}</span>`;
-    return html`<span class="${translateHash}">${textFormatted(keyLang['en'])}</span>`;
+      return html`<span class="${translateHash}"
+        >${options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang])}</span
+      >`;
+    return html`<span class="${translateHash}"
+      >${options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en'])}</span
+    >`;
   },
   renderLang: function (language) {
     localStorage.setItem('lang', language);
@@ -474,6 +487,15 @@ const TranslateCore = {
     Translate.Data['friday'] = { es: 'Viernes', en: 'Friday' };
     Translate.Data['saturday'] = { es: 'Sábado', en: 'Saturday' };
     Translate.Data['sunday'] = { es: 'Domingo', en: 'Sunday' };
+
+    Translate.Data['description'] = { es: 'Descripción', en: 'Description' };
+    Translate.Data['daysOfWeek'] = { es: 'Días de la semana', en: 'Days of the week' };
+    Translate.Data['startTime'] = { es: 'Hora de inicio', en: 'Start time' };
+    Translate.Data['endTime'] = { es: 'Hora de finalizacion', en: 'End time' };
+    Translate.Data['appointment-scheduled'] = {
+      en: 'Your appointment has been scheduled',
+      es: 'Tu cita ha sido programada',
+    };
   },
 };
 

package/src/db/mongo/MongooseDB.js

@@ -9,7 +9,12 @@ const MongooseDB = {
   connect: async (host, name) => {
     const uri = `${host}/${name}`;
     // logger.info('MongooseDB connect', { host, name, uri });
-    return await mongoose.createConnection(uri).asPromise();
+    return await mongoose
+      .createConnection(uri, {
+        // useNewUrlParser: true,
+        // useUnifiedTopology: true,
+      })
+      .asPromise();
     return new Promise((resolve, reject) =>
       mongoose
         .connect(
@@ -67,8 +72,15 @@ const MongooseDB = {
             shellExec(`sudo rm -r /var/lib/mongodb`);
             // restore lib
             // shellExec(`sudo chown -R mongodb:mongodb /var/lib/mongodb/*`);
+            // mongod --repair
 
             if (process.argv.includes('legacy')) {
+              // TODO:
+              if (process.argv.includes('rocky')) {
+                // https://github.com/mongodb/mongodb-selinux
+                // https://www.mongodb.com/docs/v7.0/tutorial/install-mongodb-enterprise-on-red-hat/
+                shellExec(`sudo chown -R mongod:mongod /var/lib/mongo`);
+              }
               logger.info('install legacy 4.4');
               shellExec(`wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -`);
 

package/src/index.js

@@ -20,7 +20,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.1';
+  static version = 'v2.8.31';
 
   constructor() {}
 

package/src/server/conf.js

@@ -9,7 +9,6 @@ import colors from 'colors';
 import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
-import ncp from 'copy-paste';
 import read from 'read';
 import splitFile from 'split-file';
 import axios from 'axios';
@@ -770,9 +769,10 @@ const deployRun = async (dataDeploy, currentAttempt = 1) => {
   } else logger.info(`Deploy process successfully`);
 };
 
-const restoreMacroDb = async (deployGroupId = '') => {
+const restoreMacroDb = async (deployGroupId = '', deployId = null) => {
   const dataDeploy = await getDataDeploy({ deployGroupId, buildSingleReplica: false });
   for (const deployGroup of dataDeploy) {
+    if (deployId && deployGroup.deployId !== deployId) continue;
     if (!deployGroup.replicaHost) {
       const deployServerConfPath = `./engine-private/conf/${deployGroup.deployId}/conf.server.json`;
       const serverConf = JSON.parse(fs.readFileSync(deployServerConfPath, 'utf8'));

package/src/server/process.js

@@ -3,8 +3,8 @@
 import shell from 'shelljs';
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
-
 import { loggerFactory } from './logger.js';
+import clipboard from 'clipboardy';
 
 dotenv.config();
 
@@ -63,4 +63,27 @@ const shellCd = (cd, options = { disableLog: false }) => {
   return shell.cd(cd);
 };
 
-export { ProcessController, getRootDirectory, shellExec, shellCd };
+function pbcopy(data) {
+  switch (process.platform) {
+    case 'linux':
+      {
+        // sudo dnf install xclip
+        // sudo apt update
+        // sudo apt install xclip
+        // paste: xclip -o
+        // copy:
+        // shellExec(`echo "${data}" | xclip -sel clip`, { async: true });
+      }
+
+      break;
+
+    default:
+      break;
+  }
+
+  clipboard.writeSync(data || '🦄');
+
+  logger.info(`copied to clipboard:`, clipboard.readSync());
+}
+
+export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy };

package/src/server/ssl.js

@@ -70,7 +70,7 @@ const validateSecureContext = (host) => {
 const buildSecureContext = (host) => {
   return {
     key: fs.readFileSync(`./engine-private/ssl/${host}/key.key`, 'utf8'),
-    cert: fs.readFileSync(`./engine-private/ssl/${host}/crt.crt`, 'utf8'),
+    cert: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
     ca: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
   };
 };

package/src/server/valkey.js

@@ -21,6 +21,8 @@ const selectDtoFactory = (payload, select) => {
 
 const valkeyClientFactory = async () => {
   const valkey = new Valkey({
+    // port: 6379,
+    // host: 'service-valkey.default.svc.cluster.local',
     retryStrategy: (attempt) => {
       if (attempt === 1) {
         valkey.disconnect();

package/startup.cjs

@@ -0,0 +1,12 @@
+const shell = require('shelljs');
+
+// /usr/bin/supervisord -n
+// /usr/sbin/sshd -D
+
+shell.exec(`/usr/bin/supervisord -n`, { async: true });
+
+// shell.exec(`sudo /opt/lampp/lampp start`, { async: true });
+
+// shell.exec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
+
+shell.exec(`underpost new app`);

package/startup.js

@@ -1,11 +0,0 @@
-import { shellExec } from './src/server/process.js';
-
-// /usr/bin/supervisord -n
-// /usr/sbin/sshd -D
-shellExec(`/usr/bin/supervisord -n`, { async: true });
-
-shellExec(`sudo /opt/lampp/lampp start`, { async: true });
-
-shellExec(`/usr/bin/mongod -f /etc/mongod.conf`, { async: true });
-
-shellExec(`underpost new app server`);