@uxland/primary-shell 5.6.5 → 5.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.6.5",
+  "version": "5.6.7",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/api/plugin-busy-manager/plugin-busy-list/styles.css

@@ -17,4 +17,11 @@
     display: flex;
     flex-direction: column;
     gap: 8px;
+}
+
+.plugin-busy-item{
+    text-align: center;
+    border: var(--dss-border-width-sm) solid var(--color-neutral-100);
+    border-radius: var(--dss-radius-lg);
+    padding: var(--dss-spacing-md);
 }

package/src/api/plugin-busy-manager/plugin-busy-list/template.ts

@@ -7,7 +7,14 @@ export const template = (props: PluginBusyList) => html`
     <div class="container">
         <div class="title">${translate("busyManager.title")}</div>
         <div class="list">
-            ${props.data?.busyTasks?.map((item: PluginBusyTask) => html`<div class="plugin-busy-item">${item.taskDescription}</div>`)}
+            ${props.data?.busyTasks?.map(
+              (item: PluginBusyTask) => html`
+                <div class="plugin-busy-item">
+                    <dss-typography tag="div" variant="body-3" fontweight="regular">
+                        ${item.taskDescription}
+                    </dss-typography>
+                </div>`,
+            )}
         </div>
     </div>
 `;

package/src/api/plugin-busy-manager/plugin-busy-manager.test.ts

@@ -15,10 +15,21 @@ describe("PluginBusyManagerImpl", () => {
 
   describe("addBusyPluginTask", () => {
     it("should add a plugin busy task", () => {
-      const task = { taskId: "1", taskDescription: "Loading plugin" };
-      manager.addBusyPluginTask(task);
-      expect(manager.getBusyPluginTasks()).toContain(task);
-    });
+    const task = { taskId: "1", taskDescription: "Loading plugin" };
+    manager.addBusyPluginTask(task);
+    expect(manager.getBusyPluginTasks()).toContain(task);
+  });
+
+  it("should not add a task if taskId already exists", () => {
+    const task1 = { taskId: "1", taskDescription: "First task" };
+    const task2 = { taskId: "1", taskDescription: "Duplicate task" }; // mismo taskId
+    manager.addBusyPluginTask(task1);
+    manager.addBusyPluginTask(task2);
+    const tasks = manager.getBusyPluginTasks();
+
+    expect(tasks.length).toBe(1);
+    expect(tasks[0]).toEqual(task1); // Asegura que no fue reemplazado ni duplicado
+  });
   });
 
   describe("removeBusyPluginTask", () => {

package/src/api/plugin-busy-manager/plugin-busy-manager.ts

@@ -32,7 +32,10 @@ export class PluginBusyManagerImpl implements PluginBusyManager {
   private busyQuickActionTasks: QuickActionBusyTask[] = [];
 
   public addBusyPluginTask(busyTask: PluginBusyTask): void {
-    this.busyPluginTasks.push(busyTask);
+    const exists = this.busyPluginTasks.some((task) => task.taskId === busyTask.taskId);
+    if (!exists) {
+      this.busyPluginTasks.push(busyTask);
+    }
   }
 
   public addBusyQuickActionTask(busyTask: QuickActionBusyTask): void {

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

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

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

@@ -54,9 +54,9 @@ export const headerMaximizedTemplate = (props: ActivityHistoryMain) => html`
             <div class="header__maximized__right">
                 <div>
                   <dss-button variant="subtle" size="md" label="${translate("actions.moreOptions")}" icon="more_horiz" iconposition="left"></dss-button>
-                  <dss-action-menu position="bottom-start">
+                  <!-- <dss-action-menu position="bottom-start">
                     <dss-action-menu-item @click=${() => props.api.broker.send(new ExportPdf())} lefticon="file_download" label=${translate("actions.exportPdf")}></dss-action-menu-item>
-                  </dss-action-menu>
+                  </dss-action-menu> -->
                 </div>
                 <dss-button label="${translate("actions.entryLegend")}" size="md" variant="secondary"  icon="info"></dss-button>
                 <dss-button label="${translate("actions.cronogram")}" size="md" variant="primary" icon="view_timeline" @click=${props._raiseEcapCronogramEvent}></dss-button>

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

@@ -33,7 +33,7 @@ export const template = (props: ActivityHistoryTimeline) => {
               .renderItem=${(itemGroup: IActivityHistoryGroup, index: number) => html`
                 <div class="visit zIndex${props.historyGroups.length - index}"
                      data-date=${ifDefined(itemGroup?.items[0]?.date || itemGroup?.subGroups[0]?.items[0]?.date)}>
-                  ${visitHeaderTemplate(props, itemGroup.items[0] || itemGroup.subGroups[0]?.items[0])}
+                  ${visitHeaderTemplate(props, itemGroup?.items[0] || itemGroup?.subGroups[0]?.items[0])}
                   <div class="visit__items">
                     ${repeat(
                       mergeHistoryItemsAndSubgroups(itemGroup),
@@ -44,7 +44,7 @@ export const template = (props: ActivityHistoryTimeline) => {
                           return html`
                             <div
                               class="item"
-                              ?has-divider=${hasItemDivider(item, itemGroup.items as IActivityHistoryItemWithComponent[])}
+                              ?has-divider=${hasItemDivider(item, itemGroup?.items as IActivityHistoryItemWithComponent[])}
                             >
                               ${item.component}
                             </div>
@@ -53,14 +53,14 @@ export const template = (props: ActivityHistoryTimeline) => {
                         const subGroup = entry.subGroup;
                         return html`
                           <div class="diagnostics">
-                            ${diagnosticHeaderTemplate(subGroup.items[0])}
+                            ${diagnosticHeaderTemplate(subGroup?.items[0])}
                             <div class="diagnostics__items">
                               ${repeat(
-                                subGroup.items,
+                                subGroup?.items,
                                 (item) => item.id,
                                 (item: IActivityHistoryItemWithComponent) => html`
                                   <div class="item"
-                                       ?has-divider=${hasItemDivider(item, subGroup.items as IActivityHistoryItemWithComponent[])}>
+                                       ?has-divider=${hasItemDivider(item, subGroup?.items as IActivityHistoryItemWithComponent[])}>
                                     ${item.component}
                                   </div>
                                 `,

package/src/internal-plugins/activity-history/activity-history-item/list/group-history-items/group-history-items.ts

@@ -2,25 +2,37 @@ import { IActivityHistoryItem, IActivityHistoryGroup, IActivityHistorySubGroup }
 import { areSameDiagnostics } from "../../domain/validation/diagnostics/are-same-diagnostics";
 import { hasValidDiagnostics } from "../../domain/validation/diagnostics/has-valid-diagnostics";
 
-const isSameVisit = (item1: IActivityHistoryItem, item2: IActivityHistoryItem): boolean => {
-  const sameProfessional =
-    item1.professional?.id === item2.professional?.id &&
-    item1.professional?.role?.id === item2.professional?.role?.id &&
-    item1.professional?.speciality?.id === item2.professional?.speciality?.id;
-  const sameLocation =
-    item1.ep?.id === item2.ep?.id &&
-    item1.up?.id === item2.up?.id &&
-    item1.center?.id === item2.center?.id &&
-    item1.service?.id === item2.service?.id;
-
-  const sameDay = new Date(item1.date).toDateString() === new Date(item2.date).toDateString();
-
-  return sameProfessional && sameLocation && sameDay;
+// Cache para evitar recalcular fechas
+const dateStringCache = new Map<string, string>();
+const dateObjectCache = new Map<string, Date>();
+
+const getDateString = (dateStr: string): string => {
+  if (!dateStringCache.has(dateStr)) {
+    dateStringCache.set(dateStr, new Date(dateStr).toDateString());
+  }
+  return dateStringCache.get(dateStr)!;
+};
+
+const getDateObject = (dateStr: string): Date => {
+  if (!dateObjectCache.has(dateStr)) {
+    dateObjectCache.set(dateStr, new Date(dateStr));
+  }
+  return dateObjectCache.get(dateStr)!;
+};
+
+// Crear una clave única para cada combinación de visita
+const createVisitKey = (item: IActivityHistoryItem): string => {
+  const professionalKey = `${item.professional?.id || 'null'}-${item.professional?.role?.id || 'null'}-${item.professional?.speciality?.id || 'null'}`;
+  const locationKey = `${item.ep?.id || 'null'}-${item.up?.id || 'null'}-${item.center?.id || 'null'}-${item.service?.id || 'null'}`;
+  const dayKey = getDateString(item.date);
+  
+  return `${professionalKey}|${locationKey}|${dayKey}`;
 };
 
 const withinEightHours = (date1: string, date2: string): boolean => {
-  const timeDifference = Math.abs(new Date(date1).getTime() - new Date(date2).getTime());
-  return timeDifference <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
+  const time1 = getDateObject(date1).getTime();
+  const time2 = getDateObject(date2).getTime();
+  return Math.abs(time1 - time2) <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
 };
 
 function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
@@ -30,12 +42,12 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 
     group.items.forEach((item) => {
       const diagnostics = item.diagnostics;
-
       const allDiagnosticsValid = diagnostics?.length > 0 && hasValidDiagnostics(diagnostics);
 
       if (allDiagnosticsValid) {
         let addedToSubGroup = false;
 
+        // Optimización: usar for...of con break para salir temprano
         for (const subGroup of subGroups) {
           const firstSubGroupItem = subGroup.items[0];
 
@@ -63,38 +75,59 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 }
 
 const groupActivityHistoryItems = (items: IActivityHistoryItem[]): IActivityHistoryGroup[] => {
-  const groups: IActivityHistoryGroup[] = [];
+  if (!items?.length) return [];
 
-  items?.forEach((item) => {
-    let added = false;
+  // Limpiar caches al inicio
+  dateStringCache.clear();
+  dateObjectCache.clear();
 
-    for (const group of groups) {
-      const firstItem = group.items[0];
-      const lastItem = group.items[group.items.length - 1];
+  // Mapa para agrupar por clave de visita
+  const visitGroups = new Map<string, IActivityHistoryGroup>();
+
+  items.forEach((item) => {
+    const visitKey = createVisitKey(item);
+    
+    if (!visitGroups.has(visitKey)) {
+      // Crear nuevo grupo
+      visitGroups.set(visitKey, {
+        idGroup: Math.random().toString(36).substr(2, 9),
+        items: [item],
+      });
+    } else {
+      // Verificar si está dentro del rango de 8 horas
+      const existingGroup = visitGroups.get(visitKey)!;
+      const firstItem = existingGroup.items[0];
+      const lastItem = existingGroup.items[existingGroup.items.length - 1];
 
       if (
-        isSameVisit(firstItem, item) &&
         withinEightHours(firstItem.date, item.date) &&
         withinEightHours(lastItem.date, item.date)
       ) {
-        group.items.push(item);
-        added = true;
-        break;
+        existingGroup.items.push(item);
+      } else {
+        // Si no está dentro del rango, crear un nuevo grupo con un sufijo
+        let counter = 1;
+        let newKey = `${visitKey}_${counter}`;
+        
+        while (visitGroups.has(newKey)) {
+          counter++;
+          newKey = `${visitKey}_${counter}`;
+        }
+        
+        visitGroups.set(newKey, {
+          idGroup: Math.random().toString(36).substr(2, 9),
+          items: [item],
+        });
       }
     }
-
-    if (!added) {
-      groups.push({
-        idGroup: Math.random().toString(36).substr(2, 9),
-        items: [item],
-      });
-    }
   });
 
-  // Crear subgrupos por diagnósticos iguales. Los items que no tienen diagnostico, se quedan fuera de subgrupos (remaining items)
+  const groups = Array.from(visitGroups.values());
+
+  // Crear subgrupos por diagnósticos iguales
   groupByValidDiagnostics(groups);
 
   return groups;
 };
 
-export { groupActivityHistoryItems };
+export { groupActivityHistoryItems };

package/src/locales.ts

@@ -49,7 +49,7 @@ export const locales = {
         speciality: "Àmbit treball",
       },
       busyManager: {
-        title: "Tasques pendents a desar:",
+        title: "Tasques pendents:",
       },
       pdfManager: {
         uploaded: "Document disponible al visor de resultats",