@uxland/primary-shell 3.5.2 → 3.5.4

package/src/internal-plugins/activity-history/activity-history-item/search/activity-history-search-bar/template.ts

@@ -0,0 +1,8 @@
+import { html } from "lit";
+import { ActivityHistorySearchBar } from "./activity-history-search-bar";
+
+export const template = (props: ActivityHistorySearchBar) =>
+  html`<dss-search-bar dropdownStyle=${"display: none"} @onSearchChange=${props._handleSearchChange} icon="search" inputsize="md" threshold="2" recentsearchestext="" emptydropdowntext="">
+                    <label slot="label" for="searchbar1" aria-hidden="false"></label>
+                    <input slot="input" id="searchbar1" type="text" value=${props.searchQuery} @input=${(e) => props._handleSearchChange({ detail: [e.target.value] })}>
+                </dss-search-bar>`;

package/src/internal-plugins/activity-history/{components/activity-history/activity-history-search-header/activity-history-search-header.ts → activity-history-item/search/activity-history-search-results/activity-history-search-results.ts}

@@ -4,8 +4,8 @@ import styles from "./styles.css?inline";
 import { template } from "./template";
 
 //@ts-ignore
-@customElement("activity-history-search-header")
-export class ActivityHistorySearchHeader extends LitElement {
+@customElement("activity-history-search-results")
+export class ActivityHistorySearchResults extends LitElement {
   render() {
     return html`${template(this)}`;
   }
@@ -16,5 +16,4 @@ export class ActivityHistorySearchHeader extends LitElement {
 
   @property()
   searchQuery = "";
-
 }

package/src/internal-plugins/activity-history/activity-history-item/search/activity-history-search-results/styles.css

@@ -0,0 +1,14 @@
+.search-header {
+  padding-inline: 16px;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  gap: var(--dds-spacing-xs);
+  border-width: 0px 0px 1px 0px;
+  border-style: solid;
+  border-color: #D8D8D8;
+  background-color: #FFFFFF;
+  color: var(--color-neutral-900);
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 24px;
+}

package/src/internal-plugins/activity-history/{components/activity-history/activity-history-search-header → activity-history-item/search/activity-history-search-results}/template.ts

@@ -1,8 +1,8 @@
 import { html } from "lit";
-import { ActivityHistorySearchHeader } from "./activity-history-search-header";
+import { ActivityHistorySearchResults } from "./activity-history-search-results";
 import { translate } from "../../../localization";
 
-export const template = (props: ActivityHistorySearchHeader) =>
+export const template = (props: ActivityHistorySearchResults) =>
   html`<div class="search-header">
     ${translate("searchBarResults")} “${props.searchQuery}”
   </div>`;

package/src/internal-plugins/activity-history/{features/search-items → activity-history-item/search}/bootstrapper.ts

@@ -2,6 +2,8 @@ import { BrokerExtensions } from "@primaria/plugins-core";
 import { SearchItemsHandler } from "./handler";
 import { SearchActivityHistoryItems } from "./request";
 import { BrokerDisposableHandler } from "../../../../api/broker/primaria-broker";
+import "./activity-history-search-results/activity-history-search-results";
+import "./activity-history-search-bar/activity-history-search-bar";
 
 let request: BrokerDisposableHandler;
 
@@ -9,6 +11,6 @@ export const bootstrapSearchItems = (broker: BrokerExtensions) => {
   request = broker.registerRequest(SearchActivityHistoryItems, SearchItemsHandler);
 };
 
-export const teardownSearchItems = (broker: BrokerExtensions) => {
+export const teardownSearchItems = () => {
   request?.dispose();
 };

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

@@ -0,0 +1,17 @@
+import { events } from "../../constants";
+import { BaseHandler } from "../../infrastructure/base-handlers";
+import { setSearchString } from "./actions";
+import { SearchActivityHistoryItems } from "./request";
+
+export class SearchItemsHandler extends BaseHandler {
+  async handle(request: SearchActivityHistoryItems) {
+    try {
+      this.store.dispatch(setSearchString(request.searchString));
+      this.api.broker.publish(events.activityHistorySearched, {
+        searchQuery: request.searchString,
+      });
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
+}

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

@@ -0,0 +1,5 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+
+export function setSearchStringReducer(state, action: PayloadAction<string>) {
+  state.searchString = action.payload;
+}

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

@@ -0,0 +1,4 @@
+import { RootState } from "../../infrastructure/state/store";
+
+export const activityHistorySearchStringSelector = (state: RootState) =>
+  state.activityHistoryFilters.searchString;

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

@@ -0,0 +1,37 @@
+import { createSlice } from "@reduxjs/toolkit";
+import { addActivityHistoryItemReducer } from "./add/add-history-item/reducer";
+import { addActivityHistoryItemsReducer } from "./add/add-history-items/reducer";
+import {
+  IActivityHistoryItemCollection,
+  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";
+
+export const activityHistoryCollectionsSlice = createSlice({
+  name: "activity-history-collections",
+  initialState: {
+    busy: [] as IBusyHistoryItem[],
+    error: [] as IErrorHistoryItem[],
+    collections: {} as Record<string, IActivityHistoryItemCollection>,
+  },
+  reducers: {
+    addBusyHistoryItem: addBusyHistoryItemReducer,
+    removeBusyHistoryItem: removeBusyHistoryItemReducer,
+    addActivityHistoryItem: addActivityHistoryItemReducer,
+    updateActivityHistoryItem: updateActivityHistoryItemReducer,
+    addActivityHistoryItems: addActivityHistoryItemsReducer,
+    addErrorHistoryItem: addErrorHistoryItemReducer,
+    removeErrorHistoryItem: removeErrorHistoryItemReducer,
+    removeActivityHistoryItem: removeActivityHistoryItemReducer,
+  },
+});

package/src/internal-plugins/activity-history/activity-history-item/update/action.ts

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

package/src/internal-plugins/activity-history/{features/update-history-item → activity-history-item/update}/bootstrapper.ts

@@ -9,6 +9,6 @@ export const bootstrapUpdateHistoryItem = (broker: BrokerExtensions) => {
   request = broker.registerRequest(updateHistoryItemRequest, UpdateHistoryItemHandler);
 };
 
-export const teardownUpdateHistoryItem = (broker: BrokerExtensions) => {
+export const teardownUpdateHistoryItem = () => {
   request?.dispose();
 };

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

@@ -0,0 +1,20 @@
+import { StoreBaseHandler } from "../../infrastructure/base-handlers";
+import { ensureAreValidActivityHistoryItems } from "../domain/is-valid-history-item/is-valid-history-item";
+import { updateActivityHistoryItem } from "./action";
+import { UpdateHistoryItemPayload } from "./request";
+
+export class UpdateHistoryItemHandler extends StoreBaseHandler {
+  async handle(payload: UpdateHistoryItemPayload) {
+    try {
+      ensureAreValidActivityHistoryItems([payload.item]);
+      this.store.dispatch(
+        updateActivityHistoryItem({
+          id: payload.entityId,
+          item: payload.item,
+        }),
+      );
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
+}

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

@@ -0,0 +1,11 @@
+import { PayloadAction } from "@reduxjs/toolkit";
+import { updateItemInCollection } from "./update-item-in-collection";
+import { IActivityHistoryItem } from "../domain/model";
+
+export function updateActivityHistoryItemReducer(
+  state,
+  action: PayloadAction<{ id: string; item: IActivityHistoryItem }>,
+) {
+  const { id, item } = action.payload;
+  state.collections = updateItemInCollection(state.collections, id, item);
+}

package/src/internal-plugins/activity-history/{features/update-history-item → activity-history-item/update}/request.ts

@@ -1,4 +1,4 @@
-import { IActivityHistoryItem } from "../../domain/model";
+import { IActivityHistoryItem } from "../domain/model";
 
 export interface UpdateHistoryItemPayload {
   entityId: string;

package/src/internal-plugins/activity-history/activity-history-item/update/update-item-in-collection.test.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import { IActivityHistoryItem } from "../..";
+import { updateItemInCollection } from "./update-item-in-collection";
+
+describe("updateItemInCollection", () => {
+  it("should return the same collections if the collection does not exist", () => {
+    const collections: Record<string, any> = {};
+    const updatedItem: IActivityHistoryItem = { id: "item1", name: "Updated Item 1" };
+
+    const result = updateItemInCollection(collections, "collection1", updatedItem);
+
+    expect(result).toEqual(collections); // Sin cambios
+  });
+
+  it("should return the same collections if the collection exists but has no items", () => {
+    const collections: Record<string, any> = {
+      collection1: {
+        id: "collection1",
+        items: [],
+      },
+    };
+    const updatedItem: IActivityHistoryItem = { id: "item1", name: "Updated Item 1" };
+
+    const result = updateItemInCollection(collections, "collection1", updatedItem);
+
+    expect(result).toEqual(collections); // Sin cambios
+  });
+
+  it("should update the item in the collection when the id matches", () => {
+    const collections: Record<string, any> = {
+      collection1: {
+        id: "collection1",
+        items: [
+          { id: "item1", name: "Item 1" },
+          { id: "item2", name: "Item 2" },
+        ],
+      },
+    };
+    const updatedItem: IActivityHistoryItem = { id: "item1", name: "Updated Item 1" };
+
+    const result = updateItemInCollection(collections, "collection1", updatedItem);
+
+    expect(result.collection1.items).toEqual([
+      { id: "item1", name: "Updated Item 1" },
+      { id: "item2", name: "Item 2" },
+    ]);
+  });
+
+  it("should return the same collections if the item with the id does not exist", () => {
+    const collections: Record<string, any> = {
+      collection1: {
+        id: "collection1",
+        items: [
+          { id: "item1", name: "Item 1" },
+          { id: "item2", name: "Item 2" },
+        ],
+      },
+    };
+    const updatedItem: IActivityHistoryItem = { id: "item3", name: "Updated Item 3" }; // No existe item3
+
+    const result = updateItemInCollection(collections, "collection1", updatedItem);
+
+    expect(result).toEqual(collections); // Sin cambios
+  });
+});

package/src/internal-plugins/activity-history/activity-history-item/update/update-item-in-collection.ts

@@ -0,0 +1,18 @@
+import { IActivityHistoryItem } from "../domain/model";
+
+export const updateItemInCollection = (
+  collections: Record<string, any>,
+  id: string,
+  updatedItem: IActivityHistoryItem,
+) => {
+  if (!collections[id]?.items) return collections;
+  const items = collections[id]?.items ?? [];
+
+  return {
+    ...collections,
+    [id]: {
+      ...collections[id],
+      items: items.map((i: IActivityHistoryItem) => (i.id === updatedItem.id ? updatedItem : i)),
+    },
+  };
+};

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

@@ -1 +1 @@
-export * from "./domain/model";
+export * from "./activity-history-item/domain/model";

package/src/internal-plugins/activity-history/infrastructure/base-handlers.ts

@@ -0,0 +1,22 @@
+import { inject, injectable } from "inversify";
+import { TYPES } from "./ioc/types";
+import { Store } from "@reduxjs/toolkit";
+import { PrimariaApi } from "@uxland/primary-shell";
+
+@injectable()
+export class StoreBaseHandler {
+  constructor(@inject(TYPES.store) protected readonly store: Store) {}
+}
+
+@injectable()
+export class ApiBaseHandler {
+  constructor(@inject(TYPES.primaryApi) protected readonly api: PrimariaApi) {}
+}
+
+@injectable()
+export class BaseHandler {
+  constructor(
+    @inject(TYPES.store) protected readonly store: Store,
+    @inject(TYPES.primaryApi) protected readonly api: PrimariaApi,
+  ) {}
+}

package/src/internal-plugins/activity-history/infrastructure/ioc/container.ts

@@ -1,6 +1,14 @@
 import { Container } from "inversify";
 import getDecorators from "inversify-inject-decorators";
+import { PrimariaApi } from "../../../../api/api";
+import { TYPES } from "./types";
+import { store } from "../state/store";
 const container = new Container();
 const { lazyInject } = getDecorators(container, false);
 
-export { container, lazyInject };
+export { container, lazyInject };
+
+export const bindDeps = (api: PrimariaApi) => {
+  container.bind(TYPES.primaryApi).toConstantValue(api);
+  container.bind(TYPES.store).toConstantValue(store);
+};

package/src/internal-plugins/activity-history/infrastructure/state/store.ts

@@ -1,12 +1,14 @@
 import { configureStore } from "@reduxjs/toolkit";
-import { activityHistorySlice } from "./slices";
+import { activityHistoryCollectionsSlice } from "../../activity-history-item/slice";
+import { activityHistoryFiltersSlice } from "../../activity-history-item/filter/slice";
 
 export type RootState = ReturnType<typeof store.getState>;
 export type AppDispatch = typeof store.dispatch;
 
 export const store = configureStore({
   reducer: {
-    activityHistory: activityHistorySlice.reducer,
+    activityHistoryCollections: activityHistoryCollectionsSlice.reducer,
+    activityHistoryFilters: activityHistoryFiltersSlice.reducer,
   },
   devTools: {
     name: "activity-history",

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

@@ -1,12 +1,21 @@
 import { PrimariaApi } from "../../api/api";
 import { clinicalMonitoringRegions } from "../../api/region-manager/regions";
-import { ActivityHistory } from "./components/activity-history/activity-history";
-import { bootstrapFeatures, teardownFeatures } from "./features/bootstrapper";
-import { container } from "./infrastructure/ioc/container";
-import { TYPES } from "./infrastructure/ioc/types";
-import { store } from "./infrastructure/state/store";
+import {
+  bootstrapActivityHistoryItem,
+  teardownActivityHistoryItem,
+} from "./activity-history-item/bootstrapper";
+import { ActivityHistoryMain } from "./activity-history-item/list/UI/main-view/activity-history-main";
+import { bindDeps } from "./infrastructure/ioc/container";
 import { initializeLocalization } from "./localization";
 
+const bootstrapFeatures = (api: PrimariaApi) => {
+  bootstrapActivityHistoryItem(api);
+};
+
+const teardownFeatures = () => {
+  teardownActivityHistoryItem();
+};
+
 export const initialize = async (api: PrimariaApi) => {
   registerViews(api);
   await initializeLocalization(api);
@@ -20,14 +29,9 @@ export const dispose = () => {
   return Promise.resolve();
 };
 
-const bindDeps = (api: PrimariaApi) => {
-  container.bind(TYPES.primaryApi).toConstantValue(api);
-  container.bind(TYPES.store).toConstantValue(store);
-};
-
 export const registerViews = (api: PrimariaApi) => {
   api.regionManager.registerView(clinicalMonitoringRegions.content, {
     id: api.pluginInfo.pluginId,
-    factory: () => Promise.resolve(new ActivityHistory()),
+    factory: () => Promise.resolve(new ActivityHistoryMain()),
   });
 };

package/dist/primary/shell/src/internal-plugins/activity-history/components/activity-history/activity-history-search-header/template.d.ts

@@ -1,3 +0,0 @@
-import { ActivityHistorySearchHeader } from './activity-history-search-header';
-
-export declare const template: (props: ActivityHistorySearchHeader) => import('lit').TemplateResult<1>;

package/dist/primary/shell/src/internal-plugins/activity-history/components/activity-history/activity-history.d.ts

@@ -1,28 +0,0 @@
-import { PrimariaApi } from '../../../../api/api';
-import { BrokerDisposableHandler } from '../../../../api/broker/primaria-broker';
-
-declare const ActivityHistory_base: any;
-export declare class ActivityHistory extends ActivityHistory_base {
-    render(): import('lit').TemplateResult<1>;
-    static styles: import('lit').CSSResult;
-    subscriptions: BrokerDisposableHandler[];
-    connectedCallback(): void;
-    disconnectedCallback(): void;
-    maximized: boolean;
-    api: PrimariaApi;
-    isAnyCollectionLoadingWithoutAnyLoaded: boolean;
-    isSomeCollectionLoadedAndOtherLoading: boolean;
-    historyItems: any[];
-    filtersExpanded: boolean;
-    _toggleFilters(): void;
-    _maximize(): void;
-    _minimize(): void;
-    _subscribeEvents(): void;
-    _unsubscribeEvents(): void;
-    searchQuery: string;
-    _handleSearchChange(event: any): void;
-    _handleSelectDate(date: string): void;
-    selectedDate: Date;
-    scrollToClosestDate(): void;
-}
-export {};

package/dist/primary/shell/src/internal-plugins/activity-history/components/activity-history/template.d.ts

@@ -1,4 +0,0 @@
-import { ActivityHistory } from './activity-history';
-
-export declare const template: (props: ActivityHistory) => import('lit').TemplateResult<1>;
-export declare const headerMaximizedTemplate: (props: ActivityHistory) => import('lit').TemplateResult<1>;

package/dist/primary/shell/src/internal-plugins/activity-history/domain/filter-by-search-string/filter-by-search-string.d.ts

@@ -1,3 +0,0 @@
-import { IActivityHistoryItem } from '../model';
-
-export declare const filterBySearchString: (searchString: string, items: IActivityHistoryItem[], searchPredicate?: (searchString: string, item: IActivityHistoryItem) => boolean) => IActivityHistoryItem[];

package/dist/primary/shell/src/internal-plugins/activity-history/domain/handle-collections/handle-collections.d.ts

@@ -1,19 +0,0 @@
-import { IActivityHistoryItem, IActivityHistoryItemCollection } from '../model';
-
-export declare const addItemToCollection: (collections: Record<string, IActivityHistoryItemCollection>, id: string, item: IActivityHistoryItem, componentFactory: () => HTMLElement) => {
-    [x: string]: IActivityHistoryItemCollection | {
-        id: string;
-        items: IActivityHistoryItem[];
-        componentFactory: () => HTMLElement;
-        searchPredicate: ((searchString: string, item: IActivityHistoryItem) => boolean) | undefined;
-    };
-};
-export declare const addItemsToCollection: (collections: Record<string, IActivityHistoryItemCollection>, id: string, items: IActivityHistoryItem[], componentFactory: () => HTMLElement, searchPredicate?: (searchString: string, item: IActivityHistoryItem) => boolean) => {
-    [x: string]: IActivityHistoryItemCollection | {
-        id: string;
-        items: IActivityHistoryItem[];
-        componentFactory: () => HTMLElement;
-        searchPredicate: ((searchString: string, item: IActivityHistoryItem) => boolean) | undefined;
-    };
-};
-export declare const updateItemInCollection: (collections: Record<string, any>, id: string, updatedItem: IActivityHistoryItem) => Record<string, any>;

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

@@ -1,8 +0,0 @@
-import { Store } from '@reduxjs/toolkit';
-import { AddHistoryItemPayload } from './request';
-
-export declare class AddHistoryItemHandler {
-    private readonly store;
-    constructor(store: Store);
-    handle(payload: AddHistoryItemPayload): Promise<void>;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/features/add-history-items/handler.d.ts

@@ -1,8 +0,0 @@
-import { Store } from '@reduxjs/toolkit';
-import { AddHistoryItemsPayload } from './request';
-
-export declare class AddHistoryItemsHandler {
-    private readonly store;
-    constructor(store: Store);
-    handle(payload: AddHistoryItemsPayload): Promise<void>;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/features/bootstrapper.d.ts

@@ -1,4 +0,0 @@
-import { PrimariaApi } from '../../../api/api';
-
-export declare const bootstrapFeatures: (api: PrimariaApi) => void;
-export declare const teardownFeatures: () => void;

package/dist/primary/shell/src/internal-plugins/activity-history/features/export-to-pdf/handler.d.ts

@@ -1,8 +0,0 @@
-import { PrimariaApi } from '../../../../api/api';
-
-export declare class ExportToPdfHandler {
-    private api;
-    constructor(api: PrimariaApi);
-    handle(): Promise<void>;
-    _notifyError(errorMessage?: string): void;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/features/inject-async-history-items/handler.d.ts

@@ -1,8 +0,0 @@
-import { Store } from '@reduxjs/toolkit';
-import { InjectAsyncHistoryItemsPayload } from './request';
-
-export declare class InjectAsyncHistoryItemsHandler {
-    private readonly store;
-    constructor(store: Store);
-    handle(payload: InjectAsyncHistoryItemsPayload): Promise<void>;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/features/search-items/handler.d.ts

@@ -1,10 +0,0 @@
-import { Store } from '@reduxjs/toolkit';
-import { SearchActivityHistoryItems } from './request';
-import { PrimariaApi } from '../../../..';
-
-export declare class SearchItemsHandler {
-    private readonly store;
-    private api;
-    constructor(store: Store, api: PrimariaApi);
-    handle(request: SearchActivityHistoryItems): Promise<void>;
-}

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

@@ -1,8 +0,0 @@
-import { Store } from '@reduxjs/toolkit';
-import { UpdateHistoryItemPayload } from './request';
-
-export declare class UpdateHistoryItemHandler {
-    private readonly store;
-    constructor(store: Store);
-    handle(payload: UpdateHistoryItemPayload): Promise<void>;
-}

package/dist/primary/shell/src/internal-plugins/activity-history/infrastructure/state/actions.d.ts

@@ -1 +0,0 @@
-export declare const addBusyHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/addBusyHistoryItem">, addErrorHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/addErrorHistoryItem">, addActivityHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/addActivityHistoryItem">, addActivityHistoryItems: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/addActivityHistoryItems">, removeBusyHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/removeBusyHistoryItem">, removeErrorHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/removeErrorHistoryItem">, removeActivityHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/removeActivityHistoryItem">, updateActivityHistoryItem: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/updateActivityHistoryItem">, setSearchString: import('@reduxjs/toolkit').ActionCreatorWithPayload<any, "activity-history/setSearchString">;