underpost 2.8.843 → 2.8.845

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

@@ -15,10 +15,10 @@ const NotificationManager = {
             right: 5px !important;
             width: 300px !important;
             bottom: ${5 + (options?.heightBottomBar ? options.heightBottomBar : 0)}px !important;
-            z-index: 5 !important;
+            z-index: 11 !important;
           }
           .notification-board-title {
-            padding: 5px !important;
+            padding: 11px !important;
           }
           .notification-manager-date {
             font-size: 20px !important;

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

@@ -119,10 +119,11 @@ const Panel = {
         });
         s(`.a-${payload._id}`).onclick = async (e) => {
           e.preventDefault();
+          if (options.onClick) await options.onClick({ payload });
         };
         s(`.container-${idPanel}-${id}`).onclick = async (e) => {
           e.preventDefault();
-          if (options.onClick) await options.onClick({ payload });
+          // if (options.onClick) await options.onClick({ payload });
         };
       });
       if (s(`.${idPanel}-${id}`)) s(`.${idPanel}-${id}`).remove();
@@ -540,7 +541,6 @@ const Panel = {
           background: #f6f6f6;
           color: black;
           padding: 10px;
-          cursor: pointer;
           min-height: 400px;
         }
         .${idPanel}:hover {

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

@@ -15,7 +15,7 @@ import { getSrcFromFileData } from './Input.js';
 import { imageShimmer, renderCssAttr } from './Css.js';
 import { Translate } from './Translate.js';
 import { Modal } from './Modal.js';
-import { listenQueryPathInstance, setQueryPath } from './Router.js';
+import { closeModalRouteChangeEvents, listenQueryPathInstance, renderTitle, setQueryPath } from './Router.js';
 
 const PanelForm = {
   Data: {},
@@ -425,13 +425,22 @@ const PanelForm = {
       });
     let firsUpdateEvent = false;
     let lastCid;
+    let lastUserId;
+    closeModalRouteChangeEvents[idPanel] = (newPath) => {
+      if (newPath.split('?')[0] === '/' && PanelForm.Data[idPanel].data && PanelForm.Data[idPanel].data.length === 0) {
+        this.Data[idPanel].updatePanel();
+      }
+    };
     this.Data[idPanel].updatePanel = async () => {
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
-      if (lastCid === cid) return;
+      const forceUpdate = lastUserId !== Elements.Data.user.main.model.user._id;
+      if (lastCid === cid && !forceUpdate) return;
+      lastUserId = newInstance(Elements.Data.user.main.model.user._id);
       lastCid = cid;
       if (options.route === 'home') Modal.homeCid = newInstance(cid);
       htmls(`.${options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body'}`, await renderSrrPanelData());
       await getPanelData();
+      if (this.Data[idPanel].data.length === 1) renderTitle(this.Data[idPanel].data[0].title);
       htmls(
         `.${options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body'}`,
         await panelRender({ data: this.Data[idPanel].data }),
@@ -452,6 +461,7 @@ const PanelForm = {
       if (!options.parentIdModal)
         Modal.Data['modal-menu'].onHome[idPanel] = async () => {
           lastCid = undefined;
+          lastUserId = undefined;
           setQueryPath({ path: options.route, queryPath: '' });
           await this.Data[idPanel].updatePanel();
         };

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

@@ -62,7 +62,7 @@ const Recover = {
 
     setTimeout(async () => {
       if (user && user.email) {
-        s(`.recover-email`).value = user.email;
+        s(`.recover-email`).value = user.role === 'guest' ? '' : user.email;
         if (user.emailConfirmed) s(`.recover-email`).setAttribute('disabled', '');
       }
 

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

@@ -1,16 +1,20 @@
 import { titleFormatted } from './CommonJs.js';
 import { loggerFactory } from './Logger.js';
 import { getProxyPath, getQueryParams, htmls, s, setPath } from './VanillaJs.js';
+import { Modal } from './Modal.js';
+import { Worker } from './Worker.js';
 
 // Router
 
 const logger = loggerFactory(import.meta);
 
+const renderTitle = (title, nameApp) => htmls('title', html`${title} | ${nameApp ?? Worker.RouterInstance.NameApp}`);
+
 const setDocTitle = (options = { Routes: () => {}, route: '', NameApp: '' }) => {
   const { Routes, route, NameApp } = options;
   let title = titleFormatted(Routes()[`/${route}`].title);
   if (Routes()[`/${route}`].upperCase) title = title.toUpperCase();
-  htmls('title', html`${title} | ${NameApp}`);
+  renderTitle(title, NameApp);
   {
     const routeId = route === '' ? 'home' : route;
     if (s(`.main-btn-${routeId}`)) {
@@ -75,4 +79,61 @@ const listenQueryPathInstance = ({ id, routeId, event }, queryKey = 'cid') => {
     });
 };
 
-export { Router, setDocTitle, LoadRouter, RouterEvents, setQueryPath, listenQueryPathInstance };
+const closeModalRouteChangeEvents = {};
+const triggerCloseModalRouteChangeEvents = (newPath) => {
+  console.warn('[closeModalRouteChangeEvent]', newPath);
+  for (const event of Object.keys(closeModalRouteChangeEvents)) closeModalRouteChangeEvents[event](newPath);
+};
+
+const closeModalRouteChangeEvent = (options = {}) => {
+  const { route, RouterInstance, homeCid } = options;
+  if (!route) return;
+
+  let path = window.location.pathname;
+  if (path[path.length - 1] !== '/') path = `${path}/`;
+  let newPath = `${getProxyPath()}`;
+
+  if (path !== newPath) {
+    for (const subIdModal of Object.keys(Modal.Data).reverse()) {
+      if (Modal.Data[subIdModal]?.options?.route) {
+        newPath = `${newPath}${Modal.Data[subIdModal].options.route}`;
+        triggerCloseModalRouteChangeEvents(newPath);
+        setPath(newPath);
+        Modal.setTopModalCallback(subIdModal);
+        return setDocTitle({ ...RouterInstance, route: Modal.Data[subIdModal].options.route });
+      }
+    }
+    newPath = `${newPath}${homeCid ? `?cid=${homeCid}` : ''}`;
+    triggerCloseModalRouteChangeEvents(newPath);
+    setPath(newPath);
+    return setDocTitle({ ...RouterInstance, route: '' });
+  }
+};
+
+const handleModalViewRoute = (options = {}) => {
+  const { route, RouterInstance } = options;
+  if (!route) return;
+
+  let path = window.location.pathname;
+  if (path !== '/' && path[path.length - 1] === '/') path = path.slice(0, -1);
+  const proxyPath = getProxyPath();
+  const newPath = `${proxyPath}${route}`;
+
+  if (path !== newPath) {
+    setPath(newPath);
+    setDocTitle({ ...RouterInstance, route });
+  }
+};
+
+export {
+  Router,
+  setDocTitle,
+  LoadRouter,
+  RouterEvents,
+  setQueryPath,
+  listenQueryPathInstance,
+  closeModalRouteChangeEvent,
+  handleModalViewRoute,
+  closeModalRouteChangeEvents,
+  renderTitle,
+};

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

@@ -60,10 +60,10 @@ const Translate = {
     this.Parse(language);
     if (s(`.action-btn-lang-render`)) htmls(`.action-btn-lang-render`, s('html').lang);
   },
-  RenderSetting: async function () {
+  RenderSetting: async function (id) {
     return html` <div class="in section-mp">
       ${await DropDown.Render({
-        id: 'settings-lang',
+        id: id ?? 'settings-lang',
         value: s('html').lang ? s('html').lang : 'en',
         label: html`${Translate.Render('lang')}`,
         data: ['en', 'es'].map((language) => {

package/src/index.js

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

package/src/server/client-build-docs.js

@@ -0,0 +1,205 @@
+'use strict';
+
+import fs from 'fs-extra';
+import swaggerAutoGen from 'swagger-autogen';
+import { shellExec } from './process.js';
+import { loggerFactory } from './logger.js';
+import { JSONweb } from './client-formatted.js';
+
+/**
+ * Builds API documentation using Swagger
+ * @param {Object} options - Documentation build options
+ * @param {string} options.host - The hostname for the API
+ * @param {string} options.path - The base path for the API
+ * @param {number} options.port - The port number for the API
+ * @param {Object} options.metadata - Metadata for the API documentation
+ * @param {Array<string>} options.apis - List of API modules to document
+ * @param {string} options.publicClientId - Client ID for the public documentation
+ * @param {string} options.rootClientPath - Root path for client files
+ * @param {Object} options.packageData - Package.json data
+ */
+const buildApiDocs = async ({
+  host,
+  path,
+  port,
+  metadata = {},
+  apis = [],
+  publicClientId,
+  rootClientPath,
+  packageData,
+}) => {
+  const logger = loggerFactory(import.meta);
+  const basePath = path === '/' ? `${process.env.BASE_API}` : `/${process.env.BASE_API}`;
+
+  const doc = {
+    info: {
+      version: packageData.version,
+      title: metadata?.title ? `${metadata.title}` : 'REST API',
+      description: metadata?.description ? metadata.description : '',
+    },
+    servers: [
+      {
+        url:
+          process.env.NODE_ENV === 'development'
+            ? `http://localhost:${port}${path}${basePath}`
+            : `https://${host}${path}${basePath}`,
+        description: `${process.env.NODE_ENV} server`,
+      },
+    ],
+    tags: [
+      {
+        name: 'user',
+        description: 'User API operations',
+      },
+    ],
+    components: {
+      schemas: {
+        userRequest: {
+          username: 'user123',
+          password: 'Password123',
+          email: 'user@example.com',
+        },
+        userResponse: {
+          status: 'success',
+          data: {
+            token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7Il9pZCI6IjY2YzM3N2Y1N2Y5OWU1OTY5YjgxZG...',
+            user: {
+              _id: '66c377f57f99e5969b81de89',
+              email: 'user@example.com',
+              emailConfirmed: false,
+              username: 'user123',
+              role: 'user',
+              profileImageId: '66c377f57f99e5969b81de87',
+            },
+          },
+        },
+        userUpdateResponse: {
+          status: 'success',
+          data: {
+            _id: '66c377f57f99e5969b81de89',
+            email: 'user@example.com',
+            emailConfirmed: false,
+            username: 'user123222',
+            role: 'user',
+            profileImageId: '66c377f57f99e5969b81de87',
+          },
+        },
+        userGetResponse: {
+          status: 'success',
+          data: {
+            _id: '66c377f57f99e5969b81de89',
+            email: 'user@example.com',
+            emailConfirmed: false,
+            username: 'user123222',
+            role: 'user',
+            profileImageId: '66c377f57f99e5969b81de87',
+          },
+        },
+        userLogInRequest: {
+          email: 'user@example.com',
+          password: 'Password123',
+        },
+        userBadRequestResponse: {
+          status: 'error',
+          message: 'Bad request. Please check your inputs, and try again',
+        },
+      },
+      securitySchemes: {
+        bearerAuth: {
+          type: 'http',
+          scheme: 'bearer',
+        },
+      },
+    },
+  };
+
+  logger.warn('build swagger api docs', doc.info);
+
+  const outputFile = `./public/${host}${path === '/' ? path : `${path}/`}swagger-output.json`;
+  const routes = [];
+  for (const api of apis) {
+    if (['user'].includes(api)) routes.push(`./src/api/${api}/${api}.router.js`);
+  }
+
+  await swaggerAutoGen({ openapi: '3.0.0' })(outputFile, routes, doc);
+};
+
+/**
+ * Builds JSDoc documentation
+ * @param {Object} options - JSDoc build options
+ * @param {string} options.host - The hostname for the documentation
+ * @param {string} options.path - The base path for the documentation
+ * @param {Object} options.metadata - Metadata for the documentation
+ */
+const buildJsDocs = async ({ host, path, metadata = {} }) => {
+  const logger = loggerFactory(import.meta);
+  const jsDocsConfig = JSON.parse(fs.readFileSync(`./jsdoc.json`, 'utf8'));
+
+  jsDocsConfig.opts.destination = `./public/${host}${path === '/' ? path : `${path}/`}docs/`;
+  jsDocsConfig.opts.theme_opts.title = metadata?.title ? metadata.title : undefined;
+  jsDocsConfig.opts.theme_opts.favicon = `./public/${host}${path === '/' ? path : `${path}/favicon.ico`}`;
+
+  fs.writeFileSync(`./jsdoc.json`, JSON.stringify(jsDocsConfig, null, 4), 'utf8');
+  logger.warn('build jsdoc view', jsDocsConfig.opts.destination);
+
+  shellExec(`npm run docs`, { silent: true });
+};
+
+/**
+ * Builds test coverage documentation
+ * @param {Object} options - Coverage build options
+ * @param {string} options.host - The hostname for the coverage
+ * @param {string} options.path - The base path for the coverage
+ */
+const buildCoverage = async ({ host, path }) => {
+  const logger = loggerFactory(import.meta);
+  const jsDocsConfig = JSON.parse(fs.readFileSync(`./jsdoc.json`, 'utf8'));
+
+  if (!fs.existsSync(`./coverage`)) {
+    shellExec(`npm test`);
+  }
+
+  const coverageBuildPath = `${jsDocsConfig.opts.destination}/coverage`;
+  fs.mkdirSync(coverageBuildPath, { recursive: true });
+  fs.copySync(`./coverage`, coverageBuildPath);
+
+  logger.warn('build coverage', coverageBuildPath);
+};
+
+/**
+ * Main function to build all documentation
+ * @param {Object} options - Documentation build options
+ * @param {string} options.host - The hostname
+ * @param {string} options.path - The base path
+ * @param {number} options.port - The port number
+ * @param {Object} options.metadata - Metadata for the documentation
+ * @param {Array<string>} options.apis - List of API modules to document
+ * @param {string} options.publicClientId - Client ID for the public documentation
+ * @param {string} options.rootClientPath - Root path for client files
+ * @param {Object} options.packageData - Package.json data
+ */
+const buildDocs = async ({
+  host,
+  path,
+  port,
+  metadata = {},
+  apis = [],
+  publicClientId,
+  rootClientPath,
+  packageData,
+}) => {
+  await buildJsDocs({ host, path, metadata });
+  await buildCoverage({ host, path });
+  await buildApiDocs({
+    host,
+    path,
+    port,
+    metadata,
+    apis,
+    publicClientId,
+    rootClientPath,
+    packageData,
+  });
+};
+
+export { buildDocs };

package/src/server/client-build.js

@@ -17,11 +17,11 @@ import dotenv from 'dotenv';
 import AdmZip from 'adm-zip';
 import * as dir from 'path';
 import { shellExec } from './process.js';
-import swaggerAutoGen from 'swagger-autogen';
 import { SitemapStream, streamToPromise } from 'sitemap';
 import { Readable } from 'stream';
 import { buildIcons, buildTextImg, getBufferPngText } from './client-icons.js';
 import Underpost from '../index.js';
+import { buildDocs } from './client-build-docs.js';
 
 dotenv.config();
 
@@ -557,145 +557,16 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
       }
 
       if (!enableLiveRebuild && !process.argv.includes('l') && !process.argv.includes('deploy') && docsBuild) {
-        // https://www.pullrequest.com/blog/leveraging-jsdoc-for-better-code-documentation-in-javascript/
-        // https://jsdoc.app/about-configuring-jsdoc
-        // https://jsdoc.app/ Block tags
-
-        const jsDocsConfig = JSON.parse(fs.readFileSync(`./jsdoc.json`, 'utf8'));
-        jsDocsConfig.opts.destination = `./public/${host}${path === '/' ? path : `${path}/`}docs/`;
-        jsDocsConfig.opts.theme_opts.title = metadata && metadata.title ? metadata.title : undefined;
-        jsDocsConfig.opts.theme_opts.favicon = `./public/${host}${path === '/' ? path : `${path}/favicon.ico`}`;
-        fs.writeFileSync(`./jsdoc.json`, JSON.stringify(jsDocsConfig, null, 4), 'utf8');
-        logger.warn('build jsdoc view', jsDocsConfig.opts.destination);
-        shellExec(`npm run docs`, { silent: true });
-
-        // coverage
-        if (!fs.existsSync(`./coverage`)) {
-          shellExec(`npm test`);
-        }
-        const coverageBuildPath = `${jsDocsConfig.opts.destination}/coverage`;
-        fs.mkdirSync(coverageBuildPath, { recursive: true });
-        fs.copySync(`./coverage`, coverageBuildPath);
-
-        // uml
-        // shellExec(`node bin/deploy uml ${host} ${path}`);
-
-        // https://swagger-autogen.github.io/docs/
-
-        const basePath = path === '/' ? `${process.env.BASE_API}` : `/${process.env.BASE_API}`;
-
-        const doc = {
-          info: {
-            version: packageData.version, // by default: '1.0.0'
-            title: metadata?.title ? `${metadata.title}` : 'REST API', // by default: 'REST API'
-            description: metadata?.description ? metadata.description : '', // by default: ''
-          },
-          servers: [
-            {
-              url:
-                process.env.NODE_ENV === 'development'
-                  ? `http://localhost:${port}${path}${basePath}`
-                  : `https://${host}${path}${basePath}`, // by default: 'http://localhost:3000'
-              description: `${process.env.NODE_ENV} server`, // by default: ''
-            },
-          ],
-          tags: [
-            // by default: empty Array
-            {
-              name: 'user', // Tag name
-              description: 'User API operations', // Tag description
-            },
-          ],
-          components: {
-            schemas: {
-              userRequest: {
-                username: 'user123',
-                password: 'Password123',
-                email: 'user@example.com',
-              },
-              userResponse: {
-                status: 'success',
-                data: {
-                  token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7Il9pZCI6IjY2YzM3N2Y1N2Y5OWU1OTY5YjgxZG...',
-                  user: {
-                    _id: '66c377f57f99e5969b81de89',
-                    email: 'user@example.com',
-                    emailConfirmed: false,
-                    username: 'user123',
-                    role: 'user',
-                    profileImageId: '66c377f57f99e5969b81de87',
-                  },
-                },
-              },
-              userUpdateResponse: {
-                status: 'success',
-                data: {
-                  _id: '66c377f57f99e5969b81de89',
-                  email: 'user@example.com',
-                  emailConfirmed: false,
-                  username: 'user123222',
-                  role: 'user',
-                  profileImageId: '66c377f57f99e5969b81de87',
-                },
-              },
-              userGetResponse: {
-                status: 'success',
-                data: {
-                  _id: '66c377f57f99e5969b81de89',
-                  email: 'user@example.com',
-                  emailConfirmed: false,
-                  username: 'user123222',
-                  role: 'user',
-                  profileImageId: '66c377f57f99e5969b81de87',
-                },
-              },
-              userLogInRequest: {
-                email: 'user@example.com',
-                password: 'Password123',
-              },
-              userBadRequestResponse: {
-                status: 'error',
-                message: 'Bad request. Please check your inputs, and try again',
-              },
-            },
-            securitySchemes: {
-              bearerAuth: {
-                type: 'http',
-                scheme: 'bearer',
-              },
-            },
-          },
-        };
-
-        // plantuml
-        logger.info('copy plantuml', `${rootClientPath}/docs/plantuml`);
-        fs.copySync(`./src/client/public/default/plantuml`, `${rootClientPath}/docs/plantuml`);
-
-        logger.warn('build swagger api docs', doc.info);
-
-        const outputFile = `./public/${host}${path === '/' ? path : `${path}/`}swagger-output.json`;
-        const routes = [];
-        for (const api of apis) {
-          if (['user'].includes(api)) routes.push(`./src/api/${api}/${api}.router.js`);
-        }
-
-        /* NOTE: If you are using the express Router, you must pass in the 'routes' only the 
-root file where the route starts, such as index.js, app.js, routes.js, etc ... */
-
-        await swaggerAutoGen({ openapi: '3.0.0' })(outputFile, routes, doc);
-
-        const htmlFiles = await fs.readdir(`./public/${host}/docs/engine/${Underpost.version.replace('v', '')}`);
-        for (const htmlFile of htmlFiles) {
-          if (htmlFile.match('.html')) {
-            fs.writeFileSync(
-              `./public/${host}/docs/engine/${Underpost.version.replace('v', '')}/${htmlFile}`,
-              fs
-                .readFileSync(`./public/${host}/docs/engine/${Underpost.version.replace('v', '')}/${htmlFile}`, 'utf8')
-                .replaceAll('Tutorials', 'References'),
-              'utf8',
-            );
-          }
-        }
+        await buildDocs({
+          host,
+          path,
+          port,
+          metadata,
+          apis,
+          publicClientId,
+          rootClientPath,
+          packageData,
+        });
       }
 
       if (client) {