From 82e9de267a24370fe2514268a358d4966e7a32ff Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Thu, 6 Feb 2025 08:40:31 -0800 Subject: [PATCH 1/3] add query info text per feedback --- .../src/components/FindPatients/Panels/PanelGroupColumn.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx index e1ebac7ee..dede22eaf 100644 --- a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx +++ b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx @@ -98,6 +98,11 @@ class PanelGroupColumn extends React.Component { } } + public renderQueryInfo(queryState : string) { + if (queryState !== CohortStateType.NOT_LOADED) return null; + return
( To query, drag and drop concepts into boxes below )
+ } + public render() { const { dispatch, panels, panelFilters, queryState } = this.props; return ( @@ -107,6 +112,7 @@ class PanelGroupColumn extends React.Component { {this.setRunQueryButtonContent()} + {this.renderQueryInfo(queryState)} From c782174ba2f28b4408ba7d4a1efc957f84721a49 Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Fri, 7 Feb 2025 11:08:41 -0800 Subject: [PATCH 2/3] fix query info text location --- .../FindPatients/ConceptSearchBox/ConceptSearchBox.tsx | 6 ++++++ .../src/components/FindPatients/Panels/PanelGroupColumn.tsx | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx b/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx index 2d2bf971a..650b3c961 100644 --- a/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx +++ b/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx @@ -151,10 +151,16 @@ export default class ConceptSearchBox extends React.PureComponent } + {this.renderQueryInfo()} ) } + public renderQueryInfo() { + return
( To query, drag and drop concepts into boxes to the right )
+ } + + private toggleRootsDropdown = () => { this.setState({ showRootsDropdown: !this.state.showRootsDropdown }); } diff --git a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx index dede22eaf..e1ebac7ee 100644 --- a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx +++ b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx @@ -98,11 +98,6 @@ class PanelGroupColumn extends React.Component { } } - public renderQueryInfo(queryState : string) { - if (queryState !== CohortStateType.NOT_LOADED) return null; - return
( To query, drag and drop concepts into boxes below )
- } - public render() { const { dispatch, panels, panelFilters, queryState } = this.props; return ( @@ -112,7 +107,6 @@ class PanelGroupColumn extends React.Component { {this.setRunQueryButtonContent()} - {this.renderQueryInfo(queryState)} From cea653588212dab442b0ec10387e177fd6ba6c8b Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Fri, 7 Feb 2025 11:17:04 -0800 Subject: [PATCH 3/3] fix margin, remove previous change --- .../FindPatients/ConceptSearchBox/ConceptSearchBox.tsx | 3 +-- .../src/components/FindPatients/Panels/PanelGroupColumn.tsx | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx b/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx index 650b3c961..cfa8fbbff 100644 --- a/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx +++ b/src/ui-client/src/components/FindPatients/ConceptSearchBox/ConceptSearchBox.tsx @@ -157,10 +157,9 @@ export default class ConceptSearchBox extends React.PureComponent } public renderQueryInfo() { - return
( To query, drag and drop concepts into boxes to the right )
+ return
( To query, drag and drop concepts into boxes to the right )
} - private toggleRootsDropdown = () => { this.setState({ showRootsDropdown: !this.state.showRootsDropdown }); } diff --git a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx index dede22eaf..e1ebac7ee 100644 --- a/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx +++ b/src/ui-client/src/components/FindPatients/Panels/PanelGroupColumn.tsx @@ -98,11 +98,6 @@ class PanelGroupColumn extends React.Component { } } - public renderQueryInfo(queryState : string) { - if (queryState !== CohortStateType.NOT_LOADED) return null; - return
( To query, drag and drop concepts into boxes below )
- } - public render() { const { dispatch, panels, panelFilters, queryState } = this.props; return ( @@ -112,7 +107,6 @@ class PanelGroupColumn extends React.Component { {this.setRunQueryButtonContent()} - {this.renderQueryInfo(queryState)}