diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c01493d..38a40e9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
- uses: actions/setup-node@v4
with:
- node-version: 19
+ node-version: 20
- name: Install server
run: yarn --cwd server install
diff --git a/README.md b/README.md
index 17f388e..e28837b 100644
--- a/README.md
+++ b/README.md
@@ -24,16 +24,26 @@ Download and install node. Go to https://nodejs.org/en/download/ and follow the
Once you have Docker and Node installed and setup then do the following:
+```
cp server/sample-bluebutton-config.json server/.bluebutton-config.json
+```
Make sure to replace the clientId and clientSecret variables within the config file with
the ones you were provided, for your application, when you created your Blue Button Sandbox account.
+```
docker-compose up -d
+```
This single command will create the docker container with all the necessary packages, configuration, and code to
run both the front and back ends of this sample application.
+To run the front-end (client component listening on port 3000) in preview mode, set environment variable BB2_APP_LAUNCH=preview when launch docker-compose:
+
+```
+ BB2_APP_LAUNCH=preview docker-compose up -d
+```
+
To see the application in action open your browser and enter the following URL:
http://localhost:3000
@@ -59,21 +69,9 @@ To start the sample in Docker :
1. go to the base directory of the repo
2. docker-compose up
-To start the sample in native OS (e.g. Linux) with server and client components started in separate windows :
-
-1. go to the base directory of the repo
-2. run below to start the server:
- 1. yarn --cwd server install
- 2. yarn --cwd server start
-3. run below to start the client:
- 1. yarn --cwd client install
- 2. yarn --cwd client start-native
-
To stop the sample:
-Both ways of starting the sample are running the sample in foreground, logging and tracing from both client and server components are on stdout of the command window, to stop the sample, press Ctl C, which will terminate both the client and server components.
-
-For client and server started separately in their command window, type Ctrl C respectively
+The sample are running the sample in foreground, logging and tracing from both client and server components are on stdout of the command window, to stop the sample, press Ctl C, which will terminate both the client and server components.
## Error Responses and handling:
diff --git a/client/.eslintignore b/client/.eslintignore
deleted file mode 100644
index e69de29..0000000
diff --git a/client/.eslintrc b/client/.eslintrc
new file mode 100644
index 0000000..1183378
--- /dev/null
+++ b/client/.eslintrc
@@ -0,0 +1,5 @@
+{
+ "extends": [
+ "react-app"
+ ]
+}
diff --git a/client/Dockerfile b/client/Dockerfile
index e1fce45..5540bb8 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,4 +1,8 @@
-FROM node:20-slim
+FROM node:22
+
+ARG BB2-APP_LAUNCH
+
+ENV BB2_APP_LAUNCH=${BB2_APP_LAUNCH:-"start"}
LABEL version="1.1"
LABEL description="Demo of a Medicare claims data sample app"
@@ -10,7 +14,9 @@ COPY . .
# In case machine is Mac M1 chip
RUN node --version
RUN yarn install
+# comment build out if not going to use preview to save build time
+RUN yarn build
EXPOSE 3000
-CMD ["yarn","start"]
\ No newline at end of file
+CMD ["sh", "-c", "yarn $BB2_APP_LAUNCH"]
diff --git a/client/README.md b/client/README.md
index b58e0af..590d730 100644
--- a/client/README.md
+++ b/client/README.md
@@ -1,6 +1,7 @@
-# Getting Started with Create React App
+# Getting Started with Vite
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+This project was created with build tool [Vite](https://v2.vitejs.dev/).
+Vite (French word for "quick", pronounced /vit/, like "veet") is a build tool that aims to provide a faster and leaner development experience for modern web projects.
## Available Scripts
@@ -14,11 +15,6 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
The page will reload if you make edits.\
You will also see any lint errors in the console.
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
### `yarn build`
Builds the app for production to the `build` folder.\
@@ -27,20 +23,20 @@ It correctly bundles React in production mode and optimizes the build for the be
The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+### `yarn preview`
-### `yarn eject`
+Locally preview the production build. Do not use this as a production server as it's not designed for it.
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+## Learn More
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+You can learn more in the [Vite documentation: Getting Started](https://v2.vitejs.dev/guide/).
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+To learn React, check out the [React documentation](https://reactjs.org/).
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+### `yarn test`
-## Learn More
+Run vitest based test (need spinning up the app to pass the tests)
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+### `yarn coverage`
-To learn React, check out the [React documentation](https://reactjs.org/).
+Run vitest based test with coverage (need spinning up the app to pass the tests)
diff --git a/client/eslint.config.mjs b/client/eslint.config.mjs
new file mode 100644
index 0000000..ba47e4d
--- /dev/null
+++ b/client/eslint.config.mjs
@@ -0,0 +1,17 @@
+import { fixupConfigRules } from "@eslint/compat";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+ baseDirectory: __dirname,
+ recommendedConfig: js.configs.recommended,
+ allConfig: js.configs.all
+});
+
+export default [{
+ ignores: [],
+}, ...fixupConfigRules(compat.extends("react-app"))];
\ No newline at end of file
diff --git a/client/index.html b/client/index.html
new file mode 100644
index 0000000..449d9b8
--- /dev/null
+++ b/client/index.html
@@ -0,0 +1,20 @@
+
+
+
+ Medicare claims data sample app
+
+
+ You need to enable JavaScript to run this app.
+
+
+
+
diff --git a/client/package.json b/client/package.json
index 430cbc5..5f3d7aa 100644
--- a/client/package.json
+++ b/client/package.json
@@ -4,28 +4,30 @@
"private": true,
"proxy": "http://localhost:3001",
"dependencies": {
- "@cmsgov/design-system": "^2.7.3",
- "@types/node": "^12.0.0",
- "@types/react": "^17.0.0",
- "@types/react-dom": "^17.0.0",
+ "@cmsgov/design-system": "^10.1.0",
+ "@types/node": "^22.0.0",
+ "@types/react": "^18.2.0",
+ "@types/react-dom": "^18.2.0",
+ "@vitejs/plugin-react-swc": "^3.7.2",
"axios": "^1.7.4",
- "http-proxy-middleware": "^1.3.1",
"micromatch": "4.0.8",
+ "process": "^0.11.10",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.2",
- "react-scripts": "5.0.1",
"sass": "1.72.0",
"typescript": "^4.8.4",
+ "vite-plugin-svgr": "^4.3.0",
+ "vite-tsconfig-paths": "^5.1.3",
"web-vitals": "^3.0.3"
},
"scripts": {
- "start": "REACT_APP_CTX=docker react-scripts start",
- "start-native": "REACT_APP_CTX=native react-scripts start",
- "lint": "eslint --ext .ts --ext .js --ext .tsx .",
- "build": "react-scripts build",
- "test": "react-scripts test",
- "eject": "react-scripts eject"
+ "start": "vite dev --host",
+ "build": "vite build",
+ "preview": "vite preview",
+ "lint": "eslint --max-warnings=100 src",
+ "test": "TEST_APP_API_URL=http://localhost:3000 vitest",
+ "coverage": "TEST_APP_API_URL=http://localhost:3000 vitest run --coverage"
},
"eslintConfig": {
"extends": [
@@ -46,6 +48,7 @@
]
},
"devDependencies": {
+ "@eslint/compat": "^1.2.3",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
@@ -53,8 +56,15 @@
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
- "eslint-config-react-app": "^7.0.0",
- "eslint-plugin-react": "^7.28.0"
+ "@vitest/coverage-v8": "2.1.6",
+ "eslint": "^9.16.0",
+ "eslint-config-react-app": "^7.0.1",
+ "eslint-plugin-react": "^7.28.0",
+ "jsdom": "^25.0.1",
+ "react-error-overlay": "6.0.9",
+ "vite": "^6.0.0",
+ "vite-plugin-eslint": "^1.8.1",
+ "vitest": "^2.1.6"
},
"resolutions": {
"@types/react": "^17.0.2"
diff --git a/client/public/index.html b/client/public/index.html
deleted file mode 100644
index 97e7bcd..0000000
--- a/client/public/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- Medicare claims data sample app
-
-
- You need to enable JavaScript to run this app.
-
-
-
-
diff --git a/client/src/App.test.tsx b/client/src/App.test.tsx
index 2a68616..8b0936b 100644
--- a/client/src/App.test.tsx
+++ b/client/src/App.test.tsx
@@ -1,9 +1,11 @@
import React from 'react';
+import { test } from 'vitest';
import { render, screen } from '@testing-library/react';
+
import App from './App';
-test('renders learn react link', () => {
+test('renders sample app landing page', () => {
render(
+
-
Patient information
diff --git a/client/src/components/header.tsx b/client/src/components/header.tsx
index c081144..f4d5eb2 100644
--- a/client/src/components/header.tsx
+++ b/client/src/components/header.tsx
@@ -1,14 +1,11 @@
import { Badge } from '@cmsgov/design-system';
-import { Link as RouterLink } from 'react-router-dom';
import React from 'react'
export default function Header() {
return (
-
-
+
Blue Button 2.0 Sample App
-
diff --git a/client/src/components/patientData.tsx b/client/src/components/patientData.tsx
index 28ed190..27f0fe2 100644
--- a/client/src/components/patientData.tsx
+++ b/client/src/components/patientData.tsx
@@ -1,19 +1,35 @@
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';
export default function PatientData() {
const [header] = useState('Add your Medicare Prescription Drug data');
- const [settingsState] = useState({
- pkce: true,
- version: 'v2',
- env: 'sandbox'
- });
+ // comment out below because the end point /api/authorize/authurl of
+ // 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({
+ // pkce: true,
+ // version: 'v2',
+ // env: 'sandbox'
+ // });
async function goAuthorize() {
- const authUrlResponse = await axios.get(`/api/authorize/authurl`, { params: settingsState });
- window.location.href = authUrlResponse.data || '/';
+ // 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 } */)
+ .then(response => {
+ return response.data;
+ })
+ .then(data => {
+ window.location.href = data;
+ })
+ .catch(error => {
+ window.location.href = "/";
+ });
+ console.log(authUrlResponseData);
}
/* DEVELOPER NOTES:
@@ -34,7 +50,7 @@ export default function PatientData() {
{ header }
- Authorize
+ Authorize