@uxland/primary-shell 3.4.1 → 3.5.1

package/src/internal-plugins/activity-history/components/activity-history/activity-history-timeline/styles.css

@@ -7,10 +7,12 @@
   display: flex;
   flex-direction: column;
   gap: 16px;
-  padding-right: 16px;
+  padding-inline: 16px;
+  padding-top: 17px;
   min-height: 1px;
   height: 100%;
   overflow-y: auto;
+  position: relative;
 
   .visit {
     display: flex;
@@ -43,11 +45,21 @@
         flex-direction: row;
         gap: 4px;
       }
+      .highlight {
+        background-color: yellow;
+        font-weight: bold;
+      }
     }
     .visit__items {
       display: flex;
       flex-direction: column;
       gap: 16px;
+        .item {
+          border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
+          &:last-of-type {
+            border: none;
+          }
+        }
     }
     .diagnostics {
       display: flex;
@@ -64,7 +76,7 @@
         flex-direction: column;
 
         .item {
-          border-bottom: 1px solid #bbbbbb;
+          border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
           &:last-of-type {
             border: none;
           }
@@ -72,4 +84,11 @@
       }
     }
   }
+  .feedback {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }

package/src/internal-plugins/activity-history/components/activity-history/activity-history-timeline/template.ts

@@ -1,4 +1,4 @@
-import { html } from "lit";
+import { html, nothing } from "lit";
 import { ActivityHistoryTimeline } from "./activity-history-timeline";
 import { repeat } from "lit/directives/repeat.js";
 import {
@@ -8,15 +8,21 @@ import {
 } from "../../../domain/model";
 import { IEntityDescription } from "@primaria/plugins-core";
 import { format } from "date-fns";
+import { translate } from "../../../localization";
+import { unsafeHTML } from "lit/directives/unsafe-html.js";
+import notFound from "../../../../../UI/images/not-found.svg";
 
 export const template = (props: ActivityHistoryTimeline) => {
+  if (!props._hasUpdatedOnce) {
+    return html`<div class="container"></div>`;
+  }
   return html`<div class="container">
     ${
-      props.historyGroups &&
-      repeat(props.historyGroups, (itemGroup: IActivityHistoryGroup) => {
-        return html`
-          <div class="visit">
-            ${visitHeaderTemplate(itemGroup.items[0] || itemGroup.subGroups[0]?.items[0])}
+      props.historyGroups && props.historyGroups.length > 0
+        ? repeat(props.historyGroups, (itemGroup: IActivityHistoryGroup) => {
+            return html`
+          <div class="visit" data-date=${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(
                 itemGroup.items,
@@ -32,7 +38,7 @@ export const template = (props: ActivityHistoryTimeline) => {
                       <div class="diagnostics__items">${repeat(
                         subGroup.items,
                         (item: IActivityHistoryItem) =>
-                          html`<div class="item" data-date=${item.date}>${item.componentFactory(item)}</div>  `,
+                          html`<div class="item">${item.componentFactory(item)}</div>  `,
                       )}</div>
                     </div>
                 `,
@@ -40,12 +46,19 @@ export const template = (props: ActivityHistoryTimeline) => {
             </div>
           </div>
           `;
-      })
+          })
+        : !props.isAnyCollectionLoadingWithoutAnyLoaded &&
+            !props.isSomeCollectionLoadedAndOtherLoading
+          ? html`<dss-user-feedback class="feedback" imagesrc=${notFound} title=${translate("noResults")}></dss-user-feedback>`
+          : nothing
     }
   </div>   `;
 };
 
-const visitHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
+const visitHeaderTemplate = (
+  props: ActivityHistoryTimeline,
+  item: IActivityHistoryItem | undefined,
+) =>
   item &&
   html`
 <div class="visit__header">
@@ -54,9 +67,12 @@ const visitHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
       <div>${format(new Date(item.date), "dd/MM/yyyy")}</div>
     </div>
     <div class="title-description">
-      <div>${item.professional.name} | ${item.professional.role.description} | ${item.center.description} | ${
-        item.professional.speciality.description
-      }</div>
+      <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))}
+      </div>
     </div>
   </div>
 </div>
@@ -68,12 +84,15 @@ const diagnosticHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
     <div class="diagnostics__header">
       
       ${item.diagnostics
-      .filter((diagnostic: IEntityDescription) => diagnostic.description != null && diagnostic.description.trim() !== "")
-      .map(
-        (diagnostic: IEntityDescription) =>
-          html`<dss-badge text=${
-            diagnostic.description?.toUpperCase() as string
-          } state="info" size="sm" outlined></dss-badge>`,
-      )}
+        .filter(
+          (diagnostic: IEntityDescription) =>
+            diagnostic.description != null && diagnostic.description.trim() !== "",
+        )
+        .map(
+          (diagnostic: IEntityDescription) =>
+            html`<dss-badge text=${
+              diagnostic.description?.toUpperCase() as string
+            } state="info" size="sm" outlined></dss-badge>`,
+        )}
     </div>
   `;

package/src/internal-plugins/activity-history/components/activity-history/activity-history.ts

@@ -3,6 +3,7 @@ import { customElement, property, state } from "lit/decorators.js";
 import styles from "./styles.css?inline";
 import { template } from "./template";
 import { PrimariaApi, PrimariaRegionHost } from "../../../../api/api";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
 import { lazyInject } from "../../infrastructure/ioc/container";
 import { TYPES } from "../../infrastructure/ioc/types";
 import { connectedProperty } from "../../infrastructure/state/connected-property";
@@ -26,22 +27,20 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
     ${unsafeCSS(styles)}
   `;
 
+  subscriptions: BrokerDisposableHandler[] = [];
+
   connectedCallback() {
     super.connectedCallback();
-    this.api.broker.subscribe(shellEvents.openClinicalMonitoringRequested, () => {
-      this.maximized = false;
-    });
-    const searchBar = this.shadowRoot?.querySelector("dss-search-bar");
-    if (searchBar) {
-      searchBar.addEventListener("onSearchChange", this._handleSearchChange);
-    }
+    this.subscriptions.push(
+      this.api.broker.subscribe(shellEvents.openClinicalMonitoringRequested, () => {
+        this.maximized = false;
+      }),
+    );
   }
 
-  firstUpdated(_changedProperties) {
-    super.firstUpdated(_changedProperties);
-    this.shadowRoot.querySelector("dss-datepicker")?.addEventListener("onValueChange", (e) => {
-      this._handleSelectDate(e.detail);
-    });
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this.subscriptions.forEach((s) => s.dispose());
   }
 
   @property({ type: Boolean })
@@ -59,13 +58,6 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
   @connectedProperty(activityHistoryCollectionsSelector)
   historyItems: any[];
 
-  @state()
-  menuOpened = false;
-
-  toggleMenu() {
-    this.menuOpened = !this.menuOpened;
-  }
-
   @state()
   filtersExpanded = false;
 
@@ -81,15 +73,14 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
     this.maximized = false;
   }
 
+  @property()
+  searchQuery = "";
   _handleSearchChange(event) {
     const selectedItems = event.detail || [];
     const searchQuery = selectedItems.length > 0 ? selectedItems.join(" ") : "";
-
-    if (searchQuery.length > 2) {
-      this.api.broker.send(new SearchActivityHistoryItems(searchQuery));
-    } else {
-      this.api.broker.send(new SearchActivityHistoryItems(""));
-    }
+    const payload = searchQuery.length > 1 ? searchQuery : "";
+    this.searchQuery = searchQuery;
+    this.api.broker.send(new SearchActivityHistoryItems(payload));
   }
 
   _handleSelectDate(date: string) {
@@ -107,7 +98,7 @@ export class ActivityHistory extends PrimariaRegionHost(LitElement) {
     let closestDifference = Number.POSITIVE_INFINITY;
 
     const timeline = this.shadowRoot.querySelector("activity-history-timeline") as HTMLElement;
-    timeline?.shadowRoot.querySelectorAll(".item").forEach((element) => {
+    timeline?.shadowRoot.querySelectorAll(".visit").forEach((element) => {
       const itemDate = new Date(element.dataset.date).getTime();
       const difference = Math.abs(itemDate - selectedDate);
 

package/src/internal-plugins/activity-history/components/activity-history/styles.css

@@ -127,7 +127,6 @@
     &[maximized] {
       .content {
         width: 100%;
-        padding: 16px 0 16px 16px;
         background: var(--color-neutral-50);
         border-top-right-radius: var(--dss-radius-sm);
       }
@@ -152,9 +151,9 @@
     }
     .content {
       width: 100%;
-      padding: 16px 0 16px 16px;
       background: var(--color-neutral-50);
       border-bottom-right-radius: var(--dss-radius-sm);
+      overflow: hidden; 
       .spinner-container {
         display: flex;
         flex-direction: row;
@@ -171,25 +170,4 @@
       }
     }
   }
-}
-md-menu {
-  cursor: pointer;
-  --md-menu-container-color: white;
-  min-width: 239px;
-  .menu-item {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    padding: 1rem;
-    &:hover {
-      background-color: #f0f0f0;
-    }
-    .two-icons {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-    }
-  }
-  color: var(--color-neutral-900);
-}
+}

package/src/internal-plugins/activity-history/components/activity-history/template.ts

@@ -1,9 +1,11 @@
 import { html, nothing } from "lit";
 import { ActivityHistory } from "./activity-history";
+import "./activity-history-search-header/activity-history-search-header"
 import "./activity-history-timeline/activity-history-timeline";
 import "../export-pdf-modal/export-pdf-modal";
 import { ExportPdf } from "../../features/export-to-pdf/request";
 import { translate } from "../../localization";
+import { when } from "lit/directives/when.js";
 export const template = (props: ActivityHistory) =>
   html`<div class="container" ?maximized=${props.maximized}>
   ${
@@ -12,11 +14,11 @@ export const template = (props: ActivityHistory) =>
       : html`<div class="header">
             <div class="header__left">
                 <div class="title">${translate("activityHistory")}</div>
-                <dss-search-bar @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="2" recentsearchestext="" emptydropdowntext="">
+                <dss-search-bar dropdownStyle=${"display: none"} @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="2" recentsearchestext="" emptydropdowntext="">
                     <label slot="label" for="searchbar1" aria-hidden="false"></label>
-                    <input slot="input" id="searchbar1" type="text">
+                    <input slot="input" id="searchbar1" type="text" @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
                 </dss-search-bar>
-                <dss-datepicker inputsize="md" class="date-picker">
+                <dss-datepicker dropdownFixed inputsize="md" class="date-picker" @onValueChange=${(event) => props._handleSelectDate(event.detail)}>
                     <label slot="label" for="myDatepicker">${translate("goToDate")}</label>
                     <input slot="input" id="myDatepicker" type="text" class="dss-input">
                 </dss-datepicker>
@@ -25,53 +27,34 @@ export const template = (props: ActivityHistory) =>
             <div class="header__right">
                 <dss-icon-button @click=${() => props._maximize()} size="md" variant="primary" icon="arrow_forward" label="Botó maximitzar"></dss-icon-button>
                 <div>|</div>
-                <primaria-menu>
-                    <div slot="anchor" id="usage-anchor">
-                    <dss-icon-button @click="${props.toggleMenu}" size="md" variant="primary" icon="more_vert" label="Botó opcions"></dss-icon-button>
-                    </div>
-                    ${
-                      props.menuOpened
-                        ? html`
-                        <md-menu slot="content" id="content" anchor="usage-anchor">
-                            <div class="menu-item">
-                                <div class="two-icons">
-                                    <dss-icon icon="view_timeline" size="sm"></dss-icon><span>${translate("actions.cronogram")}</span>
-                                </div>
-                            </div>
-                            <div class="menu-item">
-                                <div class="two-icons" @click=${() => props.api.broker.send(new ExportPdf())}>
-                                    <dss-icon icon="file_download" size="sm"></dss-icon><span>${translate("actions.exportPdf")}</span>
-                                </div>
-                            </div>
-                            <div class="menu-item">
-                                <span>${translate("actions.noteLegend")}</span>
-                            </div>
-                        </md-menu>`
-                        : nothing
-                    }
-                </primaria-menu>
+                <dss-icon-button size="md" variant="primary" icon="more_vert" label="Botó menu"></dss-icon-button>
+                <dss-action-menu position="bottom-start">
+                    <dss-action-menu-item lefticon="view_timeline" label=${translate("actions.cronogram")}></dss-action-menu-item>
+                    <dss-action-menu-item lefticon="file_download" label=${translate("actions.exportPdf")} @click=${() => props.api.broker.send(new ExportPdf())}></dss-action-menu-item>
+                    <dss-action-menu-item label=${translate("actions.noteLegend")}></dss-action-menu-item>
+                </dss-action-menu>
             </div>  
         </div>`
-  }
-        
+  } 
         <div class="wrapper" ?maximized=${props.maximized}>
-            <div class="filters-sidebar" ?expanded=${props.filtersExpanded} >
-                ${
-                  props.filtersExpanded
-                    ? html`<div class="filters-sidebar-opened">${translate("filters.filters")}<dss-icon-button @click=${() => props._toggleFilters()} size="md" variant="primary" icon="keyboard_double_arrow_left"></dss-icon-button></div>`
-                    : html`<dss-icon-button @click=${() => props._toggleFilters()} size="md" variant="primary" icon="keyboard_double_arrow_right"></dss-icon-button>`
-                }  
-            </div>
-            <div class="content">
-                ${
-                  props.isAnyCollectionLoadingWithoutAnyLoaded
-                    ? html`<div class="spinner-full-container"><dss-spinner></dss-spinner></div>`
-                    : props.isSomeCollectionLoadedAndOtherLoading
-                      ? html`<div class="spinner-container"><dss-spinner size="sm"></dss-spinner><div class="busy-description">${translate("busyEntriesLoading")}</div></div>`
-                      : nothing
-                }
-                <activity-history-timeline></activity-history-timeline>
-            </div>
+          <div class="filters-sidebar" ?expanded=${props.filtersExpanded} >
+            ${
+              props.filtersExpanded
+                ? html`<div class="filters-sidebar-opened">${translate("filters.filters")}<dss-icon-button @click=${() => props._toggleFilters()} size="md" variant="primary" icon="keyboard_double_arrow_left"></dss-icon-button></div>`
+                : html`<dss-icon-button @click=${() => props._toggleFilters()} size="md" variant="primary" icon="keyboard_double_arrow_right"></dss-icon-button>`
+            }  
+          </div>
+          <div class="content">
+            ${when(props.searchQuery.length > 1,() => html`<activity-history-search-header searchQuery="${props.searchQuery}"></activity-history-search-header>`)}
+            ${
+              props.isAnyCollectionLoadingWithoutAnyLoaded
+                ? html`<div class="spinner-full-container"><dss-spinner></dss-spinner></div>`
+                : props.isSomeCollectionLoadedAndOtherLoading
+                  ? html`<div class="spinner-container"><dss-spinner size="sm"></dss-spinner><div class="busy-description">${translate("busyEntriesLoading")}</div></div>`
+                  : nothing
+            }
+            <activity-history-timeline></activity-history-timeline>
+          </div>  
         </div>
     </div>`;
 
@@ -80,35 +63,20 @@ export const headerMaximizedTemplate = (props: ActivityHistory) => html`
         <div class="header__maximized">
             <div class="header__maximized__left">
                 <div class="title">${translate("activityHistory")}</div>
-                <dss-search-bar @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="3" recentsearchestext="" emptydropdowntext="Sense resultats per">
+                <dss-search-bar dropdownStyle=${"display: none"} @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="3" recentsearchestext="" emptydropdowntext="Sense resultats per">
                     <label slot="label" for="searchbar1" aria-hidden="false"></label>
-                    <input slot="input" id="searchbar1" type="text">
+                    <input slot="input" id="searchbar1" type="text" @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
                 </dss-search-bar>
-                <dss-datepicker inputsize="md" class="date-picker" @onValueChange=${props._handleSelectDate}>
+                <dss-datepicker dropdownFixed inputsize="md" class="date-picker" @onValueChange=${(event) => props._handleSelectDate(event.detail)}>
                     <label slot="label" for="myDatepicker">${translate("goToDate")}</label>
                     <input slot="input" id="myDatepicker" type="text" class="dss-input">
                 </dss-datepicker>
             </div>
             <div class="header__maximized__right">
-                <primaria-menu>
-                        <div slot="anchor" id="usage-anchor">
-                        <div class="options" @click="${props.toggleMenu}">
-                            <dss-button variant="subtle" size="md" label="${translate("actions.moreOptions")}" icon="more_horiz" iconposition="left"></dss-button>
-                        </div>
-                        </div>
-                        ${
-                          props.menuOpened
-                            ? html`
-                            <md-menu slot="content" id="content" anchor="usage-anchor">
-                                <div class="menu-item">
-                                    <div class="two-icons" @click=${() => props.api.broker.send(new ExportPdf())}>
-                                        <dss-icon icon="file_download" size="sm"></dss-icon><span>${translate("actions.exportPdf")}</span>
-                                    </div>
-                                </div>
-                            </md-menu>`
-                            : nothing
-                        }
-                </primaria-menu>
+                <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-item @click=${() => props.api.broker.send(new ExportPdf())} lefticon="file_download" label=${translate("actions.exportPdf")}></dss-action-menu-item>
+                </dss-action-menu>
                 <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"></dss-button>
             </div>

package/src/internal-plugins/activity-history/constants.ts

@@ -1 +1,4 @@
 export const pluginName = "activity-history";
+export const events = {
+  activityHistorySearched: "activity_history_searched",
+};

package/src/internal-plugins/activity-history/domain/filter-by-search-string/filter-by-search-string.ts

@@ -14,12 +14,17 @@ const commonFieldsSearchPredicate = (item: IActivityHistoryItem, searchString: s
     propContainsString(item.professional?.role.description, searchString);
   const serviceNameContainsSearchString =
     item.service.description && propContainsString(item.service.description, searchString);
+  const diagnosticsMatch = item.diagnostics?.some(diagnostic =>
+    propContainsString(diagnostic.id, searchString) || 
+    propContainsString(diagnostic.description, searchString)
+  );
   return (
     professionalNameContainsSearchString ||
     centerNameContainsSearchString ||
     specialityNameContainsSearchString ||
     roleNameContainsSearchString ||
-    serviceNameContainsSearchString
+    serviceNameContainsSearchString||
+    diagnosticsMatch
   );
 };
 

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

@@ -25,11 +25,12 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
   const hasValidDiagnostics = (diagnostics) => {
     return (
       (diagnostics === null || isArray(diagnostics)) && // null or array
-      (diagnostics === null || diagnostics.every(
-        (diagnostic) =>
-          diagnostic === null ||
-          (diagnostic && isString(diagnostic.id) && isString(diagnostic.description)) // Permite que un diagnóstico sea null o tenga id y description válidos
-      ))
+      (diagnostics === null ||
+        diagnostics.every(
+          (diagnostic) =>
+            diagnostic === null ||
+            (diagnostic && isString(diagnostic.id) && isString(diagnostic.description)), // Permite que un diagnóstico sea null o tenga id y description válidos
+        ))
     );
   };
 
@@ -63,3 +64,16 @@ export const ensureAreValidActivityHistoryItems = (items: IActivityHistoryItem[]
   }
   return items;
 };
+
+const notifyInvalidItem = (item: IActivityHistoryItem) => {
+  console.error("Invalid history item", item);
+};
+
+export const validateAndFilterItems = (items: IActivityHistoryItem[]) => {
+  const validItems = [] as IActivityHistoryItem[];
+  for (const item of items) {
+    if (isValidActivityHistoryItem(item)) validItems.push(item);
+    else notifyInvalidItem(item);
+  }
+  return validItems;
+};

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

@@ -1,11 +1,14 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
 import { AddHistoryItemHandler } from "./handler";
 import { addHistoryItemRequest } from "./request";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+
+let request: BrokerDisposableHandler;
 
 export const bootstrapAddHistoryItem = (broker: BrokerExtensions) => {
-  broker.registerRequest(addHistoryItemRequest, AddHistoryItemHandler);
+  request = broker.registerRequest(addHistoryItemRequest, AddHistoryItemHandler);
 };
 
 export const teardownAddHistoryItem = (broker: BrokerExtensions) => {
-  broker.unregisterRequest(AddHistoryItemHandler);
+  request?.dispose();
 };

package/src/internal-plugins/activity-history/features/add-history-items/bootstrapper.ts

@@ -1,11 +1,14 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
 import { AddHistoryItemsHandler } from "./handler";
 import { addHistoryItemsRequest } from "./request";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+
+let request: BrokerDisposableHandler;
 
 export const bootstrapAddHistoryItems = (broker: BrokerExtensions) => {
-  broker.registerRequest(addHistoryItemsRequest, AddHistoryItemsHandler);
+  request = broker.registerRequest(addHistoryItemsRequest, AddHistoryItemsHandler);
 };
 
 export const teardownAddHistoryItems = (broker: BrokerExtensions) => {
-  broker.unregisterRequest(AddHistoryItemsHandler);
+  request?.dispose();
 };

package/src/internal-plugins/activity-history/features/export-to-pdf/bootstrapper.ts

@@ -1,11 +1,14 @@
 import { BrokerExtensions } from "plugins/core";
 import { ExportToPdfHandler } from "./handler";
 import { ExportPdf } from "./request";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+
+let request: BrokerDisposableHandler;
 
 export const bootstrapExportPdf = (broker: BrokerExtensions) => {
-  broker.registerRequest(ExportPdf, ExportToPdfHandler);
+  request = broker.registerRequest(ExportPdf, ExportToPdfHandler);
 };
 
 export const teardownExportPdf = (broker: BrokerExtensions) => {
-  broker.unregisterRequest(ExportToPdfHandler);
+  request?.dispose();
 };

package/src/internal-plugins/activity-history/features/inject-async-history-items/bootstrapper.ts

@@ -1,11 +1,14 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
 import { injectAsyncHistoryItemsRequest } from "./request";
 import { InjectAsyncHistoryItemsHandler } from "./handler";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+
+let request: BrokerDisposableHandler;
 
 export const bootstrapInjectAsyncHistoryItems = (broker: BrokerExtensions) => {
-  broker.registerRequest(injectAsyncHistoryItemsRequest, InjectAsyncHistoryItemsHandler);
+  request = broker.registerRequest(injectAsyncHistoryItemsRequest, InjectAsyncHistoryItemsHandler);
 };
 
 export const teardownInjectAsyncHistoryItems = (broker: BrokerExtensions) => {
-  broker.unregisterRequest(InjectAsyncHistoryItemsHandler);
+  request?.dispose();
 };

package/src/internal-plugins/activity-history/features/inject-async-history-items/handler.ts

@@ -8,7 +8,7 @@ import {
   removeBusyHistoryItem,
 } from "../../infrastructure/state/actions";
 import { InjectAsyncHistoryItemsPayload } from "./request";
-import { ensureAreValidActivityHistoryItems } from "../../domain/is-valid-history-item/is-valid-history-item";
+import { validateAndFilterItems } from "../../domain/is-valid-history-item/is-valid-history-item";
 
 export class InjectAsyncHistoryItemsHandler {
   constructor(@inject(TYPES.store) private readonly store: Store) {}
@@ -17,11 +17,11 @@ export class InjectAsyncHistoryItemsHandler {
     try {
       let items = await payload.asyncTask();
       if (payload.mapFn) items = items.map(payload.mapFn);
-      ensureAreValidActivityHistoryItems(items);
+      const validItems = validateAndFilterItems(items);
       this.store.dispatch(
         addActivityHistoryItems({
           id: payload.entityId,
-          items: items,
+          items: validItems,
           componentFactory: payload.componentFactory,
           searchPredicate: payload.searchPredicate,
         }),

package/src/internal-plugins/activity-history/features/search-items/bootstrapper.ts

@@ -1,11 +1,14 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
 import { SearchItemsHandler } from "./handler";
 import { SearchActivityHistoryItems } from "./request";
+import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+
+let request: BrokerDisposableHandler;
 
 export const bootstrapSearchItems = (broker: BrokerExtensions) => {
-  broker.registerRequest(SearchActivityHistoryItems, SearchItemsHandler);
+  request = broker.registerRequest(SearchActivityHistoryItems, SearchItemsHandler);
 };
 
 export const teardownSearchItems = (broker: BrokerExtensions) => {
-  broker.unregisterRequest(SearchItemsHandler);
+  request?.dispose();
 };

package/src/internal-plugins/activity-history/features/search-items/handler.ts

@@ -3,12 +3,20 @@ import { inject } from "inversify";
 import { TYPES } from "../../infrastructure/ioc/types";
 import { setSearchString } from "../../infrastructure/state/actions";
 import { SearchActivityHistoryItems } from "./request";
+import { PrimariaApi } from "@uxland/primary-shell";
+import { events } from "../../constants";
 
 export class SearchItemsHandler {
-  constructor(@inject(TYPES.store) private readonly store: Store) {}
+  constructor(
+    @inject(TYPES.store) private readonly store: Store,
+    @inject(TYPES.primaryApi) private api: PrimariaApi,
+  ) {}
   async handle(request: SearchActivityHistoryItems) {
     try {
       this.store.dispatch(setSearchString(request.searchString));
+      this.api.broker.publish(events.activityHistorySearched, {
+        searchQuery: request.searchString,
+      });
     } catch (e) {
       console.log(e.message);
     }