Merge pull request #27 from OHDSI/release-1.9.0

Release 1.9.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Athena",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "public/index.js",
   "scripts": {
     "build": "webpack -p --progress --colors --env.mode production",
@@ -40,34 +40,35 @@
   "dependencies": {
     "@types/d3-force": "1.0.7",
     "@types/d3-selection": "1.0.14",
-    "@types/d3-transition": "^1.0.8",
+    "@types/d3-transition": "^1.1.3",
     "@types/keymirror": "0.1.1",
     "@types/lodash": "4.14.54",
     "@types/redux-form": "6.3.2",
     "@types/redux-logger": "2.6.34",
     "@types/superagent": "2.0.36",
-    "arachne-ui-components": "1.12.2",
+    "arachne-ui-components": "1.13.43",
     "classnames": "2.2.5",
     "copy-webpack-plugin": "4.0.1",
     "core-js": "2.4.1",
     "css-loader": "0.26.2",
     "d3-drag": "1.0.4",
     "d3-force": "1.0.6",
     "d3-selection": "1.0.5",
-    "d3-transition": "^1.0.4",
-    "d3-zoom": "^1.1.4",
+    "d3-transition": "^1.1.3",
+    "d3-zoom": "^1.7.3",
     "es6-promise": "4.0.5",
     "feathers-client": "1.9.0",
     "feathers-reduxify-services": "0.3.0",
     "feathers-rest-arachne": "1.7.3",
     "gtagger": "^1.0.1",
     "jquery-param": "0.2.0",
     "lodash": "4.17.4",
-    "moment": "^2.20.1",
-    "node-sass": "4.5.0",
+    "moment": "^2.22.2",
+    "node-sass": "4.9.3",
     "numeral": "2.0.4",
     "react": "15.4.2",
     "react-dom": "15.4.2",
+    "react-datepicker": "0.40.0",
     "react-redux": "5.0.3",
     "react-router": "3.0.2",
     "react-router-redux": "4.0.8",
@@ -83,6 +84,6 @@
     "shelljs": "^0.7.8",
     "style-loader": "0.13.2",
     "superagent": "3.5.0",
-    "urijs": "1.18.9"
+    "urijs": "^1.18.2"
   }
 }

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.odysseusinc.athena</groupId>
     <artifactId>athena-resources</artifactId>
-    <version>1.8.0</version>
+    <version>1.9.0</version>
     <packaging>pom</packaging>
     <name>Athena Resources Bundle</name>
 

src/AppContainer.tsx

@@ -37,6 +37,7 @@ import {
 import AboutInfo from 'modules/Portal/components/AboutInfo';
 import imgs from 'const/images';
 import { get } from 'lodash';
+import LicenseAgreement from 'modules/Portal/components/LicenseAgreement';
 
 interface IAppState extends Props<App> {
   isUserAuthed: boolean;
@@ -71,6 +72,7 @@ class App extends Component<IAppProps, {}> {
         {this.props.children}
         <LoadingPanel active={this.props.isLoggingOut} />
         <AboutInfo />
+        <LicenseAgreement />
       </div>
     );
   }

src/modules/Auth/actions/countries.ts

@@ -0,0 +1,38 @@
+/*
+ *
+ * Copyright 2018 Odysseus Data Services, inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Company: Odysseus Data Services, Inc.
+ * Product Owner/Architecture: Gregory Klebanov
+ * Authors: Alexandr Saltykov, Pavel Grafkin, Vitaly Koulakov
+ * Created: December 7, 2018
+ *
+ */
+
+import services from '../apiServices';
+
+const limit = 10;
+
+function query(params) {
+  return services.auth_countries.find({
+    query: {
+      ...params,
+      limit
+    }
+  });
+}
+
+export default {
+  query,
+};

src/modules/Auth/actions/provinces.ts

@@ -0,0 +1,38 @@
+/*
+ *
+ * Copyright 2018 Odysseus Data Services, inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Company: Odysseus Data Services, Inc.
+ * Product Owner/Architecture: Gregory Klebanov
+ * Authors: Alexandr Saltykov, Pavel Grafkin, Vitaly Koulakov
+ * Created: December 10, 2018
+ *
+ */
+
+import services from '../apiServices';
+
+const limit = 10;
+
+function query(params) {
+  return services.auth_provinces.find({
+    query: {
+      ...params,
+      limit,
+    }
+  });
+}
+
+export default {
+  query,
+};

src/modules/Auth/apiServices.ts

@@ -27,6 +27,8 @@ interface IAuthApiServices {
 	users: any;
 	auth_principal: any,
 	auth_professionalTypes: any,
+	auth_countries: any,
+	auth_provinces: any,
 	auth_logout: any,
 	remind_password: any;
 	reset_password: any;
@@ -37,8 +39,10 @@ export default <IAuthApiServices> reduxifyServices(
 	{
 		'users': 'auth_principal',
 		'users/professional-types': 'auth_professionalTypes',
-		'users/logout': 'auth_logout',
-		'users/remind-password': 'remind_password',
-		'users/reset-password': 'reset_password',
+    'users/countries': 'auth_countries',
+		'users/provinces': 'auth_provinces',
+    'users/logout': 'auth_logout',
+    'users/remind-password': 'remind_password',
+    'users/reset-password': 'reset_password',
 	}
 );

src/modules/Auth/components/Register/FormRegister/container.ts

@@ -67,8 +67,18 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     ...ownProps,
     ...stateProps,
     ...dispatchProps,
-    doSubmit(data) {
-      const submitPromise = dispatchProps.doRegister(data);
+    doSubmit: function(data) {
+      const reg = {
+        ...data,
+        address: {
+          ...data.address,
+          country: (data.address && data.address.country) ? ownProps.countries.filter(c => c.value === data.address.country)
+            .map(c => ({isoCode: c.value,})).shift() : null,
+          stateProvince: (data.address && data.address.stateProvince) ? ownProps.provinces.filter(p => p.value === data.address.stateProvince)
+            .map(p => ({isoCode: p.value,})).shift() : null,
+        }
+      };
+      const submitPromise = dispatchProps.doRegister(reg);
 
       submitPromise
         .then(() => dispatchProps.goToWelcome())