@uxland/primary-shell 5.3.7 → 5.3.9

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

@@ -0,0 +1,18 @@
+import { IActivityHistoryItem } from "../model";
+import { Spec } from "./spec";
+
+export class DiagnosticCodeSpec extends Spec<IActivityHistoryItem> {
+  constructor(private diagnosticCodes: string[]) {
+    super();
+  }
+
+  isSatisfiedBy(item: IActivityHistoryItem): boolean {
+    if (!this.diagnosticCodes?.length) {
+      return true; // No se filtra si no se proporcionan códigos
+    }
+
+    const itemDiagnostics = item.diagnostics ?? [];
+
+    return itemDiagnostics.some((d) => this.diagnosticCodes.includes(d.codi));
+  }
+}

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

@@ -0,0 +1,63 @@
+import { describe, it, expect } from "vitest";
+import { isValidBasicActivityHistoryItem } from "./is-valid-basic-history-item";
+
+describe("isValidBasicActivityHistoryItem", () => {
+  it("should return true for a valid ActivityHistoryItem object", () => {
+    const validItem = {
+      id: "123",
+      date: "2023-10-07T10:32:00.000Z", // formato válido ISO
+      professional: {
+        id: "prof-1",
+        name: "Dr. John Doe",
+        speciality: { id: "spec-1", description: "Cardiology" },
+        role: { id: "role-1", description: "Lead Doctor" },
+      },
+      relevant: true,
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
+      center: { id: "center-1", description: "Main Hospital" },
+      up: { id: "up-1", description: "Unit A" },
+      ep: { id: "ep-1", description: "Emergency Room" },
+      service: { id: "service-1", description: "Cardiac Service" },
+    };
+
+    expect(isValidBasicActivityHistoryItem(validItem)).toBe(true);
+  });
+
+  it('should return false if "id" is missing', () => {
+    const invalidItem = {
+      date: "2023-10-07T10:32:00.000Z",
+      // same as above
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is missing', () => {
+    const invalidItem = {
+      id: "123",
+      // same as above
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is an invalid string', () => {
+    const invalidItem = {
+      id: "123",
+      date: "not-a-date",
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  it('should return false if "date" is an empty string', () => {
+    const invalidItem = {
+      id: "123",
+      date: "",
+    };
+
+    expect(isValidBasicActivityHistoryItem(invalidItem as any)).toBe(false);
+  });
+
+  
+});

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

@@ -0,0 +1,43 @@
+import { IActivityHistoryItem } from "../model";
+
+export const isValidBasicActivityHistoryItem = (obj: IActivityHistoryItem) => {
+  // Función auxiliar para comprobar si una propiedad existe y es del tipo string válido
+  const isString = (value: any) => typeof value === "string" && value.trim() !== "";
+
+  // Función para comprobar si un string representa una fecha válida
+ const isValidDateString = (value: any) => {
+  if (typeof value !== "string" || value.trim() === "") return false;
+
+  const date = new Date(value);
+  return date instanceof Date && !Number.isNaN(date.getTime());
+};
+
+  // Comprobación del objeto principal
+  return (
+    obj &&
+    isString(obj.id) && // Verifica que "id" esté informado
+    isValidDateString(obj.date) // Verifica que "date" sea un string de fecha válido
+  );
+};
+
+export const ensureAreValidBasicActivityHistoryItems = (items: IActivityHistoryItem[]) => {
+  const areValid = items.every(isValidBasicActivityHistoryItem);
+  if (!areValid) {
+    console.error("Invalid activity history items", items);
+    throw new Error("Invalid activity history items");
+  }
+  return items;
+};
+
+const notifyInvalidItem = (item: IActivityHistoryItem) => {
+  console.error("Invalid history item", item);
+};
+
+export const validateAndFilterBasicItems = (items: IActivityHistoryItem[]) => {
+  const validItems = [] as IActivityHistoryItem[];
+  for (const item of items) {
+    if (isValidBasicActivityHistoryItem(item)) validItems.push(item);
+    else notifyInvalidItem(item);
+  }
+  return validItems;
+};

package/src/internal-plugins/activity-history/activity-history-item/domain/{is-valid-history-item/is-valid-history-item.test.ts → validation/is-valid-full-history-item.test.ts}

@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
-import { isValidActivityHistoryItem } from "./is-valid-history-item";
+import { isValidFullActivityHistoryItem } from "./is-valid-full-history-item";
 
-describe("isValidActivityHistoryItem", () => {
+describe("isValidFullActivityHistoryItem", () => {
   it("should return true for a valid ActivityHistoryItem object", () => {
     const validItem = {
       id: "123",
@@ -20,7 +20,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 
   it('should return false if "id" is missing', () => {
@@ -40,7 +40,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "date" is missing', () => {
@@ -60,7 +60,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "professional" is invalid', () => {
@@ -81,7 +81,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "diagnostics" is not an array', () => {
@@ -102,7 +102,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return true if "diagnostics" is null', () => {
@@ -123,7 +123,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 
   it('should return false if "diagnostics" are invalid', () => {
@@ -144,7 +144,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
 
   it('should return false if "relevant" is not a boolean', () => {
@@ -165,7 +165,7 @@ describe("isValidActivityHistoryItem", () => {
       service: { id: "service-1", description: "Cardiac Service" },
     };
 
-    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+    expect(isValidFullActivityHistoryItem(invalidItem)).toBe(false);
   });
   it("should return true if all base props are correct, but object contain more extra fields", () => {
     const validItem = {
@@ -187,6 +187,6 @@ describe("isValidActivityHistoryItem", () => {
       prop2: "value2",
     };
 
-    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+    expect(isValidFullActivityHistoryItem(validItem)).toBe(true);
   });
 });

package/src/internal-plugins/activity-history/activity-history-item/domain/{is-valid-history-item/is-valid-history-item.ts → validation/is-valid-full-history-item.ts}

@@ -1,6 +1,7 @@
 import { IActivityHistoryItem } from "../model";
+import { isValidBasicActivityHistoryItem } from "./is-valid-basic-history-item";
 
-export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
+export const isValidFullActivityHistoryItem = (obj: IActivityHistoryItem) => {
   // Función auxiliar para comprobar si una propiedad existe y es del tipo esperado
   const isString = (value) => typeof value === "string" && value.trim() !== "";
   const isBoolean = (value) => typeof value === "boolean";
@@ -49,9 +50,7 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
 
   // Comprobación del objeto principal
   return (
-    obj &&
-    isString(obj.id) && // Verifica que "id" esté informado
-    isString(obj.date) && // Verifica que "date" esté informado
+    isValidBasicActivityHistoryItem(obj) &&
     hasValidProfessional(obj.professional) &&
     isBoolean(obj.relevant) &&
     hasValidDiagnostics(obj.diagnostics) &&
@@ -62,8 +61,8 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
   );
 };
 
-export const ensureAreValidActivityHistoryItems = (items: IActivityHistoryItem[]) => {
-  const areValid = items.every(isValidActivityHistoryItem);
+export const ensureAreValidFullActivityHistoryItems = (items: IActivityHistoryItem[]) => {
+  const areValid = items.every(isValidFullActivityHistoryItem);
   if (!areValid) {
     console.error("Invalid activity history items", items);
     throw new Error("Invalid activity history items");
@@ -75,10 +74,10 @@ const notifyInvalidItem = (item: IActivityHistoryItem) => {
   console.error("Invalid history item", item);
 };
 
-export const validateAndFilterItems = (items: IActivityHistoryItem[]) => {
+export const validateAndFilterFullItems = (items: IActivityHistoryItem[]) => {
   const validItems = [] as IActivityHistoryItem[];
   for (const item of items) {
-    if (isValidActivityHistoryItem(item)) validItems.push(item);
+    if (isValidFullActivityHistoryItem(item)) validItems.push(item);
     else notifyInvalidItem(item);
   }
   return validItems;

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

@@ -8,9 +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, IActivityHistoryFilterGroup } from "../../model";
+import {
+  IActivityHistoryCustomFilterGroup,
+  IActivityHistoryDiagnosticsFilter,
+  IActivityHistoryFilter,
+} 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";
 
 //@ts-ignore
 @customElement("active-filters-badges")
@@ -29,11 +35,14 @@ export class ActiveFiltersBadges extends LitElement {
   activityHistoryCommonFiltersSelector;
 
   @connectedProperty(activityHistoryEnabledCommonFiltersSelector)
-  enabledCommonFilters: IActivityHistoryFilterGroup[];
+  enabledCommonFilters: IActivityHistoryFilter[];
 
   @connectedProperty(activeGroupsWithEnabledFilters)
   enabledFilters: IActivityHistoryCustomFilterGroup[];
 
+  @connectedProperty(diagnosticFilterSelector)
+  diagnosticFilterEnabled: IActivityHistoryDiagnosticsFilter;
+
   _onDeleteFilterValue(filterGroupId: string, filterId: string, optionId: string, value: boolean) {
     this.api.broker.send(
       new SetCustomFilterValue({
@@ -48,4 +57,12 @@ export class ActiveFiltersBadges extends LitElement {
   _onDeleteCommonFilterValue(filterId: string) {
     this.api.broker.send(new SetCommonFilter({ id: filterId, enabled: false }));
   }
+
+  _onDeleteDiagnosticFilterValue(diagnosticValue: string) {
+    this.api.broker.send(
+      new SetDiagnosticFiltersCommand([
+        ...this.diagnosticFilterEnabled.enabledValues.filter((v) => v !== diagnosticValue),
+      ]),
+    );
+  }
 }

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

@@ -27,16 +27,64 @@ const renderCommonChip = (filter, props) => html`
   ></dss-chip>
 `;
 
+const renderDiagnosticChip = (id, value, props) => html`
+  <dss-chip
+    label=${value}
+    size="sm"
+    hasdelete
+    selected
+    @click=${() => props._onDeleteDiagnosticFilterValue(id)}
+    @onDelete=${() => props._onDeleteDiagnosticFilterValue(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) return nothing;
+  if (
+    props.enabledFilters.length === 0 &&
+    props.enabledCommonFilters.length === 0 &&
+    props.diagnosticFilterEnabled.enabledValues.length === 0
+  )
+    return nothing;
 
   let visibleCount = 0;
   const visibleChips: any[] = [];
   const hiddenElements: any[] = [];
   const hiddenChips: any[] = [];
 
+  const diagnostic = props.diagnosticFilterEnabled;
+
+  if (diagnostic) {
+    const { title, values, enabledValues } = diagnostic;
+    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 = renderDiagnosticChip(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

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

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

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

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

@@ -4,7 +4,11 @@ import { PrimariaApi } from "../../../../../../api/api";
 import { lazyInject } from "../../../../infrastructure/ioc/container";
 import { TYPES } from "../../../../infrastructure/ioc/types";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
-import { IActivityHistoryCommonFilter, IActivityHistoryCustomFilterGroup } from "../../model";
+import {
+  IActivityHistoryCommonFilter,
+  IActivityHistoryCustomFilterGroup,
+  IActivityHistoryDiagnosticsFilter,
+} from "../../model";
 import styles from "./styles.css?inline";
 import { template } from "./template";
 import { SetCustomFilterGroup } from "../../custom-filters/set-custom-filter-group/request";
@@ -12,6 +16,11 @@ 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 { SetDiagnosticFiltersCommand } from "../../diagnostic-filters/set/request";
 
 //@ts-ignore
 @customElement("activity-history-filters")
@@ -30,6 +39,12 @@ export class ActivityHistoryFilters extends LitElement {
   @connectedProperty(customFilterGroupsWithOptionsSelector)
   customFilterGroups: IActivityHistoryCustomFilterGroup[];
 
+  @connectedProperty(diagnosticFilterSelector)
+  diagnosticFilter: IActivityHistoryDiagnosticsFilter;
+
+  @connectedProperty(diagnosticFilterEnabledValuesSelector)
+  diagnosticFilterEnabledValues: string[];
+
   @lazyInject(TYPES.primaryApi)
   api: PrimariaApi;
 
@@ -72,4 +87,9 @@ export class ActivityHistoryFilters extends LitElement {
       }),
     );
   }
+
+  _handleDiagnosticFilterChange(e: CustomEvent) {
+    const selectedValues = e.detail.selectedValue;
+    this.api.broker.send(new SetDiagnosticFiltersCommand(selectedValues));
+  }
 }

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

@@ -6,7 +6,7 @@ import {
   IActivityHistoryCommonFilter,
   IActivityHistoryCustomFilter,
   IActivityHistoryCustomFilterGroup,
-  IActivityHistoryFilterGroup,
+  IActivityHistoryFilter,
 } from "../../model";
 import { translate } from "../../../../localization";
 
@@ -27,7 +27,7 @@ const filterTemplates = {
 const getFilterTemplate = (
   filter: IActivityHistoryCommonFilter | IActivityHistoryCustomFilter,
   onChangeValue: (...args: any[]) => void,
-  filterGroup?: IActivityHistoryFilterGroup,
+  filterGroup?: IActivityHistoryFilter,
   option?: { id: string; title: string },
 ) => {
   const isCustom = !!filterGroup?.id && !!option;
@@ -62,6 +62,15 @@ export const template = (props: ActivityHistoryFilters) =>
           ? html`<div class="filters-sidebar-opened">${translate("filters.filters")}<dss-icon-button ?hidden=${props.wrapperMaximized} @click=${() => props._toggleFilters()} size="md" variant="primary" icon="keyboard_double_arrow_left"></dss-icon-button></div>
           <div class="filter-container">
                   ${repeat(props.commonFilters, (filter: IActivityHistoryCommonFilter) => html`<div class="filter">${getFilterTemplate(filter, props._onChangeCommonFilterValue.bind(props))}</div> `)}
+                  ${
+                    props.diagnosticFilter &&
+                    html`<div class="filter">
+                          <dss-input-dropdown icon="" multiple dropdownFixed type="default" .elements=${props.diagnosticFilter?.values} @onInputDropdownChange=${props._handleDiagnosticFilterChange} .selectedValue=${props.diagnosticFilterEnabledValues}>
+                            <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>`
+                  }
                   ${repeat(
                     props.customFilterGroups,
                     (group: IActivityHistoryCustomFilterGroup) => html`

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

@@ -16,12 +16,22 @@ import {
   bootstrapSetCustomFilterValue,
   teardownSetCustomFilterValue,
 } from "./custom-filters/set-custom-filter-value/bootstrapper";
+import {
+  bootstrapAddDiagnosticFilter,
+  teardownAddDiagnosticFilter,
+} from "./diagnostic-filters/add/bootstrapper";
+import {
+  bootstrapSetDiagnosticFilter,
+  teardownSetDiagnosticFilter,
+} from "./diagnostic-filters/set/bootstrapper";
 
 export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCommonFilter(broker);
   bootstrapAddCustomFilter(broker);
   bootstrapSetCustomFilterGroup(broker);
   bootstrapSetCustomFilterValue(broker);
+  bootstrapAddDiagnosticFilter(broker);
+  bootstrapSetDiagnosticFilter(broker);
 };
 
 export const teardownFilters = () => {
@@ -29,4 +39,6 @@ export const teardownFilters = () => {
   teardownAddCustomFilter();
   teardownSetCustomFilterGroup();
   teardownSetCustomFilterValue();
+  teardownAddDiagnosticFilter();
+  teardownSetDiagnosticFilter();
 };

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

@@ -1,6 +1,11 @@
 import { OwnSpec } from "../../domain/specs/own-spec";
 import { RelevantSpec } from "../../domain/specs/relevant-spec";
-import { IActivityHistoryCommonFilterGroup, ActivityHistoryFilterType } from "../model";
+import {
+  IActivityHistoryCommonFilterGroup,
+  ActivityHistoryFilterType,
+  relevantFilterId,
+  ownFilterId,
+} from "../model";
 
 export const commonFilters: IActivityHistoryCommonFilterGroup[] = [
   {
@@ -8,14 +13,14 @@ export const commonFilters: IActivityHistoryCommonFilterGroup[] = [
     title: "Comuns",
     filters: [
       {
-        id: "relevant",
+        id: relevantFilterId,
         title: "Veure rellevants",
         spec: RelevantSpec,
         enabled: false,
         type: ActivityHistoryFilterType.Switch,
       },
       {
-        id: "own",
+        id: ownFilterId,
         title: "Veure meus",
         spec: OwnSpec,
         enabled: false,

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

@@ -1,9 +1,9 @@
 import { PayloadAction } from "@reduxjs/toolkit";
-import { IActivityHistoryCommonFilterGroup } from "../model";
+import { IActivityHistoryCustomFilterGroup } from "../../model";
 
 export function addCustomFiltersReducer(
   state,
-  action: PayloadAction<IActivityHistoryCommonFilterGroup>,
+  action: PayloadAction<IActivityHistoryCustomFilterGroup>,
 ) {
   state.filters = [...state.filters, action.payload];
 }

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

@@ -1,5 +1,5 @@
-import { IActivityHistoryCommonFilterGroup } from "../model";
+import { IActivityHistoryCustomFilterGroup } from "../../model";
 
 export class AddCustomFiltersCommand {
-  constructor(public payload: IActivityHistoryCommonFilterGroup) {}
+  constructor(public payload: IActivityHistoryCustomFilterGroup) {}
 }

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

@@ -1,16 +1,15 @@
 import { createSelector } from "@reduxjs/toolkit";
 import {
-  IActivityHistoryCustomFilter,
   IActivityHistoryCustomFilterGroup,
-  IActivityHistoryFilterGroup,
-  isNotCommonFilterGroup,
+  IActivityHistoryFilter,
+  isCustomFilter,
 } from "../model";
 import { activityHistoryFiltersSelector } from "../selectors";
 
 export const activityHistoryCustomFilterGroupsSelector = createSelector(
   activityHistoryFiltersSelector,
-  (filters: IActivityHistoryFilterGroup[]) => {
-    const customFilters = filters.filter(isNotCommonFilterGroup);
+  (filters: IActivityHistoryFilter[]) => {
+    const customFilters = filters.filter(isCustomFilter);
     return customFilters.sort(sortBySortProperty);
   },
 );

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

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

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

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

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

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