underpost 2.8.635 → 2.8.641

package/src/cli/monitor.js

@@ -4,13 +4,12 @@ import UnderpostDeploy from './deploy.js';
 import axios from 'axios';
 import UnderpostRootEnv from './env.js';
 import fs from 'fs-extra';
-import { timer } from '../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
 class UnderpostMonitor {
   static API = {
-    async callback(deployId, env = 'development', options = { itc: false }) {
+    async callback(deployId, env = 'development', options = { now: false, single: false, msInterval: '' }) {
       const router = await UnderpostDeploy.API.routerFactory(deployId, env);
 
       const confServer = loadReplicas(
@@ -22,45 +21,70 @@ class UnderpostMonitor {
 
       logger.info('', pathPortAssignmentData);
 
-      if (options.itc === true) {
-        const errorPayloads = [];
-        const maxAttempts = Object.keys(pathPortAssignmentData)
-          .map((host) => pathPortAssignmentData[host].length)
-          .reduce((accumulator, value) => accumulator + value, 0);
+      const errorPayloads = [];
+      const maxAttempts = Object.keys(pathPortAssignmentData)
+        .map((host) => pathPortAssignmentData[host].length)
+        .reduce((accumulator, value) => accumulator + value, 0);
 
-        const monitor = async () => {
-          await timer(30000);
-          if (UnderpostRootEnv.API.get('running-job')) return await monitor();
-          for (const host of Object.keys(pathPortAssignmentData)) {
-            for (const instance of pathPortAssignmentData[host]) {
-              const { port, path } = instance;
-              if (path.match('peer') || path.match('socket')) continue;
-              const urlTest = `http://localhost:${port}${path}`;
-              logger.info('Test instance', urlTest);
-              await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
-                // console.log(error);
-                const errorPayload = {
-                  urlTest,
-                  host,
-                  port,
-                  path,
-                  name: error.name,
-                  status: error.status,
-                  code: error.code,
-                  errors: error.errors,
-                };
-                if (errorPayload.status !== 404) {
-                  errorPayloads.push(errorPayload);
-                  if (errorPayloads.length >= maxAttempts) throw new Error(JSON.stringify(errorPayloads, null, 4));
-                  logger.error('Error accumulator', errorPayloads.length);
+      const monitor = async (reject) => {
+        logger.info('Check server health');
+        for (const host of Object.keys(pathPortAssignmentData)) {
+          for (const instance of pathPortAssignmentData[host]) {
+            const { port, path } = instance;
+            if (path.match('peer') || path.match('socket')) continue;
+            const urlTest = `http://localhost:${port}${path}`;
+            // logger.info('Test instance', urlTest);
+            await axios.get(urlTest, { timeout: 10000 }).catch((error) => {
+              // console.log(error);
+              const errorPayload = {
+                urlTest,
+                host,
+                port,
+                path,
+                name: error.name,
+                status: error.status,
+                code: error.code,
+                errors: error.errors,
+              };
+              if (errorPayload.status !== 404) {
+                errorPayloads.push(errorPayload);
+                if (errorPayloads.length >= maxAttempts) {
+                  const message = JSON.stringify(errorPayloads, null, 4);
+                  if (reject) reject(message);
+                  else throw new Error(message);
                 }
-              });
-            }
+                logger.error('Error accumulator', errorPayloads.length);
+              }
+            });
           }
-          await monitor();
-        };
-        await monitor();
-      }
+        }
+      };
+      if (options.now === true) await monitor();
+      if (options.single === true) return;
+      let optionsMsTimeout = parseInt(options.msInterval);
+      if (isNaN(optionsMsTimeout)) optionsMsTimeout = 30000;
+      const monitorCallBack = (resolve, reject) => {
+        const envMsTimeout = UnderpostRootEnv.API.get('monitor-ms');
+        setTimeout(
+          async () => {
+            switch (UnderpostRootEnv.API.get('monitor-input')) {
+              case 'pause':
+                monitorCallBack(resolve, reject);
+                return;
+              case 'restart':
+                return reject();
+              case 'stop':
+                return resolve();
+              default:
+                await monitor(reject);
+                monitorCallBack(resolve, reject);
+                return;
+            }
+          },
+          !isNaN(envMsTimeout) ? envMsTimeout : optionsMsTimeout,
+        );
+      };
+      return await new Promise((...args) => monitorCallBack(...args));
     },
   };
 }

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

@@ -151,23 +151,27 @@ const Account = {
           // s(`.btn-close-modal-account`).click();
           s(`.main-btn-recover`).click();
         };
-        s(`.btn-account-delete-confirm`).onclick = async (e) => {
-          e.preventDefault();
-          const confirmResult = await Modal.RenderConfirm({
-            html: async () => {
-              return html`
-                <div class="in section-mp" style="text-align: center">
-                  ${Translate.Render('confirm-delete-account')}
-                </div>
-              `;
-            },
-            id: 'delete-account-modal',
-          });
-          if (confirmResult.status === 'cancelled') return;
-          s(`.btn-account-delete-confirm`).classList.add('hide');
-          s(`.btn-account-delete`).classList.remove('hide');
-          s(`.btn-account-delete`).click();
-        };
+        EventsUI.onClick(
+          `.btn-account-delete-confirm`,
+          async (e) => {
+            e.preventDefault();
+            const confirmResult = await Modal.RenderConfirm({
+              html: async () => {
+                return html`
+                  <div class="in section-mp" style="text-align: center">
+                    ${Translate.Render('confirm-delete-account')}
+                  </div>
+                `;
+              },
+              id: 'delete-account-modal',
+            });
+            if (confirmResult.status === 'cancelled') return;
+            s(`.btn-account-delete-confirm`).classList.add('hide');
+            s(`.btn-account-delete`).classList.remove('hide');
+            s(`.btn-account-delete`).click();
+          },
+          { context: 'modal' },
+        );
         EventsUI.onClick(`.btn-account-delete`, async (e) => {
           e.preventDefault();
           const result = await UserService.delete({ id: user._id });
@@ -178,7 +182,7 @@ const Account = {
           s(`.btn-account-delete-confirm`).classList.remove('hide');
           s(`.btn-account-delete`).classList.add('hide');
           if (result.status === 'success') {
-            s(`.main-btn-home`).click();
+            Modal.onHomeRouterEvent();
             await Auth.sessionOut();
           }
         });
@@ -252,7 +256,7 @@ const Account = {
         ${options?.bottomRender ? await options.bottomRender() : ``}
         <div class="in hide">
           ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-account',
+            class: 'in section-mp form-button btn-account',
             label: Translate.Render('update'),
             type: 'submit',
           })}
@@ -260,13 +264,13 @@ const Account = {
       </form>
       <div class="in">
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-account-delete hide',
+          class: 'in section-mp form-button btn-account-delete hide',
           label: html` ${Translate.Render(`delete-account`)}`,
           type: 'button',
           style: 'color: #5f5f5f',
         })}
         ${await BtnIcon.Render({
-          class: 'section-mp form-button btn-account-delete-confirm',
+          class: 'in section-mp form-button btn-account-delete-confirm',
           label: html` ${Translate.Render(`delete-account`)}`,
           type: 'button',
           style: 'color: #5f5f5f',

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

@@ -25,7 +25,7 @@ const BlockChainManagement = {
                 placeholder: true,
               })}
               ${await BtnIcon.Render({
-                class: `section-mp btn-custom btn-upload-blockchain`,
+                class: `inl section-mp btn-custom btn-upload-blockchain`,
                 label: html`<i class="fas fa-plus"></i> ${Translate.Render(`create`)}`,
               })}
             </div>

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

@@ -40,18 +40,6 @@ const CalendarCore = {
 
     const titleIcon = html`<i class="fas fa-calendar-alt"></i>`;
 
-    const getSrrData = () => {
-      this.Data[options.idModal].data = range(0, 5).map((i) => {
-        return {
-          id: `event-${i}`,
-          description: `Event ${s4()}${s4()}${s4()}`,
-          start: new Date().toTimeString(),
-          end: new Date().toTimeString(),
-        };
-      });
-    };
-    getSrrData();
-
     const getPanelData = async () => {
       const result = await EventSchedulerService.get({
         id: `${getQueryParams().cid ? getQueryParams().cid : Auth.getToken() ? 'creatorUser' : ''}`,
@@ -235,35 +223,9 @@ const CalendarCore = {
     ];
 
     setTimeout(() => {
-      const resizeModal = () => {
-        Modal.Data[options.idModal].onObserverListener[options.idModal] = () => {
-          if (s(`.main-body-calendar-${options.idModal}`))
-            s(`.main-body-calendar-${options.idModal}`).style.height = `${
-              s(`.${options.idModal}`).offsetHeight - Modal.headerTitleHeight
-            }px`;
-        };
-        Modal.Data[options.idModal].onObserverListener[options.idModal]();
-      };
-      setTimeout(resizeModal);
-      RouterEvents[`${options.idModal}-main-body`] = ({ route }) => {
-        if (route === 'calendar') {
-          setTimeout(() => {
-            resizeModal();
-          }, 400);
-        }
-      };
-
       s(`.close-calendar-container`).onclick = () => {
         s(`.calendar-container`).classList.add('hide');
         s(`.main-body-calendar-${options.idModal}`).classList.remove('hide');
-        htmls(
-          `.style-calendar`,
-          html`<style>
-            .modal-calendar {
-              overflow: hidden;
-            }
-          </style>`,
-        );
       };
     });
 
@@ -305,14 +267,6 @@ const CalendarCore = {
                 // renderCalendar();
                 CalendarCore.Data[options.idModal].calendar.setOption('height', 700);
                 Translate.Event['fullcalendar-lang']();
-                htmls(
-                  `.style-calendar`,
-                  html`<style>
-                    .modal-calendar {
-                      overflow: auto;
-                    }
-                  </style>`,
-                );
               },
             },
           ],
@@ -404,16 +358,11 @@ const CalendarCore = {
         <div class="in" style="margin-bottom: 100px"></div>`;
     };
 
-    let delayBlock = false;
+    let lastCid;
     this.Data[options.idModal].updatePanel = async () => {
-      if (delayBlock) return;
-      else {
-        delayBlock = true;
-        setTimeout(() => {
-          delayBlock = false;
-        }, 500);
-      }
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
+      if (lastCid === cid) return;
+      lastCid = cid;
       if (options.route === 'home') Modal.homeCid = newInstance(cid);
       if (s(`.main-body-calendar-${options.idModal}`)) {
         // if (Auth.getToken())
@@ -423,39 +372,22 @@ const CalendarCore = {
       }
     };
 
-    if (options.route)
+    if (options.route) {
       listenQueryPathInstance({
         id: options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body',
         routeId: options.route,
         event: async (path) => {
-          setTimeout(() => {
-            CalendarCore.Data[options.idModal].updatePanel();
-          });
+          CalendarCore.Data[options.idModal].updatePanel();
         },
       });
-
-    // if (options.route === 'home')
-    setTimeout(() => {
-      CalendarCore.Data[options.idModal].updatePanel();
-    });
-
+      if (!options.parentIdModal)
+        Modal.Data['modal-menu'].onHome[idPanel] = async () => {
+          lastCid = undefined;
+          setQueryPath({ path: options.route, queryPath: '' });
+          await this.Data[idPanel].updatePanel();
+        };
+    }
     return html`
-      <style>
-        .main-body-calendar-${options.idModal} {
-          overflow: auto;
-        }
-        .${idPanel}-form {
-          max-width: 750px !important;
-        }
-      </style>
-      <div class="style-calendar">
-        <style>
-          .modal-calendar {
-            overflow: hidden;
-          }
-        </style>
-      </div>
-
       <div class="in main-body-calendar-${options.idModal}">${await panelRender()}</div>
       <style>
         .calendar-container {
@@ -513,15 +445,13 @@ const CalendarCore = {
 
         .calendar-buttons-container {
           padding-bottom: 15px;
-          top: ${Modal.headerTitleHeight}px;
           height: 60px;
-          z-index: 4;
         }
       </style>
       <div class="in calendar-container hide">
-        <div class="stq modal calendar-buttons-container">
+        <div class="in modal calendar-buttons-container">
           ${await BtnIcon.Render({
-            class: `section-mp btn-custom close-calendar-container flr`,
+            class: `inl section-mp btn-custom close-calendar-container flr`,
             label: html`<i class="fa-solid fa-xmark"></i> ${Translate.Render('close')}`,
             type: 'button',
           })}

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

@@ -577,7 +577,8 @@ const getCurrentTrace = () => {
   try {
     _stack;
   } catch (error) {
-    return error.stack.split('is not defined')[1];
+    console.error(error);
+    return error;
   }
 };
 

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

@@ -396,7 +396,8 @@ const CssCoreDark = {
           text-align: center;
           background: #1a1a1a;
           font-size: 17px;
-          height: 35px;
+          height: 30px;
+          padding: 5px 0px 5px 0px;
         }
         ::placeholder {
           color: #c6c4c4;
@@ -471,6 +472,7 @@ const CssCoreDark = {
           width: 260px;
           font-size: 20px;
           padding: 10px;
+          min-height: 45px;
         }
         .toggle-form-container {
           border: 2px solid #313131;
@@ -494,6 +496,7 @@ const CssCoreDark = {
           font-size: 20px;
           padding: 10px;
           text-align: center;
+          min-height: 45px;
         }
         .drop-zone-file-explorer {
           min-height: 300px;
@@ -700,7 +703,8 @@ const CssCoreLight = {
           text-align: center;
           background: #eaeaea;
           font-size: 17px;
-          height: 35px;
+          height: 30px;
+          padding: 5px 0px 5px 0px;
         }
         ::placeholder {
           color: #333;
@@ -776,6 +780,7 @@ const CssCoreLight = {
           width: 260px;
           font-size: 20px;
           padding: 10px;
+          min-height: 45px;
         }
         .toggle-form-container {
           border-radius: 5px;
@@ -800,6 +805,7 @@ const CssCoreLight = {
           font-size: 20px;
           padding: 10px;
           text-align: center;
+          min-height: 45px;
         }
         .input-container-width {
           cursor: pointer;

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

@@ -16,7 +16,7 @@ const EventsUI = {
       if (complete) {
         complete = false;
         await LoadingAnimation.spinner.play(loadingContainer ? loadingContainer : id);
-        await LoadingAnimation.bar.play(id);
+        if (options.context !== 'modal') await LoadingAnimation.bar.play(id);
         try {
           await logic(e);
         } catch (error) {
@@ -26,7 +26,7 @@ const EventsUI = {
             html: error?.message ? error.message : error ? error : 'Event error',
           });
         }
-        LoadingAnimation.bar.stop(id);
+        if (options.context !== 'modal') LoadingAnimation.bar.stop(id);
         await LoadingAnimation.spinner.stop(loadingContainer ? loadingContainer : id);
         complete = true;
         return;

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

@@ -323,50 +323,54 @@ const FileExplorer = {
 
             downloadFile(new Blob([new Uint8Array(file.data.data)], { type: params.data.mimetype }), params.data.name);
           });
-          EventsUI.onClick(`.btn-file-delete-${params.data._id}`, async (e) => {
-            e.preventDefault();
-            {
-              const confirmResult = await Modal.RenderConfirm({
-                html: async () => {
-                  return html`
-                    <div class="in section-mp" style="text-align: center">
-                      ${Translate.Render('confirm-delete-item')}
-                      <br />
-                      "${params.data.title}"
-                    </div>
-                  `;
-                },
-                id: `delete-${params.data._id}`,
-              });
-              if (confirmResult.status !== 'confirm') return;
+          EventsUI.onClick(
+            `.btn-file-delete-${params.data._id}`,
+            async (e) => {
+              e.preventDefault();
+              {
+                const confirmResult = await Modal.RenderConfirm({
+                  html: async () => {
+                    return html`
+                      <div class="in section-mp" style="text-align: center">
+                        ${Translate.Render('confirm-delete-item')}
+                        <br />
+                        "${params.data.title}"
+                      </div>
+                    `;
+                  },
+                  id: `delete-${params.data._id}`,
+                });
+                if (confirmResult.status !== 'confirm') return;
 
-              const { data, status, message } = await FileService.delete({
-                id: params.data.fileId,
+                const { data, status, message } = await FileService.delete({
+                  id: params.data.fileId,
+                });
+                NotificationManager.Push({
+                  html: status,
+                  status,
+                });
+                if (status === 'error') return;
+              }
+              const { data, status, message } = await DocumentService.delete({
+                id: params.data._id,
               });
               NotificationManager.Push({
                 html: status,
                 status,
               });
               if (status === 'error') return;
-            }
-            const { data, status, message } = await DocumentService.delete({
-              id: params.data._id,
-            });
-            NotificationManager.Push({
-              html: status,
-              status,
-            });
-            if (status === 'error') return;
-
-            documentInstance = documentInstance.filter((f) => f._id !== params.data._id);
-            const format = FileExplorer.documentDataFormat({ document: documentInstance, location });
-            files = format.files;
-            folders = format.folders;
-            // AgGrid.grids[gridFileId].setGridOption('rowData', files);
-            // const selectedData = gridApi.getSelectedRows();
-            AgGrid.grids[gridFileId].applyTransaction({ remove: [params.data] });
-            AgGrid.grids[gridFolderId].setGridOption('rowData', folders);
-          });
+
+              documentInstance = documentInstance.filter((f) => f._id !== params.data._id);
+              const format = FileExplorer.documentDataFormat({ document: documentInstance, location });
+              files = format.files;
+              folders = format.folders;
+              // AgGrid.grids[gridFileId].setGridOption('rowData', files);
+              // const selectedData = gridApi.getSelectedRows();
+              AgGrid.grids[gridFileId].applyTransaction({ remove: [params.data] });
+              AgGrid.grids[gridFolderId].setGridOption('rowData', folders);
+            },
+            { context: 'modal' },
+          );
         });
       }
 
@@ -400,49 +404,53 @@ const FileExplorer = {
         `;
 
         setTimeout(() => {
-          EventsUI.onClick(`.btn-folder-delete-${id}`, async (e) => {
-            const confirmResult = await Modal.RenderConfirm({
-              html: async () => {
-                return html`
-                  <div class="in section-mp" style="text-align: center">
-                    ${Translate.Render('confirm-delete-item')}
-                    <br />
-                    "${params.data.location}"
-                  </div>
-                `;
-              },
-              id: `delete-${id}`,
-            });
-            if (confirmResult.status !== 'confirm') return;
+          EventsUI.onClick(
+            `.btn-folder-delete-${id}`,
+            async (e) => {
+              const confirmResult = await Modal.RenderConfirm({
+                html: async () => {
+                  return html`
+                    <div class="in section-mp" style="text-align: center">
+                      ${Translate.Render('confirm-delete-item')}
+                      <br />
+                      "${params.data.location}"
+                    </div>
+                  `;
+                },
+                id: `delete-${id}`,
+              });
+              if (confirmResult.status !== 'confirm') return;
 
-            e.preventDefault();
-            const idFilesDelete = [];
-            for (const file of documentInstance.filter(
-              (f) => FileExplorer.locationFormat({ f }) === params.data.location, // .startsWith(params.data.location),
-            )) {
-              {
-                const { data, status, message } = await FileService.delete({
-                  id: file.fileId._id,
-                });
+              e.preventDefault();
+              const idFilesDelete = [];
+              for (const file of documentInstance.filter(
+                (f) => FileExplorer.locationFormat({ f }) === params.data.location, // .startsWith(params.data.location),
+              )) {
+                {
+                  const { data, status, message } = await FileService.delete({
+                    id: file.fileId._id,
+                  });
+                }
+                {
+                  idFilesDelete.push(file._id);
+                  const { data, status, message } = await DocumentService.delete({
+                    id: file._id,
+                  });
+                }
               }
-              {
-                idFilesDelete.push(file._id);
-                const { data, status, message } = await DocumentService.delete({
-                  id: file._id,
-                });
-              }
-            }
-            NotificationManager.Push({
-              html: Translate.Render('success-delete'),
-              status: 'success',
-            });
-            documentInstance = documentInstance.filter((f) => !idFilesDelete.includes(f._id));
-            const format = FileExplorer.documentDataFormat({ document: documentInstance, location });
-            files = format.files;
-            folders = format.folders;
-            AgGrid.grids[gridFileId].setGridOption('rowData', files);
-            AgGrid.grids[gridFolderId].setGridOption('rowData', folders);
-          });
+              NotificationManager.Push({
+                html: Translate.Render('success-delete'),
+                status: 'success',
+              });
+              documentInstance = documentInstance.filter((f) => !idFilesDelete.includes(f._id));
+              const format = FileExplorer.documentDataFormat({ document: documentInstance, location });
+              files = format.files;
+              folders = format.folders;
+              AgGrid.grids[gridFileId].setGridOption('rowData', files);
+              AgGrid.grids[gridFolderId].setGridOption('rowData', folders);
+            },
+            { context: 'modal' },
+          );
         });
       }