underpost 2.8.871 → 2.8.872

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

@@ -7,9 +7,9 @@ import { Modal } from './Modal.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Panel } from './Panel.js';
 import { Responsive } from './Responsive.js';
-import { listenQueryPathInstance, RouterEvents, setQueryPath } from './Router.js';
+import { listenQueryPathInstance, RouterEvents, setQueryPath, getQueryParams } from './Router.js';
 import { Translate } from './Translate.js';
-import { append, getQueryParams, getTimeZone, htmls, s, sa } from './VanillaJs.js';
+import { append, getTimeZone, htmls, s, sa } from './VanillaJs.js';
 
 // https://fullcalendar.io/docs/event-object
 
@@ -346,7 +346,7 @@ const CalendarCore = {
                   status,
                 });
 
-                setQueryPath({ path: options.route, queryPath: '', replace: true });
+                setQueryPath({ path: options.route, queryPath: '' });
                 await CalendarCore.Data[options.idModal].updatePanel();
 
                 return { status };
@@ -363,7 +363,6 @@ const CalendarCore = {
       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())
         // else getSrrData();

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

@@ -577,8 +577,7 @@ const getCurrentTrace = () => {
   try {
     _stack;
   } catch (error) {
-    console.error(error);
-    return error;
+    return error.stack;
   }
 };
 

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

@@ -1,6 +1,6 @@
 import { marked } from 'marked';
 import { FileService } from '../../services/file/file.service.js';
-import { append, getBlobFromUint8ArrayFile, getQueryParams, getRawContentFile, htmls, s } from './VanillaJs.js';
+import { append, getBlobFromUint8ArrayFile, getRawContentFile, htmls, s } from './VanillaJs.js';
 import { titleFormatted } from './CommonJs.js';
 import { Translate } from './Translate.js';
 import { Modal, renderViewTitle } from './Modal.js';
@@ -8,6 +8,7 @@ import { DocumentService } from '../../services/document/document.service.js';
 import { CoreService, getApiBaseUrl } from '../../services/core/core.service.js';
 import { loggerFactory } from './Logger.js';
 import { imageShimmer, renderChessPattern, renderCssAttr, styleFactory } from './Css.js';
+import { getQueryParams } from './Router.js';
 
 const logger = loggerFactory(import.meta);
 

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

@@ -3,7 +3,8 @@ import { CssCoreDark, CssCoreLight } from './CssCore.js';
 import { DropDown } from './DropDown.js';
 import { Modal } from './Modal.js';
 import { Translate } from './Translate.js';
-import { append, getProxyPath, htmls, s, sa } from './VanillaJs.js';
+import { append, htmls, s, sa } from './VanillaJs.js';
+import { getProxyPath } from './Router.js';
 
 let ThemesScope = [];
 

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

@@ -1,7 +1,8 @@
 import { AgGrid } from './AgGrid.js';
 import { borderChar, boxShadow, scrollBarDarkRender, scrollBarLightRender } from './Css.js';
 import { LoadingAnimation } from './LoadingAnimation.js';
-import { append, getProxyPath, s } from './VanillaJs.js';
+import { append, s } from './VanillaJs.js';
+import { getProxyPath } from './Router.js';
 
 const CssCommonCore = async () => {
   if (!s(`.fa-link`))

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

@@ -1,12 +1,11 @@
 import { Badge } from './Badge.js';
 import { BtnIcon } from './BtnIcon.js';
-import { rgbToHex } from './CommonJs.js';
-import { Css, darkTheme, dynamicCol, renderCssAttr, simpleIconsRender, ThemeEvents, Themes } from './Css.js';
+import { Css, renderCssAttr, simpleIconsRender, ThemeEvents, Themes } from './Css.js';
 import { DropDown } from './DropDown.js';
 import { buildBadgeToolTipMenuOption, Modal, renderMenuLabel, renderViewTitle } from './Modal.js';
-import { listenQueryPathInstance, setQueryPath, closeModalRouteChangeEvent } from './Router.js';
+import { listenQueryPathInstance, setQueryPath, closeModalRouteChangeEvent, getProxyPath } from './Router.js';
 import { Translate } from './Translate.js';
-import { getProxyPath, getQueryParams, htmls, s, sa } from './VanillaJs.js';
+import { htmls, s } from './VanillaJs.js';
 import Sortable from 'sortablejs';
 
 // https://mintlify.com/docs/quickstart
@@ -34,6 +33,7 @@ const Docs = {
       },
       maximize: true,
       mode: 'view',
+      route: 'docs',
       slideMenu: 'modal-menu',
       observer: true,
       barMode: 'top-bottom-bar',

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

@@ -4,8 +4,7 @@ import { FileService } from '../../services/file/file.service.js';
 import { AgGrid } from './AgGrid.js';
 import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
-import { getSubpaths, timer, uniqueArray } from './CommonJs.js';
-import { Content } from './Content.js';
+import { getSubpaths, uniqueArray } from './CommonJs.js';
 import { darkTheme, renderCssAttr } from './Css.js';
 import { EventsUI } from './EventsUI.js';
 import { fileFormDataFactory, Input, InputFile } from './Input.js';
@@ -15,7 +14,8 @@ import { NotificationManager } from './NotificationManager.js';
 import { RouterEvents } from './Router.js';
 import { Translate } from './Translate.js';
 import { Validator } from './Validator.js';
-import { copyData, downloadFile, getProxyPath, getQueryParams, s, setPath } from './VanillaJs.js';
+import { copyData, downloadFile, s } from './VanillaJs.js';
+import { getProxyPath, getQueryParams, setPath } from './Router.js';
 
 const logger = loggerFactory(import.meta);
 

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

@@ -1,7 +1,7 @@
 import JoystickController from 'joystick-controller';
 import { getDirection, getId } from './CommonJs.js';
-import { loggerFactory } from './Logger.js';
-import { append, getProxyPath, s } from './VanillaJs.js';
+import { append, s } from './VanillaJs.js';
+import { getProxyPath } from './Router.js';
 
 const logger = loggerFactory(import.meta);
 

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

@@ -1,9 +1,9 @@
-import { CoreService } from '../../services/core/core.service.js';
 import { BtnIcon } from './BtnIcon.js';
 import { s4 } from './CommonJs.js';
 import { darkTheme, renderCssAttr, subThemeManager } from './Css.js';
 import { loggerFactory } from './Logger.js';
-import { append, getAllChildNodes, getProxyPath, htmls, s, sa } from './VanillaJs.js';
+import { append, htmls, s } from './VanillaJs.js';
+import { getProxyPath } from './Router.js';
 
 const logger = loggerFactory(import.meta);
 

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

@@ -1,4 +1,6 @@
-const loggerFactory = (meta) => {
+import { getCurrentTrace } from './CommonJs.js';
+
+const loggerFactory = (meta, options = { trace: false }) => {
   meta = meta.url.split('/').pop();
   const types = ['error', 'warn', 'info', 'debug'];
   const logger = {
@@ -9,6 +11,7 @@ const loggerFactory = (meta) => {
         console.info = () => null;
         console.warn = () => null;
       }
+      if (options.trace === true) args.push(getCurrentTrace().split('Logger.js:23')[1]);
       return location.hostname === 'localhost'
         ? console[type](`[${meta}] ${new Date().toISOString()} ${type}:`, ...args)
         : null;

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

@@ -1,16 +1,6 @@
-import { cap, getId, newInstance } from './CommonJs.js';
+import { getId, newInstance } from './CommonJs.js';
 import { Draggable } from '@neodrag/vanilla';
-import {
-  append,
-  s,
-  prepend,
-  setPath,
-  getProxyPath,
-  htmls,
-  sa,
-  getAllChildNodes,
-  isActiveElement,
-} from './VanillaJs.js';
+import { append, s, prepend, htmls, sa, getAllChildNodes, isActiveElement } from './VanillaJs.js';
 import { BtnIcon } from './BtnIcon.js';
 import { Responsive } from './Responsive.js';
 import { loggerFactory } from './Logger.js';
@@ -24,12 +14,18 @@ import {
   renderStatus,
   renderCssAttr,
 } from './Css.js';
-import { setDocTitle, closeModalRouteChangeEvent, handleModalViewRoute } from './Router.js';
+import {
+  setDocTitle,
+  closeModalRouteChangeEvent,
+  handleModalViewRoute,
+  getProxyPath,
+  setPath,
+  coreUI,
+} from './Router.js';
 import { NotificationManager } from './NotificationManager.js';
 import { EventsUI } from './EventsUI.js';
 import { Translate } from './Translate.js';
 import { Input, isTextInputFocused } from './Input.js';
-import { Validator } from './Validator.js';
 import { DropDown } from './DropDown.js';
 import { Keyboard } from './Keyboard.js';
 import { Badge } from './Badge.js';
@@ -186,9 +182,7 @@ const Modal = {
                     htmls(
                       `.default-slide-menu-top-bar-fix-title-container`,
                       html`
-                        <div class="inl default-slide-menu-top-bar-fix-title-container-text">
-                          ${options.RouterInstance.BannerAppTemplate}
-                        </div>
+                        <div class="inl default-slide-menu-top-bar-fix-title-container-text">${options.title}</div>
                       `,
                     );
                   } else
@@ -274,6 +268,7 @@ const Modal = {
               s(`.btn-menu-${idModal}`).classList.remove('hide');
               s(`.${idModal}`).style.width = `${this.Data[idModal][options.mode].width}px`;
               s(`.html-${idModal}`).style.display = 'none';
+              // s(`.title-modal-${idModal}`).style.display = 'none';
               setTimeout(() => {
                 s(`.main-body-btn-ui-menu-close`).classList.add('hide');
                 s(`.main-body-btn-ui-menu-menu`).classList.remove('hide');
@@ -281,9 +276,6 @@ const Modal = {
                   s(`.btn-bar-center-icon-menu`).classList.remove('hide');
                   s(`.btn-bar-center-icon-close`).classList.add('hide');
                 }
-              });
-              // s(`.title-modal-${idModal}`).style.display = 'none';
-              setTimeout(() => {
                 s(`.main-body-btn-container`).style[
                   true || (options.mode && options.mode.match('right')) ? 'right' : 'left'
                 ] = `${0}px`;
@@ -787,8 +779,7 @@ const Modal = {
                     dragDisabled: true,
                     maximize: true,
                     heightBottomBar: 0,
-                    heightTopBar: originHeightTopBar,
-                    barMode: options.barMode,
+                    heightTopBar: options.heightTopBar,
                   });
 
                   // Bind hover/focus and click-outside to dismiss
@@ -1755,9 +1746,8 @@ const Modal = {
         if (!s(`.${idModal}`)) return;
         this.removeModal(idModal);
         // Handle modal route change
-        if (options.route || options.query) {
-          closeModalRouteChangeEvent({ closedId: idModal, homeCid: Modal.homeCid });
-        }
+        closeModalRouteChangeEvent({ closedId: idModal });
+        // history.back();
       }, 300);
     };
     s(`.btn-close-${idModal}`).onclick = btnCloseEvent;
@@ -1957,7 +1947,7 @@ const Modal = {
       const modal = Modal.Data[idModal];
       if (!modal) return false;
       // Don't close the core UI elements
-      const coreUI = ['modal-menu', 'main-body', 'main-body-top', 'bottom-bar', 'board-notification'];
+
       if (coreUI.find((id) => idModal.startsWith(id))) {
         return false;
       }
@@ -1970,7 +1960,7 @@ const Modal = {
     });
 
     // 2. Navigate to home first, creating a new history entry.
-    setPath(getProxyPath());
+    setPath(`${getProxyPath()}${location.search ?? ''}${location.hash ?? ''}`);
     setDocTitle();
 
     // 3. Close the modals without them affecting the URL.

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

@@ -4,7 +4,8 @@ import { borderChar, dynamicCol } from './Css.js';
 import { DropDown } from './DropDown.js';
 import { EventsUI } from './EventsUI.js';
 import { Translate } from './Translate.js';
-import { getProxyPath, s, append, hexToRgbA } from './VanillaJs.js';
+import { s, append, hexToRgbA } from './VanillaJs.js';
+import { getProxyPath } from './Router.js';
 import { s4 } from './CommonJs.js';
 import { Input } from './Input.js';
 import { ToggleSwitch } from './ToggleSwitch.js';

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

@@ -0,0 +1,14 @@
+const Pagination = {
+  Render: async ({ id }) => {
+    return html`
+      <style>
+        .pagination-container-${id} {
+        }
+      </style>
+
+      <div class="in pagination-container-${id}">test pagination</div>
+    `;
+  },
+};
+
+export { Pagination };

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

@@ -2,17 +2,14 @@ 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';
-import { Responsive } from '../core/Responsive.js';
 import { darkTheme, ThemeEvents } from './Css.js';
-import { append, getDataFromInputFile, getQueryParams, htmls, prepend, s } from './VanillaJs.js';
+import { append, getDataFromInputFile, htmls, s } from './VanillaJs.js';
 import { BtnIcon } from './BtnIcon.js';
 import { Translate } from './Translate.js';
 import { DropDown } from './DropDown.js';
-import { dynamicCol, renderCssAttr } from './Css.js';
+import { dynamicCol } from './Css.js';
 import { EventsUI } from './EventsUI.js';
 import { ToggleSwitch } from './ToggleSwitch.js';
-import { Modal } from './Modal.js';
-import { RouterEvents, setQueryPath } from './Router.js';
 import { RichText } from './RichText.js';
 import { loggerFactory } from './Logger.js';
 import { Badge } from './Badge.js';
@@ -470,12 +467,7 @@ const Panel = {
             s(`.${btnSelector}`).classList.remove('hide');
           }
         }
-        setTimeout(() => {
-          s(`.${idPanel}-form-body`).classList.add('hide');
-        });
-        if (options.route && getQueryParams().cid) {
-          setQueryPath({ path: options.route, queryPath: '', replace: true });
-        }
+        s(`.${idPanel}-form-body`).classList.add('hide');
       };
       s(`.btn-${idPanel}-add`).onclick = (e) => {
         e.preventDefault();

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

@@ -1,12 +1,6 @@
 import { getCapVariableName, newInstance, random, range, uniqueArray } from './CommonJs.js';
 import { marked } from 'marked';
-import {
-  getBlobFromUint8ArrayFile,
-  getDataFromInputFile,
-  getQueryParams,
-  getRawContentFile,
-  htmls,
-} from './VanillaJs.js';
+import { getBlobFromUint8ArrayFile, getDataFromInputFile, getRawContentFile, htmls } from './VanillaJs.js';
 import { Panel } from './Panel.js';
 import { NotificationManager } from './NotificationManager.js';
 import { DocumentService } from '../../services/document/document.service.js';
@@ -15,7 +9,7 @@ import { getSrcFromFileData } from './Input.js';
 import { imageShimmer, renderCssAttr } from './Css.js';
 import { Translate } from './Translate.js';
 import { Modal } from './Modal.js';
-import { closeModalRouteChangeEvents, listenQueryPathInstance, setQueryPath } from './Router.js';
+import { closeModalRouteChangeEvents, listenQueryPathInstance, setQueryPath, getQueryParams } from './Router.js';
 
 const PanelForm = {
   Data: {},
@@ -170,7 +164,7 @@ const PanelForm = {
                 status,
               });
               if (getQueryParams().cid === data.id) {
-                setQueryPath({ path: options.route, queryPath: '', replace: true });
+                setQueryPath({ path: options.route, queryPath: '' });
                 if (PanelForm.Data[idPanel].updatePanel) await PanelForm.Data[idPanel].updatePanel();
               }
 
@@ -426,10 +420,8 @@ 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();
-      }
+    closeModalRouteChangeEvents[idPanel] = () => {
+      this.Data[idPanel].updatePanel();
     };
     this.Data[idPanel].updatePanel = async () => {
       const cid = getQueryParams().cid ? getQueryParams().cid : '';
@@ -437,7 +429,6 @@ const PanelForm = {
       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();
       htmls(
@@ -461,7 +452,7 @@ const PanelForm = {
         Modal.Data['modal-menu'].onHome[idPanel] = async () => {
           lastCid = undefined;
           lastUserId = undefined;
-          setQueryPath({ path: options.route, queryPath: '' });
+          setQueryPath({ path: options.route, queryPath: options.route === 'home' ? '?' : '' });
           await this.Data[idPanel].updatePanel();
         };
     }

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

@@ -3,11 +3,11 @@ import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { EventsUI } from './EventsUI.js';
 import { Input } from './Input.js';
-import { LogIn } from './LogIn.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Translate } from './Translate.js';
 import { Validator } from './Validator.js';
-import { getProxyPath, getQueryParams, s } from './VanillaJs.js';
+import { s } from './VanillaJs.js';
+import { getProxyPath, getQueryParams } from './Router.js';
 
 const Recover = {
   Event: {},