@uxland/primary-shell 5.4.7 → 5.6.0

package/src/internal-plugins/activity-history/activity-history-item/filter/UI/activity-history-filters/template.ts

@@ -22,6 +22,12 @@ const filterTemplates = {
       <input slot="input" id="checkboxStory-${id}" type="checkbox" ?disabled=${!isEnabled}>
       <label slot="label" for="checkboxStory-${id}">${title}</label>
     </dss-checkbox>`,
+
+  [ActivityHistoryFilterType.Dropdown]: (id, title, handleChange, isSelected, isEnabled) => html`
+    <dss-input-dropdown type="default" .checked=${isSelected} @onChange=${(e) => handleChange(e)}> 
+      <input slot="input" id="dropdownStory-${id}" type="text" ?disabled=${!isEnabled}>
+      <label slot="label" for="dropdownStory-${id}">${title}</label>
+    </dss-input-dropdown>`,
 };
 
 const getFilterTemplate = (
@@ -33,7 +39,7 @@ const getFilterTemplate = (
   const isCustom = !!filterGroup?.id && !!option;
   //const id = isCustom ? `${filterGroupId}-${filter.id}-${option.id}` : filter.id;
   const id = crypto.randomUUID();
-  const title = isCustom ? option.title : filter.title;
+  const title = isCustom ? option.title || option.id : filter.title;
 
   const handleChange = (e) => {
     if (filter.singleOption) onChangeValue(filterGroup?.id, filter.id, null, e.detail);
@@ -61,12 +67,21 @@ export const template = (props: ActivityHistoryFilters) =>
                   ${
                     props.diagnosticFilter &&
                     html`<div class="filter">
-                          <dss-input-dropdown icon="" multiple dropdownFixed type="default" .elements=${props.diagnosticFilter?.values} @onInputDropdownChange=${props._handleDiagnosticFilterChange} .selectedValue=${props.diagnosticFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
+                          <dss-input-dropdown inputsize="md" icon="" multiple dropdownFixed type="default" .elements=${props.diagnosticFilter?.values} @onInputDropdownChange=${props._handleDiagnosticFilterChange} .selectedValue=${props.diagnosticFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
                             <label slot="label" for="diagnostic-filter">${props.diagnosticFilter.title}</label>
                             <input id="diagnostic-filter" slot="input" type="text" class="dss-input" autocomplete="off"/>
                           </dss-input-dropdown>
                         </div>`
                   }
+                  ${
+                    props.upFilter &&
+                    html`<div class="filter">
+                      <dss-input-dropdown inputsize="md" icon="" multiple dropdownFixed type="default" .elements=${props.upFilter?.values} @onInputDropdownChange=${props._handleUpFilterChange} .selectedValue=${props.upFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
+                        <label slot="label" for="up-filter">${props.upFilter.title}</label>
+                        <input id="up-filter" slot="input" type="text" class="dss-input" autocomplete="off"/>
+                      </dss-input-dropdown>
+                    </div>`
+                  }
                   ${repeat(
                     props.customFilterGroups,
                     (group: IActivityHistoryCustomFilterGroup) => html`
@@ -91,17 +106,39 @@ const customFilterTemplate = (
   filter: IActivityHistoryCustomFilter,
   props: ActivityHistoryFilters,
   group: IActivityHistoryCustomFilterGroup,
-) =>
-  html`
-    <div class="custom-filter">
-      ${
-        filter.singleOption
-          ? getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group)
-          : html`
-          <primaria-accordion isOpen=${true}>
-            <div class="custom-filter-title" slot="title">${filter.title}</div>
-            <div class="custom-filter-content" slot="content">${repeat(filter.options, (option) => html`${getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group, option)}`)}</div>
-          </primaria-accordion>`
-      }
-    </div>
-  `;
+) => {
+  if (filter.type === ActivityHistoryFilterType.Dropdown) {
+    const elements = filter?.options.map(option => ({ value: option.id, label: option.title }));
+    return html`
+      <dss-input-dropdown
+        inputsize="md"
+        icon=""
+        multiple
+        dropdownFixed
+        type="default"
+        .elements=${elements}
+        @onInputDropdownChange=${(e) =>
+          props._onChangeCustomFilterValue(group.id, filter.id, e.detail.selectedValue[e.detail.selectedValue.length-1], true)
+        }
+        .selectedValue=${filter.enabledValues}
+        selectorStyle="max-height: 450px"
+      >
+        <label slot="label">${filter.title}</label>
+        <input slot="input" type="text" class="dss-input" autocomplete="off" />
+      </dss-input-dropdown>
+    `;
+  }
+
+  return filter.singleOption
+    ? getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group)
+    : html`
+        <primaria-accordion isOpen>
+          <div class="custom-filter-title" slot="title">${filter.title}</div>
+          <div class="custom-filter-content" slot="content">
+            ${filter.options.map(option =>
+              getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group, option)
+            )}
+          </div>
+        </primaria-accordion>
+      `;
+};

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

@@ -14,6 +14,8 @@ import { bootstrapAddDiagnosticFilter, teardownAddDiagnosticFilter } from "./dia
 import { bootstrapSetDiagnosticFilter, teardownSetDiagnosticFilter } from "./diagnostic-filters/set/bootstrapper";
 import { bootstrapResetCommonFilter, teardownResetCommonFilter } from "./common-filters/reset-common-filter/bootstrapper";
 import { bootstrapResetCustomFilter, teardownResetCustomFilter } from "./custom-filters/reset-custom-filter/bootstrapper";
+import { bootstrapAddUpFilter, teardownAddUpFilter } from "./up-filters/add/bootstrapper";
+import { bootstrapSetUpFilter, teardownSetUpFilter } from "./up-filters/set/bootstrapper";
 
 export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCommonFilter(broker);
@@ -24,6 +26,8 @@ export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetDiagnosticFilter(broker);
   bootstrapResetCommonFilter(broker);
   bootstrapResetCustomFilter(broker);
+  bootstrapAddUpFilter(broker);
+  bootstrapSetUpFilter(broker);
 };
 
 export const teardownFilters = () => {
@@ -35,4 +39,6 @@ export const teardownFilters = () => {
   teardownSetDiagnosticFilter();
   teardownResetCommonFilter();
   teardownResetCustomFilter();
+  teardownAddUpFilter();
+  teardownSetUpFilter();
 };

package/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/reset-custom-filter/reducer.ts

@@ -1,7 +1,6 @@
 export function resetCustomFilterValuesReducer(state) {
   state.filters = state.filters.map((f) => {
-    if (f.id !== "common" && f.id !== "history-diagnostics") {
-      console.log("filter", f);
+    if (f.id !== "common" && f.id !== "history-diagnostics" && f.id !== "history-up") {
       return {
         ...f,
         filters: f.filters.map((ff) => ({ ...ff, enabled: false, enabledValues: [] })),

package/src/internal-plugins/activity-history/activity-history-item/filter/model.ts

@@ -6,6 +6,7 @@ type Constructor<T> = new (...args: any[]) => T;
 export enum ActivityHistoryFilterType {
   Switch = "switch",
   Checkbox = "checkbox",
+  Dropdown = "dropdown",
 }
 
 export enum ActivityHistoryFilterOperation {
@@ -56,14 +57,11 @@ export interface IActivityHistoryCustomFilter {
 }
 
 export const isCommonFilterGroup = (group: IActivityHistoryFilter) => group.id === "common";
-export const isNotCommonFilterGroup = (group: IActivityHistoryFilter) =>
-  !isCommonFilterGroup(group);
-export const isDiagnosticFilter = (filter: IActivityHistoryFilter) =>
-  filter.id === diagnosticsfilterId;
-export const isNotDiagnosticFilter = (filter: IActivityHistoryFilter) =>
-  !isDiagnosticFilter(filter);
-export const isCustomFilter = (filter: IActivityHistoryFilter) =>
-  !isCommonFilterGroup(filter) && !isDiagnosticFilter(filter);
+export const isNotCommonFilterGroup = (group: IActivityHistoryFilter) => !isCommonFilterGroup(group);
+export const isDiagnosticFilter = (filter: IActivityHistoryFilter) => filter.id === diagnosticsfilterId;
+export const isNotDiagnosticFilter = (filter: IActivityHistoryFilter) => !isDiagnosticFilter(filter);
+export const isCustomFilter = (filter: IActivityHistoryFilter) => !isCommonFilterGroup(filter) && !isDiagnosticFilter(filter) && !isUpFilter(filter);
+export const isUpFilter = (filter: IActivityHistoryFilter) => filter.id === upFilterId;
 export interface IActivityHistoryDiagnosticsFilter {
   id: string;
   title: string;
@@ -71,6 +69,14 @@ export interface IActivityHistoryDiagnosticsFilter {
   enabledValues: string[];
 }
 
+export interface IActivityHistoryUpFilter {
+  id: string;
+  title: string;
+  values: { label: string; value: string }[];
+  enabledValues: string[];
+}
+
 export const diagnosticsfilterId = "history-diagnostics";
 export const relevantFilterId = "history-relevant";
 export const ownFilterId = "history-own";
+export const upFilterId = "history-up";

package/src/internal-plugins/activity-history/activity-history-item/filter/slice.ts

@@ -10,6 +10,8 @@ import { addDiagnosticFiltersReducer } from "./diagnostic-filters/add/reducer";
 import { setDiagnosticFilterValuesReducer } from "./diagnostic-filters/set/reducer";
 import { resetCommonFilterValuesReducer } from "./common-filters/reset-common-filter/reducer";
 import { resetCustomFilterValuesReducer } from "./custom-filters/reset-custom-filter/reducer";
+import { addUpFiltersReducer } from "./up-filters/add/reducer";
+import { setUpFilterValuesReducer } from "./up-filters/set/reducer";
 
 export const activityHistoryFiltersSlice = createSlice({
   name: "activity-history-filters",
@@ -27,5 +29,7 @@ export const activityHistoryFiltersSlice = createSlice({
     resetCustomFilterValues: resetCustomFilterValuesReducer,
     addDiagnosticFilters: addDiagnosticFiltersReducer,
     setDiagnosticFilterValues: setDiagnosticFilterValuesReducer,
+    addUpFilters: addUpFiltersReducer,
+    setUpFilterValues: setUpFilterValuesReducer,
   },
 });

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/add/actions.ts

@@ -0,0 +1,3 @@
+import { activityHistoryFiltersSlice } from "../../slice";
+
+export const { addUpFilters } = activityHistoryFiltersSlice.actions;

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/add/bootstrapper.ts

@@ -0,0 +1,14 @@
+import { BrokerExtensions } from "@primaria/plugins-core";
+import { BrokerDisposableHandler } from "../../../../../../api/broker/primaria-broker";
+import { AddUpFiltersHandler } from "./handler";
+import { AddUpFiltersCommand } from "./request";
+
+let request: BrokerDisposableHandler;
+
+export const bootstrapAddUpFilter = (broker: BrokerExtensions) => {
+  request = broker.registerRequest(AddUpFiltersCommand, AddUpFiltersHandler);
+};
+
+export const teardownAddUpFilter = () => {
+  request?.dispose();
+};

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

@@ -0,0 +1,14 @@
+import { StoreBaseHandler } from "../../../../infrastructure/base-handlers";
+import { addUpFilters } from "./actions";
+import { AddUpFiltersCommand } from "./request";
+
+export class AddUpFiltersHandler extends StoreBaseHandler {
+  async handle(request: AddUpFiltersCommand) {
+    try {
+      //TODO ensure are valid filters
+      this.store.dispatch(addUpFilters(request.payload));
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
+}

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/add/reducer.test.ts

@@ -0,0 +1,93 @@
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { IActivityHistoryUpFilter,  isUpFilter } from "../../model";
+import {  addUpFiltersReducer } from "./reducer";
+
+vi.mock("../../model", () => ({
+  isUpFilter: vi.fn(),
+}));
+
+describe("addUpFiltersReducer", () => {
+  let initialState: { filters: IActivityHistoryUpFilter[] };
+
+  const baseFilter = (values: any[]): IActivityHistoryUpFilter => ({
+    id: "up",
+    title: "UP",
+    values,
+    enabledValues: [],
+  });
+
+  beforeEach(() => {
+    initialState = {
+      filters: [],
+    };
+    vi.clearAllMocks();
+  });
+
+  const slice = createSlice({
+    name: "activity",
+    initialState,
+    reducers: {
+      addUpFilters: addUpFiltersReducer,
+    },
+  });
+
+  const { addUpFilters } = slice.actions;
+  const reducer = slice.reducer;
+
+  it("should add a new up filter if none exists", () => {
+    (isUpFilter as any).mockReturnValue(false);
+
+    const newUp = baseFilter([{ label: "0773", value: "0773" }]);
+
+    const nextState = reducer(initialState, addUpFilters(newUp));
+
+    expect(nextState.filters).toHaveLength(1);
+    expect(nextState.filters[0]).toEqual(newUp);
+  });
+
+  it("should merge values if a up filter already exists", () => {
+    const existingFilter = baseFilter([{ label: "0773", value: "0773" }]);
+    initialState.filters = [existingFilter];
+
+    (isUpFilter as any).mockImplementation((f) => f.id === "up");
+
+    const incomingFilter = baseFilter([{ label: "0444", value: "0444" }]);
+
+    const nextState = reducer(initialState, addUpFilters(incomingFilter));
+
+    expect(nextState.filters).toHaveLength(1);
+    expect(nextState.filters[0].values).toContainEqual({ label: "0773", value: "0773" });
+    expect(nextState.filters[0].values).toContainEqual({ label: "0444", value: "0444" });
+  });
+
+  it("should avoid duplicate values when merging", () => {
+    const existingFilter = baseFilter([{ label: "0444", value: "0444" }]);
+    initialState.filters = [existingFilter];
+
+    (isUpFilter as any).mockImplementation((f) => f.id === "up");
+
+    const incomingFilter = baseFilter([{ label: "0444", value: "0444" }]);
+
+    const nextState = reducer(initialState, addUpFilters(incomingFilter));
+
+    expect(nextState.filters).toHaveLength(1);
+    expect(nextState.filters[0].values).toEqual([{ label: "0444", value: "0444" }]);
+  });
+
+  it("should preserve other properties of the existing filter", () => {
+    const existingFilter = {
+      ...baseFilter([{ label: "A", value: "1" }]),
+      enabledValues: ["1"],
+    };
+    initialState.filters = [existingFilter];
+
+    (isUpFilter as any).mockReturnValue(true);
+
+    const incomingFilter = baseFilter([{ label: "B", value: "2" }]);
+
+    const nextState = reducer(initialState, addUpFilters(incomingFilter));
+
+    expect(nextState.filters[0].enabledValues).toEqual(["1"]); // no se sobreescribe
+  });
+});

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/add/reducer.ts

@@ -0,0 +1,22 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+import { IActivityHistoryUpFilter, isUpFilter } from "../../model";
+
+export function addUpFiltersReducer(state, action: PayloadAction<IActivityHistoryUpFilter>) {
+  const index = state.filters.findIndex(isUpFilter);
+
+  if (index === -1) {
+    state.filters.push(action.payload);
+  } else {
+    const existing = state.filters[index];
+
+    const mergedValues = [
+      ...existing.values,
+      ...action.payload.values.filter((v) => !existing.values.some((ev) => ev.value === v.value)),
+    ];
+
+    state.filters[index] = {
+      ...existing,
+      values: mergedValues,
+    };
+  }
+}

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/add/request.ts

@@ -0,0 +1,5 @@
+import { IActivityHistoryUpFilter } from "../../model";
+
+export class AddUpFiltersCommand {
+  constructor(public payload: IActivityHistoryUpFilter) {}
+}

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

@@ -0,0 +1,20 @@
+import { mapArrayToLabelValue } from "@primaria/plugins-core";
+import { Store } from "@reduxjs/toolkit";
+import { IActivityHistoryItem } from "../../domain/model";
+import { upFilterId } from "../model";
+import { addUpFilters } from "./add/actions";
+
+export const handleAddUpFilter = (items: IActivityHistoryItem[], store: Store) => {
+  const allUps = items.flatMap((item) => item.up ?? []).filter((up, index, self) => index === self.findIndex((u) => u.id === up.id));
+
+  if (allUps.length > 0) {
+    const newUpFilter = {
+      id: upFilterId,
+      title: "UP",
+      values: mapArrayToLabelValue(allUps, "description", "id"),
+      enabledValues: [],
+    };
+
+    store.dispatch(addUpFilters(newUpFilter));
+  }
+};

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/selectors.ts

@@ -0,0 +1,14 @@
+import { createSelector } from "@reduxjs/toolkit";
+import { IActivityHistoryFilter, IActivityHistoryUpFilter, isUpFilter } from "../model";
+import { activityHistoryFiltersSelector } from "../selectors";
+
+export const upFilterSelector = createSelector(activityHistoryFiltersSelector, (filters: IActivityHistoryFilter[]) =>
+  filters.find(isUpFilter),
+);
+
+export const upFilterEnabledValuesSelector = createSelector(
+  upFilterSelector,
+  (filter: IActivityHistoryUpFilter) => filter?.enabledValues || [],
+);
+
+export const areUpFiltersActive = createSelector(upFilterEnabledValuesSelector, (filters) => !!filters.length);

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/set/actions.ts

@@ -0,0 +1,3 @@
+import { activityHistoryFiltersSlice } from "../../slice";
+
+export const { setUpFilterValues } = activityHistoryFiltersSlice.actions;

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/set/bootstrapper.ts

@@ -0,0 +1,14 @@
+import { BrokerExtensions } from "@primaria/plugins-core";
+import { BrokerDisposableHandler } from "../../../../../../api/broker/primaria-broker";
+import { SetUpFiltersHandler } from "./handler";
+import { SetUpFiltersCommand } from "./request";
+
+let request: BrokerDisposableHandler;
+
+export const bootstrapSetUpFilter = (broker: BrokerExtensions) => {
+  request = broker.registerRequest(SetUpFiltersCommand, SetUpFiltersHandler);
+};
+
+export const teardownSetUpFilter = () => {
+  request?.dispose();
+};

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/set/handler.ts

@@ -0,0 +1,13 @@
+import { StoreBaseHandler } from "../../../../infrastructure/base-handlers";
+import { setUpFilterValues } from "./actions";
+import { SetUpFiltersCommand } from "./request";
+
+export class SetUpFiltersHandler extends StoreBaseHandler {
+  async handle(request: SetUpFiltersCommand) {
+    try {
+      this.store.dispatch(setUpFilterValues(request.payload));
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
+}

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/set/reducer.ts

@@ -0,0 +1,11 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+import { IActivityHistoryUpFilter, isUpFilter } from "../../model";
+
+export function setUpFilterValuesReducer(state, action: PayloadAction<string[]>) {
+  state.filters = [...state.filters].map((f) => {
+    if (isUpFilter(f)) {
+      return { ...f, enabledValues: action.payload } as IActivityHistoryUpFilter;
+    }
+    return f;
+  });
+}

package/src/internal-plugins/activity-history/activity-history-item/filter/up-filters/set/request.ts

@@ -0,0 +1,3 @@
+export class SetUpFiltersCommand {
+  constructor(public payload: string[]) {}
+}

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

@@ -9,6 +9,7 @@ import { TYPES } from "../../../../infrastructure/ioc/types";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import { SearchActivityHistoryItems } from "../../../search/request";
 import { activityHistoryCollectionsSelector } from "../../../selectors";
+import { isSomeCollectionLoadedAndOtherLoading, isCollectionInitialState } from "../../../add/handle-busy/selectors";
 import { ActivityHistoryTimeline } from "../timeline/activity-history-timeline";
 import styles from "./styles.css?inline";
 import { template } from "./template";
@@ -45,6 +46,12 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
   @connectedProperty(activityHistoryCollectionsSelector)
   historyItems: any[];
 
+  @connectedProperty(isCollectionInitialState)
+  isCollectionInitialState: boolean;
+
+  @connectedProperty(isSomeCollectionLoadedAndOtherLoading)
+  isSomeCollectionLoadedAndOtherLoading: boolean;
+
   _maximize() {
     this.maximized = true;
   }
@@ -54,12 +61,9 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
   }
 
   _subscribeEvents() {
-    const subscription = this.api.broker.subscribe(
-      shellEvents.openClinicalMonitoringRequested,
-      () => {
-        this.maximized = false;
-      },
-    );
+    const subscription = this.api.broker.subscribe(shellEvents.openClinicalMonitoringRequested, () => {
+      this.maximized = false;
+    });
     this.subscriptions.push(subscription);
   }
 
@@ -88,9 +92,7 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
 
   scrollToClosestDate(date: Date) {
     const selectedDate = date.getTime();
-    const timeline = this.shadowRoot.querySelector(
-      "activity-history-timeline",
-    ) as ActivityHistoryTimeline;
+    const timeline = this.shadowRoot.querySelector("activity-history-timeline") as ActivityHistoryTimeline;
     timeline._scrollIntoDate(selectedDate);
   }
 }

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

@@ -1,4 +1,4 @@
-import { html } from "lit";
+import { html, nothing } from "lit";
 import { ActivityHistoryMain } from "./activity-history-main";
 import { ExportPdf } from "../../../export-to-pdf/request";
 import { translate } from "../../../../localization";
@@ -35,7 +35,7 @@ export const template = (props: ActivityHistoryMain) =>
           <div class="content">
             <active-filters-header></active-filters-header>
             <activity-history-busy></activity-history-busy>
-            <activity-history-timeline></activity-history-timeline>
+            ${!props.isCollectionInitialState ? html`<activity-history-timeline></activity-history-timeline>` : nothing}
           </div>  
         </div>
     </div>`;

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

@@ -7,10 +7,7 @@ import { activityHistoryGroupedItems } from "../../../selectors";
 import styles from "./styles.css?inline";
 import { template } from "./template";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
-import {
-  isAnyCollectionLoadingWithoutAnyLoaded,
-  isSomeCollectionLoadedAndOtherLoading,
-} from "../../../add/handle-busy/selectors";
+import { isSomeCollectionLoadedAndOtherLoading, isCollectionInitialState } from "../../../add/handle-busy/selectors";
 import { virtualizerRef } from "@lit-labs/virtualizer/virtualize.js";
 import "@lit-labs/virtualizer";
 
@@ -44,8 +41,8 @@ export class ActivityHistoryTimeline extends LitElement {
   @connectedProperty(activityHistoryGroupedItems)
   historyGroups: IActivityHistoryGroup[];
 
-  @connectedProperty(isAnyCollectionLoadingWithoutAnyLoaded)
-  isAnyCollectionLoadingWithoutAnyLoaded: boolean;
+  @connectedProperty(isCollectionInitialState)
+  isCollectionInitialState: boolean;
 
   @connectedProperty(isSomeCollectionLoadedAndOtherLoading)
   isSomeCollectionLoadedAndOtherLoading: boolean;

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

@@ -78,7 +78,7 @@ export const template = (props: ActivityHistoryTimeline) => {
               `}
             ></lit-virtualizer>
           `
-          : !props.isAnyCollectionLoadingWithoutAnyLoaded && !props.isSomeCollectionLoadedAndOtherLoading
+          : !props.isCollectionInitialState && !props.isSomeCollectionLoadedAndOtherLoading
             ? html`
               <dss-user-feedback
                 class="feedback"

package/src/internal-plugins/activity-history/activity-history-item/selectors.ts

@@ -1,11 +1,7 @@
 import { createSelector } from "@reduxjs/toolkit";
 import { RootState } from "../infrastructure/state/store";
 import { getUniqueObjects } from "../utils/get-unique-values-by-prop-path";
-import {
-  IActivityHistoryItem,
-  IActivityHistoryItemCollection,
-  TSearchActivityHistoryItemPredicate,
-} from "./domain/model";
+import { IActivityHistoryItem, IActivityHistoryItemCollection, TSearchActivityHistoryItemPredicate } from "./domain/model";
 import { CommonFilterSpec } from "./domain/specs/common-filter-spec";
 import { CustomFilterSpec } from "./domain/specs/custom-filter-spec";
 import { SearchStringSpec } from "./domain/specs/search-string-spec";
@@ -18,9 +14,10 @@ import { sortGroupsByMostRecentDate } from "./list/sort-history-items-by-date/so
 import { activityHistorySearchStringSelector } from "./search/selectors";
 import { diagnosticFilterEnabledValuesSelector } from "./filter/diagnostic-filters/selectors";
 import { DiagnosticCodeSpec } from "./domain/specs/diagnostics-filter-spec";
+import { upFilterEnabledValuesSelector } from "./filter/up-filters/selectors";
+import { UpFilterSpec } from "./domain/specs/up-filter-spec";
 
-export const activityHistoryCollectionsSelector = (state: RootState) =>
-  state.activityHistoryCollections.collections;
+export const activityHistoryCollectionsSelector = (state: RootState) => state.activityHistoryCollections.collections;
 
 const mapItemsWithMetadata = (
   items: IActivityHistoryItem[],
@@ -43,12 +40,7 @@ export const activityHistoryMappedItems = createSelector(
   activityHistoryCollectionsSelector,
   (collections: Record<string, IActivityHistoryItemCollection>) => {
     return Object.values(collections).flatMap((collection: IActivityHistoryItemCollection) => {
-      return mapItemsWithMetadata(
-        collection.items,
-        collection.componentFactory,
-        collection.id,
-        collection.searchPredicate,
-      );
+      return mapItemsWithMetadata(collection.items, collection.componentFactory, collection.id, collection.searchPredicate);
     });
   },
 );
@@ -56,10 +48,7 @@ export const activityHistoryMappedItems = createSelector(
 export const customFilterGroupsWithOptionsSelector = createSelector(
   activityHistoryCustomFilterGroupsSelector,
   activityHistoryCollectionsSelector,
-  (
-    filterGroups: IActivityHistoryCustomFilterGroup[],
-    collections: Record<string, IActivityHistoryItemCollection>,
-  ) => {
+  (filterGroups: IActivityHistoryCustomFilterGroup[], collections: Record<string, IActivityHistoryItemCollection>) => {
     const result = filterGroups.map((filterGroup: IActivityHistoryCustomFilterGroup) => {
       const collection = collections[filterGroup.id] as IActivityHistoryItemCollection;
       return {
@@ -69,12 +58,7 @@ export const customFilterGroupsWithOptionsSelector = createSelector(
             ...f,
             options:
               (!f.singleOption
-                ? getUniqueObjects<IActivityHistoryItem>(
-                    collection.items,
-                    f.propPathValue,
-                    f.propsPathDescription,
-                    f.title
-                  )
+                ? getUniqueObjects<IActivityHistoryItem>(collection.items, f.propPathValue, f.propsPathDescription, f.title)
                 : []) || [],
           };
         }),
@@ -90,12 +74,14 @@ export const activityHistoryGroupedItems = createSelector(
   activityHistoryCommonFiltersSelector,
   activityHistoryCustomFilterGroupsSelector,
   diagnosticFilterEnabledValuesSelector,
+  upFilterEnabledValuesSelector,
   (
     items: IActivityHistoryItem[],
     searchString: string,
     commonFilters: IActivityHistoryCommonFilter[],
     customFilters: IActivityHistoryCustomFilterGroup[],
     diagnosticFilterEnabledValues: string[],
+    upFilterEnabledValues: string[],
   ) => {
     const filteredItems = items.filter((item: IActivityHistoryItem) =>
       new SearchStringSpec(searchString, item.searchPredicate)
@@ -103,6 +89,7 @@ export const activityHistoryGroupedItems = createSelector(
         .and(new ComposedTypeSpec(customFilters))
         .and(new CustomFilterSpec(customFilters))
         .and(new DiagnosticCodeSpec(diagnosticFilterEnabledValues))
+        .and(new UpFilterSpec(upFilterEnabledValues))
         .isSatisfiedBy(item),
     );
 

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

@@ -13,7 +13,9 @@ export function getUniqueObjects<T>(
     const title = propPathDescription.reduce((acc, key) => acc?.[key], item);
 
     const isValidId = typeof id === "string" && id.trim() !== "";
-    const isValidTitle = typeof title === "string" && title.trim() !== "";
+
+    //Tret el trim del title pels casos de migració on arriben camps buits
+    const isValidTitle = typeof title === "string";
 
     if (isValidId && isValidTitle) {
       if (!map.has(id)) {