@uxland/primary-shell 5.4.3 → 5.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.4.3",
+  "version": "5.4.5",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@uxland/harmonix": "^1.1.1",
-    "@uxland/harmonix-adapters": "^1.2.0"
+    "@uxland/harmonix-adapters": "^1.2.1"
   },
   "devDependencies": {
     "@primaria/plugins-core": "^1.0.14",

package/src/UI/components/primaria-shell/styles.css

@@ -58,6 +58,17 @@
       flex-direction: column;
       gap: 4px;
     }
+
+    /*Temporary scrollbar*/
+    #menu-region-container {
+      overflow-y: auto;
+      margin-right: -10px; 
+      padding-right: 10px; 
+      scrollbar-color: var(--color-primary-900) var(--color-primary-700);
+      scrollbar-width: thin;
+    }
+    /**/
+
     .bottom-content {
       display: flex;
       flex-direction: column;

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

@@ -154,7 +154,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
     label: "Gabinets de proves",
     type: "item",
     sortHint: "0080",
-    callbackFn: () => {},
+    callbackFn: () => navigateToEcapWithoutClosingWithCip("GABINETS_PROVES"),
   },
   {
     id: "prescriptions",

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

@@ -21,4 +21,5 @@
 
 .item.active{
   outline: 2px solid white;
+  outline-offset: -2px;
 }

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

@@ -80,6 +80,7 @@
       flex-direction: row;
       align-items: center;
       gap: 16px;
+      flex-wrap: wrap;
     }
     .diagnostics__items {
       display: flex;

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

@@ -1,135 +1,100 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach } from "vitest";
 import { IActivityHistoryItem } from "../../domain/model";
+import * as diagnosticsUtils from "../../domain/validation/diagnostics/has-valid-diagnostics";
+import * as sameDiagnosticsUtils from "../../domain/validation/diagnostics/are-same-diagnostics";
 import { groupActivityHistoryItems } from "./group-history-items";
 
-const baseItem = (overrides: Partial<IActivityHistoryItem>): IActivityHistoryItem => ({
-  id: "1",
+vi.mock("../../domain/validation/diagnostics/has-valid-diagnostics", () => ({
+  hasValidDiagnostics: vi.fn(),
+}));
+vi.mock("../../domain/validation/diagnostics/are-same-diagnostics", () => ({
+  areSameDiagnostics: vi.fn(),
+}));
+
+const mockItem = (overrides: Partial<IActivityHistoryItem>): IActivityHistoryItem => ({
   date: new Date().toISOString(),
-  professional: { id: "p1", role: { id: "r1" }, speciality: { id: "s1" } },
+  diagnostics: [],
+  professional: {
+    id: "1",
+    role: { id: "r1" },
+    speciality: { id: "s1" },
+  },
   ep: { id: "ep1" },
   up: { id: "up1" },
   center: { id: "c1" },
-  service: { id: "sv1" },
-  diagnostics: [],
+  service: { id: "svc1" },
   ...overrides,
 });
 
 describe("groupActivityHistoryItems", () => {
-  it("agrupa en un solo grupo por misma visita y dentro de 8h", () => {
-    const now = new Date();
-    const items = [
-      baseItem({ id: "1", date: now.toISOString() }),
-      baseItem({ id: "2", date: new Date(now.getTime() + 2 * 3600 * 1000).toISOString() }),
-    ];
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
 
-    const result = groupActivityHistoryItems(items);
+  it("agrupa ítems que son de la misma visita y dentro de 8h", () => {
+    const date1 = new Date();
+    const date2 = new Date(date1.getTime() + 2 * 60 * 60 * 1000); // +2h
 
-    expect(result).toHaveLength(1);
-    expect(result[0].sameVisit).toBe(true);
-    expect(result[0].items).toHaveLength(2);
-  });
+    const items = [mockItem({ date: date1.toISOString() }), mockItem({ date: date2.toISOString() })];
 
-  it("agrupa sin misma visita pero dentro de 8h", () => {
-    const now = new Date();
-    const items = [
-      baseItem({
-        id: "1",
-        date: now.toISOString(),
-        professional: { id: "p1", role: { id: "r1" }, speciality: { id: "s1" } },
-      }),
-      baseItem({
-        id: "2",
-        date: new Date(now.getTime() + 2 * 3600 * 1000).toISOString(),
-        professional: { id: "p2", role: { id: "r2" }, speciality: { id: "s2" } },
-      }),
-    ];
+    (diagnosticsUtils.hasValidDiagnostics as any).mockReturnValue(false);
 
     const result = groupActivityHistoryItems(items);
 
     expect(result).toHaveLength(1);
-    expect(result[0].sameVisit).toBe(false);
     expect(result[0].items).toHaveLength(2);
   });
 
-  it("no agrupa si hay diferencia de más de 8h", () => {
-    const now = new Date();
-    const items = [
-      baseItem({ id: "1", date: now.toISOString() }),
-      baseItem({ id: "2", date: new Date(now.getTime() + 9 * 3600 * 1000).toISOString() }),
-    ];
+  it("no agrupa ítems de diferente visita", () => {
+    const item1 = mockItem({ professional: { id: "1", role: { id: "r1" }, speciality: { id: "s1" } } });
+    const item2 = mockItem({ professional: { id: "2", role: { id: "r2" }, speciality: { id: "s2" } } });
 
-    const result = groupActivityHistoryItems(items);
+    (diagnosticsUtils.hasValidDiagnostics as any).mockReturnValue(false);
+
+    const result = groupActivityHistoryItems([item1, item2]);
 
     expect(result).toHaveLength(2);
   });
 
-  it("crea subgrupos con mismos diagnósticos", () => {
-    const now = new Date();
-    const diagnostics = [
-      {
-        codi: "A123",
-        cataleg: "ICD-10",
-        descripcio: "Dolor lumbar",
-      },
-    ];
-    const items = [
-      baseItem({ id: "1", date: now.toISOString(), diagnostics }),
-      baseItem({ id: "2", date: new Date(now.getTime() + 1000).toISOString(), diagnostics }),
-    ];
+  it("crea subgrupos por diagnósticos válidos e iguales", () => {
+    const diagnostics = [{ code: "A" }];
+    const item1 = mockItem({ diagnostics });
+    const item2 = mockItem({ diagnostics });
 
-    const result = groupActivityHistoryItems(items);
+    (diagnosticsUtils.hasValidDiagnostics as any).mockReturnValue(true);
+    (sameDiagnosticsUtils.areSameDiagnostics as any).mockReturnValue(true);
+
+    const result = groupActivityHistoryItems([item1, item2]);
 
+    expect(result).toHaveLength(1);
     expect(result[0].subGroups).toHaveLength(1);
-    expect(result[0].subGroups![0].items).toHaveLength(2);
-    expect(result[0].items).toHaveLength(0);
+    expect(result[0].subGroups[0].items).toHaveLength(2);
+    expect(result[0].items).toHaveLength(0); // todos se agruparon
   });
 
-  it("no crea subgrupos si alguno de los diagnosticos es invalido", () => {
-    const now = new Date();
-    const diagnostics1 = [
-      {
-        codi: "A123",
-        cataleg: "ICD-10",
-        descripcio: "Dolor lumbar",
-      },
-    ];
-    const diagnostics2 = [
-      {
-        codi: "A123",
-      },
-    ];
-    const items = [
-      baseItem({ id: "1", date: now.toISOString(), diagnostics1 }),
-      baseItem({ id: "2", date: new Date(now.getTime() + 1000).toISOString(), diagnostics2 }),
-    ];
+  it("deja fuera del subgrupo los ítems con diagnósticos no válidos", () => {
+    const item1 = mockItem({ diagnostics: [{ code: "A" }] });
+    const item2 = mockItem({ diagnostics: [] });
 
-    const result = groupActivityHistoryItems(items);
+    (diagnosticsUtils.hasValidDiagnostics as any).mockImplementation((d: any[]) => d.length > 0);
+    (sameDiagnosticsUtils.areSameDiagnostics as any).mockReturnValue(true);
 
-    expect(result[0].subGroups).toHaveLength(0);
-    expect(result[0].items).toHaveLength(2);
+    const result = groupActivityHistoryItems([item1, item2]);
+
+    expect(result[0].subGroups).toHaveLength(1);
+    expect(result[0].subGroups[0].items).toHaveLength(1);
+    expect(result[0].items).toHaveLength(1); // el que no tiene diagnóstico válido
   });
 
-  it("deja fuera de subgrupos ítems sin diagnóstico", () => {
-    const now = new Date();
-    const items = [
-      baseItem({
-        id: "1",
-        date: now.toISOString(),
-        diagnostics: [
-          {
-            codi: "A123",
-            cataleg: "ICD-10",
-            descripcio: "Dolor lumbar",
-          },
-        ],
-      }),
-      baseItem({ id: "2", date: new Date(now.getTime() + 1000).toISOString() }),
-    ];
+  it("crea subgrupos distintos para diagnósticos distintos", () => {
+    const item1 = mockItem({ diagnostics: [{ code: "A" }] });
+    const item2 = mockItem({ diagnostics: [{ code: "B" }] });
 
-    const result = groupActivityHistoryItems(items);
+    (diagnosticsUtils.hasValidDiagnostics as any).mockReturnValue(true);
+    (sameDiagnosticsUtils.areSameDiagnostics as any).mockReturnValue(false);
 
-    expect(result[0].subGroups).toHaveLength(1);
-    expect(result[0].subGroups![0].items).toHaveLength(1);
-    expect(result[0].items).toHaveLength(1);
+    const result = groupActivityHistoryItems([item1, item2]);
+
+    expect(result[0].subGroups).toHaveLength(2);
   });
 });

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

@@ -1,8 +1,4 @@
-import {
-  IActivityHistoryItem,
-  IActivityHistoryGroup,
-  IActivityHistorySubGroup,
-} from "../../domain/model";
+import { IActivityHistoryItem, IActivityHistoryGroup, IActivityHistorySubGroup } from "../../domain/model";
 import { areSameDiagnostics } from "../../domain/validation/diagnostics/are-same-diagnostics";
 import { hasValidDiagnostics } from "../../domain/validation/diagnostics/has-valid-diagnostics";
 
@@ -72,7 +68,6 @@ const groupActivityHistoryItems = (items: IActivityHistoryItem[]): IActivityHist
   items?.forEach((item) => {
     let added = false;
 
-    // Primer intento: agrupar por misma visita y dentro de 8 horas
     for (const group of groups) {
       const firstItem = group.items[0];
       const lastItem = group.items[group.items.length - 1];
@@ -83,43 +78,20 @@ const groupActivityHistoryItems = (items: IActivityHistoryItem[]): IActivityHist
         withinEightHours(lastItem.date, item.date)
       ) {
         group.items.push(item);
-        group.sameVisit = true; // marcamos el grupo como de "misma visita"
         added = true;
         break;
       }
     }
 
-    // Segundo intento: agrupar solo por 8h, pero solo en grupos que NO son "misma visita"
-    if (!added) {
-      for (const group of groups) {
-        if (group.sameVisit) continue; // evitamos mezclar visitas
-
-        const firstItem = group.items[0];
-        const lastItem = group.items[group.items.length - 1];
-
-        if (
-          withinEightHours(firstItem.date, item.date) &&
-          withinEightHours(lastItem.date, item.date)
-        ) {
-          group.items.push(item);
-          added = true;
-          break;
-        }
-      }
-    }
-
-    // Si no se pudo agrupar, crear un nuevo grupo
     if (!added) {
       groups.push({
-        idGroup: crypto.randomUUID(),
+        idGroup: Math.random().toString(36).substr(2, 9),
         items: [item],
-        sameVisit: false,
       });
     }
   });
 
   // Crear subgrupos por diagnósticos iguales. Los items que no tienen diagnostico, se quedan fuera de subgrupos (remaining items)
-
   groupByValidDiagnostics(groups);
 
   return groups;