@uxland/primary-shell 7.29.7 → 7.29.13

package/dist/primary/shell/src/UI/shared-components/primaria-nav-tree-menu/primaria-nav-tree-menu.d.ts

@@ -3,9 +3,9 @@ import { PrimariaNavItemConfig, PrimariaNavTreeMenuConfig } from '../typings';
 export declare class PrimariaNavTreeMenu extends LitElement {
     static styles: import('lit').CSSResult;
     config: PrimariaNavTreeMenuConfig;
-    primariaNavItemConfig: PrimariaNavItemConfig;
     showActionMenu: boolean;
     constructor(config: PrimariaNavTreeMenuConfig);
+    get primariaNavItemConfig(): PrimariaNavItemConfig;
     handleItemClick: () => void;
     handleCloseMenu: () => void;
     render(): import('lit').TemplateResult<1>;

package/dist/primary/shell/src/api/pdf-viewer-manager/pdf-viewer-manager.d.ts

@@ -1,13 +1,19 @@
 import { PrimariaBroker } from '../broker/primaria-broker';
 import { PrimariaNotificationService } from '../notification-service/notification-service';
+export interface PdfData {
+    id: string;
+    name: string;
+    date: string;
+    url?: string;
+    b64?: string;
+}
 export interface IPdfDocument {
-    pdfName: string;
     id: string;
+    pdfName: string;
     data: PdfData;
 }
-export interface PdfData {
-    url?: string;
-    b64?: string;
+export interface PdfViewerOptions {
+    autoNavigate?: boolean;
 }
 export declare class PdfViewerManager {
     private broker;
@@ -15,7 +21,7 @@ export declare class PdfViewerManager {
     constructor(broker: PrimariaBroker, notificationService: PrimariaNotificationService);
     private pdfs;
     private activePdf;
-    add(pdfName: string, data: PdfData): void;
+    add(data: PdfData, options?: PdfViewerOptions): IPdfDocument | undefined;
     delete(pdfId: string): void;
     getPdfs(): IPdfDocument[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "7.29.7",
+  "version": "7.29.13",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",
@@ -25,7 +25,7 @@
     "url": "https://github.com/uxland/harmonix/issues"
   },
   "dependencies": {
-    "@uxland/harmonix": "^1.1.2",
+    "@uxland/harmonix": "^1.1.3",
     "@uxland/harmonix-adapters": "^1.2.2"
   },
   "devDependencies": {

package/src/UI/components/clinical-pathways-action-menu/styles.css

@@ -23,3 +23,7 @@
   outline: 2px solid white;
   outline-offset: -2px;
 }
+
+dss-tooltip {
+  pointer-events: none;
+}

package/src/UI/components/communication-action-menu/styles.css

@@ -23,3 +23,7 @@
   outline: 2px solid white;
   outline-offset: -2px;
 }
+
+dss-tooltip {
+  pointer-events: none;
+}

package/src/UI/components/navigation-tooltip/navigation-tooltip.ts

@@ -1,4 +1,4 @@
-import { LitElement, html, css, unsafeCSS } from "lit";
+import { LitElement, css, html, unsafeCSS } from "lit";
 import { property } from "lit/decorators.js";
 import styles from "./styles.css?inline";
 
@@ -12,11 +12,11 @@ export class NavigationTooltip extends LitElement {
 
   render() {
     const itemHeight = 51;
-    const centerY = this.itemAbsoluteY + itemHeight / 2;
+    const centerY = this.itemAbsoluteY + itemHeight / 2 - 5;
 
     return html`
       <div class="tooltip-overlay">
-        <div class="navigation-tooltip" style="left: 73px; top: ${centerY}px">
+        <div class="navigation-tooltip" style="left: 88px; top: ${centerY}px">
           <dss-icon icon="info" size="md"></dss-icon>
           ${this.text}
           <div class="arrow"></div>

package/src/UI/components/poc-events-ecap/poc-events-ecap.ts

@@ -22,8 +22,12 @@ export class PocEventsEcap extends LitElement {
     </div>
     
     <form>
+        <label for="pdfId">PDF ID</label>
+        <input type="text" id="pdfId" name="pdfId" placeholder="unique-id">
         <label for="pdfName">PDF Name</label>
         <input type="text" id="pdfName" name="pdfName" placeholder="pdfName">
+        <label for="pdfDate">PDF Date</label>
+        <input type="text" id="pdfDate" name="pdfDate" placeholder="2024-01-15">
         <label for="url">URL</label>
         <input type="text" id="url" name="url" placeholder="url">
 
@@ -37,12 +41,12 @@ export class PocEventsEcap extends LitElement {
   }
 
   sendPdfToViewer() {
+    const pdfId = (this as any).shadowRoot?.getElementById("pdfId")?.value as string;
     const pdfName = (this as any).shadowRoot?.getElementById("pdfName")?.value as string;
+    const pdfDate = (this as any).shadowRoot?.getElementById("pdfDate")?.value as string;
     const fileName = (this as any).shadowRoot?.getElementById("url")?.value as string;
 
-    const data = { url: fileName };
-
-    shellApi.pdfViewerManager.add(pdfName, data);
+    shellApi.pdfViewerManager.add({ id: pdfId, name: pdfName, date: pdfDate, url: fileName });
   }
 
   getPDFS() {

package/src/UI/components/primaria-accordion/primaria-accordion.ts

@@ -1,6 +1,5 @@
 import { LitElement, html, css } from "lit";
 import { property } from "lit/decorators.js";
-
 export class PrimariaAccordion extends LitElement {
   @property({ type: Boolean })
   isOpen;

package/src/UI/shared-components/primaria-nav-item/styles.css

@@ -23,3 +23,7 @@
   outline: 2px solid white;
   outline-offset: -2px;
 }
+
+dss-tooltip {
+  pointer-events: none;
+}

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

@@ -4,12 +4,11 @@ import { classMap } from "lit/directives/class-map.js";
 
 export const template = (props: PrimariaNavItem) => {
   return html`
-  <div 
-    class=${classMap({ item: true, active: props.isActive })} 
-    @click=${props.config.callbackFn} 
+  <div
+    class=${classMap({ item: true, active: props.isActive })}
     ?expanded=${props.showText}
   >
-    <div class="icon-label">
+    <div class="icon-label" @click=${props.config.callbackFn}>
       <dss-icon icon=${props.config.icon} size="md" ?fill=${props.config.fill} style=${props.config.rotateIcon ? "transform: rotate(180deg);" : ""}></dss-icon>
       ${props.showText ? html`<span>${props.config.label}</span>` : ""}
     </div>

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

@@ -10,16 +10,18 @@ export class PrimariaNavTreeMenu extends LitElement {
   `;
 
   @property({ type: Object }) config: PrimariaNavTreeMenuConfig;
-  @state() primariaNavItemConfig: PrimariaNavItemConfig;
 
   @state() showActionMenu = false;
 
   constructor(config: PrimariaNavTreeMenuConfig) {
     super();
     this.config = config;
-    this.primariaNavItemConfig = {
-      icon: config.icon,
-      label: config.label,
+  }
+
+  get primariaNavItemConfig(): PrimariaNavItemConfig {
+    return {
+      icon: this.config.icon,
+      label: this.config.label,
       showArrow: true,
       callbackFn: this.handleItemClick,
     };
@@ -27,7 +29,6 @@ export class PrimariaNavTreeMenu extends LitElement {
 
   handleItemClick = () => {
     this.showActionMenu = true;
-    this.requestUpdate();
   };
 
   handleCloseMenu = () => {

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

@@ -1,4 +1,4 @@
-import { html, nothing } from "lit";
+import { html } from "lit";
 import { PrimariaNavTreeMenu } from "./primaria-nav-tree-menu";
 import { classMap } from "lit/directives/class-map.js";
 
@@ -6,45 +6,41 @@ export const template = (props: PrimariaNavTreeMenu) => html`
   <div class="wrapper">
     <primaria-nav-item
       .config=${props.primariaNavItemConfig}
-      @click=${props.handleItemClick}
       class="${classMap({ "menu-active": props.showActionMenu })}"
     ></primaria-nav-item>
-    ${
-      props.showActionMenu
-        ? html`
-          <dss-action-menu @onCloseActionMenu=${props.handleCloseMenu}>
-            ${props.config.actionMenuItems?.map(
-              (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>
-        `
-        : nothing
-    }
+    <dss-action-menu
+      @onCloseActionMenu=${props.handleCloseMenu}
+      ?hidden=${!props.showActionMenu}
+    >
+      ${props.config.actionMenuItems?.map((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>
   </div>
 `;

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

@@ -42,32 +42,32 @@ describe("PdfViewerManager", () => {
   });
 
   it("should show error if neither url nor b64 is provided", () => {
-    manager.add("Doc1", {});
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00" });
     expect(notificationService.error).toHaveBeenCalledWith("pdfManager.missingData");
     expect(manager.getPdfs()).toHaveLength(0);
   });
 
   it("should show error if both url and b64 are provided", () => {
-    manager.add("Doc1", { url: "url", b64: "b64" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "url", b64: "b64" });
     expect(notificationService.error).toHaveBeenCalledWith("pdfManager.duplicatedSource");
     expect(manager.getPdfs()).toHaveLength(0);
   });
 
   it("should add a valid pdf and publish event", () => {
-    manager.add("Doc1", { url: "https://test.com/doc1.pdf" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "https://test.com/doc1.pdf" });
 
     expect(manager.getPdfs()).toHaveLength(1);
     expect(broker.publish).toHaveBeenCalledWith(pdfViwerEvents.added, {
-      id: "generated-id",
+      id: "doc-1",
       pdfName: "Doc1",
-      data: { url: "https://test.com/doc1.pdf" },
+      data: { id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "https://test.com/doc1.pdf" },
     });
   });
 
   it("should show tooltip when adding a valid pdf", async () => {
     vi.useFakeTimers();
 
-    manager.add("Doc1", { url: "https://test.com/doc1.pdf" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "https://test.com/doc1.pdf" });
 
     // Fast-forward the setTimeout(100ms)
     vi.advanceTimersByTime(100);
@@ -81,8 +81,8 @@ describe("PdfViewerManager", () => {
   });
 
   it("should warn if pdf with same name already exists", () => {
-    manager.add("Doc1", { b64: "xxx" });
-    manager.add("Doc1", { b64: "xxx" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", b64: "xxx" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", b64: "xxx" });
 
     expect(notificationService.warning).toHaveBeenCalledWith("pdfManager.alreadyUploaded");
     expect(manager.getPdfs()).toHaveLength(1); // solo el primero
@@ -92,14 +92,14 @@ describe("PdfViewerManager", () => {
     vi.useFakeTimers();
 
     // First add succeeds and shows tooltip
-    manager.add("Doc1", { b64: "xxx" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", 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" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", b64: "xxx" });
     vi.advanceTimersByTime(100);
 
     expect(notificationService.warning).toHaveBeenCalledWith("pdfManager.alreadyUploaded");
@@ -111,7 +111,7 @@ describe("PdfViewerManager", () => {
   it("should not show tooltip when pdf data is invalid", () => {
     vi.useFakeTimers();
 
-    manager.add("Doc1", {});
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00" });
     vi.advanceTimersByTime(100);
 
     expect(notificationService.error).toHaveBeenCalledWith("pdfManager.missingData");
@@ -122,14 +122,14 @@ describe("PdfViewerManager", () => {
 
   it("should not call registerNavButton when adding PDFs", () => {
     // registerPdfViewerNavItem is now called from UI/internal-views, not from the manager
-    manager.add("Doc1", { url: "u" });
-    manager.add("Doc2", { url: "u2" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "u" });
+    manager.add({ id: "doc-2", name: "Doc2", date: "2024-01-15 - 10:00", url: "u2" });
 
     expect(registerPdfViewerNavItem).not.toHaveBeenCalled();
   });
 
   it("should delete a pdf and publish deletion event", () => {
-    manager.add("Doc1", { url: "u" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "u" });
     const pdfs = manager.getPdfs();
     expect(pdfs.length).toBeGreaterThan(0);
     const id = pdfs[0]!.id;
@@ -141,7 +141,7 @@ describe("PdfViewerManager", () => {
   });
 
   it("should clear activePdf if deleted", () => {
-    manager.add("Doc1", { url: "u" });
+    manager.add({ id: "doc-1", name: "Doc1", date: "2024-01-15 - 10:00", url: "u" });
     const pdfs = manager.getPdfs();
     expect(pdfs.length).toBeGreaterThan(0);
     const id = pdfs[0]!.id;

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

@@ -1,4 +1,3 @@
-import { generateId } from "@primaria/plugins-core";
 import { customElement } from "lit/decorators.js";
 import { translate } from "../../locales";
 import { PrimariaBroker } from "../broker/primaria-broker";
@@ -10,15 +9,22 @@ import { showNavItemTooltip } from "../../UI/components/navigation-tooltip";
 import { pdfViewerId } from "./constants";
 import { primariaShellId } from "../../constants";
 
+export interface PdfData {
+  id: string;
+  name: string;
+  date: string;
+  url?: string;
+  b64?: string;
+}
+
 export interface IPdfDocument {
-  pdfName: string;
   id: string;
+  pdfName: string;
   data: PdfData;
 }
 
-export interface PdfData {
-  url?: string;
-  b64?: string;
+export interface PdfViewerOptions {
+  autoNavigate?: boolean;
 }
 
 export class PdfViewerManager {
@@ -37,9 +43,12 @@ export class PdfViewerManager {
   private pdfs: IPdfDocument[] = [];
   private activePdf: IPdfDocument | null = null;
 
-  add(pdfName: string, data: PdfData) {
-    const id = generateId();
-    const pdf: IPdfDocument = { id, pdfName, data };
+  add(data: PdfData, options?: PdfViewerOptions) {
+    const pdf: IPdfDocument = {
+      id: data.id,
+      pdfName: data.name,
+      data
+    };
 
     if (!data.url && !data.b64) {
       this.notificationService.error(translate("pdfManager.missingData"));
@@ -49,18 +58,29 @@ export class PdfViewerManager {
       this.notificationService.error(translate("pdfManager.duplicatedSource"));
       return;
     }
-    if (this.pdfs.some((p) => p.pdfName === pdf.pdfName)) {
+    if (this.pdfs.some((p) => p.id === pdf.id)) {
       this.notificationService.warning(translate("pdfManager.alreadyUploaded"));
     } else {
       this.pdfs.push(pdf as IPdfDocument);
       this.broker.publish(pdfViwerEvents.added, pdf);
 
-      // Show tooltip to guide user to the PDF viewer
-      setTimeout(() => {
-        const navItemKey = `${primariaShellId}::${pdfViewerId}`;
-        showNavItemTooltip(navItemKey, translate("pdfManager.tooltipMessage"));
-      }, 100);
+      if (options?.autoNavigate) {
+        // Navigate automatically to PDF viewer
+        setTimeout(() => {
+          import("../api").then(({ shellApi }) => {
+            shellApi.regionManager.activateMainView(pdfViewerId);
+          });
+        }, 150);
+      } else {
+        // Show tooltip to guide user to the PDF viewer
+        setTimeout(() => {
+          const navItemKey = `${primariaShellId}::${pdfViewerId}`;
+          showNavItemTooltip(navItemKey, translate("pdfManager.tooltipMessage"));
+        }, 100);
+      }
     }
+
+    return pdf;
   }
 
   delete(pdfId: string) {

package/src/api/pdf-viewer-manager/pdf-visor/pdf-selector/styles.css

@@ -6,19 +6,40 @@
 .pdf-item{
   display: flex;
   align-items: flex-start;
-  padding: 8px; 
+  padding: 8px;
   gap:8px;
   color:black;
   border-bottom: 1px solid var(--color-neutral-100);
 }
 
-.header-icons{
+.container{
   display: flex;
-  gap: 8px;
+  flex-direction: column;
+  flex: 1;
+  position: relative;
 }
 
-.container{
-  gap: 8px;   
+.close-button{
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+.data{
   display: flex;
   flex-direction: column;
+  gap: 4px;
+  padding-right: 40px;
+}
+
+.pdf-name{
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 1.4;
+}
+
+.pdf-date{
+  font-size: 12px;
+  color: var(--color-neutral-500);
+  line-height: 1.3;
 }

package/src/api/pdf-viewer-manager/pdf-visor/pdf-selector/template.ts

@@ -8,21 +8,18 @@ export const template = (props: PdfSelector) => {
     return html`
     <div class="pdf-item">
       <dss-checkbox @onChange=${() => props.setActivePdf(pdf.id)}>
-        <input 
-          slot="input" 
-          type="checkbox" 
+        <input
+          slot="input"
+          type="checkbox"
           aria-label="Label"
           .checked=${props.activePdfs.some((p) => p.id === pdf.id)}
         >
       </dss-checkbox>
       <div class="container">
-        <div class="header-icons">
-          <dss-icon-button size="md" variant="error" icon="picture_as_pdf"></dss-icon-button> 
-          <dss-icon-button size="md" variant="error" icon="close" @click=${() => props.removePdf(pdf.id)}></dss-icon-button> 
-          <!-- <dss-icon-button size="md"  icon="open_in_new" @click=${() => props.openInNewWindow(pdf)}></dss-icon-button>  -->
-        </div>
+        <dss-icon-button class="close-button" size="md" variant="error" icon="close" @click=${() => props.removePdf(pdf.id)}></dss-icon-button>
         <div class="data">
-          ${pdf.pdfName}
+          <div class="pdf-name">${pdf.data.name || "Sense nom"}</div>
+          <div class="pdf-date">${pdf.data.date || " "}</div>
         </div>
       </div>
     </div>

package/src/features/visit/finalize-visit/component/template.ts

@@ -4,6 +4,6 @@ import { translate } from "../../../../locales";
 
 export const template = (props: FinalizeVisitButton) => {
   return html`
-    ${props.visitId ? html`<dss-button @click=${props.finalizeVisitHandler} variant="subtle" size="md" icon="door_front" label=${translate("actions.finalizeVisit")}></dss-button>` : nothing}
-`;
+    <dss-button @click=${props.finalizeVisitHandler} variant="subtle" size="md" icon="door_front" label=${translate("actions.finalizeVisit")}></dss-button>
+  `;
 };