@uxland/primary-shell 5.3.8 → 5.3.9

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-basic-history-item.d.ts

@@ -0,0 +1,5 @@
+import { IActivityHistoryItem } from '../model';
+
+export declare const isValidBasicActivityHistoryItem: (obj: IActivityHistoryItem) => boolean;
+export declare const ensureAreValidBasicActivityHistoryItems: (items: IActivityHistoryItem[]) => IActivityHistoryItem[];
+export declare const validateAndFilterBasicItems: (items: IActivityHistoryItem[]) => IActivityHistoryItem[];

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-full-history-item.d.ts

@@ -0,0 +1,5 @@
+import { IActivityHistoryItem } from '../model';
+
+export declare const isValidFullActivityHistoryItem: (obj: IActivityHistoryItem) => any;
+export declare const ensureAreValidFullActivityHistoryItems: (items: IActivityHistoryItem[]) => IActivityHistoryItem[];
+export declare const validateAndFilterFullItems: (items: IActivityHistoryItem[]) => IActivityHistoryItem[];

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-full-history-item.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/primary/shell/src/internal-plugins/activity-history/utils/get-unique-values-by-prop-path.d.ts

@@ -1,4 +1,4 @@
-export declare function getUniqueObjects<T>(items: T[], propPathId: string[], propPathDescription: string[]): {
+export declare function getUniqueObjects<T>(items: T[], propPathId: string[], propPathDescription: string[], filterTitle: string): {
     id: string;
     title: string;
 }[];

package/package.json

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

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

@@ -27,6 +27,7 @@
       display: flex;
       flex-direction: row;
       align-items: center;
+      gap: 24px;
     }
   }
 

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

@@ -37,14 +37,6 @@ const upperNavMenuItems: MenuItemConfig[] = [
     sortHint: "0010",
     callbackFn: () => shellApi.broker.send(new ExitShell("OBRIR_PI")),
   },
-  {
-    id: "dinamic-monitoring",
-    icon: "poll",
-    label: "Monitoratge dinàmic",
-    type: "item",
-    sortHint: "0030",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("SIA_DEV"),
-  },
   {
     id: "processes",
     icon: "account_tree",

package/src/internal-plugins/activity-history/activity-history-item/add/add-history-item/handler.ts

@@ -1,5 +1,5 @@
 import { StoreBaseHandler } from "../../../infrastructure/base-handlers";
-import { ensureAreValidActivityHistoryItems } from "../../domain/is-valid-history-item/is-valid-history-item";
+import { ensureAreValidBasicActivityHistoryItems } from "../../domain/validation/is-valid-basic-history-item";
 import { handleAddDiagnosticsFilter } from "../../filter/diagnostic-filters/handle-add-diagnostics-options-from-item";
 import { addActivityHistoryItem } from "./action";
 import { AddHistoryItemPayload } from "./request";
@@ -7,7 +7,7 @@ import { AddHistoryItemPayload } from "./request";
 export class AddHistoryItemHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemPayload) {
     try {
-      ensureAreValidActivityHistoryItems([payload.item]);
+      ensureAreValidBasicActivityHistoryItems([payload.item]);
       this.store.dispatch(
         addActivityHistoryItem({
           id: payload.entityId,

package/src/internal-plugins/activity-history/activity-history-item/add/add-history-items/handler.ts

@@ -1,5 +1,5 @@
 import { StoreBaseHandler } from "../../../infrastructure/base-handlers";
-import { validateAndFilterItems } from "../../domain/is-valid-history-item/is-valid-history-item";
+import { validateAndFilterBasicItems } from "../../domain/validation/is-valid-basic-history-item";
 import { handleAddDiagnosticsFilter } from "../../filter/diagnostic-filters/handle-add-diagnostics-options-from-item";
 import { addActivityHistoryItems } from "./action";
 import { AddHistoryItemsPayload } from "./request";
@@ -7,7 +7,7 @@ import { AddHistoryItemsPayload } from "./request";
 export class AddHistoryItemsHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemsPayload) {
     try {
-      const validItems = validateAndFilterItems(payload.items);
+      const validItems = validateAndFilterBasicItems(payload.items);
       this.store.dispatch(
         addActivityHistoryItems({
           id: payload.entityId,

package/src/internal-plugins/activity-history/activity-history-item/domain/business-rules.ts

@@ -20,5 +20,5 @@ export const hasItemDivider = (
     return true;
   }
 
-  return !item.diagnostics.length;
+  return !item.diagnostics?.length;
 };

package/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-basic-history-item.test.ts

@@ -0,0 +1,63 @@
+import { describe, it, expect } from "vitest";
+import { isValidBasicActivityHistoryItem } from "./is-valid-basic-history-item";
+
+describe("isValidBasicActivityHistoryItem", () => {
+  it("should return true for a valid ActivityHistoryItem object", () => {
+    const validItem = {
+      id: "123",
+      date: "2023-10-07T10:32:00.000Z", // formato válido ISO
+      professional: {
+        id: "prof-1",
+        name: "Dr. John Doe",
+        speciality: { id: "spec-1", description: "Cardiology" },
+        role: { id: "role-1", description: "Lead Doctor" },
+      },
+      relevant: true,
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
+      center: { id: "center-1", description: "Main Hospital" },
+      up: { id: "up-1", description: "Unit A" },
+      ep: { id: "ep-1", description: "Emergency Room" },
+      service: { id: "service-1", description: "Cardiac Service" },
+    };
+
+    expect(isValidBasicActivityHistoryItem(validItem)).toBe(true);
+  });
+
+  it('should return false if "id" is missing', () => {
+    const invalidItem = {
+      date: "2023-10-07T10:32:00.000Z",
+      // same as above
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is missing', () => {
+    const invalidItem = {
+      id: "123",
+      // same as above
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is an invalid string', () => {
+    const invalidItem = {
+      id: "123",
+      date: "not-a-date",
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is an empty string', () => {
+    const invalidItem = {
+      id: "123",
+      date: "",
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  
+});

package/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-basic-history-item.ts

@@ -0,0 +1,43 @@
+import { IActivityHistoryItem } from "../model";
+
+export const isValidBasicActivityHistoryItem = (obj: IActivityHistoryItem) => {
+  // Función auxiliar para comprobar si una propiedad existe y es del tipo string válido
+  const isString = (value: any) => typeof value === "string" && value.trim() !== "";
+
+  // Función para comprobar si un string representa una fecha válida
+ const isValidDateString = (value: any) => {
+  if (typeof value !== "string" || value.trim() === "") return false;
+
+  const date = new Date(value);
+  return date instanceof Date && !Number.isNaN(date.getTime());
+};
+
+  // Comprobación del objeto principal
+  return (
+    obj &&
+    isString(obj.id) && // Verifica que "id" esté informado
+    isValidDateString(obj.date) // Verifica que "date" sea un string de fecha válido
+  );
+};
+
+export const ensureAreValidBasicActivityHistoryItems = (items: IActivityHistoryItem[]) => {
+  const areValid = items.every(isValidBasicActivityHistoryItem);
+  if (!areValid) {
+    console.error("Invalid activity history items", items);
+    throw new Error("Invalid activity history items");
+  }
+  return items;
+};
+
+const notifyInvalidItem = (item: IActivityHistoryItem) => {
+  console.error("Invalid history item", item);
+};
+
+export const validateAndFilterBasicItems = (items: IActivityHistoryItem[]) => {
+  const validItems = [] as IActivityHistoryItem[];
+  for (const item of items) {
+    if (isValidBasicActivityHistoryItem(item)) validItems.push(item);
+    else notifyInvalidItem(item);
+  }
+  return validItems;
+};

package/src/internal-plugins/activity-history/activity-history-item/domain/{is-valid-history-item/is-valid-history-item.test.ts → validation/is-valid-full-history-item.test.ts}

@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
-import { isValidActivityHistoryItem } from "./is-valid-history-item";
+import { isValidFullActivityHistoryItem } from "./is-valid-full-history-item";
 
-describe("isValidActivityHistoryItem", () => {
+describe("isValidFullActivityHistoryItem", () => {
   it("should return true for a valid ActivityHistoryItem object", () => {
     const validItem = {
       id: "123",
@@ -20,7 +20,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 
   it('should return false if "id" is missing', () => {
@@ -40,7 +40,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "date" is missing', () => {
@@ -60,7 +60,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "professional" is invalid', () => {
@@ -81,7 +81,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "diagnostics" is not an array', () => {
@@ -102,7 +102,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return true if "diagnostics" is null', () => {
@@ -123,7 +123,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 
   it('should return false if "diagnostics" are invalid', () => {
@@ -144,7 +144,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "relevant" is not a boolean', () => {
@@ -165,7 +165,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
   it("should return true if all base props are correct, but object contain more extra fields", () => {
     const validItem = {
@@ -187,6 +187,6 @@ describe("isValidActivityHistoryItem", () => {
       prop2: "value2",
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 });

package/src/internal-plugins/activity-history/activity-history-item/domain/{is-valid-history-item/is-valid-history-item.ts → validation/is-valid-full-history-item.ts}

@@ -1,6 +1,7 @@
 import { IActivityHistoryItem } from "../model";
+import { isValidBasicActivityHistoryItem } from "./is-valid-basic-history-item";
 
-export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
+export const isValidFullActivityHistoryItem = (obj: IActivityHistoryItem) => {
   // Función auxiliar para comprobar si una propiedad existe y es del tipo esperado
   const isString = (value) => typeof value === "string" && value.trim() !== "";
   const isBoolean = (value) => typeof value === "boolean";
@@ -49,9 +50,7 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
 
   // Comprobación del objeto principal
   return (
-    obj &&
-    isString(obj.id) && // Verifica que "id" esté informado
-    isString(obj.date) && // Verifica que "date" esté informado
+    isValidBasicActivityHistoryItem(obj) &&
     hasValidProfessional(obj.professional) &&
     isBoolean(obj.relevant) &&
     hasValidDiagnostics(obj.diagnostics) &&
@@ -62,8 +61,8 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
   );
 };
 
-export const ensureAreValidActivityHistoryItems = (items: IActivityHistoryItem[]) => {
-  const areValid = items.every(isValidActivityHistoryItem);
+export const ensureAreValidFullActivityHistoryItems = (items: IActivityHistoryItem[]) => {
+  const areValid = items.every(isValidFullActivityHistoryItem);
   if (!areValid) {
     console.error("Invalid activity history items", items);
     throw new Error("Invalid activity history items");
@@ -75,10 +74,10 @@ const notifyInvalidItem = (item: IActivityHistoryItem) => {
   console.error("Invalid history item", item);
 };
 
-export const validateAndFilterItems = (items: IActivityHistoryItem[]) => {
+export const validateAndFilterFullItems = (items: IActivityHistoryItem[]) => {
   const validItems = [] as IActivityHistoryItem[];
   for (const item of items) {
-    if (isValidActivityHistoryItem(item)) validItems.push(item);
+    if (isValidFullActivityHistoryItem(item)) validItems.push(item);
     else notifyInvalidItem(item);
   }
   return validItems;

package/src/internal-plugins/activity-history/activity-history-item/filter/diagnostic-filters/handle-add-diagnostics-options-from-item.ts

@@ -7,6 +7,7 @@ import { addDiagnosticFilters } from "./add/actions";
 export const handleAddDiagnosticsFilter = (items: IActivityHistoryItem[], store: Store) => {
   const allDiagnostics = items
     .flatMap((item) => item.diagnostics ?? [])
+    .filter((diag) => typeof diag.codi === "string" && diag.codi.trim() !== "")
     .filter((diag, index, self) => index === self.findIndex((d) => d.codi === diag.codi));
 
   if (allDiagnostics.length > 0) {

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

@@ -34,7 +34,7 @@ export const template = (props: ActivityHistoryTimeline) => {
             ${virtualize({
               items: props.historyGroups,
               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)}>
+                <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])}
                   <div class="visit__items">
                     ${repeat(
@@ -113,6 +113,7 @@ const visitHeaderTemplate = (
 };
 
 const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivityHistoryItem) => {
+  if(!item.professional) return nothing;
   const showRole = shouldShowRole(item);
   const professionalItems = [
     props.highlighted(item.professional.name),