@uxland/primary-shell 5.5.0 → 5.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist/index.js +11259 -11049
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.umd.cjs +796 -746
  4. package/dist/index.umd.cjs.map +1 -1
  5. package/dist/primary/shell/src/UI/components/primaria-shell/shell-header/header-divider/header-divider.d.ts +6 -0
  6. package/dist/primary/shell/src/UI/components/primaria-shell/shell-header/header-divider/template.d.ts +3 -0
  7. package/dist/primary/shell/src/UI/components/primaria-shell/shell-header/shell-header.d.ts +1 -0
  8. package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/busy-component/component.d.ts +2 -1
  9. package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/selectors.d.ts +1 -1
  10. package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/list/UI/main-view/activity-history-main.d.ts +2 -0
  11. package/package.json +2 -2
  12. package/src/UI/components/bootstrapper.ts +2 -0
  13. package/src/UI/components/primaria-shell/shell-header/header-divider/header-divider.ts +13 -0
  14. package/src/UI/components/primaria-shell/shell-header/header-divider/styles.css +5 -0
  15. package/src/UI/components/primaria-shell/shell-header/header-divider/template.ts +8 -0
  16. package/src/UI/components/primaria-shell/shell-header/shell-header.ts +27 -0
  17. package/src/UI/components/primaria-shell/shell-header/styles.css +4 -4
  18. package/src/UI/components/primaria-shell/shell-header/template.ts +2 -0
  19. package/src/UI/components/primaria-shell/styles.css +6 -1
  20. package/src/UI/internal-views/handle-views.ts +1 -1
  21. package/src/UI/internal-views/lower-nav-menu-views.ts +0 -17
  22. package/src/UI/internal-views/upper-nav-views.ts +30 -4
  23. package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/busy-component/component.ts +7 -6
  24. package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/busy-component/styles.css +11 -14
  25. package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/busy-component/template.ts +2 -2
  26. package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/selectors.ts +6 -6
  27. package/src/internal-plugins/activity-history/activity-history-item/add/handle-error/selectors.ts +4 -6
  28. package/src/internal-plugins/activity-history/activity-history-item/domain/specs/search-string-spec.ts +1 -1
  29. package/src/internal-plugins/activity-history/activity-history-item/filter/UI/active-filters-badges/active-filters-badges.ts +14 -13
  30. package/src/internal-plugins/activity-history/activity-history-item/filter/UI/active-filters-badges/template.ts +22 -7
  31. package/src/internal-plugins/activity-history/activity-history-item/filter/UI/activity-history-filters/template.ts +3 -2
  32. package/src/internal-plugins/activity-history/activity-history-item/list/UI/main-view/activity-history-main.ts +11 -9
  33. package/src/internal-plugins/activity-history/activity-history-item/list/UI/main-view/template.ts +2 -2
  34. package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/activity-history-timeline.ts +3 -6
  35. package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts +1 -1
@@ -0,0 +1,6 @@
1
+ import { LitElement } from 'lit';
2
+
3
+ export declare class HeaderDivider extends LitElement {
4
+ render(): import('lit').TemplateResult<1>;
5
+ static styles: import('lit').CSSResult;
6
+ }
@@ -0,0 +1,3 @@
1
+ import { HeaderDivider } from './header-divider';
2
+
3
+ export declare const template: (props: HeaderDivider) => import('lit').TemplateResult<1>;
@@ -12,5 +12,6 @@ export declare class PrimariaShellHeader extends PrimariaShellHeader_base {
12
12
  toggleMenu(): void;
13
13
  logout(): void;
14
14
  connectedCallback(): void;
15
+ firstUpdated(): void;
15
16
  }
16
17
  export {};
@@ -3,6 +3,7 @@ import { LitElement } from 'lit';
3
3
  export declare class ActivityHistoryBusy extends LitElement {
4
4
  render(): import('lit').TemplateResult<1>;
5
5
  static styles: import('lit').CSSResult;
6
- isAnyCollectionLoadingWithoutAnyLoaded: boolean;
6
+ isCollectionInitialState: boolean;
7
7
  isSomeCollectionLoadedAndOtherLoading: boolean;
8
+ get skeletons(): import('lit').TemplateResult<1>[];
8
9
  }
@@ -1,4 +1,4 @@
1
1
  import { RootState } from '../../../infrastructure/state/store';
2
2
 
3
- export declare const isAnyCollectionLoadingWithoutAnyLoaded: (state: RootState) => boolean;
4
3
  export declare const isSomeCollectionLoadedAndOtherLoading: (state: RootState) => boolean;
4
+ export declare const isCollectionInitialState: (state: RootState) => boolean;
@@ -11,6 +11,8 @@ export declare class ActivityHistoryMain extends ActivityHistoryMain_base {
11
11
  maximized: boolean;
12
12
  api: PrimariaApi;
13
13
  historyItems: any[];
14
+ isCollectionInitialState: boolean;
15
+ isSomeCollectionLoadedAndOtherLoading: boolean;
14
16
  _maximize(): void;
15
17
  _minimize(): void;
16
18
  _subscribeEvents(): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uxland/primary-shell",
3
- "version": "5.5.0",
3
+ "version": "5.6.0",
4
4
  "description": "Primaria Shell",
5
5
  "author": "UXLand <dev@uxland.es>",
6
6
  "homepage": "https://github.com/uxland/harmonix/tree/app#readme",
@@ -31,7 +31,7 @@
31
31
  "devDependencies": {
32
32
  "@primaria/plugins-core": "^1.0.14",
33
33
  "@reduxjs/toolkit": "^2.6.1",
34
- "@salut/design-system-salut": "../../design-system-salut-2.5.1.tgz",
34
+ "@salut/design-system-salut": "../../design-system-salut-2.6.0.tgz",
35
35
  "@types/react": "^19.0.12",
36
36
  "@uxland/lit-utilities": "^1.0.0",
37
37
  "@uxland/localization": "^1.0.3",
@@ -7,6 +7,7 @@ import { PocEventsEcap } from "./poc-events-ecap/poc-events-ecap";
7
7
  import { FinalizeVisitButton } from "../../features/visit/finalize-visit/component/finalize-visit-button";
8
8
  import { PrimariaAccordion } from "./primaria-accordion/primaria-accordion";
9
9
  import { CommunicationActionMenu } from "./communication-action-menu/communication-action-menu";
10
+ import { HeaderDivider } from "./primaria-shell/shell-header/header-divider/header-divider";
10
11
 
11
12
  export const useComponents = () => {
12
13
  //@ts-ignore
@@ -16,6 +17,7 @@ export const useComponents = () => {
16
17
  customElement("primaria-error-view")(PrimariaErrorView);
17
18
  customElement("quick-actions-menu")(QuickActionsMenu);
18
19
  customElement("finalize-visit-button")(FinalizeVisitButton);
20
+ customElement('header-divider')(HeaderDivider);
19
21
  customElement("communication-action-menu")(CommunicationActionMenu);
20
22
  //@ts-ignore
21
23
  customElement("poc-events-ecap")(PocEventsEcap);
@@ -0,0 +1,13 @@
1
+ import { html, LitElement, css, unsafeCSS } from "lit";
2
+ import styles from "./styles.css?inline";
3
+ import { template } from "./template";
4
+
5
+ export class HeaderDivider extends LitElement {
6
+ render() {
7
+ return html`${template(this)}`;
8
+ }
9
+
10
+ static styles = css`
11
+ ${unsafeCSS(styles)}
12
+ `;
13
+ }
@@ -0,0 +1,5 @@
1
+ .header-container {
2
+ width: 1px;
3
+ height: 40px;
4
+ background-color: var(--color-neutral-100);
5
+ }
@@ -0,0 +1,8 @@
1
+ import { html } from "lit";
2
+ import { HeaderDivider } from "./header-divider";
3
+
4
+ export const template = (props: HeaderDivider) => {
5
+ return html`
6
+ <div class="header-container"></div>
7
+ `;
8
+ };
@@ -44,4 +44,31 @@ export class PrimariaShellHeader extends PrimariaRegionHost(LitElement) {
44
44
  this.professional = response;
45
45
  });
46
46
  }
47
+
48
+ firstUpdated() {
49
+ const container = this.renderRoot?.querySelector('#header-region-container');
50
+ if (!container) return;
51
+
52
+ let observer: MutationObserver;
53
+
54
+ const updateDividers = () => {
55
+ observer.disconnect();
56
+
57
+ Array.from(container.querySelectorAll('header-divider')).forEach(div => (div as HTMLElement).remove());
58
+
59
+ const children = Array.from(container.children).filter(
60
+ el => (el as HTMLElement).tagName !== 'HEADER-DIVIDER'
61
+ );
62
+
63
+ for (let i = 1; i < children.length; i++) {
64
+ const divider = document.createElement('header-divider');
65
+ container.insertBefore(divider, children[i]);
66
+ }
67
+
68
+ observer.observe(container, { childList: true });
69
+ };
70
+
71
+ observer = new MutationObserver(updateDividers);
72
+ observer.observe(container, { childList: true });
73
+ }
47
74
  }
@@ -1,5 +1,5 @@
1
1
  :host {
2
- z-index: 101;
2
+ z-index: 205;
3
3
  }
4
4
  .header {
5
5
  display: flex;
@@ -18,7 +18,7 @@
18
18
  display: flex;
19
19
  flex-direction: row;
20
20
  align-items: center;
21
- gap: 24px;
21
+ gap: 16px;
22
22
 
23
23
  .header-logo {
24
24
  align-self: center;
@@ -27,7 +27,7 @@
27
27
  display: flex;
28
28
  flex-direction: row;
29
29
  align-items: center;
30
- gap: 24px;
30
+ gap: 16px;
31
31
  }
32
32
  }
33
33
 
@@ -35,7 +35,7 @@
35
35
  display: flex;
36
36
  flex-direction: row;
37
37
  align-items: center;
38
- gap: 24px;
38
+ gap: 16px;
39
39
 
40
40
  #header-actions-region-container {
41
41
  display: flex;
@@ -15,11 +15,13 @@ export const template = (props: PrimariaShellHeader) => {
15
15
  <div class="header-logo">
16
16
  <img src=${salutLogo} alt="logo" />
17
17
  </div>
18
+ <header-divider></header-divider>
18
19
  <div id="header-region-container"></div>
19
20
  </div>
20
21
  <div class="header__right">
21
22
  <finalize-visit-button></finalize-visit-button>
22
23
  <div id="header-actions-region-container"></div>
24
+ <header-divider></header-divider>
23
25
  ${when(
24
26
  props.professional,
25
27
  () => html`<dss-header-menu-professional @onExit=${props.logout} slot="professional-menu" name="${props.professional.firstName} ${props.professional?.familyName} ${props.professional?.lastName}" center="${props.professional.workCenter}" collegiate="${props.professional.registrationNumber}">
@@ -64,7 +64,7 @@
64
64
  overflow-y: auto;
65
65
  margin-right: -14px;
66
66
  padding-right: 14px;
67
- scrollbar-color: var(--color-primary-800) var(--color-primary-700);
67
+ scrollbar-color: var(--color-primary-200) var(--color-primary-700);
68
68
  scrollbar-width: thin;
69
69
  }
70
70
  #menu-region-container::-webkit-scrollbar {
@@ -140,6 +140,11 @@
140
140
  height: 100%;
141
141
  flex: 1;
142
142
  }
143
+ #navigation-menu-lower-region-container{
144
+ display: flex;
145
+ flex-direction: column;
146
+ gap: 4px;
147
+ }
143
148
  #floating-region-container {
144
149
  position: fixed;
145
150
  z-index: 300;
@@ -10,7 +10,7 @@ export const useInternalViews = () => {
10
10
  registerMainViews();
11
11
  registerCommunicationNavMenuItem();
12
12
  registerUpperNavMenuViews();
13
- registerLowerNavMenuViews();
13
+ // registerLowerNavMenuViews();
14
14
 
15
15
  registerCommunicationMenuActions();
16
16
  };
@@ -1,19 +1,2 @@
1
- import { shellApi } from "../../api/api";
2
- import { shellRegions } from "../../api/region-manager/regions";
3
- import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
4
-
5
1
  export const registerLowerNavMenuViews = () => {
6
- shellApi.regionManager.registerView(shellRegions.navigationLowerLeftMenu, {
7
- id: "configuration-center",
8
- factory: () => {
9
- const menuItem = new PrimariaNavItem({
10
- icon: "settings",
11
- label: "Centre de configuració",
12
- callbackFn: () => {
13
- // shellApi.regionManager.activateView(shellRegions.main, "");
14
- },
15
- });
16
- return Promise.resolve(menuItem);
17
- },
18
- });
19
2
  };
@@ -7,6 +7,7 @@ import { CommunicationActionMenu } from "../components/communication-action-menu
7
7
  import { QuickActionItem } from "../shared-components/quick-action-item/quick-action-item";
8
8
  import { PrimariaNavItem } from "../shared-components/primaria-nav-item/primaria-nav-item";
9
9
  import { PrimariaNavTreeMenu } from "../shared-components/primaria-nav-tree-menu/primaria-nav-tree-menu";
10
+ import { GetVisitId } from "../../features/visit/get-visit-id/request";
10
11
 
11
12
  type MenuItemConfig =
12
13
  | {
@@ -56,7 +57,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
56
57
  actionMenuItems: [
57
58
  {
58
59
  icon: "open_in_new",
59
- label: "ARES",
60
+ label: "Proces d'atenció - ARES",
60
61
  callbackFn: () => navigateToEcapWithoutClosingWithCip("PROCES_ATENCIO"),
61
62
  },
62
63
  {
@@ -89,7 +90,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
89
90
  {
90
91
  id: "unique-petition",
91
92
  icon: "playlist_add",
92
- label: "Petitori",
93
+ label: "Peticionari",
93
94
  type: "tree",
94
95
  sortHint: "0050",
95
96
  actionMenuItems: [
@@ -273,8 +274,33 @@ export const registerCommunicationMenuActions = () => {
273
274
  });
274
275
  },
275
276
  },
276
- { id: "2", sortHint: "0020", icon: "open_in_new", label: "eConsulta", callbackFn: () => {} },
277
- { id: "3", icon: "open_in_new", label: "Mail", callbackFn: () => {} },
277
+ {
278
+ id: "2",
279
+ sortHint: "0020",
280
+ icon: "open_in_new",
281
+ label: "eConsulta",
282
+ callbackFn: async () => {
283
+ const CIP = await getPatientCip(shellApi);
284
+ const visiId = (await shellApi.broker.send(new GetVisitId())) as string;
285
+
286
+ shellApi.ecapEventManager.publish("NAVEGACIO_ECAP_ECONSULTA", "NO_TANCAR", {
287
+ CIP: CIP || "",
288
+ VisiID: visiId || "",
289
+ });
290
+ },
291
+ },
292
+ {
293
+ id: "3",
294
+ icon: "open_in_new",
295
+ label: "Mail",
296
+ callbackFn: async () => {
297
+ const CIP = await getPatientCip(shellApi);
298
+ shellApi.ecapEventManager.publish("COMUNICACIO_MISSATGES_CREAR", "NO_TANCAR", {
299
+ CIP: CIP || "",
300
+ TipusMissatge: "SMS",
301
+ });
302
+ },
303
+ },
278
304
  {
279
305
  id: "4",
280
306
  sortHint: "0030",
@@ -3,10 +3,7 @@ import { customElement } from "lit/decorators.js";
3
3
  import styles from "./styles.css?inline";
4
4
  import { template } from "./template";
5
5
  import { connectedProperty } from "../../../../infrastructure/state/connected-property";
6
- import {
7
- isAnyCollectionLoadingWithoutAnyLoaded,
8
- isSomeCollectionLoadedAndOtherLoading,
9
- } from "../selectors";
6
+ import { isSomeCollectionLoadedAndOtherLoading, isCollectionInitialState } from "../selectors";
10
7
 
11
8
  //@ts-ignore
12
9
  @customElement("activity-history-busy")
@@ -19,9 +16,13 @@ export class ActivityHistoryBusy extends LitElement {
19
16
  ${unsafeCSS(styles)}
20
17
  `;
21
18
 
22
- @connectedProperty(isAnyCollectionLoadingWithoutAnyLoaded)
23
- isAnyCollectionLoadingWithoutAnyLoaded: boolean;
19
+ @connectedProperty(isCollectionInitialState)
20
+ isCollectionInitialState: boolean;
24
21
 
25
22
  @connectedProperty(isSomeCollectionLoadedAndOtherLoading)
26
23
  isSomeCollectionLoadedAndOtherLoading: boolean;
24
+
25
+ get skeletons() {
26
+ return Array.from({ length: 12 }, () => html`<dss-skeleton width="100" height="10"></dss-skeleton>`);
27
+ }
27
28
  }
@@ -1,15 +1,12 @@
1
1
  .spinner-container {
2
- display: flex;
3
- flex-direction: row;
4
- align-items: center;
5
- gap: 24px;
6
- justify-content: center;
7
- padding-top:16px
8
- }
9
- .spinner-full-container {
10
- width: 100%;
11
- height: 100%;
12
- display: flex;
13
- align-items: center;
14
- justify-content: center;
15
- }
2
+ display: flex;
3
+ flex-direction: row;
4
+ align-items: center;
5
+ gap: 24px;
6
+ justify-content: center;
7
+ padding-top:16px
8
+ }
9
+ .skeleton-container {
10
+ padding: 20px;
11
+ height: 100%;
12
+ }
@@ -3,8 +3,8 @@ import { ActivityHistoryBusy } from "./component";
3
3
  import { translate } from "../../../../localization";
4
4
 
5
5
  export const template = (props: ActivityHistoryBusy) =>
6
- props.isAnyCollectionLoadingWithoutAnyLoaded
7
- ? html`<div class="spinner-full-container"><dss-spinner></dss-spinner></div>`
6
+ props.isCollectionInitialState
7
+ ? html`<div class="skeleton-container">${props.skeletons}</div>`
8
8
  : props.isSomeCollectionLoadedAndOtherLoading
9
9
  ? html`<div class="spinner-container"><dss-spinner size="sm"></dss-spinner><div class="busy-description">${translate("busyEntriesLoading")}</div></div>`
10
10
  : nothing;
@@ -1,13 +1,13 @@
1
1
  import { RootState } from "../../../infrastructure/state/store";
2
2
 
3
- const isAnyCollectionBusySelector = (state: RootState) =>
4
- state.activityHistoryCollections.busy.length > 0;
5
- export const isAnyCollectionLoadingWithoutAnyLoaded = (state: RootState) => {
6
- const collections = Object.values(state.activityHistoryCollections.collections);
7
- return !collections?.length && isAnyCollectionBusySelector(state);
8
- };
3
+ const isAnyCollectionBusySelector = (state: RootState) => state.activityHistoryCollections.busy.length > 0;
9
4
 
10
5
  export const isSomeCollectionLoadedAndOtherLoading = (state: RootState) => {
11
6
  const collections = Object.values(state.activityHistoryCollections.collections);
12
7
  return collections && isAnyCollectionBusySelector(state);
13
8
  };
9
+
10
+ export const isCollectionInitialState = (state: RootState) => {
11
+ const collections = Object.values(state.activityHistoryCollections.collections);
12
+ return !collections?.length && !isAnyCollectionBusySelector(state);
13
+ };
@@ -1,19 +1,17 @@
1
1
  import { RootState } from "../../../infrastructure/state/store";
2
- import { isAnyCollectionLoadingWithoutAnyLoaded, isSomeCollectionLoadedAndOtherLoading } from "../handle-busy/selectors";
2
+ import { isSomeCollectionLoadedAndOtherLoading } from "../handle-busy/selectors";
3
3
 
4
4
  export const isErrorOccurred = (state: RootState) => state.activityHistoryCollections.error.length > 0;
5
5
 
6
6
  const areCollectionsEmpty = (state: RootState) => {
7
7
  const collections = state.activityHistoryCollections.collections;
8
8
 
9
- return Object.values(collections).every(collection => {
9
+ return Object.values(collections).every((collection) => {
10
10
  return !collection.items || collection.items.length === 0;
11
11
  });
12
12
  };
13
13
  export const isAllDataFailedToLoad = (state: RootState) => {
14
- return !isAnyCollectionLoadingWithoutAnyLoaded(state) &&
15
- !isSomeCollectionLoadedAndOtherLoading(state) &&
16
- isErrorOccurred(state) && areCollectionsEmpty(state);
14
+ return !isSomeCollectionLoadedAndOtherLoading(state) && isErrorOccurred(state) && areCollectionsEmpty(state);
17
15
  };
18
16
 
19
- export const selectErrorMessages = (state: RootState) => state.activityHistoryCollections.error;
17
+ export const selectErrorMessages = (state: RootState) => state.activityHistoryCollections.error;
@@ -12,7 +12,7 @@ const commonFieldsSearchPredicate = (item: IActivityHistoryItem, searchString: s
12
12
  item.professional?.role?.description && propContainsString(item.professional?.role.description, searchString);
13
13
  const serviceNameContainsSearchString = item.service?.description && propContainsString(item.service.description, searchString);
14
14
  const diagnosticsMatch = item.diagnostics?.some(
15
- (diagnostic) => propContainsString(diagnostic.id, searchString) || propContainsString(diagnostic.description, searchString),
15
+ (diagnostic) => propContainsString(diagnostic.descripcio, searchString),
16
16
  );
17
17
  return (
18
18
  professionalNameContainsSearchString ||
@@ -6,9 +6,15 @@ import { PrimariaApi } from "../../../../../../api/api";
6
6
  import { TYPES } from "../../../../infrastructure/ioc/types";
7
7
  import { template } from "./template";
8
8
  import styles from "./styles.css?inline";
9
- import { activeGroupsWithEnabledFilters } from "../../custom-filters/selectors";
9
+
10
10
  import { SetCustomFilterValue } from "../../custom-filters/set-custom-filter-value/request";
11
- import { IActivityHistoryCustomFilterGroup, IActivityHistoryDiagnosticsFilter, IActivityHistoryFilter, IActivityHistoryUpFilter } from "../../model";
11
+ import {
12
+ IActivityHistoryCustomFilter,
13
+ IActivityHistoryCustomFilterGroup,
14
+ IActivityHistoryDiagnosticsFilter,
15
+ IActivityHistoryFilter,
16
+ IActivityHistoryUpFilter,
17
+ } from "../../model";
12
18
  import { activityHistoryEnabledCommonFiltersSelector } from "../../common-filters/selectors";
13
19
  import { SetCommonFilter } from "../../common-filters/set-common-filter/request";
14
20
  import { diagnosticFilterSelector } from "../../diagnostic-filters/selectors";
@@ -17,6 +23,7 @@ import { ResetCommonFilter } from "../../common-filters/reset-common-filter/requ
17
23
  import { ResetCustomFilter } from "../../custom-filters/reset-custom-filter/request";
18
24
  import { upFilterSelector } from "../../up-filters/selectors";
19
25
  import { SetUpFiltersCommand } from "../../up-filters/set/request";
26
+ import { customFilterGroupsWithOptionsSelector } from "../../../selectors";
20
27
 
21
28
  //@ts-ignore
22
29
  @customElement("active-filters-badges")
@@ -37,12 +44,12 @@ export class ActiveFiltersBadges extends LitElement {
37
44
  @connectedProperty(activityHistoryEnabledCommonFiltersSelector)
38
45
  enabledCommonFilters: IActivityHistoryFilter[];
39
46
 
40
- @connectedProperty(activeGroupsWithEnabledFilters)
47
+ @connectedProperty(customFilterGroupsWithOptionsSelector)
41
48
  enabledFilters: IActivityHistoryCustomFilterGroup[];
42
49
 
43
50
  @connectedProperty(diagnosticFilterSelector)
44
51
  diagnosticFilterEnabled: IActivityHistoryDiagnosticsFilter;
45
-
52
+
46
53
  @connectedProperty(upFilterSelector)
47
54
  upFilterEnabled: IActivityHistoryUpFilter;
48
55
 
@@ -63,18 +70,12 @@ export class ActiveFiltersBadges extends LitElement {
63
70
 
64
71
  _onDeleteDiagnosticFilterValue(diagnosticValue: string) {
65
72
  this.api.broker.send(
66
- new SetDiagnosticFiltersCommand([
67
- ...this.diagnosticFilterEnabled.enabledValues.filter((v) => v !== diagnosticValue),
68
- ]),
73
+ new SetDiagnosticFiltersCommand([...this.diagnosticFilterEnabled.enabledValues.filter((v) => v !== diagnosticValue)]),
69
74
  );
70
75
  }
71
76
 
72
- _onDeleteUpFilterValue(upValue: string) {
73
- this.api.broker.send(
74
- new SetUpFiltersCommand([
75
- ...this.upFilterEnabled.enabledValues.filter((v) => v !== upValue),
76
- ]),
77
- );
77
+ _onDeleteUpFilterValue(upValue: string) {
78
+ this.api.broker.send(new SetUpFiltersCommand([...this.upFilterEnabled.enabledValues.filter((v) => v !== upValue)]));
78
79
  }
79
80
 
80
81
  resetFilters() {
@@ -5,14 +5,14 @@ import { formatShowFilterTitle, normalizeDeletedFilterBooleanValue, normalizeEmp
5
5
 
6
6
  const MAX_VISIBLE_CHIPS = 5;
7
7
 
8
- const renderChip = (id, filter, value, props) => html`
8
+ const renderChip = (id, filter, option, props) => html`
9
9
  <dss-chip
10
- label=${normalizeEmptyFilterValue(value, filter.title)}
10
+ label=${normalizeEmptyFilterValue(option.title, filter.title)}
11
11
  size="sm"
12
12
  hasdelete
13
13
  selected
14
- @click=${() => props._onDeleteFilterValue(id, filter.id, value, false)}
15
- @onDelete=${() => props._onDeleteFilterValue(id, filter.id, value, false)}
14
+ @click=${() => props._onDeleteFilterValue(id, filter.id, option.id, false)}
15
+ @onDelete=${() => props._onDeleteFilterValue(id, filter.id, option.id, false)}
16
16
  ></dss-chip>
17
17
  `;
18
18
 
@@ -52,6 +52,7 @@ const renderUpChip = (id, value, props) => html`
52
52
  const renderFilterTitle = (title) => html`<div class="filter-title">${`${title}:`}</div>`;
53
53
 
54
54
  export const template = (props: ActiveFiltersBadges) => {
55
+ //TODO: refactor chips render
55
56
  if (
56
57
  props.enabledFilters.length === 0 &&
57
58
  props.enabledCommonFilters.length === 0 &&
@@ -97,7 +98,7 @@ export const template = (props: ActiveFiltersBadges) => {
97
98
  }
98
99
  }
99
100
 
100
- const up = props.upFilterEnabled;
101
+ const up = props.upFilterEnabled;
101
102
 
102
103
  if (up) {
103
104
  const { title, values, enabledValues } = up;
@@ -127,7 +128,7 @@ export const template = (props: ActiveFiltersBadges) => {
127
128
  }
128
129
  }
129
130
  }
130
- }
131
+ }
131
132
 
132
133
  for (const filter of props.enabledCommonFilters) {
133
134
  const chip = renderCommonChip(filter, props);
@@ -147,7 +148,21 @@ export const template = (props: ActiveFiltersBadges) => {
147
148
 
148
149
  for (const filter of filters) {
149
150
  for (const value of [...new Set(filter.enabledValues)]) {
150
- const chip = renderChip(id, filter, normalizeDeletedFilterBooleanValue(value), props);
151
+ let filterOption = filter?.options?.find((o) => o.id === value);
152
+
153
+ if (filterOption) {
154
+ //Fill when filter option doesnt have title (description)
155
+ filterOption.title = filterOption.title !== "" ? filterOption.title : value;
156
+ } else {
157
+ //Hi ha un filtre de curs clinic "veure eliminats" booleà que no serà un filterOption, per tant entra aquí
158
+ //Aqui es crea el objecte que es passa al chip
159
+ const deletedFiltersOption = normalizeDeletedFilterBooleanValue(value);
160
+ filterOption = { title: deletedFiltersOption, id: deletedFiltersOption };
161
+ }
162
+
163
+ const chip2 = renderChip(id, filter, normalizeDeletedFilterBooleanValue(value), props);
164
+
165
+ const chip = renderChip(id, filter, filterOption, props);
151
166
 
152
167
  if (visibleCount < MAX_VISIBLE_CHIPS) {
153
168
  if (!titleAddedToVisible) {
@@ -67,7 +67,7 @@ export const template = (props: ActivityHistoryFilters) =>
67
67
  ${
68
68
  props.diagnosticFilter &&
69
69
  html`<div class="filter">
70
- <dss-input-dropdown icon="" multiple dropdownFixed type="default" .elements=${props.diagnosticFilter?.values} @onInputDropdownChange=${props._handleDiagnosticFilterChange} .selectedValue=${props.diagnosticFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
70
+ <dss-input-dropdown inputsize="md" icon="" multiple dropdownFixed type="default" .elements=${props.diagnosticFilter?.values} @onInputDropdownChange=${props._handleDiagnosticFilterChange} .selectedValue=${props.diagnosticFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
71
71
  <label slot="label" for="diagnostic-filter">${props.diagnosticFilter.title}</label>
72
72
  <input id="diagnostic-filter" slot="input" type="text" class="dss-input" autocomplete="off"/>
73
73
  </dss-input-dropdown>
@@ -76,7 +76,7 @@ export const template = (props: ActivityHistoryFilters) =>
76
76
  ${
77
77
  props.upFilter &&
78
78
  html`<div class="filter">
79
- <dss-input-dropdown icon="" multiple dropdownFixed type="default" .elements=${props.upFilter?.values} @onInputDropdownChange=${props._handleUpFilterChange} .selectedValue=${props.upFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
79
+ <dss-input-dropdown inputsize="md" icon="" multiple dropdownFixed type="default" .elements=${props.upFilter?.values} @onInputDropdownChange=${props._handleUpFilterChange} .selectedValue=${props.upFilterEnabledValues} selectorStyle=${"max-height: 450px"}>
80
80
  <label slot="label" for="up-filter">${props.upFilter.title}</label>
81
81
  <input id="up-filter" slot="input" type="text" class="dss-input" autocomplete="off"/>
82
82
  </dss-input-dropdown>
@@ -111,6 +111,7 @@ const customFilterTemplate = (
111
111
  const elements = filter?.options.map(option => ({ value: option.id, label: option.title }));
112
112
  return html`
113
113
  <dss-input-dropdown
114
+ inputsize="md"
114
115
  icon=""
115
116
  multiple
116
117
  dropdownFixed
@@ -9,6 +9,7 @@ import { TYPES } from "../../../../infrastructure/ioc/types";
9
9
  import { connectedProperty } from "../../../../infrastructure/state/connected-property";
10
10
  import { SearchActivityHistoryItems } from "../../../search/request";
11
11
  import { activityHistoryCollectionsSelector } from "../../../selectors";
12
+ import { isSomeCollectionLoadedAndOtherLoading, isCollectionInitialState } from "../../../add/handle-busy/selectors";
12
13
  import { ActivityHistoryTimeline } from "../timeline/activity-history-timeline";
13
14
  import styles from "./styles.css?inline";
14
15
  import { template } from "./template";
@@ -45,6 +46,12 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
45
46
  @connectedProperty(activityHistoryCollectionsSelector)
46
47
  historyItems: any[];
47
48
 
49
+ @connectedProperty(isCollectionInitialState)
50
+ isCollectionInitialState: boolean;
51
+
52
+ @connectedProperty(isSomeCollectionLoadedAndOtherLoading)
53
+ isSomeCollectionLoadedAndOtherLoading: boolean;
54
+
48
55
  _maximize() {
49
56
  this.maximized = true;
50
57
  }
@@ -54,12 +61,9 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
54
61
  }
55
62
 
56
63
  _subscribeEvents() {
57
- const subscription = this.api.broker.subscribe(
58
- shellEvents.openClinicalMonitoringRequested,
59
- () => {
60
- this.maximized = false;
61
- },
62
- );
64
+ const subscription = this.api.broker.subscribe(shellEvents.openClinicalMonitoringRequested, () => {
65
+ this.maximized = false;
66
+ });
63
67
  this.subscriptions.push(subscription);
64
68
  }
65
69
 
@@ -88,9 +92,7 @@ export class ActivityHistoryMain extends PrimariaRegionHost(LitElement) {
88
92
 
89
93
  scrollToClosestDate(date: Date) {
90
94
  const selectedDate = date.getTime();
91
- const timeline = this.shadowRoot.querySelector(
92
- "activity-history-timeline",
93
- ) as ActivityHistoryTimeline;
95
+ const timeline = this.shadowRoot.querySelector("activity-history-timeline") as ActivityHistoryTimeline;
94
96
  timeline._scrollIntoDate(selectedDate);
95
97
  }
96
98
  }