@uxland/primary-shell 5.7.1 → 6.0.1

package/dist/{primary/shell/src/internal-plugins → internal-plugins}/activity-history/infrastructure/base-handlers.d.ts

@@ -1,5 +1,5 @@
 import { Store } from '@reduxjs/toolkit';
-import { PrimariaApi } from '../../..';
+import { PrimariaApi } from '@uxland/primary-shell';
 
 export declare class StoreBaseHandler {
     protected readonly store: Store;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.7.1",
+  "version": "6.0.1",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/UI/shared-components/primaria-text-editor/primaria-rich-text-editor.ts

@@ -8,6 +8,8 @@ import { fixSpellCheckerIssue } from "./utils";
 fixSpellCheckerIssue(Quill);
 
 export class PrimariaRichTextEditor extends LitElement {
+  private textChangeTimeout: number | null = null;
+
   render() {
     return html` ${template(this)} `;
   }
@@ -20,31 +22,26 @@ export class PrimariaRichTextEditor extends LitElement {
     // const rte: PrimariaRichTextEditor = this;
     this.quill = new Quill(this.shadowRoot?.querySelector("#rte"), this._getOptions());
 
-    this.quill.on("text-change", () => this._emitTextChangeEvent());
+    this.quill.on("text-change", () => this._debouncedEmitTextChangeEvent());
 
     this.quill.root.addEventListener("paste", () => {
-      this._emitTextChangeEvent();
-    });
-
-    this.quill.on("text-change", (delta, oldDelta, source) => {
-      const plainValue = this.quill.getText();
-      const values = {
-        html: (<any>this).shadowRoot.querySelector(".ql-editor").innerHTML,
-        plain: plainValue,
-      };
-
-      const textChanged = new CustomEvent("text-changed", {
-        composed: true,
-        detail: values,
-      });
-      (<any>this).dispatchEvent(textChanged);
-      this.range = this.getCursorPosition();
+      this._debouncedEmitTextChangeEvent();
     });
     this.quill.on("selection-change", (range, oldRange, source) => {
       if (range) this.range = range;
     });
   }
 
+  _debouncedEmitTextChangeEvent() {
+    if (this.textChangeTimeout) {
+      clearTimeout(this.textChangeTimeout);
+    }
+
+    this.textChangeTimeout = window.setTimeout(() => {
+      this._emitTextChangeEvent();
+    }, 200);
+  }
+
   _emitTextChangeEvent() {
     const plainValue = this.quill.getText();
     const values = {
@@ -150,8 +147,7 @@ export class PrimariaRichTextEditor extends LitElement {
     } else {
       toolbarOptions = this.options.split(",");
       toolbarOptions.forEach((option) => {
-        if (availableOpts.indexOf(option) <= -1)
-          toolbarOptions.splice(toolbarOptions.indexOf(option), 1);
+        if (availableOpts.indexOf(option) <= -1) toolbarOptions.splice(toolbarOptions.indexOf(option), 1);
       });
       toolbarOptions = toolbarOptions.map(function (option) {
         if (option == "color") return { color: [] };

package/src/api/interaction-service/interaction-service-impl.tsx

@@ -1,8 +1,7 @@
 import {
-  ConfirmationContentProps,
   ConfirmationOptions,
   ConfirmationResult,
-  ConfirmationWithResultContentProps,
+  ConfirmComponentUI,
   PrimariaInteractionService,
 } from "./interaction-service";
 import * as React from "react";
@@ -25,23 +24,23 @@ const defaultOptions: ConfirmationOptions = {
 export class ParimariaInteractionServiceImpl extends PrimariaInteractionService {
   confirm<TData = undefined, TResult = undefined>(
     data: TData | undefined,
-    DialogComponent:
-      | React.ComponentType<ConfirmationContentProps<TData, TResult> | ConfirmationWithResultContentProps<TData, TResult>>
-      | (new () => HTMLElement),
-    options?: ConfirmationOptions | undefined,
-    styles?: any
+    componentUI: ConfirmComponentUI<TData, TResult>,
+    options?: ConfirmationOptions | undefined
   ): Promise<ConfirmationResult<TResult | undefined>> {
     const finalOptions: ConfirmationOptions = { ...defaultOptions, ...(options || {}) };
     return new Promise((resolve) => {
       const div = document.createElement("div");
       document.body.appendChild(div);
-      const wrapperStyles = document.createElement("style");
-      wrapperStyles.textContent = modalStyles;
-      document.head.appendChild(wrapperStyles);
-      if(styles) {
-        const style = document.createElement("style");
-        style.textContent = styles;
-        document.head.appendChild(style);
+      const wrapperHeadStyles = document.createElement("style");
+      wrapperHeadStyles.textContent = modalStyles;
+      document.head.appendChild(wrapperHeadStyles);
+      const DialogComponent = componentUI.component;
+      const DialogComponentStyles = componentUI.styles;
+      let componentHeadStyles;
+      if(DialogComponentStyles) {
+        componentHeadStyles = document.createElement("style");
+        componentHeadStyles.textContent = componentUI?.styles;
+        document.head.appendChild(componentHeadStyles);
       }
 
       const DialogWrapper = () => {
@@ -111,7 +110,9 @@ export class ParimariaInteractionServiceImpl extends PrimariaInteractionService
             };
             resolve(confirmationResult);
             document.body.removeChild(div);
-            document.head.removeChild(style);
+            document.head.removeChild(wrapperHeadStyles);
+            if (DialogComponentStyles)
+              document.head.removeChild(componentHeadStyles);
             window.removeEventListener('keydown', handleKeydown);
           }, 300);
         };
@@ -203,6 +204,6 @@ export class ParimariaInteractionServiceImpl extends PrimariaInteractionService
     message: string,
     options?: ConfirmationOptions | undefined,
   ): Promise<ConfirmationResult> {
-    return this.confirm(message, ConfirmationMessage, options);
+    return this.confirm(message, {component: ConfirmationMessage}, options);
   }
 }

package/src/api/interaction-service/interaction-service.ts

@@ -31,12 +31,16 @@ export interface ConfirmationOptions {
   state?: "success" | "info" | "alert" | "error";
 }
 
+export interface ConfirmComponentUI<TData = undefined, TResult = undefined> {
+  component: | React.ComponentType<ConfirmationContentProps<TData, TResult> | ConfirmationWithResultContentProps<TData, TResult>>
+  | (new () => HTMLElement);
+  styles?: string;
+}
+
 export abstract class PrimariaInteractionService {
   abstract confirm<TData = undefined, TResult = undefined>(
     data: TData | undefined,
-    dialogComponent:
-      | React.ComponentType<ConfirmationContentProps<TData, TResult> | ConfirmationWithResultContentProps<TData, TResult>>
-      | (new () => HTMLElement),
+    componentUI: ConfirmComponentUI<TData, TResult>,
     options?: ConfirmationOptions | undefined,
   ): Promise<ConfirmationResult<TResult | undefined>>;
   abstract confirmMessage(

package/src/features/exit/handler.test.ts

@@ -74,12 +74,16 @@ describe("ExitShellHandler", () => {
 
     await handler.handle(message);
 
-    expect(mockApi.interactionService.confirm).toHaveBeenCalledWith({ busyTasks }, PluginBusyList, {
-      title: expect.any(String),
-      state: "error",
-      confirmButtonText: "Sí",
-      cancelButtonText: "No",
-    });
+    expect(mockApi.interactionService.confirm).toHaveBeenCalledWith(
+      { busyTasks },
+      { component: PluginBusyList },
+      {
+        title: "actions.askExit",
+        state: "error",
+        confirmButtonText: "Sí",
+        cancelButtonText: "No",
+      },
+    );
     expect(disposePlugins).toHaveBeenCalled();
     expect(disposeShell).toHaveBeenCalled();
     expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
@@ -126,17 +130,17 @@ describe("ExitShellHandler", () => {
     expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
   });
 
-  it("should proceed if disposePlugins takes longer than 5 seconds", async () => {
+  it("should proceed if disposePlugins takes longer than 10 seconds", async () => {
     const message = { ecapEvent: {} } as ExitShell;
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
-    (disposePlugins as any).mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 6000)));
+    (disposePlugins as any).mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 11000)));
 
     await handler.handle(message);
 
     expect(disposePlugins).toHaveBeenCalled();
     expect(disposeShell).toHaveBeenCalled();
     expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
-  });
+  }, 15000);
 
   it("should raise raiseCloseEvent if no exitEvent is passed", async () => {
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);

package/src/features/exit/handler.ts

@@ -23,7 +23,7 @@ export class ExitShellHandler {
       // Per si un plugin tarda molt en fer dispose, màxim deixarem 5 segons, per no interrompre el tancar infinitament
       await Promise.race([
         disposePlugins(), // S'intenta executar un dispose normal
-        this.timeout(5000), // Si passen 5s, es segueix amb l'execució
+        this.timeout(10000), // Si passen 5s, es segueix amb l'execució
       ]);
       disposeShell();
       this.emitClose(evt);
@@ -34,7 +34,7 @@ export class ExitShellHandler {
   }
 
   private askForClose(busyTasks: PluginBusyTask[]) {
-    return this.api.interactionService.confirm({ busyTasks }, PluginBusyList, {
+    return this.api.interactionService.confirm({ busyTasks }, {component: PluginBusyList}, {
       title: translate("actions.askExit"),
       state: "error",
       confirmButtonText: "Sí",

package/src/internal-plugins/activity-history/activity-history-item/export-to-pdf/handler.ts

@@ -5,7 +5,7 @@ import { ExportPdfModal } from "./export-pdf-modal/export-pdf-modal";
 export class ExportToPdfHandler extends ApiBaseHandler {
   async handle() {
     try {
-      this.api.interactionService.confirm(undefined, ExportPdfModal, {
+      this.api.interactionService.confirm(undefined, {component: ExportPdfModal}, {
         title: translate("modal.selectExportOption"),
         confirmButtonText: "Exportar",
         cancelButtonText: "Cancelar",

package/src/internal-plugins/activity-history/activity-history-item/list/UI/main-view/styles.css

@@ -122,6 +122,8 @@
         width: 100%;
         background: var(--color-neutral-50);
         border-top-right-radius: var(--dss-radius-sm);
+        display: flex;
+        flex-direction: column;
       }
     }
     
@@ -130,7 +132,8 @@
       background: var(--color-neutral-50);
       border-bottom-right-radius: var(--dss-radius-sm);
       overflow: hidden; 
-      
+      display: flex;
+      flex-direction: column;
     }
   }
 }

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/styles.css

@@ -1,6 +1,8 @@
 :host {
   min-height: 1px;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0%;
 }
 
 .virtualizer {

package/dist/primary/shell/src/api/interaction-service/interaction-service-impl.d.ts

@@ -1,7 +0,0 @@
-import { ConfirmationContentProps, ConfirmationOptions, ConfirmationResult, ConfirmationWithResultContentProps, PrimariaInteractionService } from './interaction-service';
-
-import * as React from "react";
-export declare class ParimariaInteractionServiceImpl extends PrimariaInteractionService {
-    confirm<TData = undefined, TResult = undefined>(data: TData | undefined, DialogComponent: React.ComponentType<ConfirmationContentProps<TData, TResult> | ConfirmationWithResultContentProps<TData, TResult>> | (new () => HTMLElement), options?: ConfirmationOptions | undefined, styles?: any): Promise<ConfirmationResult<TResult | undefined>>;
-    confirmMessage(message: string, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult>;
-}

package/dist/primary/shell/src/index.d.ts

@@ -1,15 +0,0 @@
-
-export * from './bootstrapper';
-export * from './disposer';
-export * from './api/region-manager/regions';
-export * from './handle-plugins';
-export * from './api/api';
-export * from './api/broker/primaria-broker';
-export * from './UI/index';
-export { PrimariaNavItem } from './UI/shared-components/primaria-nav-item/primaria-nav-item';
-export { EcapEventManager, createEcapEventManager, } from './api/ecap-event-manager/ecap-event-manager';
-export type { IEcapEvent } from './api/ecap-event-manager/typings';
-export * from './internal-plugins';
-export * from '@uxland/harmonix-adapters';
-export * from './events';
-export * from './api/interaction-service';