@uxland/primary-shell 5.6.9 → 5.6.10

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

@@ -1,3 +1,5 @@
+import { ExitShellPayload } from './features/exit/request';
+
 export declare const disposeShell: () => void;
 export declare const raiseCloseEvent: () => void;
-export declare const raiseCustomCloseEvent: (event: string) => void;
+export declare const raiseCustomCloseEvent: (event: ExitShellPayload) => void;

package/dist/primary/shell/src/features/exit/handler.d.ts

@@ -4,7 +4,7 @@ import { ExitShell } from './request';
 export declare class ExitShellHandler {
     private api;
     constructor(api: PrimariaApi);
-    handle({ ecapEvent }: ExitShell): Promise<void>;
+    handle(exitEvent: ExitShell): Promise<void>;
     private askForClose;
     private timeout;
     private emitClose;

package/dist/primary/shell/src/features/exit/request.d.ts

@@ -1,6 +1,11 @@
 import { IRequest } from '../..';
 
+export interface ExitShellPayload {
+    ecapEvent?: string;
+    payload?: any;
+}
 export declare class ExitShell implements IRequest<void> {
     ecapEvent?: string | undefined;
-    constructor(ecapEvent?: string | undefined);
+    payload?: {} | undefined;
+    constructor(ecapEvent?: string | undefined, payload?: {} | undefined);
 }

package/package.json

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

package/src/UI/internal-views/upper-nav-views.ts

@@ -8,7 +8,6 @@ import { QuickActionItem } from "../shared-components/quick-action-item/quick-ac
 import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
 import { PrimariaNavTreeMenu } from "../shared-components/primaria-nav-tree-menu/primaria-nav-tree-menu";
 import { GetVisitId } from "../../features/visit/get-visit-id/request";
-import { openHesVisor } from "../../features/open-hes-visor/open-hes-visor";
 
 type MenuItemConfig =
   | {
@@ -212,15 +211,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
     type: "item",
     sortHint: "0130",
     callbackFn: () => navigateToEcapWithoutClosingWithCip("CONSULTA_VISITES"),
-  },
-  {
-    id: "visor",
-    icon: "window",
-    label: "Visor",
-    type: "item",
-    sortHint: "0140",
-    callbackFn: openHesVisor,
-  },
+  }
 ];
 
 export const registerUpperNavMenuViews = () => {

package/src/disposer.ts

@@ -1,5 +1,6 @@
 import { shellApi } from "./api/api";
 import { disposeFeatures } from "./features/bootstrapper";
+import { ExitShellPayload } from "./features/exit/request";
 export const disposeShell = () => {
   disposeFeatures(shellApi);
 };
@@ -8,6 +9,6 @@ export const raiseCloseEvent = () => {
   shellApi.ecapEventManager.publish("CLOSE_FORM", "", {});
 };
 
-export const raiseCustomCloseEvent = (event: string) => {
-  shellApi.ecapEventManager.publish(event, "", {});
+export const raiseCustomCloseEvent = (event: ExitShellPayload) => {
+  shellApi.ecapEventManager.publish(event.ecapEvent as string, "", event.payload);
 };

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

@@ -2,9 +2,10 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { ExitShellHandler } from "./handler";
 import { ExitShell } from "./request";
 import { disposePlugins } from "../../handle-plugins";
-import { disposeShell, raiseCloseEvent } from "../../disposer";
+import { disposeShell, raiseCloseEvent, raiseCustomCloseEvent } from "../../disposer";
 import { PluginBusyTask } from "../../api/plugin-busy-manager/plugin-busy-manager";
 import { PrimariaApi } from "@uxland/primary-shell";
+import { PluginBusyList } from "../../api/plugin-busy-manager/plugin-busy-list/component";
 
 vi.mock("../../handle-plugins", () => ({
   disposePlugins: vi.fn(),
@@ -13,6 +14,7 @@ vi.mock("../../handle-plugins", () => ({
 vi.mock("../../disposer", () => ({
   disposeShell: vi.fn(),
   raiseCloseEvent: vi.fn(),
+  raiseCustomCloseEvent: vi.fn(),
 }));
 
 const createMockApi = (): PrimariaApi =>
@@ -39,7 +41,7 @@ describe("ExitShellHandler", () => {
     vi.clearAllMocks();
   });
 
-  it("should dispose and raise close event if no busy tasks", async () => {
+  it("should dispose and raise custom close event if no busy tasks", async () => {
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
     (disposePlugins as any).mockResolvedValue(undefined);
 
@@ -47,7 +49,7 @@ describe("ExitShellHandler", () => {
 
     expect(disposePlugins).toHaveBeenCalled();
     expect(disposeShell).toHaveBeenCalled();
-    expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
   });
 
   it("should ask for confirmation if there are busy tasks", async () => {
@@ -58,10 +60,19 @@ describe("ExitShellHandler", () => {
 
     await handler.handle(message);
 
-    expect(mockApi.interactionService.confirm).toHaveBeenCalled();
+    expect(mockApi.interactionService.confirm).toHaveBeenCalledWith(
+      { busyTasks },
+      PluginBusyList,
+      {
+        title: expect.any(String),
+        state: "error",
+        confirmButtonText: "Sí",
+        cancelButtonText: "No",
+      }
+    );
     expect(disposePlugins).toHaveBeenCalled();
     expect(disposeShell).toHaveBeenCalled();
-    expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
   });
 
   it("should not continue if confirmation is declined", async () => {
@@ -74,10 +85,10 @@ describe("ExitShellHandler", () => {
     expect(mockApi.interactionService.confirm).toHaveBeenCalled();
     expect(disposePlugins).not.toHaveBeenCalled();
     expect(disposeShell).not.toHaveBeenCalled();
-    expect(raiseCloseEvent).not.toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
   });
 
-  it("should handle errors and raise close event", async () => {
+  it("should handle errors and raise custom close event", async () => {
     const error = new Error("Something went wrong");
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
     (disposePlugins as any).mockRejectedValue(error);
@@ -85,19 +96,30 @@ describe("ExitShellHandler", () => {
     await handler.handle(message);
 
     expect(mockApi.notificationService.error).toHaveBeenCalledWith("Something went wrong");
-    expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
   });
 
   it("should proceed if disposePlugins takes longer than 5 seconds", async () => {
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
     (disposePlugins as any).mockImplementation(
-      () => new Promise((resolve) => setTimeout(resolve, 6000)),
+      () => new Promise((resolve) => setTimeout(resolve, 6000))
     );
 
     await handler.handle(message);
 
     expect(disposePlugins).toHaveBeenCalled();
+    expect(disposeShell).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
+  });
+
+  it("should raise raiseCloseEvent if no exitEvent is passed", async () => {
+    mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
+    (disposePlugins as any).mockResolvedValue(undefined);
+
+    await handler.handle(undefined as any);
+
     expect(disposeShell).toHaveBeenCalled();
     expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
   });
-});
+});

package/src/features/exit/handler.ts

@@ -10,7 +10,7 @@ import { translate } from "../../locales";
 
 export class ExitShellHandler {
   constructor(@inject(TYPES.primaryApi) private api: PrimariaApi) {}
-  async handle({ ecapEvent }: ExitShell): Promise<void> {
+  async handle(exitEvent: ExitShell): Promise<void> {
     try {
       const busyTasks = this.api.pluginBusyManager.getBusyPluginTasks();
       if (busyTasks.length > 0) {
@@ -24,10 +24,10 @@ export class ExitShellHandler {
         this.timeout(5000), // Si passen 5s, es segueix amb l'execució
       ]);
       disposeShell();
-      this.emitClose(ecapEvent);
+      this.emitClose(exitEvent);
     } catch (error) {
       this.api.notificationService.error(error.message);
-      this.emitClose(ecapEvent);
+      this.emitClose(exitEvent);
     }
   }
 
@@ -44,9 +44,9 @@ export class ExitShellHandler {
     return new Promise<void>((resolve) => setTimeout(resolve, ms));
   }
 
-  private emitClose(ecapEvent?: string): void {
-    if (ecapEvent) {
-      raiseCustomCloseEvent(ecapEvent);
+  private emitClose(exitEvent?: ExitShell): void {
+    if (exitEvent) {
+      raiseCustomCloseEvent(exitEvent);
     } else {
       raiseCloseEvent();
     }

package/src/features/exit/request.ts

@@ -1,5 +1,10 @@
 import { IRequest } from "@uxland/primary-shell";
 
+export interface ExitShellPayload {
+  ecapEvent?: string;
+  payload?: any;
+}
+
 export class ExitShell implements IRequest<void> {
-  constructor(public ecapEvent?: string) {}
+  constructor(public ecapEvent?: string, public payload?: {}) {}
 }

package/src/features/visit/finalize-visit/handler.ts

@@ -2,13 +2,14 @@ import { TYPES } from "../../../infrastructure/ioc/types";
 import { inject } from "inversify";
 import { PrimariaApi } from "../../../api/api";
 import { FinalizeVisit } from "./request";
+import { ExitShell } from "../../exit/request";
 
 export class FinalizeVisitHandler {
   constructor(@inject(TYPES.primaryApi) private api: PrimariaApi) {}
   async handle(data: FinalizeVisit) {
     try {
       const visitIdData = data.visitId;
-      this.api.ecapEventManager.publish("RESOL_VISITA", "", { VisiID: visitIdData });
+      this.api.broker.send(new ExitShell("RESOL_VISITA", { VisiID: visitIdData }))
     } catch (error) {
       this.api.notificationService.error(error.message);
     }

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts

@@ -81,23 +81,25 @@ export const template = (props: ActivityHistoryTimeline) => {
   `;
 };
 
-const noGroupsTemplate = (props: ActivityHistoryTimeline)=> html `
-${props.searchString?.length > 1
-      ? html`
+const noGroupsTemplate = (props: ActivityHistoryTimeline) => html`
+${
+  props.searchString?.length > 1
+    ? html`
           <dss-user-feedback
             class="feedback"
             imagesrc=${notFound}
             title=${translate("noResults")}>
           </dss-user-feedback>
         `
-      : props.renderGroupsControlTimeExpired
+    : props.renderGroupsControlTimeExpired
       ? html`<dss-user-feedback
             class="feedback"
             imagesrc=${notFound}
             title=${translate("noData.title")}
             description=${translate("noData.description")}>
           </dss-user-feedback>`
-      : html`<activity-history-is-grouping-busy></activity-history-is-grouping-busy>`}`;
+      : html`<activity-history-is-grouping-busy></activity-history-is-grouping-busy>`
+}`;
 
 const visitHeaderTemplate = (props: ActivityHistoryTimeline, item: IActivityHistoryItem | undefined) => {
   if (!item) return nothing;
@@ -129,14 +131,14 @@ const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivit
     values.push(props.highlighted(item.professional.role.description));
   }
 
-  if (item.up?.description) {
-    values.push(props.highlighted(item.up.description));
-  }
-
   if (item.professional?.speciality?.description) {
     values.push(props.highlighted(item.professional.speciality.description));
   }
 
+  if (item.up?.description) {
+    values.push(props.highlighted(item.up.description));
+  }
+
   if (item.service?.description) {
     values.push(props.highlighted(item.service.description));
   }

package/src/internal-plugins/activity-history/activity-history-item/list/merge-history-items-and-subgroups/merge-history-items-and-subgroups.ts

@@ -19,7 +19,7 @@ export const mergeHistoryItemsAndSubgroups = (
   }));
 
   // 2. Prepara los subGroups, usando la fecha del ítem más reciente de cada subgrupo
-  const subGroupEntries: ActivityHistoryEntry[] = group.subGroups.map((subGroup) => {
+  const subGroupEntries: ActivityHistoryEntry[] = group?.subGroups.map((subGroup) => {
     // Asumimos que subGroup.items ya está ordenado de más reciente a más antiguo
     const mostRecent = subGroup?.items.length ? new Date(subGroup.items[0].date) : new Date(0);
     return {

package/dist/primary/shell/src/features/open-hes-visor/open-hes-visor.d.ts

@@ -1 +0,0 @@
-export declare const openHesVisor: () => void;

package/src/features/open-hes-visor/open-hes-visor.ts

@@ -1,6 +0,0 @@
-import { shellApi } from "../../api/api";
-
-const sendHesFormRequest = "send_hes_form";
-export const openHesVisor = () => {
-  shellApi.broker.send(sendHesFormRequest);
-};