@uxland/primary-shell 5.4.7 → 5.5.0

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

@@ -1,11 +1,7 @@
 import { createSelector } from "@reduxjs/toolkit";
 import { RootState } from "../infrastructure/state/store";
 import { getUniqueObjects } from "../utils/get-unique-values-by-prop-path";
-import {
-  IActivityHistoryItem,
-  IActivityHistoryItemCollection,
-  TSearchActivityHistoryItemPredicate,
-} from "./domain/model";
+import { IActivityHistoryItem, IActivityHistoryItemCollection, TSearchActivityHistoryItemPredicate } from "./domain/model";
 import { CommonFilterSpec } from "./domain/specs/common-filter-spec";
 import { CustomFilterSpec } from "./domain/specs/custom-filter-spec";
 import { SearchStringSpec } from "./domain/specs/search-string-spec";
@@ -18,9 +14,10 @@ import { sortGroupsByMostRecentDate } from "./list/sort-history-items-by-date/so
 import { activityHistorySearchStringSelector } from "./search/selectors";
 import { diagnosticFilterEnabledValuesSelector } from "./filter/diagnostic-filters/selectors";
 import { DiagnosticCodeSpec } from "./domain/specs/diagnostics-filter-spec";
+import { upFilterEnabledValuesSelector } from "./filter/up-filters/selectors";
+import { UpFilterSpec } from "./domain/specs/up-filter-spec";
 
-export const activityHistoryCollectionsSelector = (state: RootState) =>
-  state.activityHistoryCollections.collections;
+export const activityHistoryCollectionsSelector = (state: RootState) => state.activityHistoryCollections.collections;
 
 const mapItemsWithMetadata = (
   items: IActivityHistoryItem[],
@@ -43,12 +40,7 @@ export const activityHistoryMappedItems = createSelector(
   activityHistoryCollectionsSelector,
   (collections: Record<string, IActivityHistoryItemCollection>) => {
     return Object.values(collections).flatMap((collection: IActivityHistoryItemCollection) => {
-      return mapItemsWithMetadata(
-        collection.items,
-        collection.componentFactory,
-        collection.id,
-        collection.searchPredicate,
-      );
+      return mapItemsWithMetadata(collection.items, collection.componentFactory, collection.id, collection.searchPredicate);
     });
   },
 );
@@ -56,10 +48,7 @@ export const activityHistoryMappedItems = createSelector(
 export const customFilterGroupsWithOptionsSelector = createSelector(
   activityHistoryCustomFilterGroupsSelector,
   activityHistoryCollectionsSelector,
-  (
-    filterGroups: IActivityHistoryCustomFilterGroup[],
-    collections: Record<string, IActivityHistoryItemCollection>,
-  ) => {
+  (filterGroups: IActivityHistoryCustomFilterGroup[], collections: Record<string, IActivityHistoryItemCollection>) => {
     const result = filterGroups.map((filterGroup: IActivityHistoryCustomFilterGroup) => {
       const collection = collections[filterGroup.id] as IActivityHistoryItemCollection;
       return {
@@ -69,12 +58,7 @@ export const customFilterGroupsWithOptionsSelector = createSelector(
             ...f,
             options:
               (!f.singleOption
-                ? getUniqueObjects<IActivityHistoryItem>(
-                    collection.items,
-                    f.propPathValue,
-                    f.propsPathDescription,
-                    f.title
-                  )
+                ? getUniqueObjects<IActivityHistoryItem>(collection.items, f.propPathValue, f.propsPathDescription, f.title)
                 : []) || [],
           };
         }),
@@ -90,12 +74,14 @@ export const activityHistoryGroupedItems = createSelector(
   activityHistoryCommonFiltersSelector,
   activityHistoryCustomFilterGroupsSelector,
   diagnosticFilterEnabledValuesSelector,
+  upFilterEnabledValuesSelector,
   (
     items: IActivityHistoryItem[],
     searchString: string,
     commonFilters: IActivityHistoryCommonFilter[],
     customFilters: IActivityHistoryCustomFilterGroup[],
     diagnosticFilterEnabledValues: string[],
+    upFilterEnabledValues: string[],
   ) => {
     const filteredItems = items.filter((item: IActivityHistoryItem) =>
       new SearchStringSpec(searchString, item.searchPredicate)
@@ -103,6 +89,7 @@ export const activityHistoryGroupedItems = createSelector(
         .and(new ComposedTypeSpec(customFilters))
         .and(new CustomFilterSpec(customFilters))
         .and(new DiagnosticCodeSpec(diagnosticFilterEnabledValues))
+        .and(new UpFilterSpec(upFilterEnabledValues))
         .isSatisfiedBy(item),
     );
 

package/src/internal-plugins/activity-history/utils/get-unique-values-by-prop-path.ts

@@ -13,7 +13,9 @@ export function getUniqueObjects<T>(
     const title = propPathDescription.reduce((acc, key) => acc?.[key], item);
 
     const isValidId = typeof id === "string" && id.trim() !== "";
-    const isValidTitle = typeof title === "string" && title.trim() !== "";
+
+    //Tret el trim del title pels casos de migració on arriben camps buits
+    const isValidTitle = typeof title === "string";
 
     if (isValidId && isValidTitle) {
       if (!map.has(id)) {

package/src/locales.ts

@@ -12,9 +12,7 @@ export const useLocalization = async (api: PrimariaApi) => {
 
 type LocaleKeys<T> = T extends object
   ? {
-      [K in keyof T]:
-        | `${K & string}`
-        | (T[K] extends object ? `${K & string}.${LocaleKeys<T[K]>}` : never);
+      [K in keyof T]: `${K & string}` | (T[K] extends object ? `${K & string}.${LocaleKeys<T[K]>}` : never);
     }[keyof T]
   : never;
 
@@ -43,12 +41,11 @@ export const locales = {
       },
       errors: {
         session: "Hi ha hagut un error amb la sessió. Siusplau, tanca i torna a obrir l'aplicació.",
-        invalidPatient:
-          "El pacient actual no és vàlid. Siusplau, tanca i torna a obrir l'aplicació.",
+        invalidPatient: "El pacient actual no és vàlid. Siusplau, tanca i torna a obrir l'aplicació.",
       },
       header: {
         workCenter: "Centre treball",
-        role: "Rol",
+        role: "Tipus de profesional",
         speciality: "Àmbit treball",
       },
       busyManager: {