fix: change program in search

dhis2 · Aug 14, 2023 · 261d312 · 261d312
1 parent 72ac535
commit 261d312
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ture-core/components/Pages/common/TEIRelationshipsWidget/TeiSearch/TeiSearch.container.js b/...ture-core/components/Pages/common/TEIRelationshipsWidget/TeiSearch/TeiSearch.container.js
@@ -15,15 +15,16 @@ import { getSearchGroups } from './getSearchGroups';
 import { getTrackedEntityTypeThrowIfNotFound } from '../../../../../metaData';
 
 const mapStateToProps = (state: ReduxState, props: OwnProps) => {
-    const { selectedProgramId, selectedTrackedEntityTypeId } = props;
-    const searchGroups = getSearchGroups(selectedTrackedEntityTypeId, selectedProgramId);
-    const { name } = getTrackedEntityTypeThrowIfNotFound(selectedTrackedEntityTypeId);
     const currentTeiSearch = state.teiSearch[props.id] ?? {};
+    const { selectedTrackedEntityTypeId } = props;
+    const searchGroups = getSearchGroups(selectedTrackedEntityTypeId, currentTeiSearch.selectedProgramId);
+    const { name } = getTrackedEntityTypeThrowIfNotFound(selectedTrackedEntityTypeId);
     return {
         searchGroups,
         showResults: !!currentTeiSearch.searchResults,
         openSearchGroupSection: currentTeiSearch.openSearchGroupSection,
         trackedEntityTypeName: name.toLowerCase(),
+        selectedProgramId: currentTeiSearch.selectedProgramId,
     };
 };
 

diff --git a/.../capture-core/components/Pages/common/TEIRelationshipsWidget/TeiSearch/TeiSearch.types.js b/.../capture-core/components/Pages/common/TEIRelationshipsWidget/TeiSearch/TeiSearch.types.js
@@ -6,6 +6,7 @@ type PropsFromRedux = {|
     showResults?: ?boolean,
     openSearchGroupSection: ?string,
     trackedEntityTypeName: string,
+    selectedProgramId: ?string,
 |}
 
 type DispatchersFromRedux = {|
@@ -22,7 +23,6 @@ export type OwnProps = {|
     getResultsView: Function,
     resultsPageSize: number,
     selectedTrackedEntityTypeId: string,
-    selectedProgramId: ?string,
 |}
 
 export type Props = {| ...OwnProps, ...DispatchersFromRedux, ...PropsFromRedux, ...CssClasses |}
diff --git a/...psWidget/TrackedEntityRelationshipsWrapper/TrackedEntityRelationshipsWrapper.component.js b/...psWidget/TrackedEntityRelationshipsWrapper/TrackedEntityRelationshipsWrapper.component.js
@@ -89,7 +89,6 @@ export const TrackedEntityRelationshipsWrapper = ({
                     <TeiSearch
                         resultsPageSize={5}
                         id="relationshipTeiSearchWidget"
-                        selectedProgramId={searchProgramId}
                         selectedTrackedEntityTypeId={searchTrackedEntityTypeId}
                         getResultsView={viewProps => (
                             <TeiRelationshipSearchResults