Merge pull request #104 from OHDSI/release-1.11.2

Release 1.11.2
OHDSI · Jan 19, 2021 · 1835f37 · 1835f37
2 parents 31371b8 + 4a8b115
commit 1835f37
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Athena",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "main": "public/index.js",
   "license": "Apache-2.0",
   "repository": {

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.odysseusinc.athena</groupId>
     <artifactId>athena-resources</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.2</version>
     <packaging>pom</packaging>
     <name>Athena Resources Bundle</name>
 

diff --git a/src/modules/Admin/components/Statistics/container.ts b/src/modules/Admin/components/Statistics/container.ts
@@ -29,6 +29,7 @@ import presenter, { IStatisticsDispatchProps, IStatisticsProps, IStatisticsState
 import { getSorting, getStatisticFilterForQuery } from './components/selectors';
 import { SortingParams } from "modules/Admin/actions/statistics";
 import { apiPaths } from 'modules/Admin/const';
+import { get } from "lodash";
 
 class Statistics extends Component<IStatisticsProps, {}> {
 
@@ -74,7 +75,8 @@ const mapDispatchToProps = {
 function mapStateToProps(state: Object): IStatisticsStateProps {
     const filter = getStatisticFilterForQuery(state);
     const sorting = getSorting(state);
-    return {sorting, filter};
+    const isLoading=  get(state, 'admin.statistics.isLoading', false);
+    return {sorting, filter, isLoading};
 }
 
 export default connect<IStatisticsStateProps, IStatisticsDispatchProps, {}>(

diff --git a/src/modules/Admin/components/Statistics/presenter.tsx b/src/modules/Admin/components/Statistics/presenter.tsx
@@ -24,6 +24,7 @@
 import * as React from 'react';
 import BEMHelper from "services/BemHelper";
 
+import { LoadingPanel } from 'arachne-ui-components';
 import { Downloads, Filters } from './components';
 import { SortingParams } from "../../actions/statistics";
 import { IStatisticsFilter } from "./components/Filters/presenter";
@@ -37,7 +38,8 @@ interface IStatisticsProps extends IStatisticsStateProps, IStatisticsDispatchPro
 
 interface IStatisticsStateProps {
     sorting: SortingParams,
-    filter: IStatisticsFilter
+    filter: IStatisticsFilter,
+    isLoading: boolean
 }
 
 interface IStatisticsDispatchProps {
@@ -55,6 +57,7 @@ function Statistics(props: IStatisticsProps) {
                 <div {...classes({element: 'downloads-wrapper'})}>
                     <Downloads runSearch={props.runSearch}/>
                 </div>
+                <LoadingPanel active={props.isLoading}/>
             </div>
         </div>);
 }