@uxland/primary-shell 5.7.1 → 6.0.0

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

@@ -1,7 +1,6 @@
-import { ConfirmationContentProps, ConfirmationOptions, ConfirmationResult, ConfirmationWithResultContentProps, PrimariaInteractionService } from './interaction-service';
+import { ConfirmationOptions, ConfirmationResult, ConfirmComponentUI, 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>>;
+    confirm<TData = undefined, TResult = undefined>(data: TData | undefined, componentUI: ConfirmComponentUI<TData, TResult>, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult<TResult | undefined>>;
     confirmMessage(message: string, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult>;
 }

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

@@ -26,7 +26,11 @@ export interface ConfirmationOptions {
     closeOnOutsideClick?: boolean | undefined;
     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 declare abstract class PrimariaInteractionService {
-    abstract confirm<TData = undefined, TResult = undefined>(data: TData | undefined, dialogComponent: React.ComponentType<ConfirmationContentProps<TData, TResult> | ConfirmationWithResultContentProps<TData, TResult>> | (new () => HTMLElement), options?: ConfirmationOptions | undefined): Promise<ConfirmationResult<TResult | undefined>>;
+    abstract confirm<TData = undefined, TResult = undefined>(data: TData | undefined, componentUI: ConfirmComponentUI<TData, TResult>, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult<TResult | undefined>>;
     abstract confirmMessage(message: string, options?: ConfirmationOptions | undefined): Promise<ConfirmationResult>;
 }

package/package.json

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

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,8 +74,8 @@ describe("ExitShellHandler", () => {
 
     await handler.handle(message);
 
-    expect(mockApi.interactionService.confirm).toHaveBeenCalledWith({ busyTasks }, PluginBusyList, {
-      title: expect.any(String),
+    expect(mockApi.interactionService.confirm).toHaveBeenCalledWith({ busyTasks }, {component: PluginBusyList}, {
+      title: "actions.askExit",
       state: "error",
       confirmButtonText: "Sí",
       cancelButtonText: "No",

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",