@uxland/primary-shell 8.0.0-rc.0 → 8.0.0-rc.2

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

@@ -1,8 +1,12 @@
 import { inject, injectable } from "inversify";
-import { IUserInfo } from "./model";
 import { jwtDecode } from "jwt-decode";
-import { TYPES } from "../../infrastructure/ioc/types";
 import { shellApi } from "../../api/api";
+import { TYPES } from "../../infrastructure/ioc/types";
+import { IUserInfo } from "./model";
+import { PdsAccessInfo, PdsToken } from "./pds-token";
+
+/** Ordre de preferència dels identificadors del professional dins del token. */
+const USER_ID_TYPES = ["DNI", "NIE", "PASS"];
 
 export abstract class UserInfoBackendAdapter {
   abstract getUserInfo(): Promise<IUserInfo>;
@@ -11,26 +15,34 @@ 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<PdsToken>(this.api.tokenManager.getToken());
+    const accessInfo = decodedToken.access_info;
+
+    // `IUserInfo` declara `string` a tots els camps, però el token no en garanteix cap. Abans
+    // el token era `any` i els absents arribaven com a `undefined` amb tipus `string`; ara es
+    // normalitzen a cadena buida perquè el tipus digui la veritat.
     const userInfo: IUserInfo = {
-      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")
-        ?.value,
-      workCenter: decodedToken.access_info.center_code,
-      role: decodedToken.access_info.role_type,
-      speciality: decodedToken.access_info.professional_category,
+      userId: this.getUserId(accessInfo) ?? "",
+      firstName: accessInfo?.trace_user_given_name ?? "",
+      familyName: accessInfo?.trace_user_family_name ?? "",
+      lastName: accessInfo?.trace_user_last_name ?? "",
+      registrationNumber: this.findIdentifier(accessInfo, "NUMCOL") ?? "",
+      workCenter: accessInfo?.center_code ?? "",
+      role: accessInfo?.role_type ?? "",
+      speciality: accessInfo?.professional_category ?? "",
     };
     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 ||
-      access_info.identifier?.find((identifierItem: { type: string; value: string }) => identifierItem.type === "PASS")?.value
-    );
+  private findIdentifier(accessInfo: PdsAccessInfo | undefined, type: string) {
+    return accessInfo?.identifier?.find((identifier) => identifier.type === type)?.value;
+  }
+
+  getUserId(accessInfo: PdsAccessInfo | undefined) {
+    for (const type of USER_ID_TYPES) {
+      const value = this.findIdentifier(accessInfo, type);
+      if (value) return value;
+    }
+    return undefined;
   }
 }

package/src/features/get-user-info/handler.test.ts

@@ -27,8 +27,14 @@ describe("GetUserInfoHandler", () => {
 
   const message = {} as GetUserInfo;
   const mockUserInfo: IUserInfo = {
-    name: "John Doe",
-    email: "john@example.com",
+    userId: "12345678Z",
+    firstName: "John",
+    familyName: "Doe",
+    lastName: "Smith",
+    registrationNumber: "081234",
+    workCenter: "CAP",
+    role: "assist",
+    speciality: "MF",
   };
 
   beforeEach(() => {

package/src/features/get-user-info/pds-token.ts

@@ -0,0 +1,28 @@
+/**
+ * Els camps del token del PDS que aquest adaptador llegeix.
+ *
+ * Es declara aquí, i no s'importa `PDSToken` de `@pds/core`, per dues raons: el shell no depèn
+ * d'aquell package, i el seu `AccessInfo` no inclou `trace_user_last_name`, que sí que es fa
+ * servir. Si algun dia s'unifiquen els dos contractes, aquest fitxer hauria de desaparèixer.
+ *
+ * Tot és opcional perquè el token no en garanteix cap: fins ara el tipus era `any` i
+ * `IUserInfo` prometia `string` a tot arreu, cosa que no era certa en runtime.
+ */
+export interface PdsAccessInfo {
+  trace_user_given_name?: string;
+  trace_user_family_name?: string;
+  trace_user_last_name?: string;
+  center_code?: string;
+  role_type?: string;
+  professional_category?: string;
+  identifier?: PdsIdentifier[];
+}
+
+export interface PdsIdentifier {
+  type: string;
+  value: string;
+}
+
+export interface PdsToken {
+  access_info?: PdsAccessInfo;
+}

package/src/features/get-visi-id/action.ts

@@ -0,0 +1,11 @@
+import { PrimariaApi } from "../../api/api";
+
+export const getVisiId = async (api: PrimariaApi): Promise<string | undefined> => {
+  const context = api.contextManager.getContext();
+  if (context.visi_id) return context.visi_id as string;
+  try {
+    return (await api.broker.send("get_visi_id")) as string;
+  } catch {
+    return undefined;
+  }
+};

package/src/index.ts

@@ -5,11 +5,15 @@ import fontsCSS from "./UI/fonts/fonts.css?inline";
 // Inject CSS automatically
 if (typeof document !== "undefined") {
   const style = document.createElement("style");
-  style.textContent = fontsCSS + "\n" + dssCSS;
+  style.textContent = `${fontsCSS}\n${dssCSS}`;
   document.head.appendChild(style);
 }
 export * from "./bootstrapper";
 export * from "./disposer";
+export * from "./api/region-manager/regions";
+// Tipus de retorn de `regionManager.getRegisteredMainViews()`. El regionManager
+// arriba als plugins tipat via `PrimariaApi`; això només és per poder-lo anomenar.
+export type { RegisteredMainView } from "./api/region-manager/region-manager";
 export * from "./handle-plugins";
 // Superfície pública explícita: `primariaApiFactory`, `activityMonitor` i
 // `sessionRefreshTimer` són singletons interns del shell i no s'exposen.
@@ -24,6 +28,16 @@ export { PrimariaRegionHost, shellApi } from "./api/api";
 export type { TokenManager, InternalTokenManager } from "./api/token-manager/token-manager";
 export * from "./api/broker/primaria-broker";
 export type { PrimariaContextManager, EcapContext } from "./api/context-manager/context-manager";
+// Contractes de l'importador de dades estructurades. Una iniciativa que crida
+// `importDataManager.import(...)` necessita `ImportParams` per tipar-ho, i la que
+// s'injecta dins del modal la rep de `getCurrentImportParams()`. La implementació
+// (`ImportDataManagerImpl`) es queda dins: els plugins reben el mànager per la
+// `PrimariaApi`, no l'instancien.
+export type {
+  PrimariaImportDataManager,
+  ImportParams,
+  ImportParamsDiagnostic,
+} from "./api/import-data-manager/import-data-manager";
 export * from "./UI/index";
 export { PrimariaNavItem } from "./UI/shared-components/primaria-nav-item/primaria-nav-item";
 export { QuickActionItem } from "./UI/shared-components/quick-action-item/quick-action-item";
@@ -51,3 +65,28 @@ export type {
   IActivityHistoryCustomFilterGroup,
   IActivityHistoryCustomFilter,
 } from "@primaria/plugins-core";
+// Contractes de broker entre iniciatives. Es declaren a `@primaria/plugins-core`
+// perquè el shell no hi és part, i es re-exporten aquí perquè és l'únic paquet
+// que instal·len les iniciatives externes. Els noms també són a
+// `api.broker.requests` i `api.broker.events`, agrupats per propietari.
+export {
+  REQUEST_DIAGNOSTICS_SELECTOR,
+  CIPDS_SELECTION_REQUEST,
+  CIPDS_DIAGNOSTIC_FILTER_HISTORIC_REQUESTED,
+  LAST_WORKED_DIAGNOSTICS_KEY,
+  CLINICAL_COURSE_DRAFT_APPEND_REQUESTED,
+  HELP_REQUESTED,
+} from "@primaria/plugins-core";
+export type {
+  Diagnostic,
+  ConfigFilterDiagnosticParams,
+  DiagnosticsUpdater,
+  DiagnosticsSelectorPayload,
+  CipdsSelectionRequestPayload,
+  CipdsSelectionResponse,
+  DiagnosticRelation,
+  DiagnosticWithRelations,
+  DiagnosticFilterHistoricPayload,
+  ClinicalCourseDraftAppendRequestedPayload,
+  HelpRequestedPayload,
+} from "@primaria/plugins-core";

package/src/locales.ts

@@ -61,6 +61,7 @@ export const locales = {
         title: "Importar dades",
         actions: {
           cancel: "Cancel·lar",
+          close: "Tancar",
           import: "Importar dades",
         },
       },

package/src/types/custom.d.ts

@@ -0,0 +1,30 @@
+import "react";
+
+/**
+ * Els components web del Design System de Salut (`dss-*`) no porten tipus, així que s'obre
+ * `JSX.IntrinsicElements` per acceptar qualsevol element personalitzat.
+ *
+ * S'amplien els dos especificadors: amb `jsx: "react-jsx"`, la cerca del namespace JSX passa per
+ * `react/jsx-runtime`, que hereta de `React.JSX`.
+ *
+ * Aquest fitxer és idèntic a tots els plugins i no es pot compartir des de l'arrel: sota pnpm,
+ * l'arrel no té `react` a `node_modules`, així que l'especificador no resoldria i el
+ * `declare module` no ampliaria res.
+ */
+declare module "react" {
+  namespace JSX {
+    interface IntrinsicElements {
+      // biome-ignore lint/suspicious/noExplicitAny: els components del DSS no estan tipats
+      [key: string]: any;
+    }
+  }
+}
+
+declare module "react/jsx-runtime" {
+  namespace JSX {
+    interface IntrinsicElements {
+      // biome-ignore lint/suspicious/noExplicitAny: els components del DSS no estan tipats
+      [key: string]: any;
+    }
+  }
+}

package/dist/component-Bt_gBs5e.js

@@ -1,52 +0,0 @@
-import { s, u as d, k as l, h as p, r as m, b as g, c as h } from "./index-8n9_rIYI.js";
-const v = ".container{background-color:#fff;display:flex;flex-direction:column;min-width:500px;width:95vw;height:95vh;border-radius:var(--dss-radius-sm);overflow:hidden}.content{display:grid;flex:1;min-height:0;grid-template-columns:1fr 1fr;gap:16px;padding:16px}.content>primaria-region{width:100%;height:100%;min-height:0}.content primaria-region>div{width:100%;height:100%;border:1px solid var(--color-neutral-200);border-radius:8px;padding:16px;box-sizing:border-box}.content>primaria-region[name=import-data-region]>div{overflow-y:auto}.content>primaria-region[name=import-data-activity-history-region]>div{display:flex;flex-direction:column;gap:16px;overflow:hidden}.content>primaria-region[name=import-data-activity-history-region]>div>*{flex-shrink:0}.content>primaria-region[name=import-data-activity-history-region]>div>*:last-child{flex:1;min-height:0}.footer{display:flex;flex-direction:row;align-items:center;background:#fff;justify-content:end;gap:12px;height:56px;border-top:1px solid var(--color-neutral-100);padding:var(--dss-spacing-sm)}", f = (i) => l`
-    <div class="container">
-      <div class="content">
-        <primaria-region name="${s.regionManager.regions.shell.importDataActivityHistory}"></primaria-region>
-        <primaria-region name="${s.regionManager.regions.shell.importData}"></primaria-region>
-      </div>
-      <div class="footer">
-        <dss-button
-          label="${d("importDataManager.actions.cancel")}"
-          @click="${() => {
-  i.cancel();
-}}"
-          size="md"
-          variant="secondary"
-        ></dss-button>
-        <dss-button
-          label="${d("importDataManager.actions.import")}"
-          @click="${() => {
-  i._accept();
-}}"
-          size="md"
-          variant="primary"
-        ></dss-button>
-      </div>
-    </div>
-  `;
-var u = Object.getOwnPropertyDescriptor, x = (i, e, c, n) => {
-  for (var r = n > 1 ? void 0 : n ? u(e, c) : e, a = i.length - 1, o; a >= 0; a--)
-    (o = i[a]) && (r = o(r) || r);
-  return r;
-};
-let t = class extends p {
-  constructor() {
-    super(...arguments), this._accept = () => {
-      this.confirm();
-    };
-  }
-  render() {
-    return l`${f(this)}`;
-  }
-};
-t.styles = g`
-    ${m(v)}
-  `;
-t = x([
-  h("import-data-manager-modal")
-], t);
-export {
-  t as ImportDataManagerModal
-};
-//# sourceMappingURL=component-Bt_gBs5e.js.map

package/dist/component-Bt_gBs5e.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"component-Bt_gBs5e.js","sources":["../src/api/import-data-manager/component/template.ts","../src/api/import-data-manager/component/component.ts"],"sourcesContent":["import { html } from \"lit\";\nimport { translate } from \"../../../locales\";\nimport { shellApi } from \"../../api\";\nimport { ImportDataManagerModal } from \"./component\";\n\nexport const template = (props: ImportDataManagerModal) => {\n  return html`\n    <div class=\"container\">\n      <div class=\"content\">\n        <primaria-region name=\"${shellApi.regionManager.regions.shell.importDataActivityHistory}\"></primaria-region>\n        <primaria-region name=\"${shellApi.regionManager.regions.shell.importData}\"></primaria-region>\n      </div>\n      <div class=\"footer\">\n        <dss-button\n          label=\"${translate(\"importDataManager.actions.cancel\")}\"\n          @click=\"${() => {\n            props.cancel();\n          }}\"\n          size=\"md\"\n          variant=\"secondary\"\n        ></dss-button>\n        <dss-button\n          label=\"${translate(\"importDataManager.actions.import\")}\"\n          @click=\"${() => {\n            props._accept();\n          }}\"\n          size=\"md\"\n          variant=\"primary\"\n        ></dss-button>\n      </div>\n    </div>\n  `;\n};\n","import { LitElement, css, html, unsafeCSS } from \"lit\";\nimport { customElement } from \"lit/decorators.js\";\nimport { ConfirmationContentProps } from \"../../interaction-service\";\nimport styles from \"./styles.css?inline\";\nimport { template } from \"./template\";\n\n@customElement(\"import-data-manager-modal\")\nexport class ImportDataManagerModal extends LitElement implements ConfirmationContentProps<undefined, undefined> {\n  data: undefined;\n  setResult: (result: undefined) => void;\n  setIsValid: (isValid: boolean) => void;\n  confirm: () => void;\n  cancel: () => void;\n\n  render() {\n    return html`${template(this)}`;\n  }\n\n  static styles = css`\n    ${unsafeCSS(styles)}\n  `;\n\n  _accept = () => {\n    this.confirm();\n  };\n}\n"],"names":["template","props","html","shellApi","translate","ImportDataManagerModal","LitElement","css","unsafeCSS","styles","__decorateClass","customElement"],"mappings":";kiCAKaA,IAAW,CAACC,MAChBC;AAAAA;AAAAA;AAAAA,iCAGwBC,EAAS,cAAc,QAAQ,MAAM,yBAAyB;AAAA,iCAC9DA,EAAS,cAAc,QAAQ,MAAM,UAAU;AAAA;AAAA;AAAA;AAAA,mBAI7DC,EAAU,kCAAkC,CAAC;AAAA,oBAC5C,MAAM;AACd,EAAAH,EAAM,OAAA;AACR,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA,mBAKQG,EAAU,kCAAkC,CAAC;AAAA,oBAC5C,MAAM;AACd,EAAAH,EAAM,QAAA;AACR,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;AClBJ,IAAMI,IAAN,cAAqCC,EAAqE;AAAA,EAA1G,cAAA;AAAA,UAAA,GAAA,SAAA,GAeL,KAAA,UAAU,MAAM;AACd,WAAK,QAAA;AAAA,IACP;AAAA,EAAA;AAAA,EAVA,SAAS;AACP,WAAOJ,IAAOF,EAAS,IAAI,CAAC;AAAA,EAC9B;AASF;AAlBaK,EAWJ,SAASE;AAAAA,MACZC,EAAUC,CAAM,CAAC;AAAA;AAZVJ,IAANK,EAAA;AAAA,EADNC,EAAc,2BAA2B;AAAA,GAC7BN,CAAA;"}