merge conflicts resolved

.meteor/.versions

@@ -16,7 +16,7 @@ [email protected]
 clinical:[email protected]
 clinical:[email protected]
 clinical:[email protected]
-clinical:hl7-fhir-data-infrastructure@6.33.0
+clinical:hl7-fhir-data-infrastructure@6.24.0
 clinical:[email protected]
 [email protected]
 [email protected]

.meteor/cordova-plugins

@@ -1,12 +1,12 @@
-# com.telerik.plugins.healthkit@https://github.com/rossmartin/HealthKit.git
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
-# [email protected]
+com.telerik.plugins.healthkit@https://github.com/rossmartin/HealthKit.git
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]

.meteor/packages

@@ -22,7 +22,7 @@ alanning:roles
 # DATA INFRASTRUCTURE
 [email protected]                   # The database Meteor supports right now
 [email protected]            # Reactive variable for tracker
-react-meteor-data              # React higher-order component for reactively tracking Meteor data
+react-meteor-data@2.4.0        # React higher-order component for reactively tracking Meteor data
 [email protected]
 [email protected]
 [email protected]
@@ -39,18 +39,16 @@ [email protected]             # Enable ECMAScript2015+ syntax in app code
 [email protected]            # Server-side component of the `meteor shell` command
 [email protected]
 npdev:react-loadable
-# fourseven:scss
 littledata:synced-cron
 
 # CLINICAL INFRASTRUCTURE
-clinical:[email protected]
-clinical:[email protected]
+clinical:extended-api
+clinical:fonts
+clinical:hl7-resource-datatypes
 clinical:hl7-fhir-data-infrastructure
-# clinical:[email protected]
-# clinical:[email protected]
-# clinical:json-routes
-# clinical:vault-server
-# clinical:uscore
+clinical:json-routes
+clinical:vault-server
+clinical:uscore
 
 # TESTING
 # meteortesting:mocha
@@ -72,3 +70,4 @@ clinical:hl7-fhir-data-infrastructure
 # mitre:space-health-registry
 # symptomatic:data-relay
 # symptomatic:data-importer
+

.meteor/versions

@@ -15,8 +15,11 @@ [email protected]
 [email protected]
 clinical:[email protected]
 clinical:[email protected]
-clinical:hl7-fhir-data-infrastructure@6.33.7
+clinical:hl7-fhir-data-infrastructure@6.34.1
 clinical:[email protected]
+clinical:[email protected]
+clinical:[email protected]
+clinical:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -31,6 +34,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+fourseven:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -39,15 +43,16 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-littledata:[email protected].0
+littledata:[email protected].1
 [email protected]
 [email protected]
 [email protected]
 matb33:[email protected]
 [email protected]
 [email protected]
+meteorhacks:[email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -80,7 +85,7 @@ simple:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 tmeasday:[email protected]

app/accounts/Accounts.js

@@ -13,6 +13,7 @@ let apiHostFromSettings = get(Meteor, 'settings.public.interfaces.accountsServer
 // console.log('Accounts.apiHost', apiHostFromSettings);
 
 const accountsRest = new RestClient({
+  // apiHost: 'http://localhost:4000',
   apiHost: apiHostFromSettings,
   rootPath: '/accounts'
 });

app/core/AppLoadingPage.jsx

@@ -23,7 +23,6 @@ const drawerWidth =  get(Meteor, 'settings.public.defaults.drawerWidth', 280);
 
 import { Meteor } from 'meteor/meteor';
 
-
 function AppLoadingPage(props) {
   // if(logger){
   //   logger.debug('Rendering the AppLoadingPage.');

app/layout/Header.jsx

@@ -365,6 +365,22 @@ function Header(props) {
     Session.toggle('mainAppDialogOpen');
   }
 
+  function toggleLoginDialog(){
+    console.log('Toggle login dialog open/close.')
+    Session.set('mainAppDialogJson', false);
+    Session.set('mainAppDialogMaxWidth', "sm");
+
+    if(Session.get('currentUser')){
+      Session.set('mainAppDialogTitle', "Logout");
+      Session.set('mainAppDialogComponent', "LogoutDialog");
+    } else {
+      Session.set('mainAppDialogTitle', "Login");
+      Session.set('mainAppDialogComponent', "LoginDialog");      
+    }
+
+    Session.toggle('mainAppDialogOpen');
+  }
+
 
   let demographicItems;
   let dateTimeItems;

app/patient/AutoDashboard.jsx

@@ -49,6 +49,19 @@ export function AutoDashboard(props){
         basicQuery: {}
     }
 
+    data.selectedPatientId = useTracker(function(){
+        return Session.get('selectedPatientId');
+    }, []);
+    data.selectedPatient = useTracker(function(){
+        if(Session.get('selectedPatientId')){
+            return Patients.findOne({id: Session.get('selectedPatientId')});
+        } else if(get(Session.get('currentUser'), 'patientId')){
+            return Patients.findOne({id: get(Session.get('currentUser'), 'patientId')});
+        }   
+    }, []);
+    data.patients = useTracker(function(){
+        return Patients.find().fetch();
+    }, []);
 
     let [careTeamsPage, setCareTeamsPage] = useState(0);
     let [carePlansPage, setCarePlansPage] = useState(0);

certs/jwks.json

@@ -0,0 +1,13 @@
+{
+    "keys": [
+        {
+            "kty": "EC",
+            "use": "sig",
+            "crv": "P-256",
+            "kid": "yRwxp3sb7ldGlbGcw42zkcamMCo_9QZqUqKR6ZFQtH8",
+            "x": "ivxR4CWtwm4B0D4Bqbg3YnlQO6SuzF-VFZ66D44IDLA",
+            "y": "T6EdDPqAz9sIBrTXaR0KTFlbQsmdCbV4ZpObVo_80MY",
+            "alg": "ES256"
+        }
+    ]
+}

certs/private.jwks.json

@@ -0,0 +1,14 @@
+{
+    "keys": [
+        {
+            "kty": "EC",
+            "d": "hp2_IVKLNhXUZCqz38TBnp4fHqsMq-dVwxDNhnTtRYI",
+            "use": "sig",
+            "crv": "P-256",
+            "kid": "yRwxp3sb7ldGlbGcw42zkcamMCo_9QZqUqKR6ZFQtH8",
+            "x": "ivxR4CWtwm4B0D4Bqbg3YnlQO6SuzF-VFZ66D44IDLA",
+            "y": "T6EdDPqAz9sIBrTXaR0KTFlbQsmdCbV4ZpObVo_80MY",
+            "alg": "ES256"
+        }
+    ]
+}

client/meteor-adapter-client.js

@@ -93,4 +93,4 @@ export const wrapMeteorClient = (Meteor, Accounts, AccountsClient) => {
     obj: AccountsClient,
     method: 'logout',
   });
-};
+};