@uxland/primary-shell 5.4.6 → 5.5.0

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

@@ -3,6 +3,8 @@ import { shellRegions } from "../../api/region-manager/regions";
 import { ExitShell } from "../../features/exit/request";
 import { getPatientCip } from "../../features/get-patient-cip/action";
 import { navigateToEcapWithoutClosingWithCip } from "../../features/navigate-to-ecap/navigate-without-closing-and-with-cip";
+import { CommunicationActionMenu } from "../components/communication-action-menu/communication-action-menu";
+import { QuickActionItem } from "../shared-components/quick-action-item/quick-action-item";
 import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
 import { PrimariaNavTreeMenu } from "../shared-components/primaria-nav-tree-menu/primaria-nav-tree-menu";
 
@@ -181,7 +183,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Prescripció social",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCIPCIO_SOCIAL"),
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCRIPCIO_SOCIAL"),
       },
     ],
   },
@@ -201,34 +203,6 @@ const upperNavMenuItems: MenuItemConfig[] = [
     sortHint: "0100",
     callbackFn: () => navigateToEcapWithoutClosingWithCip("REV_IT"),
   },
-  {
-    id: "communication",
-    icon: "3p",
-    label: "Comunicació",
-    type: "tree",
-    sortHint: "0120",
-    actionMenuItems: [
-      {
-        icon: "open_in_new",
-        label: "SMS",
-        callbackFn: async () => {
-          const CIP = await getPatientCip(shellApi);
-          shellApi.ecapEventManager.publish("MISSATGES_DEV", "NO_TANCAR", {
-            CIP: CIP || "",
-            TipusMissatge: "SMS",
-          });
-        },
-      },
-      { icon: "open_in_new", label: "eConsulta", callbackFn: () => {} },
-      { icon: "open_in_new", label: "Mail", callbackFn: () => {} },
-      {
-        icon: "open_in_new",
-        label: "Veu IP",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("VOIP"),
-      },
-      { icon: "open_in_new", label: "Videoconsulta", callbackFn: () => {} },
-    ],
-  },
   {
     id: "visits",
     icon: "event",
@@ -271,3 +245,59 @@ export const registerUpperNavMenuViews = () => {
     });
   }
 };
+
+export const registerCommunicationNavMenuItem = () => {
+  shellApi.regionManager.registerView(shellRegions.navigationMenu, {
+    id: "communication",
+    sortHint: "0120",
+    factory: () => {
+      const menuItem = new CommunicationActionMenu("3p", "Comunicació");
+
+      return Promise.resolve(menuItem);
+    },
+  });
+};
+
+export const registerCommunicationMenuActions = () => {
+  const communicationItems = [
+    {
+      id: "1",
+      sortHint: "0010",
+      icon: "open_in_new",
+      label: "SMS",
+      callbackFn: async () => {
+        const CIP = await getPatientCip(shellApi);
+        shellApi.ecapEventManager.publish("MISSATGES_DEV", "NO_TANCAR", {
+          CIP: CIP || "",
+          TipusMissatge: "SMS",
+        });
+      },
+    },
+    { id: "2", sortHint: "0020", icon: "open_in_new", label: "eConsulta", callbackFn: () => {} },
+    { id: "3", icon: "open_in_new", label: "Mail", callbackFn: () => {} },
+    {
+      id: "4",
+      sortHint: "0030",
+      icon: "open_in_new",
+      label: "Veu IP",
+      callbackFn: () => navigateToEcapWithoutClosingWithCip("VOIP"),
+    },
+    // { id: "5", sortHint: "0040", icon: "open_in_new", label: "Videoconsulta", callbackFn: () => {} },
+  ];
+  for (const item of communicationItems) {
+    shellApi.regionManager.registerView(shellRegions.communicationSidenav, {
+      id: item.id,
+      sortHint: item.sortHint,
+      factory: () => {
+        const menuItem = new PrimariaNavItem({
+          icon: item.icon,
+          label: item.label,
+          callbackFn: item.callbackFn,
+        });
+
+        const menuTest = new QuickActionItem(item.icon, item.label, item.callbackFn);
+        return Promise.resolve(menuTest);
+      },
+    });
+  }
+};

package/src/UI/shared-components/quick-action-item/quick-action-item.ts

@@ -0,0 +1,21 @@
+import { LitElement, html } from "lit";
+import { template } from "./template";
+import { customElement, property } from "lit/decorators.js";
+
+@customElement("quick-action-item")
+export class QuickActionItem extends LitElement {
+  constructor(icon: string, label: string, callbackFn: () => void) {
+    super();
+    this.icon = icon;
+    this.label = label;
+    this.callbackFn = callbackFn;
+  }
+
+  render() {
+    return html`${template(this)}`;
+  }
+
+  @property({ type: String }) icon = "";
+  @property({ type: String }) label = "";
+  @property({ attribute: false }) callbackFn = () => {};
+}

package/src/UI/shared-components/quick-action-item/template.ts

@@ -0,0 +1,8 @@
+import { html } from "lit";
+import { QuickActionItem } from "./quick-action-item";
+
+export const template = (props: QuickActionItem) => {
+  return html`
+    <dss-action-menu-item @click=${props.callbackFn} notificationsstate="error" rightIcon=${props.icon} label=${props.label}></dss-action-menu-item>
+  `;
+};

package/src/api/region-manager/regions.ts

@@ -6,6 +6,7 @@ export const shellRegions = {
   navigationLowerLeftMenu: "navigation-lower-left-menu",
   quickActions: "quick-actions-region",
   floating: "floating-region",
+  communicationSidenav: "communication-sidenav-region",
 };
 
 export const clinicalMonitoringRegions = {

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

@@ -1,6 +1,7 @@
 import { StoreBaseHandler } from "../../../infrastructure/base-handlers";
 import { ensureAreValidBasicActivityHistoryItems } from "../../domain/validation/is-valid-basic-history-item";
 import { handleAddDiagnosticsFilter } from "../../filter/diagnostic-filters/handle-add-diagnostics-options-from-item";
+import { handleAddUpFilter } from "../../filter/up-filters/handle-add-up-options-from-item";
 import { addActivityHistoryItem } from "./action";
 import { AddHistoryItemPayload } from "./request";
 
@@ -15,6 +16,7 @@ export class AddHistoryItemHandler extends StoreBaseHandler {
         }),
       );
       handleAddDiagnosticsFilter([payload.item], this.store);
+      handleAddUpFilter([payload.item], this.store);
     } catch (e) {
       console.log(e.message);
     }

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

@@ -1,6 +1,7 @@
 import { StoreBaseHandler } from "../../../infrastructure/base-handlers";
 import { validateAndFilterBasicItems } from "../../domain/validation/is-valid-basic-history-item";
 import { handleAddDiagnosticsFilter } from "../../filter/diagnostic-filters/handle-add-diagnostics-options-from-item";
+import { handleAddUpFilter } from "../../filter/up-filters/handle-add-up-options-from-item";
 import { addActivityHistoryItems } from "./action";
 import { AddHistoryItemsPayload } from "./request";
 
@@ -17,6 +18,7 @@ export class AddHistoryItemsHandler extends StoreBaseHandler {
         }),
       );
       handleAddDiagnosticsFilter(validItems, this.store);
+      handleAddUpFilter(validItems, this.store);
     } catch (e) {
       console.log(e.message);
     }

package/src/internal-plugins/activity-history/activity-history-item/domain/specs/up-filter-spec.test.ts

@@ -0,0 +1,38 @@
+import { describe, it, expect } from 'vitest';
+import { IActivityHistoryItem } from '../model';
+import { UpFilterSpec } from './up-filter-spec';
+
+
+describe('UpFilterSpec', () => {
+  const makeItem = (upId: string | undefined, description: string | undefined): IActivityHistoryItem => ({
+    up: { id: upId, description },
+  } as IActivityHistoryItem);
+
+  it('should return true if up filter is empty', () => {
+    const spec = new UpFilterSpec([]);
+    const item =  makeItem('00461', 'EAP Barcelona 2D - Universitat');
+
+    expect(spec.isSatisfiedBy(item)).toBe(true);
+  });
+
+  it('should return true if item has at least one matching up', () => {
+    const spec = new UpFilterSpec(['00001', '00461', '99999']);
+    const item = makeItem('00461', 'EAP Barcelona 2D - Universitat');
+
+    expect(spec.isSatisfiedBy(item)).toBe(true);
+  });
+
+  it('should return false if item has up but none match', () => {
+    const spec = new UpFilterSpec(['00001', '00002', '00003']);
+    const item = makeItem('00461', 'EAP Barcelona 2D - Universitat');
+
+    expect(spec.isSatisfiedBy(item)).toBe(false);
+  });
+
+  it('should return false if item has no up', () => {
+    const spec = new UpFilterSpec(['a']);
+    const item = makeItem(undefined, undefined);
+
+    expect(spec.isSatisfiedBy(item)).toBe(false);
+  });
+});

package/src/internal-plugins/activity-history/activity-history-item/domain/specs/up-filter-spec.ts

@@ -0,0 +1,18 @@
+import { IActivityHistoryItem } from "../model";
+import { Spec } from "./spec";
+
+export class UpFilterSpec extends Spec<IActivityHistoryItem> {
+  constructor(private upIds: string[]) {
+    super();
+  }
+
+  isSatisfiedBy(item: IActivityHistoryItem): boolean {
+    if (!this.upIds?.length) {
+      return true; // No se filtra si no se proporcionan códigos
+    }
+
+    const itemUp = item.up ?? null;
+
+    return this.upIds.some((upId) => itemUp.id === upId);
+  }
+}

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

@@ -8,13 +8,15 @@ import { template } from "./template";
 import styles from "./styles.css?inline";
 import { activeGroupsWithEnabledFilters } from "../../custom-filters/selectors";
 import { SetCustomFilterValue } from "../../custom-filters/set-custom-filter-value/request";
-import { IActivityHistoryCustomFilterGroup, IActivityHistoryDiagnosticsFilter, IActivityHistoryFilter } from "../../model";
+import { IActivityHistoryCustomFilterGroup, IActivityHistoryDiagnosticsFilter, IActivityHistoryFilter, IActivityHistoryUpFilter } from "../../model";
 import { activityHistoryEnabledCommonFiltersSelector } from "../../common-filters/selectors";
 import { SetCommonFilter } from "../../common-filters/set-common-filter/request";
 import { diagnosticFilterSelector } from "../../diagnostic-filters/selectors";
 import { SetDiagnosticFiltersCommand } from "../../diagnostic-filters/set/request";
 import { ResetCommonFilter } from "../../common-filters/reset-common-filter/request";
 import { ResetCustomFilter } from "../../custom-filters/reset-custom-filter/request";
+import { upFilterSelector } from "../../up-filters/selectors";
+import { SetUpFiltersCommand } from "../../up-filters/set/request";
 
 //@ts-ignore
 @customElement("active-filters-badges")
@@ -40,6 +42,9 @@ export class ActiveFiltersBadges extends LitElement {
 
   @connectedProperty(diagnosticFilterSelector)
   diagnosticFilterEnabled: IActivityHistoryDiagnosticsFilter;
+  
+  @connectedProperty(upFilterSelector)
+  upFilterEnabled: IActivityHistoryUpFilter;
 
   _onDeleteFilterValue(filterGroupId: string, filterId: string, optionId: string, value: boolean) {
     this.api.broker.send(
@@ -64,8 +69,17 @@ export class ActiveFiltersBadges extends LitElement {
     );
   }
 
+    _onDeleteUpFilterValue(upValue: string) {
+    this.api.broker.send(
+      new SetUpFiltersCommand([
+        ...this.upFilterEnabled.enabledValues.filter((v) => v !== upValue),
+      ]),
+    );
+  }
+
   resetFilters() {
     this.api.broker.send(new SetDiagnosticFiltersCommand([]));
+    this.api.broker.send(new SetUpFiltersCommand([]));
     this.api.broker.send(new ResetCommonFilter());
     this.api.broker.send(new ResetCustomFilter());
   }

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

@@ -38,13 +38,25 @@ const renderDiagnosticChip = (id, value, props) => html`
   ></dss-chip>
 `;
 
+const renderUpChip = (id, value, props) => html`
+  <dss-chip
+    label=${value}
+    size="sm"
+    hasdelete
+    selected
+    @click=${() => props._onDeleteUpFilterValue(id)}
+    @onDelete=${() => props._onDeleteUpFilterValue(id)}
+  ></dss-chip>
+`;
+
 const renderFilterTitle = (title) => html`<div class="filter-title">${`${title}:`}</div>`;
 
 export const template = (props: ActiveFiltersBadges) => {
   if (
     props.enabledFilters.length === 0 &&
     props.enabledCommonFilters.length === 0 &&
-    props.diagnosticFilterEnabled.enabledValues.length === 0
+    props.diagnosticFilterEnabled.enabledValues.length === 0 &&
+    props.upFilterEnabled.enabledValues.length === 0
   )
     return nothing;
 
@@ -85,6 +97,38 @@ export const template = (props: ActiveFiltersBadges) => {
     }
   }
 
+  const up = props.upFilterEnabled;  
+
+  if (up) {
+    const { title, values, enabledValues } = up;
+    const selectedOptions = values.filter((opt) => enabledValues.includes(opt.value));
+
+    if (selectedOptions.length > 0) {
+      let titleAddedToVisible = false;
+      let titleAddedToHidden = false;
+
+      for (const option of selectedOptions) {
+        const chip = renderUpChip(option.value, option.label, props);
+
+        if (visibleCount < MAX_VISIBLE_CHIPS) {
+          if (!titleAddedToVisible) {
+            visibleChips.push(renderFilterTitle(title));
+            titleAddedToVisible = true;
+          }
+          visibleChips.push(chip);
+          visibleCount++;
+        } else {
+          if (!titleAddedToHidden) {
+            hiddenElements.push(renderFilterTitle(title));
+            titleAddedToHidden = true;
+          }
+          hiddenElements.push(chip);
+          hiddenChips.push(chip);
+        }
+      }
+    }
+  }  
+
   for (const filter of props.enabledCommonFilters) {
     const chip = renderCommonChip(filter, props);
 

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

@@ -7,6 +7,7 @@ import { activityHistorySearchStringSelector } from "../../../search/selectors";
 import { areCustomFiltersActive } from "../../custom-filters/selectors";
 import { areCommonFiltersActive } from "../../common-filters/selectors";
 import { areDiagnosticFiltersActive } from "../../diagnostic-filters/selectors";
+import { areUpFiltersActive } from "../../up-filters/selectors";
 
 //@ts-ignore
 @customElement("active-filters-header")
@@ -30,4 +31,7 @@ export class ActiveFiltersHeader extends LitElement {
 
   @connectedProperty(areDiagnosticFiltersActive)
   areDiagnosticFiltersActive: boolean;
+
+  @connectedProperty(areUpFiltersActive)
+  areUpFiltersActive: boolean;
 }

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

@@ -7,6 +7,7 @@ export const template = (props: ActiveFiltersHeader) => {
     !props.areCustomFiltersActive &&
     !props.areCommonFiltersActive &&
     !props.areDiagnosticFiltersActive &&
+    !props.areUpFiltersActive &&
     props.searchString.length < 1
   )
     return nothing;

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

@@ -8,6 +8,7 @@ import {
   IActivityHistoryCommonFilter,
   IActivityHistoryCustomFilterGroup,
   IActivityHistoryDiagnosticsFilter,
+  IActivityHistoryUpFilter,
 } from "../../model";
 import styles from "./styles.css?inline";
 import { template } from "./template";
@@ -16,11 +17,10 @@ import { SetCommonFilter } from "../../common-filters/set-common-filter/request"
 import { activityHistoryCommonFiltersSelector } from "../../common-filters/selectors";
 import { SetCustomFilterValue } from "../../custom-filters/set-custom-filter-value/request";
 import { customFilterGroupsWithOptionsSelector } from "../../../selectors";
-import {
-  diagnosticFilterEnabledValuesSelector,
-  diagnosticFilterSelector,
-} from "../../diagnostic-filters/selectors";
+import { diagnosticFilterEnabledValuesSelector, diagnosticFilterSelector } from "../../diagnostic-filters/selectors";
 import { SetDiagnosticFiltersCommand } from "../../diagnostic-filters/set/request";
+import { upFilterEnabledValuesSelector, upFilterSelector } from "../../up-filters/selectors";
+import { SetUpFiltersCommand } from "../../up-filters/set/request";
 
 //@ts-ignore
 @customElement("activity-history-filters")
@@ -45,6 +45,12 @@ export class ActivityHistoryFilters extends LitElement {
   @connectedProperty(diagnosticFilterEnabledValuesSelector)
   diagnosticFilterEnabledValues: string[];
 
+  @connectedProperty(upFilterSelector)
+  upFilter: IActivityHistoryUpFilter;
+
+  @connectedProperty(upFilterEnabledValuesSelector)
+  upFilterEnabledValues: string[];
+
   @lazyInject(TYPES.primaryApi)
   api: PrimariaApi;
 
@@ -72,12 +78,7 @@ export class ActivityHistoryFilters extends LitElement {
     this.api.broker.send(new SetCustomFilterGroup({ id: filterGroupId, enabled: value }));
   }
 
-  _onChangeCustomFilterValue(
-    filterGroupId: string,
-    filterId: string,
-    optionId: string,
-    value: boolean,
-  ) {
+  _onChangeCustomFilterValue(filterGroupId: string, filterId: string, optionId: string, value: boolean) {
     this.api.broker.send(
       new SetCustomFilterValue({
         filterGroupId,
@@ -92,4 +93,9 @@ export class ActivityHistoryFilters extends LitElement {
     const selectedValues = e.detail.selectedValue;
     this.api.broker.send(new SetDiagnosticFiltersCommand(selectedValues));
   }
+
+  _handleUpFilterChange(e: CustomEvent) {
+    const selectedValues = e.detail.selectedValue;
+    this.api.broker.send(new SetUpFiltersCommand(selectedValues));
+  }
 }

package/src/internal-plugins/activity-history/activity-history-item/filter/UI/activity-history-filters/styles.css

@@ -41,6 +41,7 @@
     display: flex;
     flex-direction: column;
     padding-top: 12px;
+    gap: var(--dss-spacing-xs);
 
     .custom-filter{
       display: flex;

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);
@@ -67,6 +73,15 @@ export const template = (props: ActivityHistoryFilters) =>
                           </dss-input-dropdown>
                         </div>`
                   }
+                  ${
+                    props.upFilter &&
+                    html`<div class="filter">
+                      <dss-input-dropdown 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,38 @@ 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
+        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();
+};