@uxland/primary-shell 5.3.7 → 5.3.8

package/src/internal-plugins/activity-history/activity-history-item/filter/diagnostic-filters/set/reducer.ts

@@ -0,0 +1,11 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+import { IActivityHistoryDiagnosticsFilter, isDiagnosticFilter } from "../../model";
+
+export function setDiagnosticFilterValuesReducer(state, action: PayloadAction<string[]>) {
+  state.filters = [...state.filters].map((f) => {
+    if (isDiagnosticFilter(f)) {
+      return { ...f, enabledValues: action.payload } as IActivityHistoryDiagnosticsFilter;
+    }
+    return f;
+  });
+}

package/src/internal-plugins/activity-history/activity-history-item/filter/diagnostic-filters/set/request.ts

@@ -0,0 +1,3 @@
+export class SetDiagnosticFiltersCommand {
+  constructor(public payload: string[]) {}
+}

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

@@ -35,9 +35,10 @@ export interface IActivityHistoryCustomFilterGroup {
   filters: IActivityHistoryCustomFilter[];
 }
 
-export type IActivityHistoryFilterGroup =
+export type IActivityHistoryFilter =
   | IActivityHistoryCommonFilterGroup
-  | IActivityHistoryCustomFilterGroup;
+  | IActivityHistoryCustomFilterGroup
+  | IActivityHistoryDiagnosticsFilter;
 
 export interface IActivityHistoryCustomFilter {
   id: string;
@@ -54,6 +55,22 @@ export interface IActivityHistoryCustomFilter {
   enabledValues?: string[];
 }
 
-export const isCommonFilterGroup = (group: IActivityHistoryFilterGroup) => group.id === "common";
-export const isNotCommonFilterGroup = (group: IActivityHistoryFilterGroup) =>
+export const isCommonFilterGroup = (group: IActivityHistoryFilter) => group.id === "common";
+export const isNotCommonFilterGroup = (group: IActivityHistoryFilter) =>
   !isCommonFilterGroup(group);
+export const isDiagnosticFilter = (filter: IActivityHistoryFilter) =>
+  filter.id === diagnosticsfilterId;
+export const isNotDiagnosticFilter = (filter: IActivityHistoryFilter) =>
+  !isDiagnosticFilter(filter);
+export const isCustomFilter = (filter: IActivityHistoryFilter) =>
+  !isCommonFilterGroup(filter) && !isDiagnosticFilter(filter);
+export interface IActivityHistoryDiagnosticsFilter {
+  id: string;
+  title: string;
+  values: { label: string; value: string }[];
+  enabledValues: string[];
+}
+
+export const diagnosticsfilterId = "history-diagnostics";
+export const relevantFilterId = "history-relevant";
+export const ownFilterId = "history-own";

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

@@ -5,13 +5,15 @@ import { setCommonFilterValueReducer } from "./common-filters/set-common-filter/
 import { addCustomFiltersReducer } from "./custom-filters/add-custom-filters/reducer";
 import { setCustomFilterGroupValueReducer } from "./custom-filters/set-custom-filter-group/reducer";
 import { setCustomFilterValueReducer } from "./custom-filters/set-custom-filter-value/reducer";
-import { IActivityHistoryFilterGroup } from "./model";
+import { IActivityHistoryFilter } from "./model";
+import { addDiagnosticFiltersReducer } from "./diagnostic-filters/add/reducer";
+import { setDiagnosticFilterValuesReducer } from "./diagnostic-filters/set/reducer";
 
 export const activityHistoryFiltersSlice = createSlice({
   name: "activity-history-filters",
   initialState: {
     searchString: "",
-    filters: [...commonFilters] as IActivityHistoryFilterGroup[],
+    filters: [...commonFilters] as IActivityHistoryFilter[],
   },
   reducers: {
     setSearchString: setSearchStringReducer,
@@ -19,5 +21,7 @@ export const activityHistoryFiltersSlice = createSlice({
     addCustomFilters: addCustomFiltersReducer,
     setCustomFilterGroupValue: setCustomFilterGroupValueReducer,
     setCustomFilterValue: setCustomFilterValueReducer,
+    addDiagnosticFilters: addDiagnosticFiltersReducer,
+    setDiagnosticFilterValues: setDiagnosticFilterValuesReducer,
   },
 });

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

@@ -3,14 +3,11 @@ import { customElement } from "lit/decorators.js";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import { IActivityHistoryGroup } from "../../../domain/model";
 import { activityHistorySearchStringSelector } from "../../../search/selectors";
-import {
-  isAnyCollectionLoadingWithoutAnyLoaded,
-  isSomeCollectionLoadedAndOtherLoading,
-} from "../../handle-busy/selectors";
 import { activityHistoryGroupedItems } from "../../../selectors";
 import styles from "./styles.css?inline";
 import { template } from "./template";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
+import { isAnyCollectionLoadingWithoutAnyLoaded, isSomeCollectionLoadedAndOtherLoading } from "../../../add/handle-busy/selectors";
 
 const createZIndexStyles = (max: number) => {
   let styles = "";

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts

@@ -25,6 +25,8 @@ export const template = (props: ActivityHistoryTimeline) => {
   }
   return html`
   <div class="container">
+    <activity-history-full-data-error></activity-history-full-data-error>
+    <activity-history-partial-data-error></activity-history-partial-data-error>
     ${
       props.historyGroups?.length > 0
         ? html`
@@ -115,7 +117,7 @@ const renderProfessionalValues = (props: ActivityHistoryTimeline, item: IActivit
   const professionalItems = [
     props.highlighted(item.professional.name),
     showRole ? props.highlighted(item.professional.role.description) : null,
-    props.highlighted(item.up.description) ?? props.highlighted(item.center.description),
+    props.highlighted(item.up.description),
     props.highlighted(item.professional.speciality.description),
     props.highlighted(item.service.description),
   ].filter(Boolean);

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

@@ -1,6 +1,9 @@
 import "./UI/timeline/activity-history-timeline";
 import "../filter/UI/active-filters-header/active-filters-header";
+import "../add/handle-error/history-full-data-error/component";
+import "../add/handle-error/history-partial-data-error/component";
+
 
 export const bootstrapListActivityHistoryItems = () => {
   () => null;
-};
+}

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

@@ -16,6 +16,8 @@ import { activityHistoryCustomFilterGroupsSelector } from "./filter/custom-filte
 import { groupActivityHistoryItems } from "./list/group-history-items/group-history-items";
 import { sortGroupsByMostRecentDate } from "./list/sort-history-items-by-date/sort-history-items-by-date";
 import { activityHistorySearchStringSelector } from "./search/selectors";
+import { diagnosticFilterEnabledValuesSelector } from "./filter/diagnostic-filters/selectors";
+import { DiagnosticCodeSpec } from "./domain/specs/diagnostics-filter-spec";
 
 export const activityHistoryCollectionsSelector = (state: RootState) =>
   state.activityHistoryCollections.collections;
@@ -86,17 +88,20 @@ export const activityHistoryGroupedItems = createSelector(
   activityHistorySearchStringSelector,
   activityHistoryCommonFiltersSelector,
   activityHistoryCustomFilterGroupsSelector,
+  diagnosticFilterEnabledValuesSelector,
   (
     items: IActivityHistoryItem[],
     searchString: string,
     commonFilters: IActivityHistoryCommonFilter[],
     customFilters: IActivityHistoryCustomFilterGroup[],
+    diagnosticFilterEnabledValues: string[],
   ) => {
     const filteredItems = items.filter((item: IActivityHistoryItem) =>
       new SearchStringSpec(searchString, item.searchPredicate)
         .and(new CommonFilterSpec(commonFilters))
         .and(new ComposedTypeSpec(customFilters))
         .and(new CustomFilterSpec(customFilters))
+        .and(new DiagnosticCodeSpec(diagnosticFilterEnabledValues))
         .isSatisfiedBy(item),
     );
 

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

@@ -6,16 +6,10 @@ import {
   IBusyHistoryItem,
   IErrorHistoryItem,
 } from "./domain/model";
-import {
-  addBusyHistoryItemReducer,
-  removeBusyHistoryItemReducer,
-} from "./list/handle-busy/reducers";
-import {
-  addErrorHistoryItemReducer,
-  removeErrorHistoryItemReducer,
-} from "./list/handle-error/reducers";
 import { removeActivityHistoryItemReducer } from "./remove/reducer";
 import { updateActivityHistoryItemReducer } from "./update/reducer";
+import { addBusyHistoryItemReducer, removeBusyHistoryItemReducer } from "./add/handle-busy/reducers";
+import { addErrorHistoryItemReducer, removeErrorHistoryItemReducer } from "./add/handle-error/reducers";
 
 export const activityHistoryCollectionsSlice = createSlice({
   name: "activity-history-collections",

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

@@ -86,6 +86,22 @@ export const locales = {
       chipHeader: {
         selection: "Selecció:",
       },
+      error: {
+        general: {
+          title: "Hi ha hagut un problema durant la càrrega de contingut. Actualitza la pàgina o torna-ho a provar més tard.",
+          refresh: "Actualitzar pàgina",
+          noInfo: "No hi ha informació disponible.", 
+        },
+        partial: {
+          title: "Hi ha hagut un problema i no s'ha pogut carregar les notes de tipus",
+          refresh: "Actualitzar",
+          limit: "Límit de clicks superat",
+        },
+        title: "Error en la càrrega",
+        viewDetails: "Veure detalls",
+        imageAlt: "Imatge d'error",
+        errorToRefresh: "Error en l'acció d'actualitzar la pàgina",
+      },
     },
   },
 };

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/list/handle-error/actions.d.ts

@@ -1,4 +0,0 @@
-export declare const addErrorHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<{
-    id: string;
-    message: string;
-}, "activity-history-collections/addErrorHistoryItem">, removeErrorHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "activity-history-collections/removeErrorHistoryItem">;