@uxland/primary-shell 5.6.11 → 5.6.13

package/package.json

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

package/src/UI/components/primaria-shell/styles.css

@@ -83,7 +83,7 @@
       .bottom-content-first {
         display: flex;
         flex-direction: column;
-        gap: 4px;
+        gap: 22px;
       }
     }
     &[expanded] {
@@ -165,3 +165,12 @@
 .toggle-button {
   margin-bottom: 24px;
 }
+@media (max-width: 1024px) {
+  .toggle-button {
+    display: none;
+  }
+  .content {
+    overflow-y: auto;
+  }
+}
+

package/src/features/clinical-monitoring/component/styles.css

@@ -34,3 +34,26 @@
     }
   }
 }
+
+@media (max-width: 1024px) {
+  :host {
+    min-height: 100vh;
+  }
+  .wrapper {
+    flex-direction: column;
+    #widgets-sidebar-region {
+      width: 100%;
+      border-left: none;
+    }
+    .content {
+      #header-widgets-region {
+        grid-template-columns: 1fr;
+        gap: 16px;
+      }
+      #content-widgets-region {
+        height: 70vh;
+        flex: none;
+      }
+    }
+  }
+}

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

@@ -33,7 +33,6 @@ const createMockApi = (): PrimariaApi =>
 describe("ExitShellHandler", () => {
   let handler: ExitShellHandler;
   let mockApi: PrimariaApi;
-  const message = {} as ExitShell;
 
   beforeEach(() => {
     mockApi = createMockApi();
@@ -41,7 +40,8 @@ describe("ExitShellHandler", () => {
     vi.clearAllMocks();
   });
 
-  it("should dispose and raise custom close event if no busy tasks", async () => {
+  it("should dispose and raise custom close event if no busy tasks and message has ecapEvent", async () => {
+    const message = { ecapEvent: {} } as ExitShell;
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
     (disposePlugins as any).mockResolvedValue(undefined);
 
@@ -52,24 +52,34 @@ describe("ExitShellHandler", () => {
     expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
   });
 
+  it("should dispose and raise default close event if no busy tasks and no ecapEvent in message", async () => {
+    const message = {} as ExitShell;
+    mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
+    (disposePlugins as any).mockResolvedValue(undefined);
+
+    await handler.handle(message);
+
+    expect(disposePlugins).toHaveBeenCalled();
+    expect(disposeShell).toHaveBeenCalled();
+    expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
+  });
+
   it("should ask for confirmation if there are busy tasks", async () => {
     const busyTasks: PluginBusyTask[] = [{ pluginId: "x" }] as any;
+    const message = { ecapEvent: {} } as ExitShell;
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue(busyTasks);
     mockApi.interactionService.confirm = vi.fn().mockResolvedValue({ confirmed: true });
     (disposePlugins as any).mockResolvedValue(undefined);
 
     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 }, PluginBusyList, {
+      title: expect.any(String),
+      state: "error",
+      confirmButtonText: "Sí",
+      cancelButtonText: "No",
+    });
     expect(disposePlugins).toHaveBeenCalled();
     expect(disposeShell).toHaveBeenCalled();
     expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
@@ -77,6 +87,7 @@ describe("ExitShellHandler", () => {
 
   it("should not continue if confirmation is declined", async () => {
     const busyTasks: PluginBusyTask[] = [{ pluginId: "x" }] as any;
+    const message = { ecapEvent: {} } as ExitShell;
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue(busyTasks);
     mockApi.interactionService.confirm = vi.fn().mockResolvedValue({ confirmed: false });
 
@@ -86,10 +97,12 @@ describe("ExitShellHandler", () => {
     expect(disposePlugins).not.toHaveBeenCalled();
     expect(disposeShell).not.toHaveBeenCalled();
     expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
+    expect(raiseCloseEvent).not.toHaveBeenCalled();
   });
 
-  it("should handle errors and raise custom close event", async () => {
+  it("should handle errors and raise custom close event if message has ecapEvent", async () => {
     const error = new Error("Something went wrong");
+    const message = { ecapEvent: {} } as ExitShell;
     mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
     (disposePlugins as any).mockRejectedValue(error);
 
@@ -97,13 +110,26 @@ describe("ExitShellHandler", () => {
 
     expect(mockApi.notificationService.error).toHaveBeenCalledWith("Something went wrong");
     expect(raiseCustomCloseEvent).toHaveBeenCalledWith(message);
+    expect(raiseCloseEvent).not.toHaveBeenCalled();
+  });
+
+  it("should handle errors and raise default close event if message has no ecapEvent", async () => {
+    const error = new Error("Something went wrong");
+    const message = {} as ExitShell;
+    mockApi.pluginBusyManager.getBusyPluginTasks = vi.fn().mockReturnValue([]);
+    (disposePlugins as any).mockRejectedValue(error);
+
+    await handler.handle(message);
+
+    expect(mockApi.notificationService.error).toHaveBeenCalledWith("Something went wrong");
+    expect(raiseCloseEvent).toHaveBeenCalled();
+    expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
   });
 
   it("should proceed if disposePlugins takes longer than 5 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, 6000)));
 
     await handler.handle(message);
 
@@ -122,4 +148,4 @@ describe("ExitShellHandler", () => {
     expect(raiseCloseEvent).toHaveBeenCalled();
     expect(raiseCustomCloseEvent).not.toHaveBeenCalled();
   });
-});
+});

package/src/features/exit/handler.ts

@@ -11,6 +11,8 @@ import { translate } from "../../locales";
 export class ExitShellHandler {
   constructor(@inject(TYPES.primaryApi) private api: PrimariaApi) {}
   async handle(exitEvent: ExitShell): Promise<void> {
+    const evt = exitEvent && exitEvent.ecapEvent !== undefined ? exitEvent : undefined;
+
     try {
       const busyTasks = this.api.pluginBusyManager.getBusyPluginTasks();
       if (busyTasks.length > 0) {
@@ -24,10 +26,10 @@ export class ExitShellHandler {
         this.timeout(5000), // Si passen 5s, es segueix amb l'execució
       ]);
       disposeShell();
-      this.emitClose(exitEvent);
+      this.emitClose(evt);
     } catch (error) {
       this.api.notificationService.error(error.message);
-      this.emitClose(exitEvent);
+      this.emitClose(evt);
     }
   }