@uxland/primary-shell 5.3.9 → 5.3.10

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { IActivityHistoryItem, IActivityHistoryItemWithComponent } from "./model";
 
 export function shouldShowRole(item: IActivityHistoryItem): boolean {
-  return !item.professional.speciality.description;
+  return !item.professional?.speciality?.description;
 }
 
 export const hasItemDivider = (

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

@@ -113,21 +113,30 @@ const visitHeaderTemplate = (
 };
 
 const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivityHistoryItem) => {
-  if(!item.professional) return nothing;
+  if (!item.professional) return nothing;
   const showRole = shouldShowRole(item);
-  const professionalItems = [
-    props.highlighted(item.professional.name),
-    showRole ? props.highlighted(item.professional.role.description) : null,
-    props.highlighted(item.up.description),
-    props.highlighted(item.professional.speciality.description),
-    props.highlighted(item.service.description),
-  ].filter(Boolean);
 
-  const professionalValues = professionalItems.map(
-    (item, i) => html`${item}${i < professionalItems.length - 1 ? " | " : ""}`,
-  );
+  const values: Array<any> = [];
 
-  return professionalValues;
+  values.push(props.highlighted(item.professional.name));
+
+  if (showRole && item.professional.role) {
+    values.push(props.highlighted(item.professional.role.description));
+  }
+
+  if (item.up) {
+    values.push(props.highlighted(item.up.description));
+  }
+
+  if (item.professional.speciality) {
+    values.push(props.highlighted(item.professional.speciality.description));
+  }
+
+  if (item.service) {
+    values.push(props.highlighted(item.service.description));
+  }
+
+  return values.map((v, i) => html`${v}${i < values.length - 1 ? " | " : ""}`);
 };
 
 const diagnosticHeaderTemplate = (item: IActivityHistoryItem | undefined) =>

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

@@ -8,8 +8,8 @@ import {
 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;
+    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 &&