@uxland/primary-shell 5.6.2 → 5.6.3

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/reset/actions.d.ts

@@ -0,0 +1 @@
+export declare const resetFilters: import('@reduxjs/toolkit').ActionCreatorWithoutPayload<"activity-history-filters/resetFilters">;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/reset/bootstrapper.d.ts

@@ -0,0 +1,4 @@
+import { BrokerExtensions } from '@primaria/plugins-core';
+
+export declare const bootstrapResetFilters: (broker: BrokerExtensions) => void;
+export declare const teardownResetFilters: () => void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/reset/handler.d.ts

@@ -0,0 +1,6 @@
+import { StoreBaseHandler } from '../../../infrastructure/base-handlers';
+import { ResetFiltersCommand } from './request';
+
+export declare class ResetFiltersHandler extends StoreBaseHandler {
+    handle(request: ResetFiltersCommand): Promise<void>;
+}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/reset/reducer.d.ts

@@ -0,0 +1,3 @@
+import { PayloadAction } from '@reduxjs/toolkit';
+
+export declare function resetFiltersReducer(state: any, action: PayloadAction<void>): void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/reset/request.d.ts

@@ -0,0 +1,2 @@
+export declare class ResetFiltersCommand {
+}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/slice.d.ts

@@ -6,10 +6,9 @@ import { setCustomFilterValueReducer } from './custom-filters/set-custom-filter-
 import { IActivityHistoryFilter } from './model';
 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';
+import { resetFiltersReducer } from './reset/reducer';
 
 export declare const activityHistoryFiltersSlice: import('@reduxjs/toolkit').Slice<{
     searchString: string;
@@ -17,15 +16,14 @@ export declare const activityHistoryFiltersSlice: import('@reduxjs/toolkit').Sli
 }, {
     setSearchString: typeof setSearchStringReducer;
     setCommonFilterValue: typeof setCommonFilterValueReducer;
-    resetCommonFilterValues: typeof resetCommonFilterValuesReducer;
     addCustomFilters: typeof addCustomFiltersReducer;
     setCustomFilterGroupValue: typeof setCustomFilterGroupValueReducer;
     setCustomFilterValue: typeof setCustomFilterValueReducer;
-    resetCustomFilterValues: typeof resetCustomFilterValuesReducer;
     addDiagnosticFilters: typeof addDiagnosticFiltersReducer;
     setDiagnosticFilterValues: typeof setDiagnosticFilterValuesReducer;
     addUpFilters: typeof addUpFiltersReducer;
     setUpFilterValues: typeof setUpFilterValuesReducer;
+    resetFilters: typeof resetFiltersReducer;
 }, "activity-history-filters", "activity-history-filters", import('@reduxjs/toolkit').SliceSelectors<{
     searchString: string;
     filters: IActivityHistoryFilter[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

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

@@ -1,29 +1,27 @@
 import { LitElement, css, html, unsafeCSS } from "lit";
 import { customElement } from "lit/decorators.js";
-import { connectedProperty } from "../../../../infrastructure/state/connected-property";
-import { lazyInject } from "../../../../infrastructure/ioc/container";
 import { PrimariaApi } from "../../../../../../api/api";
+import { lazyInject } from "../../../../infrastructure/ioc/container";
 import { TYPES } from "../../../../infrastructure/ioc/types";
-import { template } from "./template";
+import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import styles from "./styles.css?inline";
+import { template } from "./template";
 
+import { customFilterGroupsWithOptionsSelector } from "../../../selectors";
+import { activityHistoryEnabledCommonFiltersSelector } from "../../common-filters/selectors";
+import { SetCommonFilter } from "../../common-filters/set-common-filter/request";
 import { SetCustomFilterValue } from "../../custom-filters/set-custom-filter-value/request";
+import { diagnosticFilterSelector } from "../../diagnostic-filters/selectors";
+import { SetDiagnosticFiltersCommand } from "../../diagnostic-filters/set/request";
 import {
-  IActivityHistoryCustomFilter,
   IActivityHistoryCustomFilterGroup,
   IActivityHistoryDiagnosticsFilter,
   IActivityHistoryFilter,
-  IActivityHistoryUpFilter,
+  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 { ResetFiltersCommand } from "../../reset/request";
 import { upFilterSelector } from "../../up-filters/selectors";
 import { SetUpFiltersCommand } from "../../up-filters/set/request";
-import { customFilterGroupsWithOptionsSelector } from "../../../selectors";
 
 //@ts-ignore
 @customElement("active-filters-badges")
@@ -79,9 +77,6 @@ export class ActiveFiltersBadges extends LitElement {
   }
 
   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());
+    this.api.broker.send(new ResetFiltersCommand())
   }
 }

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

@@ -12,22 +12,22 @@ import { translate } from "../../../../localization";
 
 const filterTemplates = {
   [ActivityHistoryFilterType.Switch]: (id, title, handleChange, isSelected, isEnabled) => html`
-    <dss-input-switch size="sm" .checked=${isSelected} @onChangeValue=${handleChange} >
-      <input slot="input" id="switch-${id}" aria-label=${title} type="checkbox" ?disabled=${!isEnabled}>
+    <dss-input-switch size="sm" @onChangeValue=${handleChange} .checked=${isSelected}>
+      <input slot="input" id="switch-${id}" aria-label=${title} type="checkbox"  ?disabled=${!isEnabled}>
       <label slot="label" for="switch-${id}">${title || id}</label>
     </dss-input-switch>`,
 
   [ActivityHistoryFilterType.Checkbox]: (id, title, handleChange, isSelected, isEnabled) => html`
-    <dss-checkbox variant="default" .checked=${isSelected} @onChange=${(e) => handleChange(e)}> 
-      <input slot="input" id="checkboxStory-${id}" type="checkbox" ?disabled=${!isEnabled}>
+    <dss-checkbox variant="default" @onChange=${(e) => handleChange(e)}> 
+      <input slot="input" id="checkboxStory-${id}" type="checkbox" .checked=${isSelected} ?disabled=${!isEnabled}>
       <label slot="label" for="checkboxStory-${id}">${title || id}</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}>
+  /* [ActivityHistoryFilterType.Dropdown]: (id, title, handleChange, isSelected, isEnabled) => html`
+    <dss-input-dropdown type="default" @onChange=${(e) => handleChange(e)}> 
+      <input slot="input" id="dropdownStory-${id}" type="text" .checked=${isSelected} ?disabled=${!isEnabled}>
       <label slot="label" for="dropdownStory-${id}">${title || id}</label>
-    </dss-input-dropdown>`,
+    </dss-input-dropdown>`, */
 };
 
 const getFilterTemplate = (

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

@@ -12,10 +12,9 @@ import {
 } from "./custom-filters/set-custom-filter-value/bootstrapper";
 import { bootstrapAddDiagnosticFilter, teardownAddDiagnosticFilter } from "./diagnostic-filters/add/bootstrapper";
 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";
+import { bootstrapResetFilters, teardownResetFilters } from "./reset/bootstrapper";
 
 export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCommonFilter(broker);
@@ -24,10 +23,9 @@ export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCustomFilterValue(broker);
   bootstrapAddDiagnosticFilter(broker);
   bootstrapSetDiagnosticFilter(broker);
-  bootstrapResetCommonFilter(broker);
-  bootstrapResetCustomFilter(broker);
   bootstrapAddUpFilter(broker);
   bootstrapSetUpFilter(broker);
+  bootstrapResetFilters(broker);
 };
 
 export const teardownFilters = () => {
@@ -37,8 +35,7 @@ export const teardownFilters = () => {
   teardownSetCustomFilterValue();
   teardownAddDiagnosticFilter();
   teardownSetDiagnosticFilter();
-  teardownResetCommonFilter();
-  teardownResetCustomFilter();
   teardownAddUpFilter();
   teardownSetUpFilter();
+  teardownResetFilters();
 };

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

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

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

@@ -0,0 +1,14 @@
+import { BrokerExtensions } from "@primaria/plugins-core";
+import { ResetFiltersCommand } from "./request";
+import { ResetFiltersHandler } from "./handler";
+import { BrokerDisposableHandler } from "@uxland/primary-shell";
+
+let request: BrokerDisposableHandler;
+
+export const bootstrapResetFilters = (broker: BrokerExtensions) => {
+  request = broker.registerRequest(ResetFiltersCommand, ResetFiltersHandler);
+};
+
+export const teardownResetFilters = () => {
+  request?.dispose();
+};

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

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

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

@@ -0,0 +1,28 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+import { commonFilters } from "../common-filters/common-filters";
+
+export function resetFiltersReducer(state, action: PayloadAction<void>) {
+  state.filters = state.filters.map((f) => {
+    if (f.id !== "common" && f.id !== "history-diagnostics" && f.id !== "history-up") {
+      return {
+        ...f,
+        filters: f.filters.map((ff) => {
+          if(ff.singleOption)
+            return {...ff, enabled: false}
+          return {...ff, enabled: true, enabledValues: []}
+        }),
+      };
+    }
+
+    if(f.id === "history-diagnostics" || f.id === "history-up") {
+      return {
+        ...f,
+        enabledValues: [],
+      };
+    }
+    if(f.id === "common") {
+      return commonFilters[0]
+    }
+    return f;
+  });
+}

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

@@ -0,0 +1 @@
+export class ResetFiltersCommand {}

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

@@ -8,10 +8,9 @@ import { setCustomFilterValueReducer } from "./custom-filters/set-custom-filter-
 import { IActivityHistoryFilter } from "./model";
 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";
+import { resetFiltersReducer } from "./reset/reducer";
 
 export const activityHistoryFiltersSlice = createSlice({
   name: "activity-history-filters",
@@ -22,14 +21,13 @@ export const activityHistoryFiltersSlice = createSlice({
   reducers: {
     setSearchString: setSearchStringReducer,
     setCommonFilterValue: setCommonFilterValueReducer,
-    resetCommonFilterValues: resetCommonFilterValuesReducer,
     addCustomFilters: addCustomFiltersReducer,
     setCustomFilterGroupValue: setCustomFilterGroupValueReducer,
     setCustomFilterValue: setCustomFilterValueReducer,
-    resetCustomFilterValues: resetCustomFilterValuesReducer,
     addDiagnosticFilters: addDiagnosticFiltersReducer,
     setDiagnosticFilterValues: setDiagnosticFilterValuesReducer,
     addUpFilters: addUpFiltersReducer,
     setUpFilterValues: setUpFilterValuesReducer,
+    resetFilters: resetFiltersReducer
   },
 });

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/common-filters/reset-common-filter/actions.d.ts

@@ -1 +0,0 @@
-export declare const resetCommonFilterValues: import('@reduxjs/toolkit').ActionCreatorWithoutPayload<"activity-history-filters/resetCommonFilterValues">;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/common-filters/reset-common-filter/bootstrapper.d.ts

@@ -1,4 +0,0 @@
-import { BrokerExtensions } from '@primaria/plugins-core';
-
-export declare const bootstrapResetCommonFilter: (broker: BrokerExtensions) => void;
-export declare const teardownResetCommonFilter: () => void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/common-filters/reset-common-filter/handler.d.ts

@@ -1,5 +0,0 @@
-import { StoreBaseHandler } from '../../../../infrastructure/base-handlers';
-
-export declare class ResetCommonFilterHandler extends StoreBaseHandler {
-    handle(): Promise<void>;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/common-filters/reset-common-filter/reducer.d.ts

@@ -1 +0,0 @@
-export declare function resetCommonFilterValuesReducer(state: any): void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/common-filters/reset-common-filter/request.d.ts

@@ -1,2 +0,0 @@
-export declare class ResetCommonFilter {
-}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/reset-custom-filter/actions.d.ts

@@ -1 +0,0 @@
-export declare const resetCustomFilterValues: import('@reduxjs/toolkit').ActionCreatorWithoutPayload<"activity-history-filters/resetCustomFilterValues">;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/reset-custom-filter/bootstrapper.d.ts

@@ -1,4 +0,0 @@
-import { BrokerExtensions } from '@primaria/plugins-core';
-
-export declare const bootstrapResetCustomFilter: (broker: BrokerExtensions) => void;
-export declare const teardownResetCustomFilter: () => void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/reset-custom-filter/handler.d.ts

@@ -1,5 +0,0 @@
-import { StoreBaseHandler } from '../../../../infrastructure/base-handlers';
-
-export declare class ResetCustomFilterHandler extends StoreBaseHandler {
-    handle(): Promise<void>;
-}

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

@@ -1 +0,0 @@
-export declare function resetCustomFilterValuesReducer(state: any): void;

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/filter/custom-filters/reset-custom-filter/request.d.ts

@@ -1,2 +0,0 @@
-export declare class ResetCustomFilter {
-}

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

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

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

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

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

@@ -1,12 +0,0 @@
-import { StoreBaseHandler } from "../../../../infrastructure/base-handlers";
-import { resetCommonFilterValues } from "./actions";
-
-export class ResetCommonFilterHandler extends StoreBaseHandler {
-  async handle() {
-    try {
-      this.store.dispatch(resetCommonFilterValues());
-    } catch (e) {
-      console.log(e.message);
-    }
-  }
-}

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

@@ -1,11 +0,0 @@
-export function resetCommonFilterValuesReducer(state) {
-  state.filters = state.filters.map((f) => {
-    if (f.id === "common") {
-      return {
-        ...f,
-        filters: f.filters.map((ff) => ({ ...ff, enabled: false })),
-      };
-    }
-    return f;
-  });
-}

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

@@ -1 +0,0 @@
-export class ResetCommonFilter {}

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

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

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

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

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

@@ -1,8 +0,0 @@
-import { StoreBaseHandler } from "../../../../infrastructure/base-handlers";
-import { resetCustomFilterValues } from "./actions";
-
-export class ResetCustomFilterHandler extends StoreBaseHandler {
-  async handle() {
-    await this.store.dispatch(resetCustomFilterValues());
-  }
-}

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

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

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

@@ -1 +0,0 @@
-export class ResetCustomFilter {}