@uxland/primary-shell 5.3.3 → 5.3.4

package/dist/primary/shell/src/UI/internal-views/lower-nav-menu-views.d.ts

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

package/dist/primary/shell/src/UI/internal-views/upper-nav-views.d.ts

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

package/dist/primary/shell/src/features/get-user-info/backend-adapter.d.ts

@@ -8,4 +8,5 @@ export declare class GetUserInfoBackendAdapter implements UserInfoBackendAdapter
     private api;
     constructor(api: typeof shellApi);
     getUserInfo(): Promise<IUserInfo>;
+    getUserId(access_info: any): any;
 }

package/dist/primary/shell/src/features/visit/finalize-visit/bootstrapper.d.ts

@@ -0,0 +1,4 @@
+import { PrimariaApi } from '../../../api/api';
+
+export declare const useFinalizeVisit: (api: PrimariaApi) => void;
+export declare const disposeFinalizeVisit: () => void;

package/dist/primary/shell/src/features/visit/finalize-visit/component/finalize-visit-button.d.ts

@@ -0,0 +1,9 @@
+import { LitElement } from 'lit';
+
+export declare class FinalizeVisitButton extends LitElement {
+    render(): import('lit').TemplateResult<1>;
+    connectedCallback(): void;
+    visitId: string | undefined;
+    getVisitId(): Promise<void>;
+    finalizeVisitHandler(): void;
+}

package/dist/primary/shell/src/features/visit/finalize-visit/component/template.d.ts

@@ -0,0 +1,3 @@
+import { FinalizeVisitButton } from './finalize-visit-button';
+
+export declare const template: (props: FinalizeVisitButton) => import('lit').TemplateResult<1>;

package/dist/primary/shell/src/features/visit/finalize-visit/handler.d.ts

@@ -0,0 +1,8 @@
+import { PrimariaApi } from '../../../api/api';
+import { FinalizeVisit } from './request';
+
+export declare class FinalizeVisitHandler {
+    private api;
+    constructor(api: PrimariaApi);
+    handle(data: FinalizeVisit): Promise<void>;
+}

package/dist/primary/shell/src/features/visit/finalize-visit/request.d.ts

@@ -0,0 +1,4 @@
+export declare class FinalizeVisit {
+    visitId: string;
+    constructor(visitId: string);
+}

package/dist/primary/shell/src/features/visit/get-visit-id/bootstrapper.d.ts

@@ -0,0 +1,4 @@
+import { PrimariaApi } from '../../../api/api';
+
+export declare const useGetVisitId: (api: PrimariaApi) => void;
+export declare const disposeGetVisitId: () => void;

package/dist/primary/shell/src/features/visit/get-visit-id/handler.d.ts

@@ -0,0 +1,9 @@
+import { PrimariaApi } from '../../../api/api';
+import { GetVisitId } from './request';
+
+export declare class GetVisitIdHandler {
+    private api;
+    constructor(api: PrimariaApi);
+    handle(message: GetVisitId): Promise<string | undefined>;
+    private getVisitId;
+}

package/dist/primary/shell/src/features/visit/get-visit-id/request.d.ts

@@ -0,0 +1,2 @@
+export declare class GetVisitId {
+}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/business-rules.d.ts

@@ -1,3 +1,4 @@
-import { IActivityHistoryItem } from './model';
+import { IActivityHistoryItem, IActivityHistoryItemWithComponent } from './model';
 
 export declare function shouldShowRole(item: IActivityHistoryItem): boolean;
+export declare const hasItemDivider: (item: IActivityHistoryItemWithComponent, items: IActivityHistoryItemWithComponent[]) => boolean;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/model.d.ts

@@ -8,12 +8,20 @@ export interface IErrorHistoryItem {
     message: string;
 }
 export type TSearchActivityHistoryItemPredicate = (searchString: string, item: IActivityHistoryItem) => boolean;
+export interface IActivityHistoryDiagnostic {
+    codi: string;
+    cataleg: string;
+    descripcio: string;
+    idEcap: string;
+    idCipds: string;
+    idCdr: string;
+}
 export interface IActivityHistoryItem {
     id: string;
     date: string;
     professional: IOwner;
     relevant: boolean;
-    diagnostics: IEntityDescription[];
+    diagnostics: IActivityHistoryDiagnostic[];
     center: IEntityDescription;
     up: IEntityDescription;
     ep: IEntityDescription;

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

@@ -18,6 +18,7 @@ export declare const locales: {
                 toggleMenuClose: string;
                 toggleMenuOpen: string;
                 askExit: string;
+                finalizeVisit: string;
             };
             clinicalMonitoring: {
                 title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.3.3",
+  "version": "5.3.4",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",
@@ -25,14 +25,13 @@
     "url": "https://github.com/uxland/harmonix/issues"
   },
   "dependencies": {
-    "@lit-labs/virtualizer": "^2.1.0",
     "@uxland/harmonix": "^1.0.5",
     "@uxland/harmonix-adapters": "^1.0.1"
   },
   "devDependencies": {
     "@primaria/plugins-core": "^1.0.14",
     "@reduxjs/toolkit": "^2.6.1",
-    "@salut/design-system-salut": "../../design-system-salut-2.4.0.tgz",
+    "@salut/design-system-salut": "../../design-system-salut-2.4.1.tgz",
     "@types/react": "^19.0.12",
     "@uxland/lit-utilities": "^1.0.0",
     "@uxland/localization": "^1.0.3",
@@ -52,7 +51,8 @@
     "reflect-metadata": "^0.2.2",
     "tslib": "^2.3.0",
     "uxl-quill": "^1.0.1",
-    "vite": "^5.2.8"
+    "vite": "^5.2.8",
+    "@lit-labs/virtualizer": "^2.1.0"
   },
   "scripts": {
     "serve": "vite",

package/src/UI/bootstrapper.ts

@@ -1,6 +1,7 @@
 import { regionAdapterRegistry, selectableAdapterFactory } from "@uxland/regions";
 import { useComponents } from "./components/bootstrapper";
 import { useSharedUI } from "./shared-components/bootstrapper";
+import { useInternalViews } from "./internal-views/handle-views";
 
 export const useUI = () => {
   regionAdapterRegistry.registerAdapterFactory(
@@ -9,4 +10,5 @@ export const useUI = () => {
   );
   useSharedUI();
   useComponents();
+  useInternalViews();
 };

package/src/UI/components/bootstrapper.ts

@@ -4,6 +4,7 @@ import { PrimariaErrorView } from "./error-view/component";
 import { QuickActionsMenu } from "./quick-actions-menu/quick-actions-menu";
 import { PrimariaShellHeader } from "./primaria-shell/shell-header/shell-header";
 import { PocEventsEcap } from "./poc-events-ecap/poc-events-ecap";
+import { FinalizeVisitButton } from "../../features/visit/finalize-visit/component/finalize-visit-button";
 
 export const useComponents = () => {
   //@ts-ignore
@@ -12,6 +13,7 @@ export const useComponents = () => {
   customElement("primaria-shell-header")(PrimariaShellHeader);
   customElement("primaria-error-view")(PrimariaErrorView);
   customElement("quick-actions-menu")(QuickActionsMenu);
+  customElement("finalize-visit-button")(FinalizeVisitButton);
   //@ts-ignore
   customElement("poc-events-ecap")(PocEventsEcap);
 };

package/src/UI/components/primaria-shell/shell-header/template.ts

@@ -1,4 +1,4 @@
-import { html } from "lit";
+import { html, nothing } from "lit";
 import salutLogo from "../../../../UI/images/Salut_Logotip.svg";
 import { PrimariaShellHeader } from "./shell-header";
 import { when } from "lit/directives/when.js";
@@ -18,6 +18,7 @@ export const template = (props: PrimariaShellHeader) => {
       <div id="header-region-container"></div>
     </div>
     <div class="header__right">
+      <finalize-visit-button></finalize-visit-button>
       <div id="header-actions-region-container"></div>
       ${when(
         props.professional,

package/src/UI/internal-views/handle-views.ts

@@ -0,0 +1,13 @@
+import { registerPDFVisorMainView } from "../../api/pdf-viewer-manager/handle-views";
+import { registerLowerNavMenuViews } from "./lower-nav-menu-views";
+import { registerUpperNavMenuViews } from "./upper-nav-views";
+
+const registerMainViews = () => {
+  registerPDFVisorMainView();
+};
+
+export const useInternalViews = () => {
+  registerMainViews();
+  registerUpperNavMenuViews();
+  registerLowerNavMenuViews();
+};

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

@@ -0,0 +1,19 @@
+import { shellApi } from "../../api/api";
+import { shellRegions } from "../../api/region-manager/regions";
+import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
+
+export const registerLowerNavMenuViews = () => {
+  shellApi.regionManager.registerView(shellRegions.navigationLowerLeftMenu, {
+    id: "configuration-center",
+    factory: () => {
+      const menuItem = new PrimariaNavItem({
+        icon: "settings",
+        label: "Centre de configuració",
+        callbackFn: () => {
+          // shellApi.regionManager.activateView(shellRegions.main, "");
+        },
+      });
+      return Promise.resolve(menuItem);
+    },
+  });
+};

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

@@ -0,0 +1,200 @@
+import { shellApi } from "../../api/api";
+import { shellRegions } from "../../api/region-manager/regions";
+import { ExitShell } from "../../features/exit/request";
+import { getPatientCip } from "../../features/get-patient-cip/action";
+import { navigateToEcapWithoutClosingWithCip } from "../../features/navigate-to-ecap/navigate-without-closing-and-with-cip";
+import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
+import { PrimariaNavTreeMenu } from "../shared-components/primaria-nav-tree-menu/primaria-nav-tree-menu";
+
+type MenuItemConfig =
+  | {
+      id: string;
+      sortHint?: string;
+      icon: string;
+      label: string;
+      type: "item";
+      callbackFn: () => void | Promise<void>;
+    }
+  | {
+      id: string;
+      sortHint?: string;
+      icon: string;
+      label: string;
+      type: "tree";
+      actionMenuItems: {
+        icon: string;
+        label: string;
+        callbackFn: () => void | Promise<void>;
+      }[];
+    };
+
+const upperNavMenuItems: MenuItemConfig[] = [
+  {
+    id: "landing",
+    icon: "home",
+    label: "Pàgina inici",
+    type: "item",
+    sortHint: "0010",
+    callbackFn: () => shellApi.broker.send(new ExitShell()),
+  },
+  {
+    id: "processes",
+    icon: "account_tree",
+    label: "Vies clíniques",
+    type: "tree",
+    sortHint: "0040",
+    actionMenuItems: [
+      {
+        icon: "open_in_new",
+        label: "ARES",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("PROCES_ATENCIO"),
+      },
+      {
+        icon: "open_in_new",
+        label: "Procés Obstètric",
+        callbackFn: () => {},
+      },
+      {
+        icon: "open_in_new",
+        label: "Nen sa",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("NEN_SA"),
+      },
+      {
+        icon: "open_in_new",
+        label: "Odontologia",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("ODONTOLOGO"),
+      },
+      {
+        icon: "open_in_new",
+        label: "Situació d'especial cura",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("SIT_ESPEC_CURA_DEV"),
+      },
+    ],
+  },
+  {
+    id: "unique-petition",
+    icon: "playlist_add",
+    label: "Petitori",
+    type: "tree",
+    sortHint: "0050",
+    actionMenuItems: [
+      {
+        icon: "open_in_new",
+        label: "Analítiques",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("LABORATORI"),
+      },
+      {
+        icon: "open_in_new",
+        label: "Ordres Clíniques",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("RESULT_OC"),
+      },
+      {
+        icon: "open_in_new",
+        label: "OC Exprés",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("OC_EXPRES"),
+      },
+      {
+        icon: "open_in_new",
+        label: "Sol·licitud de trasllat",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("TRANSPORT"),
+      },
+    ],
+  },
+  {
+    id: "results-reports",
+    icon: "folder_shared",
+    label: "Documents",
+    type: "tree",
+    sortHint: "0070",
+    actionMenuItems: [
+      {
+        icon: "open_in_new",
+        label: "Resultats i informes ECAP",
+        callbackFn: () => {},
+      },
+      {
+        icon: "open_in_new",
+        label: "Documents usuari",
+        callbackFn: () =>
+          setTimeout(() => {
+            navigateToEcapWithoutClosingWithCip("CRIDA_DOCS_USU");
+          }, 0),
+      },
+    ],
+  },
+  {
+    id: "communication",
+    icon: "3p",
+    label: "Comunicació",
+    type: "tree",
+    sortHint: "0120",
+    actionMenuItems: [
+      {
+        icon: "open_in_new",
+        label: "SMS",
+        callbackFn: async () => {
+          const CIP = await getPatientCip(shellApi);
+          shellApi.ecapEventManager.publish("MISSATGES_DEV", "NO_TANCAR", {
+            CIP: CIP || "",
+            TipusMissatge: "SMS",
+          });
+        },
+      },
+      { icon: "open_in_new", label: "Econsulta", callbackFn: () => {} },
+      { icon: "open_in_new", label: "Mail", callbackFn: () => {} },
+      {
+        icon: "open_in_new",
+        label: "Veu IP",
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("VOIP"),
+      },
+      { icon: "open_in_new", label: "Videoconsulta", callbackFn: () => {} },
+    ],
+  },
+  {
+    id: "visits",
+    icon: "event",
+    label: "Visites",
+    type: "item",
+    sortHint: "0130",
+    callbackFn: () => navigateToEcapWithoutClosingWithCip("CONSULTA_VISITES"),
+  },
+  {
+    id: "it",
+    icon: "add_box",
+    label: "IT",
+    type: "item",
+    callbackFn: () => navigateToEcapWithoutClosingWithCip("REV_IT"),
+  },
+  {
+    id: "variable activities",
+    icon: "add_box",
+    label: "Activitats variables",
+    type: "item",
+    callbackFn: () => navigateToEcapWithoutClosingWithCip("SIA_DEV"),
+  },
+];
+
+export const registerUpperNavMenuViews = () => {
+  for (const item of upperNavMenuItems) {
+    shellApi.regionManager.registerView(shellRegions.navigationMenu, {
+      id: item.id,
+      sortHint: item.sortHint,
+      factory: () => {
+        const menuItem =
+          item.type === "item"
+            ? new PrimariaNavItem({
+                icon: item.icon,
+                label: item.label,
+                callbackFn: item.callbackFn,
+              })
+            : new PrimariaNavTreeMenu({
+                icon: item.icon,
+                label: item.label,
+                actionMenuItems: item.actionMenuItems,
+              });
+
+        return Promise.resolve(menuItem);
+      },
+    });
+  }
+};

package/src/bootstrapper.ts

@@ -1,14 +1,12 @@
 import { PrimariaShell } from "./UI/components/primaria-shell/primaria-shell";
 import { shellApi } from "./api/api";
 import { useFeatures } from "./features/bootstrapper";
-import { useInternalViews } from "./handle-views";
 import { useLocalization } from "./locales";
 import { useUI } from "./UI/bootstrapper";
 
 export const initializeShell = (hostAppElement: HTMLElement) => {
   useLocalization(shellApi);
   useUI();
-  useInternalViews();
   useFeatures(shellApi);
   const shell = new PrimariaShell();
   hostAppElement.appendChild(shell as any);

package/src/features/bootstrapper.ts

@@ -9,11 +9,15 @@ import {
   disposeClinicalMonitoring,
   useClinicalMonitoring,
 } from "./clinical-monitoring/bootstrapper";
+import { disposeGetVisitId, useGetVisitId } from "./visit/get-visit-id/bootstrapper";
+import { disposeFinalizeVisit, useFinalizeVisit } from "./visit/finalize-visit/bootstrapper";
 
 export const useFeatures = (api: PrimariaApi) => {
   container.bind(TYPES.primaryApi).toConstantValue(api);
   useGetUserInfo(api);
   useExitShell(api);
+  useGetVisitId(api);
+  useFinalizeVisit(api);
   useClinicalMonitoring(api);
   api.broker.send(new GetUserInfo());
 };
@@ -21,6 +25,8 @@ export const useFeatures = (api: PrimariaApi) => {
 export const disposeFeatures = (api: PrimariaApi) => {
   disposeGetUserInfo();
   disposeExitShell();
+  disposeGetVisitId();
+  disposeFinalizeVisit();
   disposeClinicalMonitoring(api);
   container.unbindAll();
   api.regionManager._destroy();

package/src/features/get-user-info/backend-adapter.ts

@@ -11,14 +11,14 @@ export abstract class UserInfoBackendAdapter {
 export class GetUserInfoBackendAdapter implements UserInfoBackendAdapter {
   constructor(@inject(TYPES.primaryApi) private api: typeof shellApi) {}
   getUserInfo(): Promise<IUserInfo> {
-    const decodedToken = jwtDecode(this.api.tokenManager.getToken())
+    const decodedToken = jwtDecode(this.api.tokenManager.getToken());
     const userInfo: IUserInfo = {
-      userId: decodedToken.access_info.trace_user_id,
+      userId: this.getUserId(decodedToken.access_info),
       firstName: decodedToken.access_info.trace_user_given_name,
       familyName: decodedToken.access_info.trace_user_family_name,
       lastName: decodedToken.access_info.trace_user_last_name,
       registrationNumber: decodedToken.access_info.identifier.find(
-        (id: { type: string; value: string }) => id.type === "NUMCOL"
+        (id: { type: string; value: string }) => id.type === "NUMCOL",
       )?.value,
       workCenter: decodedToken.access_info.center_code,
       role: decodedToken.access_info.role_type,
@@ -26,4 +26,15 @@ export class GetUserInfoBackendAdapter implements UserInfoBackendAdapter {
     };
     return Promise.resolve(userInfo);
   }
+
+  getUserId(access_info) {
+    return (
+      access_info.identifier?.find(
+        (identifierItem: { type: string; value: string }) => identifierItem.type === "DNI",
+      )?.value ||
+      access_info.identifier?.find(
+        (identifierItem: { type: string; value: string }) => identifierItem.type === "NIE",
+      )?.value
+    );
+  }
 }

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

@@ -0,0 +1,17 @@
+import { PrimariaApi } from "../../../api/api";
+import { BrokerDisposableHandler } from "../../../api/broker/primaria-broker";
+import { container } from "../../../infrastructure/ioc/container";
+import { registerRequest } from "../../utils";
+import { FinalizeVisitHandler } from "./handler";
+import { FinalizeVisit } from "./request";
+
+let request: BrokerDisposableHandler;
+
+export const useFinalizeVisit = (api: PrimariaApi) => {
+  disposeFinalizeVisit();
+  request = registerRequest(api, container)(FinalizeVisit, FinalizeVisitHandler);
+};
+
+export const disposeFinalizeVisit = () => {
+  request?.dispose();
+};

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

@@ -0,0 +1,36 @@
+import { LitElement, html } from "lit";
+import { template } from "./template";
+import { property } from "lit/decorators.js";
+import { GetVisitId } from "../../get-visit-id/request";
+import { shellApi } from "../../../../api/api";
+import { FinalizeVisit } from "../request";
+
+export class FinalizeVisitButton extends LitElement {
+  render() {
+    return html`${template(this)}`;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this.getVisitId();
+  }
+
+  @property({ type: String }) 
+  visitId: string | undefined;
+
+  async getVisitId() {
+    try {
+      await shellApi.broker.send(new GetVisitId()).then((visitIdResponse: string | undefined) => {
+        this.visitId = visitIdResponse;
+      });
+    } catch (error) {
+      console.error(error.message);
+    }
+  }
+
+  finalizeVisitHandler() {
+    if (this.visitId) {
+      shellApi.broker.send(new FinalizeVisit(this.visitId));
+    }
+  }
+}

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

@@ -0,0 +1,9 @@
+import { html, nothing } from "lit";
+import { FinalizeVisitButton } from "./finalize-visit-button";
+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}
+`;
+};

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

@@ -0,0 +1,18 @@
+import { TYPES } from "../../../infrastructure/ioc/types";
+import { inject } from "inversify";
+import { PrimariaApi } from "../../../api/api";
+import { FinalizeVisit } from "./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", "", { visitId: visitIdData });
+    } catch (error) {
+      this.api.notificationService.error(error.message);
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+export class FinalizeVisit {
+  constructor(public visitId: string) {}
+}

package/src/features/visit/get-visit-id/bootstrapper.ts

@@ -0,0 +1,17 @@
+import { PrimariaApi } from "../../../api/api";
+import { BrokerDisposableHandler } from "../../../api/broker/primaria-broker";
+import { container } from "../../../infrastructure/ioc/container";
+import { registerRequest } from "../../utils";
+import { GetVisitIdHandler } from "./handler";
+import { GetVisitId } from "./request";
+
+let request: BrokerDisposableHandler;
+
+export const useGetVisitId = (api: PrimariaApi) => {
+  disposeGetVisitId();
+  request = registerRequest(api, container)(GetVisitId, GetVisitIdHandler);
+};
+
+export const disposeGetVisitId = () => {
+  request?.dispose();
+};

package/src/features/visit/get-visit-id/handler.ts

@@ -0,0 +1,27 @@
+import { TYPES } from "../../../infrastructure/ioc/types";
+import { inject } from "inversify";
+import { PrimariaApi } from "../../../api/api";
+import { GetVisitId } from "./request";
+
+export class GetVisitIdHandler {
+  constructor(
+    @inject(TYPES.primaryApi) private api: PrimariaApi,
+  ) {}
+  async handle(message: GetVisitId): Promise<string | undefined> {
+    try {
+      const visitIdData = await this.getVisitId();
+      console.log("Visit ID obtenido: ", visitIdData);
+      return visitIdData;
+    } catch (error) {
+      this.api.notificationService.error(error.message);
+      return undefined;
+    }
+  }
+
+  private getVisitId(): Promise<string | undefined> {
+    const urlParams = new URLSearchParams(window.location.search);
+    console.log("Paràmetres de la URL: ", window.location.search);
+    const visitId = urlParams.get("visit_id");
+    return Promise.resolve(visitId || undefined);
+  }
+}

package/src/features/visit/get-visit-id/request.ts

@@ -0,0 +1 @@
+export class GetVisitId {}