@uxland/primary-shell 5.3.1 → 5.3.2

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/business-rules.d.ts

@@ -0,0 +1,3 @@
+import { IActivityHistoryItem } from './model';
+
+export declare function shouldShowRole(item: IActivityHistoryItem): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "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

@@ -0,0 +1,5 @@
+import { IActivityHistoryItem } from "./model";
+
+export function shouldShowRole(item: IActivityHistoryItem): boolean {
+  return !item.professional.speciality.description;
+}

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

@@ -10,6 +10,7 @@ import {
 import { activityHistoryGroupedItems } from "../../../selectors";
 import styles from "./styles.css?inline";
 import { template } from "./template";
+import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
 //@ts-ignore
 @customElement("activity-history-timeline")
@@ -76,6 +77,10 @@ export class ActivityHistoryTimeline extends LitElement {
     return text.replace(regex, `<span class="highlight">$1</span>`);
   }
 
+  highlighted(text?: string) {
+    return text ? unsafeHTML(this.highlightMatch(text, this.searchString)) : null;
+  }
+
   _scrollIntoDate(selectedDate: number) {
     let closestElement = null;
     let closestDifference = Number.POSITIVE_INFINITY;

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

@@ -3,7 +3,6 @@ import { ActivityHistoryTimeline } from "./activity-history-timeline";
 import { repeat } from "lit/directives/repeat.js";
 import { IEntityDescription } from "@primaria/plugins-core";
 import { format } from "date-fns";
-import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import notFound from "../../../../../../UI/images/not-found.svg";
 import { ifDefined } from "lit/directives/if-defined.js";
 import {
@@ -14,6 +13,7 @@ import {
 } from "../../../domain/model";
 import { translate } from "../../../../localization";
 import { virtualize } from "@lit-labs/virtualizer/virtualize.js";
+import { shouldShowRole } from "../../../domain/business-rules";
 
 export const template = (props: ActivityHistoryTimeline) => {
   if (!props._hasUpdatedOnce) {
@@ -72,25 +72,40 @@ export const template = (props: ActivityHistoryTimeline) => {
 const visitHeaderTemplate = (
   props: ActivityHistoryTimeline,
   item: IActivityHistoryItem | undefined,
-) =>
-  item &&
-  html`
-<div class="visit__header">
-  <div class="title">
-    <div class="title-date">
-      <div>${format(new Date(item.date), "dd/MM/yyyy")}</div>
-    </div>
-    <div class="title-description">
-      <div>
-        ${unsafeHTML(props.highlightMatch(item.professional.name, props.searchString))} | 
-        ${unsafeHTML(props.highlightMatch(item.professional.role.description, props.searchString))} | 
-        ${unsafeHTML(props.highlightMatch(item.center.description, props.searchString))} | 
-        ${unsafeHTML(props.highlightMatch(item.professional.speciality.description, props.searchString))}
+) => {
+  if (!item) return nothing;
+
+  return html`  
+  <div class="visit__header">
+    <div class="title">
+      <div class="title-date">
+        <div>${format(new Date(item.date), "dd/MM/yyyy")}</div>
+      </div>
+      <div class="title-description">
+        <div>
+          ${renderProfessionalValues(props, item)}
+        </div>
       </div>
     </div>
   </div>
-</div>
-`;
+  `;
+};
+
+const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivityHistoryItem) => {
+  const showRole = shouldShowRole(item);
+  const professionalItems = [
+    props.highlighted(item.professional.name),
+    showRole ? props.highlighted(item.professional.role.description) : null,
+    props.highlighted(item.center.description),
+    props.highlighted(item.professional.speciality.description),
+  ].filter(Boolean);
+
+  const professionalValues = professionalItems.map(
+    (item, i) => html`${item}${i < professionalItems.length - 1 ? " | " : ""}`,
+  );
+
+  return professionalValues;
+};
 
 const diagnosticHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
   item &&

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/activity-history-timeline.d.ts

@@ -1,17 +0,0 @@
-import { LitElement } from 'lit';
-import { IActivityHistoryGroup } from '../../../domain/model';
-
-export declare class ActivityHistoryTimeline extends LitElement {
-    render(): import('lit').TemplateResult<1>;
-    static styles: import('lit').CSSResult;
-    historyGroups: IActivityHistoryGroup[];
-    isAnyCollectionLoadingWithoutAnyLoaded: boolean;
-    isSomeCollectionLoadedAndOtherLoading: boolean;
-    searchString: string;
-    _hasUpdatedOnce: boolean;
-    firstUpdated(): void;
-    updated(changedProperties: any): Promise<void>;
-    prepareComponents(historyGroups: any): Promise<void>;
-    highlightMatch(text: string, searchString: string): string;
-    _scrollIntoDate(selectedDate: number): void;
-}