Adjustments to button and client settings

Author: jimmyfagan

client/src/components/patientData.tsx

@@ -1,7 +1,7 @@
 import { Button } from '@cmsgov/design-system';
 import axios from 'axios';
 import chart from '../images/who-charted.png'
-//import { SettingsType } from '../types/settings';
+import { SettingsType } from '../types/settings';
 import React, { useState } from 'react';
 import * as process from 'process'; 
 
@@ -11,15 +11,12 @@ export default function PatientData() {
     // the server component (on port 3001), does not take parameter such as pkce, version, env
     // they are generated by the server component.
     //
-    // const [settingsState] = useState<SettingsType>({
-    //     pkce: true,
-    //     version: 'v2',
-    //     env: 'sandbox'
-    // });
+    const [settingsState] = useState<SettingsType>({
+        useDefaultDataButton: true,
+    });
     async function goAuthorize() {
-        // comment out '{ params: settingsState }' since /api/authorize/authurl does not take params
         const test_url = process.env.TEST_APP_API_URL ? process.env.TEST_APP_API_URL : ''
-        const authUrlResponseData = await axios.get(`${test_url}/api/authorize/authurl`/*, { params: settingsState } */)
+        const authUrlResponseData = await axios.get(`${test_url}/api/authorize/authurl`)
         .then(response => {
             return response.data;
         })
@@ -32,8 +29,8 @@ export default function PatientData() {
         console.log(authUrlResponseData);
     }    
     async function goLoadDefaults() {
-        const authUrlResponse = await axios.get(`/api/bluebutton/loadDefaults`);
-        window.location.href = authUrlResponse.data || '/';
+        const loadDefaultsData = await axios.get(`/api/bluebutton/loadDefaults`);
+        window.location.href = loadDefaultsData.data || '/';
     }    
 
     /* DEVELOPER NOTES:
@@ -57,9 +54,13 @@ export default function PatientData() {
                 <div className='ds-u-margin-top--2'>
                     <Button id="auth_btn" variation="solid" onClick={goAuthorize}>Authorize</Button>
                 </div>
-                <div className='ds-u-margin-top--2'>
-                    <Button id="load_defaults_btn" variation="solid" onClick={goLoadDefaults}>Load default data</Button>
-                </div>
+                {
+                    settingsState.useDefaultDataButton ?
+                    <div className='ds-u-margin-top--2'>
+                        <Button id="load_defaults_btn" variation="primary" onClick={goLoadDefaults}>Load default data</Button>
+                    </div> :
+                        null
+                }
             </div>
         </div>
     );

client/src/types/settings.ts

@@ -1,5 +1,3 @@
 export type SettingsType = {
-    env: 'sandbox' | 'local' | 'production',
-    version: 'v1' | 'v2',
-    pkce: boolean,
+    useDefaultDataButton: boolean
 }

server/app.py

@@ -106,7 +106,7 @@ def load_default_data():
 
 
 def load_data_file(dataset_name, resource_file_name):
-    response_file = open("./defaultDatasets/{}/{}.json".format(dataset_name, resource_file_name), 'r')
+    response_file = open("./default_datasets/{}/{}.json".format(dataset_name, resource_file_name), 'r')
     resource = json.load(response_file)
     response_file.close()
     return resource