@uxland/primary-shell 7.26.4 → 7.28.0

package/src/UI/internal-views/doctor-nav-menu.ts

@@ -1,14 +1,10 @@
 import { getPatientCip } from "../../features/get-patient-cip/action";
-import { navigateToEcapWithoutClosingWithCip } from "../../features/navigate-to-ecap/navigate-without-closing-and-with-cip";
+import { navigateToEcap } from "../../features/navigate-to-ecap/navigate-to-ecap";
 import { GetVisitId } from "../../features/visit/get-visit-id/request";
 import { shellApi } from "../../api/api";
 import { QuickActionItem } from "../shared-components/quick-action-item/quick-action-item";
 import { ClinicalPathwaysActionMenu } from "../components/clinical-pathways-action-menu/clinical-pathways-action-menu";
-import {
-  MenuItemConfig,
-  registerNavMenuViews,
-  registerCommunicationNavMenu,
-} from "./common-nav-menu";
+import { MenuItemConfig, registerNavMenuViews, registerCommunicationNavMenu } from "./common-nav-menu";
 
 const doctorNavMenuItems: MenuItemConfig[] = [
   {
@@ -17,7 +13,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Monitoratge dinàmic",
     type: "item",
     sortHint: "0030",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("IA_DEV"),
+    callbackFn: () => navigateToEcap("IA_DEV"),
   },
   {
     id: "unique-petition",
@@ -29,22 +25,22 @@ const doctorNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Analítiques",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("LABORATORI"),
+        callbackFn: () => navigateToEcap("LABORATORI"),
       },
       {
         icon: "open_in_new",
         label: "Ordres Clíniques",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("RESULT_OC"),
+        callbackFn: () => navigateToEcap("RESULT_OC"),
       },
       {
         icon: "open_in_new",
         label: "OC Exprés",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("OC_EXPRES"),
+        callbackFn: () => navigateToEcap("OC_EXPRES"),
       },
       {
         icon: "open_in_new",
         label: "Sol·licitud de trasllat",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("TRANSPORT"),
+        callbackFn: () => navigateToEcap("TRANSPORT"),
       },
     ],
   },
@@ -54,7 +50,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Seguiment analític",
     type: "item",
     sortHint: "0060",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("SEGUIMENT_ANALITIC"),
+    callbackFn: () => navigateToEcap("SEGUIMENT_ANALITIC"),
   },
   {
     id: "results-reports",
@@ -66,21 +62,21 @@ const doctorNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Resultats i informes",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("RESULTAT_INFORMES"),
+        callbackFn: () => navigateToEcap("RESULTAT_INFORMES"),
       },
       {
         icon: "open_in_new",
         label: "Documents usuari",
         callbackFn: () => {
           setTimeout(() => {
-            navigateToEcapWithoutClosingWithCip("CRIDA_DOCS_USU");
+            navigateToEcap("CRIDA_DOCS_USU");
           }, 0);
         },
       },
       {
         icon: "open_in_new",
         label: "Informes clínics",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("INFORME_CLINIC_NET"),
+        callbackFn: () => navigateToEcap("INFORME_CLINIC_NET"),
       },
     ],
   },
@@ -90,7 +86,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Gabinets de proves",
     type: "item",
     sortHint: "0080",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("GABINETS_PROVES"),
+    callbackFn: () => navigateToEcap("GABINETS_PROVES"),
   },
   {
     id: "prescriptions",
@@ -102,22 +98,22 @@ const doctorNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Prescripció",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCRIPCIO_ACTIVA"),
+        callbackFn: () => navigateToEcap("PRESCRIPCIO_ACTIVA"),
       },
       {
         icon: "open_in_new",
         label: "Ordres de tractament",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("ORDRE_TRACTAMENT"),
+        callbackFn: () => navigateToEcap("ORDRE_TRACTAMENT"),
       },
       {
         icon: "open_in_new",
         label: "Dispensació material sanitari",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("DISPENSACIO_MATERIAL_PACIENT"),
+        callbackFn: () => navigateToEcap("DISPENSACIO_MATERIAL_PACIENT"),
       },
       {
         icon: "open_in_new",
         label: "Prescripció social",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCRIPCIO_SOCIAL"),
+        callbackFn: () => navigateToEcap("PRESCRIPCIO_SOCIAL"),
       },
     ],
   },
@@ -127,7 +123,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Immunitzacions",
     type: "item",
     sortHint: "0100",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("IMMUNITZACIONS"),
+    callbackFn: () => navigateToEcap("IMMUNITZACIONS"),
   },
   {
     id: "it",
@@ -135,7 +131,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Incapacitat temporal",
     type: "item",
     sortHint: "0100",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("REV_IT"),
+    callbackFn: () => navigateToEcap("REV_IT"),
   },
   {
     id: "visits",
@@ -143,7 +139,7 @@ const doctorNavMenuItems: MenuItemConfig[] = [
     label: "Visites",
     type: "item",
     sortHint: "0130",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("CONSULTA_VISITES"),
+    callbackFn: () => navigateToEcap("CONSULTA_VISITES"),
   },
 ];
 
@@ -206,7 +202,7 @@ export const registerDoctorCommunicationMenuActions = () => {
       sortHint: "0030",
       icon: "open_in_new",
       label: "Veu IP",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("VOIP"),
+      callbackFn: () => navigateToEcap("VOIP"),
     },
     // { id: "5", sortHint: "0040", icon: "open_in_new", label: "Videoconsulta", callbackFn: () => {} },
   ];
@@ -229,42 +225,42 @@ export const registerDoctorClinicalPathwaysMenuActions = () => {
       sortHint: "0010",
       icon: "open_in_new",
       label: "Proces d'atenció - ARES",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("PROCES_ATENCIO"),
+      callbackFn: () => navigateToEcap("PROCES_ATENCIO"),
     },
     {
       id: "3",
       sortHint: "0030",
       icon: "open_in_new",
       label: "Nen sa",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("NEN_SA"),
+      callbackFn: () => navigateToEcap("NEN_SA"),
     },
     {
       id: "4",
       sortHint: "0040",
       icon: "open_in_new",
       label: "ASSIR",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("NAVEGACIO_ASSIR"),
+      callbackFn: () => navigateToEcap("NAVEGACIO_ASSIR"),
     },
     {
       id: "5",
       sortHint: "0050",
       icon: "open_in_new",
       label: "Odontologia",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("ODONTOLOGO"),
+      callbackFn: () => navigateToEcap("ODONTOLOGO"),
     },
     {
       id: "6",
       sortHint: "0060",
       icon: "open_in_new",
       label: "Situació d'especial cura",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("SIT_ESPEC_CURA_DEV"),
+      callbackFn: () => navigateToEcap("SIT_ESPEC_CURA_DEV"),
     },
     {
       id: "7",
       sortHint: "0070",
       icon: "open_in_new",
       label: "Valoració social",
-      callbackFn: () => navigateToEcapWithoutClosingWithCip("VALORACIO_SOCIAL"),
+      callbackFn: () => navigateToEcap("VALORACIO_SOCIAL"),
     },
   ];
   for (const item of clinicalPathwaysItems) {

package/src/UI/internal-views/doctor-quick-action-menu.ts

@@ -1,6 +1,6 @@
 import { shellApi } from "../../api/api";
 import { QuickActionItem } from "../shared-components/quick-action-item/quick-action-item";
-import { navigateToEcapWithoutClosingWithCip } from "../../features/navigate-to-ecap/navigate-without-closing-and-with-cip";
+import { navigateToEcap } from "../../features/navigate-to-ecap/navigate-to-ecap";
 
 export const registerDoctorQuickActionViews = () => {
   shellApi.regionManager.registerView(shellApi.regionManager.regions.shell.quickActions, {
@@ -8,7 +8,7 @@ export const registerDoctorQuickActionViews = () => {
     sortHint: "0011",
     factory: () => {
       const quickActionItem = new QuickActionItem("", "Cita", () => {
-        navigateToEcapWithoutClosingWithCip("CREAR_VISITA");
+        navigateToEcap("CREAR_VISITA");
       });
       return Promise.resolve(quickActionItem);
     },

package/src/UI/shared-components/primaria-nav-tree-menu/template.ts

@@ -14,13 +14,33 @@ export const template = (props: PrimariaNavTreeMenu) => html`
         ? html`
           <dss-action-menu @onCloseActionMenu=${props.handleCloseMenu}>
             ${props.config.actionMenuItems?.map(
-              (item) => html`
-                <dss-action-menu-item
-                  righticon=${item.icon}
-                  .label=${item.label}
-                  @click=${item.callbackFn}
-                ></dss-action-menu-item>
-              `,
+              (item) => item.hasNestedMenu
+                ? html`
+                  <dss-action-menu-item
+                    righticon=${item.icon}
+                    .label=${item.label}
+                    hasnestedmenu
+                  >
+                    <dss-action-menu>
+                      ${item.nestedMenuItems?.map(
+                        (nestedItem) => html`
+                          <dss-action-menu-item
+                            righticon=${nestedItem.icon}
+                            .label=${nestedItem.label}
+                            @click=${nestedItem.callbackFn}
+                          ></dss-action-menu-item>
+                        `,
+                      )}
+                    </dss-action-menu>
+                  </dss-action-menu-item>
+                `
+                : html`
+                  <dss-action-menu-item
+                    righticon=${item.icon}
+                    .label=${item.label}
+                    @click=${item.callbackFn}
+                  ></dss-action-menu-item>
+                `,
             )}
           </dss-action-menu>
         `

package/src/UI/shared-components/typings.ts

@@ -4,10 +4,12 @@ interface MenuItem {
 }
 
 export interface PrimariaNavItemConfig extends MenuItem {
-  callbackFn: () => void;
+  callbackFn?: () => void;
   showArrow?: boolean;
   fill?: boolean;
   rotateIcon?: boolean;
+  hasNestedMenu?: boolean;
+  nestedMenuItems?: PrimariaNavItemConfig[];
 }
 
 export interface PrimariaNavTreeMenuConfig {

package/src/api/pdf-viewer-manager/handle-views.ts

@@ -3,6 +3,8 @@ import { translate } from "../../locales";
 import { PrimariaNavItem } from "../../UI/shared-components/primaria-nav-item/primaria-nav-item";
 import { shellApi } from "../api";
 import { PdfVisor } from "./pdf-visor/pdf-visor";
+import { showNavItemTooltip } from "../../UI/components/navigation-tooltip/tooltip-manager";
+import { primariaShellId } from "../../constants";
 
 export const registerPdfViewerNavItem = () => {
   shellApi.regionManager.registerView(shellApi.regionManager.regions.shell.navigationMenu, {
@@ -18,6 +20,12 @@ export const registerPdfViewerNavItem = () => {
       return Promise.resolve(menuItem);
     },
   });
+
+  // Show tooltip when PDF viewer is registered
+  setTimeout(() => {
+    const navItemKey = `${primariaShellId}::${pdfViewerId}`;
+    showNavItemTooltip(navItemKey, translate("pdfManager.tooltipMessage"));
+  }, 100);
 };
 
 export const registerPDFVisorMainView = () => {

package/src/api/pdf-viewer-manager/pdf-viewer-manager.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { createPdfViewerManager } from "./pdf-viewer-manager";
 import { pdfViwerEvents } from "./events";
 import { registerPdfViewerNavItem } from "./handle-views";
+import { showNavItemTooltip } from "../../UI/components/navigation-tooltip";
 
 vi.mock("@primaria/plugins-core", () => ({
   generateId: () => "generated-id",
@@ -15,6 +16,10 @@ vi.mock("../../locales", () => ({
   translate: (key: string) => key,
 }));
 
+vi.mock("../../UI/components/navigation-tooltip", () => ({
+  showNavItemTooltip: vi.fn(),
+}));
+
 describe("PdfViewerManager", () => {
   let manager: ReturnType<typeof createPdfViewerManager>;
   let broker: any;
@@ -60,6 +65,22 @@ describe("PdfViewerManager", () => {
     });
   });
 
+  it("should show tooltip when adding a valid pdf", async () => {
+    vi.useFakeTimers();
+
+    manager.add("Doc1", { url: "https://test.com/doc1.pdf" });
+
+    // Fast-forward the setTimeout(100ms)
+    vi.advanceTimersByTime(100);
+
+    expect(showNavItemTooltip).toHaveBeenCalledWith(
+      "primaria-shell::pdf-viewer",
+      "pdfManager.tooltipMessage"
+    );
+
+    vi.useRealTimers();
+  });
+
   it("should warn if pdf with same name already exists", () => {
     manager.add("Doc1", { b64: "xxx" });
     manager.add("Doc1", { b64: "xxx" });
@@ -68,6 +89,38 @@ describe("PdfViewerManager", () => {
     expect(manager.getPdfs()).toHaveLength(1); // solo el primero
   });
 
+  it("should not show tooltip when pdf with same name already exists", () => {
+    vi.useFakeTimers();
+
+    // First add succeeds and shows tooltip
+    manager.add("Doc1", { b64: "xxx" });
+    vi.advanceTimersByTime(100);
+
+    // Clear mocks after first add
+    vi.clearAllMocks();
+
+    // Second add with same name should show warning but NOT tooltip
+    manager.add("Doc1", { b64: "xxx" });
+    vi.advanceTimersByTime(100);
+
+    expect(notificationService.warning).toHaveBeenCalledWith("pdfManager.alreadyUploaded");
+    expect(showNavItemTooltip).not.toHaveBeenCalled();
+
+    vi.useRealTimers();
+  });
+
+  it("should not show tooltip when pdf data is invalid", () => {
+    vi.useFakeTimers();
+
+    manager.add("Doc1", {});
+    vi.advanceTimersByTime(100);
+
+    expect(notificationService.error).toHaveBeenCalledWith("pdfManager.missingData");
+    expect(showNavItemTooltip).not.toHaveBeenCalled();
+
+    vi.useRealTimers();
+  });
+
   it("should call registerNavButton only once", () => {
     manager.add("Doc1", { url: "u" });
     manager.add("Doc2", { url: "u2" });

package/src/api/pdf-viewer-manager/pdf-viewer-manager.ts

@@ -7,6 +7,9 @@ import { PrimariaNotificationService } from "../notification-service/notificatio
 import { pdfViwerEvents } from "./events";
 import { PdfSelector } from "./pdf-visor/pdf-selector/pdf-selector";
 import { PdfVisor } from "./pdf-visor/pdf-visor";
+import { showNavItemTooltip } from "../../UI/components/navigation-tooltip";
+import { pdfViewerId } from "./constants";
+import { primariaShellId } from "../../constants";
 
 export interface IPdfDocument {
   pdfName: string;
@@ -59,6 +62,12 @@ export class PdfViewerManager {
       this.broker.publish(pdfViwerEvents.added, pdf);
 
       this.notificationService.success(translate("pdfManager.uploaded"));
+
+      // Show tooltip to guide user to the PDF viewer
+      setTimeout(() => {
+        const navItemKey = `${primariaShellId}::${pdfViewerId}`;
+        showNavItemTooltip(navItemKey, translate("pdfManager.tooltipMessage"));
+      }, 100);
     }
   }
 
@@ -81,7 +90,5 @@ export class PdfViewerManager {
   }
 }
 
-export const createPdfViewerManager = (
-  broker: PrimariaBroker,
-  notificationService: PrimariaNotificationService,
-) => new PdfViewerManager(broker, notificationService);
+export const createPdfViewerManager = (broker: PrimariaBroker, notificationService: PrimariaNotificationService) =>
+  new PdfViewerManager(broker, notificationService);

package/src/events.ts

@@ -4,4 +4,6 @@ export const shellEvents = {
   refreshTokenFailed: "refreshTokenFailed",
   mpidHeaderInvalid: "mpidHeaderInvalid",
   quickActionBusyChanged: "quickActionBusyChanged",
+  scrollToNavItemRequested: "scrollToNavItemRequested",
+  scrollToNavItemCompleted: "scrollToNavItemCompleted",
 };

package/src/features/navigate-to-ecap/navigate-to-ecap.ts

@@ -0,0 +1,18 @@
+import { shellApi } from "../../api/api";
+import { getPatientCip } from "../get-patient-cip/action";
+
+export const navigateToEcap = async (
+  eventName: string,
+  closeAction = "NO_TANCAR",
+  additionalParams: Record<string, string> = {},
+  includeCip = true,
+) => {
+  const params = { ...additionalParams };
+
+  if (includeCip) {
+    const CIP = await getPatientCip(shellApi);
+    params.CIP = CIP;
+  }
+
+  shellApi.ecapEventManager.publish(eventName, closeAction, params);
+};

package/src/locales.ts

@@ -41,7 +41,7 @@ export const locales = {
       errors: {
         session: "Hi ha hagut un error amb la sessió. Siusplau, tanca i torna a obrir l'aplicació.",
         invalidPatient: "El pacient actual no és vàlid. Siusplau, tanca i torna a obrir l'aplicació.",
-        exit: "Hi ha hagut un error en sortir de l'ETC"
+        exit: "Hi ha hagut un error en sortir de l'ETC",
       },
       header: {
         workCenter: "Centre treball",
@@ -57,17 +57,18 @@ export const locales = {
         navButtonLabel: "Visor PDF",
         missingData: "Es necesita un document o URL per enviar al visor de resultats",
         duplicatedSource: "Només pots envar un document o URL a la vegada",
+        tooltipMessage: "S'ha generat el PDF al visor",
       },
       pdfVisor: {
         noPdfSelected: "No hi ha cap PDF seleccionat",
       },
-      importDataManager:{
+      importDataManager: {
         title: "Importar dades",
         actions: {
           cancel: "Cancel·lar",
           import: "Importar dades",
-        }
-      }
+        },
+      },
     },
   },
 };