@uxland/primary-shell 4.2.0 → 4.3.0

package/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/set-custom-filter-value/reducer.ts

@@ -1,5 +1,6 @@
 import { PayloadAction } from "@reduxjs/toolkit";
 import { SetCustomFilterValuePayload } from "./request";
+import { IActivityHistoryCustomFilter, IActivityHistoryCustomFilterGroup } from "../../model";
 
 export function setCustomFilterValueReducer(
   state,
@@ -22,8 +23,13 @@ export function setCustomFilterValueReducer(
   });
 }
 
-const setMultipleOptionsFilterValue = (filter, payload: SetCustomFilterValuePayload) => {
+const setMultipleOptionsFilterValue = (
+  filter: IActivityHistoryCustomFilter,
+  payload: SetCustomFilterValuePayload,
+) => {
   const { optionId, enabled } = payload;
+  //Si el option ya estaba habilitado, no cambiamos nada
+  if (filter.enabledValues?.some((id) => id === optionId) && enabled) return filter;
   return {
     ...filter,
     enabledValues: enabled

package/src/internal-plugins/activity-history/activity-history-item/filter/utils.ts

@@ -0,0 +1,9 @@
+import { translate } from "../../localization";
+
+export const formatShowFilterTitle = (title: string) => {
+  const filterTitle = title.replace(/veure/gi, "").trim();
+  return filterTitle.charAt(0).toUpperCase() + filterTitle.slice(1);
+};
+
+export const normalizeDeletedFilterBooleanValue = (value) =>
+  value === true ? translate("filters.deleted") : value;

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/activity-history-timeline.ts

@@ -40,6 +40,36 @@ export class ActivityHistoryTimeline extends LitElement {
     this._hasUpdatedOnce = true;
   }
 
+  async updated(changedProperties) {
+    if (changedProperties.has("historyGroups") && this.historyGroups?.length) {
+      // Resolver los elementos antes de actualizar el template
+      await this.prepareComponents(this.historyGroups);
+    }
+  }
+
+  async prepareComponents(historyGroups) {
+    for (const group of historyGroups) {
+      // Resolver items del grupo principal
+      group.items = await Promise.all(
+        group.items.map(async (item) => ({
+          ...item,
+          component: await item.componentFactory({ item }),
+        })),
+      );
+
+      // Resolver subgrupos
+      for (const subGroup of group.subGroups) {
+        subGroup.items = await Promise.all(
+          subGroup.items.map(async (item) => ({
+            ...item,
+            component: await item.componentFactory({ item }),
+          })),
+        );
+      }
+    }
+    this.requestUpdate(); // 🔥 Forzar actualización del template
+  }
+
   highlightMatch(text: string, searchString: string): string {
     if (!this.searchString || this.searchString.length < 2) return text;
     const regex = new RegExp(`(${searchString})`, "gi");

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts

@@ -9,6 +9,7 @@ import { ifDefined } from "lit/directives/if-defined.js";
 import {
   IActivityHistoryGroup,
   IActivityHistoryItem,
+  IActivityHistoryItemWithComponent,
   IActivityHistorySubGroup,
 } from "../../../domain/model";
 import { translate } from "../../../../localization";
@@ -27,8 +28,9 @@ export const template = (props: ActivityHistoryTimeline) => {
             <div class="visit__items">
               ${repeat(
                 itemGroup.items,
-                (item: IActivityHistoryItem) =>
-                  html`<div class="item">${item?.componentFactory(item)}</div> `,
+                (item) => item.id,
+                (item: IActivityHistoryItemWithComponent) =>
+                  html`<div class="item">${item.component}</div> `,
               )}
               ${repeat(
                 itemGroup.subGroups,
@@ -38,8 +40,9 @@ export const template = (props: ActivityHistoryTimeline) => {
                       ${diagnosticHeaderTemplate(subGroup.items[0])}
                       <div class="diagnostics__items">${repeat(
                         subGroup.items,
-                        (item: IActivityHistoryItem) =>
-                          html`<div class="item">${item?.componentFactory(item)}</div>  `,
+                        (item) => item.id,
+                        (item: IActivityHistoryItemWithComponent) =>
+                          html`<div class="item">${item?.component}</div>  `,
                       )}</div>
                     </div>
                 `,

package/src/internal-plugins/activity-history/handle-views.ts

@@ -0,0 +1,17 @@
+import { PrimariaApi } from "../../api/api";
+import { clinicalMonitoringRegions } from "../../api/region-manager/regions";
+import { ActivityHistoryMain } from "./activity-history-item/list/UI/main-view/activity-history-main";
+import { container } from "./infrastructure/ioc/container";
+import { TYPES } from "./infrastructure/ioc/types";
+
+export const registerViews = (api: PrimariaApi) => {
+  api.regionManager.registerView(clinicalMonitoringRegions.content, {
+    id: api.pluginInfo.pluginId,
+    factory: () => Promise.resolve(new ActivityHistoryMain()),
+  });
+};
+
+export const unregisterViews = () => {
+  const api = container.get(TYPES.primaryApi) as PrimariaApi;
+  api.regionManager.removeView(clinicalMonitoringRegions.content, api.pluginInfo.pluginId);
+};

package/src/internal-plugins/activity-history/infrastructure/ioc/container.ts

@@ -12,3 +12,8 @@ export const bindDeps = (api: PrimariaApi) => {
   container.bind(TYPES.primaryApi).toConstantValue(api);
   container.bind(TYPES.store).toConstantValue(store);
 };
+
+export const unbindDeps = () => {
+  container.unbind(TYPES.primaryApi);
+  container.unbind(TYPES.store);
+};

package/src/internal-plugins/activity-history/infrastructure/ioc/types.ts

@@ -1,5 +1,4 @@
 export const TYPES = {
   primaryApi: Symbol.for("primaryApi"),
   store: Symbol.for("store"),
-  localeManager: Symbol.for("localeManager"),
 };

package/src/internal-plugins/activity-history/localization.ts

@@ -1,7 +1,4 @@
 import { PrimariaApi } from "../../api/api";
-import { container } from "./infrastructure/ioc/container";
-import { TYPES } from "./infrastructure/ioc/types";
-import { getLocaleManagerDependency } from "./utils/get-locale-manager-dependency";
 
 type LocaleKeys<T> = T extends object
   ? {
@@ -17,15 +14,15 @@ export type ActivityHistoryLocales = LocaleKeys<
 
 const defaultLang = "ca";
 
+let pluginLocaleManager;
+
 export const initializeLocalization = async (api: PrimariaApi) => {
-  const pluginLocaleManager = await api.createLocaleManager(locales);
-  container.bind(TYPES.localeManager).toConstantValue(pluginLocaleManager);
+  pluginLocaleManager = await api.createLocaleManager(locales);
 };
 
 export const translate = (path: ActivityHistoryLocales) => {
-  const localeManager = getLocaleManagerDependency();
-  if (localeManager) return (localeManager as any).translate(path);
-  else return path;
+  if (pluginLocaleManager) return (pluginLocaleManager as any).translate(path);
+  return path;
 };
 
 export const locales = {
@@ -74,6 +71,8 @@ export const locales = {
 
         selected: "seleccionats",
         applyFilters: "Aplicar filtres",
+
+        deleted: "Eliminats",
       },
       tooltips: {
         subjective: "Subjectiu",

package/src/internal-plugins/activity-history/main.ts

@@ -1,11 +1,10 @@
 import { PrimariaApi } from "../../api/api";
-import { clinicalMonitoringRegions } from "../../api/region-manager/regions";
 import {
   bootstrapActivityHistoryItem,
   teardownActivityHistoryItem,
 } from "./activity-history-item/bootstrapper";
-import { ActivityHistoryMain } from "./activity-history-item/list/UI/main-view/activity-history-main";
-import { bindDeps } from "./infrastructure/ioc/container";
+import { registerViews, unregisterViews } from "./handle-views";
+import { bindDeps, unbindDeps } from "./infrastructure/ioc/container";
 import { initializeLocalization } from "./localization";
 
 const bootstrapFeatures = (api: PrimariaApi) => {
@@ -26,12 +25,7 @@ export const initialize = async (api: PrimariaApi) => {
 
 export const dispose = () => {
   teardownFeatures();
+  unregisterViews();
+  unbindDeps();
   return Promise.resolve();
 };
-
-export const registerViews = (api: PrimariaApi) => {
-  api.regionManager.registerView(clinicalMonitoringRegions.content, {
-    id: api.pluginInfo.pluginId,
-    factory: () => Promise.resolve(new ActivityHistoryMain()),
-  });
-};

package/src/locales.ts

@@ -31,19 +31,23 @@ export const locales = {
   ca: {
     [primariaShellId]: {
       title: "Estació de Treball Clínica",
-      actions:{
+      actions: {
         create: "Crear",
         toggleMenuClose: "Tancar menú",
         toggleMenuOpen: "Expandir menú",
+        askExit: "Atenció, vols sortir igualment?",
       },
-      clinicalMonitoring:{
+      clinicalMonitoring: {
         title: "Seguiment clínic",
       },
       header: {
         workCenter: "Centre treball",
         role: "Rol",
         speciality: "Àmbit treball",
-      }
-    }
+      },
+      busyManager: {
+        title: "Tasques pendents a desar:",
+      },
+    },
   },
 };

package/dist/primary/shell/src/internal-plugins/activity-history/utils/get-locale-manager-dependency.d.ts

@@ -1 +0,0 @@
-export declare const getLocaleManagerDependency: () => unknown;

package/src/internal-plugins/activity-history/utils/get-locale-manager-dependency.ts

@@ -1,7 +0,0 @@
-import { container } from "../infrastructure/ioc/container";
-import { TYPES } from "../infrastructure/ioc/types";
-
-export const getLocaleManagerDependency = () => {
-  const localeManager = container.get(TYPES.localeManager);
-  return localeManager;
-};