@uxland/primary-shell 5.4.4 → 5.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.4.4",
+  "version": "5.4.6",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@uxland/harmonix": "^1.1.1",
-    "@uxland/harmonix-adapters": "^1.2.0"
+    "@uxland/harmonix-adapters": "^1.2.1"
   },
   "devDependencies": {
     "@primaria/plugins-core": "^1.0.14",
     "@reduxjs/toolkit": "^2.6.1",
-    "@salut/design-system-salut": "../../design-system-salut-2.5.0.tgz",
+    "@salut/design-system-salut": "../../design-system-salut-2.5.1.tgz",
     "@types/react": "^19.0.12",
     "@uxland/lit-utilities": "^1.0.0",
     "@uxland/localization": "^1.0.3",

package/src/UI/components/bootstrapper.ts

@@ -5,6 +5,7 @@ import { QuickActionsMenu } from "./quick-actions-menu/quick-actions-menu";
 import { PrimariaShellHeader } from "./primaria-shell/shell-header/shell-header";
 import { PocEventsEcap } from "./poc-events-ecap/poc-events-ecap";
 import { FinalizeVisitButton } from "../../features/visit/finalize-visit/component/finalize-visit-button";
+import { PrimariaAccordion } from "./primaria-accordion/primaria-accordion";
 
 export const useComponents = () => {
   //@ts-ignore
@@ -16,4 +17,5 @@ export const useComponents = () => {
   customElement("finalize-visit-button")(FinalizeVisitButton);
   //@ts-ignore
   customElement("poc-events-ecap")(PocEventsEcap);
+  customElement("primaria-accordion")(PrimariaAccordion);
 };

package/src/UI/components/primaria-accordion/primaria-accordion.ts

@@ -0,0 +1,46 @@
+import { LitElement, html, css } from "lit";
+import { property } from "lit/decorators.js";
+
+export class PrimariaAccordion extends LitElement {
+  @property({ type: Boolean })
+  isOpen;
+
+  static styles = css`
+    :host {
+      display: block;
+    }
+
+    .content {
+      overflow: hidden;
+      max-height: 0;
+    }
+
+    .content.open {
+      margin-top: 8px;
+      max-height: unset; 
+    }
+
+    .title {
+      cursor: pointer;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  `;
+
+  toggle() {
+    this.isOpen = !this.isOpen;
+  }
+
+  render() {
+    return html`
+    <div class="title" @click=${this.toggle}>
+      <slot name="title"></slot>
+      <dss-icon-button size="md" variant="primary" icon=${this.isOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"}></dss-icon-button>
+    </div>
+    <div class="content ${this.isOpen ? "open" : ""}">
+      <slot name="content"></slot>
+    </div>
+    `;
+  }
+}

package/src/UI/components/primaria-shell/styles.css

@@ -62,11 +62,21 @@
     /*Temporary scrollbar*/
     #menu-region-container {
       overflow-y: auto;
-      margin-right: -10px; 
-      padding-right: 10px; 
-      scrollbar-color: var(--color-primary-900) var(--color-primary-700);
+      margin-right: -14px; 
+      padding-right: 14px; 
+      scrollbar-color: var(--color-primary-800) var(--color-primary-700);
       scrollbar-width: thin;
     }
+    #menu-region-container::-webkit-scrollbar {
+      width: 6px; 
+    }
+    #menu-region-container::-webkit-scrollbar-track {
+      background: var(--color-primary-700);
+    }
+    #menu-region-container::-webkit-scrollbar-thumb {
+      background-color: var(--color-primary-400);
+      border-radius: 4px;
+    }
     /**/
 
     .bottom-content {

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

@@ -43,7 +43,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
     label: "Monitoratge dinàmic",
     type: "item",
     sortHint: "0030",
-    callbackFn: () => navigateToEcapWithoutClosingWithCip("SIA_DEV"),
+    callbackFn: () => navigateToEcapWithoutClosingWithCip("IA_DEV"),
   },
   {
     id: "processes",
@@ -80,7 +80,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Valoració social",
-        callbackFn: () => {},
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("VALORACIO_SOCIAL"),
       },
     ],
   },
@@ -166,7 +166,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
       {
         icon: "open_in_new",
         label: "Prescripció",
-        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCIPCIO_ACTIVA"),
+        callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCRIPCIO_ACTIVA"),
       },
       {
         icon: "open_in_new",

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

@@ -28,11 +28,7 @@ class RegionManagerProxy implements PrimariaRegionManager {
    * @return {Promise<void>} A promise that resolves when the view is successfully registered.
    */
   registerView(regionName: string, view: HarmonixViewDefinition): Promise<void> {
-    this.regionManager.registerViewWithRegion(
-      regionName,
-      `${this.pluginInfo.pluginId}::${view.id}`,
-      view,
-    );
+    this.regionManager.registerViewWithRegion(regionName, `${this.pluginInfo.pluginId}::${view.id}`, view);
     return Promise.resolve();
   }
   /**
@@ -101,44 +97,30 @@ class RegionManagerProxy implements PrimariaRegionManager {
     return Promise.resolve(region?.isViewActive(`${this.pluginInfo.pluginId}::${viewId}`));
   }
   registerQuickAction(view: HarmonixViewDefinition): Promise<void> {
-    this.regionManager.registerViewWithRegion(
-      shellRegions.quickActions,
-      `${this.pluginInfo.pluginId}::${view.id}`,
-      view,
-    );
+    this.regionManager.registerViewWithRegion(shellRegions.quickActions, `${this.pluginInfo.pluginId}::${view.id}`, view);
     return Promise.resolve();
   }
   registerNavigationMenu(view: HarmonixViewDefinition): Promise<void> {
-    this.regionManager.registerViewWithRegion(
-      shellRegions.navigationMenu,
-      `${this.pluginInfo.pluginId}::${view.id}`,
-      view,
-    );
+    this.regionManager.registerViewWithRegion(shellRegions.navigationMenu, `${this.pluginInfo.pluginId}::${view.id}`, view);
     return Promise.resolve();
   }
   registerMainView(view: HarmonixViewDefinition): Promise<void> {
-    this.regionManager.registerViewWithRegion(
-      shellRegions.main,
-      `${this.pluginInfo.pluginId}::${view.id}`,
-      view,
-    );
+    this.regionManager.registerViewWithRegion(shellRegions.main, `${this.pluginInfo.pluginId}::${view.id}`, view);
     return Promise.resolve();
   }
   activateMainView(viewId: string): Promise<void> {
-    this.regionManager
-      .getRegion(shellRegions.main)
-      .activate(`${this.pluginInfo.pluginId}::${viewId}`);
+    this.regionManager.getRegion(shellRegions.main).activate(`${this.pluginInfo.pluginId}::${viewId}`);
     this._notifyMainViewChanged(viewId);
     return Promise.resolve();
   }
 
   getCurrentMainViewActive() {
-    const mainView = this.regionManager.getRegion(shellRegions.main)
-      .currentActiveViews[0] as HarmonixViewDefinition;
+    const mainView = this.regionManager.getRegion(shellRegions.main).currentActiveViews[0] as HarmonixViewDefinition;
     return mainView?.id;
   }
 
   _notifyMainViewChanged(viewId: string) {
+    console.log(viewId);
     this.broker.publish(shellEvents.mainViewChanged, { viewId });
   }
 

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

@@ -8,15 +8,13 @@ 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 } 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";
 
 //@ts-ignore
 @customElement("active-filters-badges")
@@ -65,4 +63,10 @@ export class ActiveFiltersBadges extends LitElement {
       ]),
     );
   }
+
+  resetFilters() {
+    this.api.broker.send(new SetDiagnosticFiltersCommand([]));
+    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/styles.css

@@ -1,3 +1,8 @@
+:host{
+  display: flex;
+  justify-content: space-between;
+}
+
 .filters-container{
   display: flex;
   gap: var(--dss-spacing-md);
@@ -9,6 +14,7 @@
 
 .filter-groups{
   display: flex;
+  flex-wrap: wrap;
   gap: var(--dss-spacing-xs);
 }
 
@@ -19,6 +25,14 @@
   font-weight: 600;
 }
 
+.clean-filters{
+  display: flex;
+
+  .separator{
+    padding: 0 8px;
+  }
+}
+
 .popover-content {
   box-sizing: border-box;
   display: flex;

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

@@ -147,5 +147,9 @@ export const template = (props: ActiveFiltersBadges) => {
       }
     </div>
   </div>
+  <div class="clean-filters">
+    <div class="separator">|</div>
+    <dss-button variant="secondary" size="sm" label=${translate("chipHeader.cleanFilters")} icon="cleaning_services" @click=${props.resetFilters}></dss-button>
+  </div>
   `;
 };

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

@@ -50,6 +50,7 @@
       .custom-filter-content{
         display: flex;
         flex-direction: column;
+        gap: 8px;
       }
     }
 }

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

@@ -42,14 +42,10 @@ const getFilterTemplate = (
   };
 
   const isSelected =
-    isCustom && option
-      ? (filter as IActivityHistoryCustomFilter).enabledValues?.includes(option.id)
-      : filter.enabled;
+    isCustom && option ? (filter as IActivityHistoryCustomFilter).enabledValues?.includes(option.id) : filter.enabled;
 
   const isEnabled =
-    (isCustom && option) || filter.singleOption
-      ? (filterGroup as IActivityHistoryCustomFilterGroup).enabled
-      : true;
+    (isCustom && option) || filter.singleOption ? (filterGroup as IActivityHistoryCustomFilterGroup).enabled : true;
 
   return filterTemplates[filter.type]?.(id, title, handleChange, isSelected, isEnabled) || html``;
 };
@@ -81,9 +77,7 @@ export const template = (props: ActivityHistoryFilters) =>
                     </dss-input-switch>
                     ${
                       group?.filters &&
-                      repeat(group.filters, (filter: IActivityHistoryCustomFilter) =>
-                        customFilterTemplate(filter, props, group),
-                      )
+                      repeat(group.filters, (filter: IActivityHistoryCustomFilter) => customFilterTemplate(filter, props, group))
                     }
                   </div> `,
                   )}
@@ -103,9 +97,11 @@ const customFilterTemplate = (
       ${
         filter.singleOption
           ? getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group)
-          : html`<div class="custom-filter-title">${filter.title}</div>
-                <div class="custom-filter-content">${repeat(filter.options, (option) => html`${getFilterTemplate(filter, props._onChangeCustomFilterValue.bind(props), group, option)}`)}</div>`
+          : 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>
   `;

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

@@ -1,13 +1,7 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
 import "../../activity-history-item/filter/UI/activity-history-filters/activity-history-filters";
-import {
-  bootstrapSetCommonFilter,
-  teardownSetCommonFilter,
-} from "./common-filters/set-common-filter/bootstrapper";
-import {
-  bootstrapAddCustomFilter,
-  teardownAddCustomFilter,
-} from "./custom-filters/add-custom-filters/bootstrapper";
+import { bootstrapSetCommonFilter, teardownSetCommonFilter } from "./common-filters/set-common-filter/bootstrapper";
+import { bootstrapAddCustomFilter, teardownAddCustomFilter } from "./custom-filters/add-custom-filters/bootstrapper";
 import {
   bootstrapSetCustomFilterGroup,
   teardownSetCustomFilterGroup,
@@ -16,14 +10,10 @@ 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";
+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";
 
 export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCommonFilter(broker);
@@ -32,6 +22,8 @@ export const bootstrapFilters = (broker: BrokerExtensions) => {
   bootstrapSetCustomFilterValue(broker);
   bootstrapAddDiagnosticFilter(broker);
   bootstrapSetDiagnosticFilter(broker);
+  bootstrapResetCommonFilter(broker);
+  bootstrapResetCustomFilter(broker);
 };
 
 export const teardownFilters = () => {
@@ -41,4 +33,6 @@ export const teardownFilters = () => {
   teardownSetCustomFilterValue();
   teardownAddDiagnosticFilter();
   teardownSetDiagnosticFilter();
+  teardownResetCommonFilter();
+  teardownResetCustomFilter();
 };

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,11 @@
+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

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

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

@@ -1,5 +1,5 @@
 import { BrokerExtensions } from "@primaria/plugins-core";
-import { BrokerDisposableHandler } from "../../../../../api/broker/primaria-broker";
+import { BrokerDisposableHandler } from "../../../../../../api/broker/primaria-broker";
 import { SetCommonFilter } from "./request";
 import { SetCommonFilterHandler } from "./handler";
 

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,12 @@
+export function resetCustomFilterValuesReducer(state) {
+  state.filters = state.filters.map((f) => {
+    if (f.id !== "common" && f.id !== "history-diagnostics") {
+      console.log("filter", f);
+      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

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

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

@@ -8,6 +8,8 @@ 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";
 
 export const activityHistoryFiltersSlice = createSlice({
   name: "activity-history-filters",
@@ -18,9 +20,11 @@ export const activityHistoryFiltersSlice = createSlice({
   reducers: {
     setSearchString: setSearchStringReducer,
     setCommonFilterValue: setCommonFilterValueReducer,
+    resetCommonFilterValues: resetCommonFilterValuesReducer,
     addCustomFilters: addCustomFiltersReducer,
     setCustomFilterGroupValue: setCustomFilterGroupValueReducer,
     setCustomFilterValue: setCustomFilterValueReducer,
+    resetCustomFilterValues: resetCustomFilterValuesReducer,
     addDiagnosticFilters: addDiagnosticFiltersReducer,
     setDiagnosticFilterValues: setDiagnosticFilterValuesReducer,
   },

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

@@ -59,7 +59,7 @@
   .visit__items {
     display: flex;
     flex-direction: column;
-    gap: 16px;
+    gap: var(--dss-spacing-sm);
       .item[has-divider] {
         border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
         &:last-of-type {
@@ -80,6 +80,7 @@
       flex-direction: row;
       align-items: center;
       gap: 16px;
+      flex-wrap: wrap;
     }
     .diagnostics__items {
       display: flex;

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

@@ -82,6 +82,7 @@ export const locales = {
       chipHeader: {
         selection: "Selecció:",
         without: "Sense",
+        cleanFilters: "Netejar filtres",
       },
       error: {
         general: {