Merge pull request #294 from masslight/develop

release Euphrates v0.5
masslight · Jul 31, 2024 · e650eea · e650eea
2 parents 6a06944 + 283ef33
commit e650eea
Show file tree

Hide file tree

Showing 57 changed files with 4,060 additions and 3,448 deletions.
diff --git a/.github/workflows/build-and-deploy-PRODUCTION.yml b/.github/workflows/build-and-deploy-PRODUCTION.yml
@@ -35,7 +35,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Install Vercel CLI
         run: pnpm install --global vercel@latest

diff --git a/.github/workflows/build-and-deploy-telemed-ehr.yml b/.github/workflows/build-and-deploy-telemed-ehr.yml
@@ -68,7 +68,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Check out secrets repo to grab the env file.
         uses: actions/checkout@v3

diff --git a/.github/workflows/build-and-deploy-telemed-intake.yml b/.github/workflows/build-and-deploy-telemed-intake.yml
@@ -63,7 +63,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Check out secrets repo to grab the env file.
         uses: actions/checkout@v3

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -58,7 +58,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Install Vercel CLI
         run: pnpm install --global vercel@latest

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Create secrets file from github secrets
         id: create-json

diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,3 @@
-save-exact = true
-tag-version-prefix=""
+save-exact=true
+tag-version-prefix=""
+link-workspace-packages=true
diff --git a/README.md b/README.md
@@ -69,26 +69,10 @@ This command should display the installed Node.js version.
 
 ### Installing `pnpm`
 
-To manage Node.js packages, we recommend using [pnpm](https://pnpm.io/).
-
-#### Using Homebrew or NPM (macOS/Linux):
-
-The easiest way to get started is to use the [brew](https://brew.sh/) or [npm](https://www.npmjs.com/) command:
-
 ```bash
-brew install pnpm
+npm install -g pnpm@9
 ```
 
-OR
-
-```bash
-npm install -g pnpm
-```
-
-#### Manual Installation
-
-Alternatively, you can install `pnpm` using the [official documentation](https://pnpm.io/installation).
-
 ### Joining Oystehr
 
 You'll need a free Oystehr account to run Ottehr. Register for access at [oystehr.com](https://oystehr.com). Follow these simple steps:
@@ -147,7 +131,7 @@ Once the program finishes running,
 1. The Intake and EHR websites will open.
 1. To log in to the EHR, enter the email you input during the setup program. Click `Forgot password?` and set a password then log in.
 
-The URL for a test location is http://localhost:3002/location/ak/in-person/prebook.
+The URL for a test location is <http://localhost:3002/location/ak/in-person/prebook>.
 
 ## Scripts
 
@@ -177,5 +161,137 @@ Lints all packages using [ESLint](https://eslint.org/).
 
 Interactively updates all dependencies to their latest versions, respecting ranges specified in `package.json`.
 
-## Contribute to Ottehr!
+## SendGrid Email Configuration
+
+### Required Environment / Secrets
+- SENDGRID_API_KEY
+- TELEMED_SENDGRID_EMAIL_BCC
+- TELEMED_SENDGRID_EMAIL_FROM
+- TELEMED_SENDGRID_EMAIL_FROM_NAME
+- TELEMED_SENDGRID_CONFIRMATION_EMAIL_TEMPLATE_ID
+- TELEMED_SENDGRID_CANCELLATION_EMAIL_TEMPLATE_ID
+- TELEMED_SENDGRID_VIDEO_CHAT_INVITATION_EMAIL_TEMPLATE_ID
+
+**Example Confirmation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>You're confirmed!</h2>
+    <p>Thanks for choosing Ottehr!</p><br>
+    <p>Your check-in time for {{ firstName }} at {{ locationName }} is on {{ startTime }}.</p><br>
+    <p>Please complete your paperwork in advance to save time at check-in. <a href="{{ paperworkUrl }}">Click here to complete paperwork</a></p><br>
+    {{#notEquals appointmentType "walkin"}}
+        <p><a href="{{ checkInUrl }}">Click here to modify/cancel your check-in</a></p><br>
+    {{/notEquals}}
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+**Example Cancellation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>Sorry to have you go!</h2>
+    <p>Your appointment for {{firstName}} at {{locationName}} on {{startTime}} has been cancelled.</p><br>
+    <p><a href="{{ locationUrl }}">Click here to book again</a></p><br>
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+**Example Invitation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>You're Invited!</h2>
+    <p>You have been invited to join an Ottehr visit with {{patientName}}.</p><br>
+    <p><a href="{{ inviteUrl }}">Click here to join</a></p><br>
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+## SendGrid Email Configuration
+
+### Required Environment / Secrets
+- SENDGRID_API_KEY
+- TELEMED_SENDGRID_EMAIL_BCC
+- TELEMED_SENDGRID_EMAIL_FROM
+- TELEMED_SENDGRID_EMAIL_FROM_NAME
+- TELEMED_SENDGRID_CONFIRMATION_EMAIL_TEMPLATE_ID
+- TELEMED_SENDGRID_CANCELLATION_EMAIL_TEMPLATE_ID
+- TELEMED_SENDGRID_VIDEO_CHAT_INVITATION_EMAIL_TEMPLATE_ID
+
+**Example Confirmation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>You're confirmed!</h2>
+    <p>Thanks for choosing Ottehr!</p><br>
+    <p>Your check-in time for {{ firstName }} at {{ locationName }} is on {{ startTime }}.</p><br>
+    <p>Please complete your paperwork in advance to save time at check-in. <a href="{{ paperworkUrl }}">Click here to complete paperwork</a></p><br>
+    {{#notEquals appointmentType "walkin"}}
+        <p><a href="{{ checkInUrl }}">Click here to modify/cancel your check-in</a></p><br>
+    {{/notEquals}}
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+**Example Cancellation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>Sorry to have you go!</h2>
+    <p>Your appointment for {{firstName}} at {{locationName}} on {{startTime}} has been cancelled.</p><br>
+    <p><a href="{{ locationUrl }}">Click here to book again</a></p><br>
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+**Example Invitation Template:**
+```html
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+    <h2>You're Invited!</h2>
+    <p>You have been invited to join an Ottehr visit with {{patientName}}.</p><br>
+    <p><a href="{{ inviteUrl }}">Click here to join</a></p><br>
+    <hr>
+    <p>Thank you for choosing Ottehr. We look forward to partnering with you and your family.</p><br>
+    <small>For questions or feedback, please <a target="_blank" href="https://www.ottehr.com/">Check out Ottehr</a></small>
+</body>
+</html>
+```
+
+## Contribute to Ottehr
 We love it when you contribute to Ottehr! By submitting to this project, you agree to adopt the [Developer Certificate of Origin (DCO)](https://developercertificate.org/) for your contributions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ottehr",
-  "version": "0.4",
+  "version": "0.5.0",
   "private": true,
   "scripts": {
     "test": "pnpm recursive run test",
@@ -24,9 +24,9 @@
     "telemed-intake-deploy": "pnpm --filter=telemed-intake-app deploy ${ENV}",
     "telemed-ehr-deploy": "pnpm --filter=telemed-ehr-app deploy ${ENV}"
   },
-  "packageManager": "pnpm@8.7.6",
+  "packageManager": "pnpm@9.6.0",
   "engines": {
-    "pnpm": ">=8.0.0",
+    "pnpm": ">=9.0.0 <10",
     "node": ">=18.0.0"
   },
   "browserslist": {
@@ -105,7 +105,6 @@
     "@mui/material": "^5.14.18",
     "@mui/system": "^5.10.16",
     "@mui/x-date-pickers": "^5.0.10",
-    "@playwright/test": "^1.39.0",
     "@sentry/vite-plugin": "^2.10.2",
     "@types/aws-lambda": "^8.10.109",
     "@types/fhir": "^0.0.35",
@@ -152,4 +151,4 @@
     "vitest": "^0.34.6",
     "web-vitals": "^2.1.4"
   }
-}
+}
diff --git a/packages/ehr-utils/lib/types/data/urgent-care/appointment.types.ts b/packages/ehr-utils/lib/types/data/urgent-care/appointment.types.ts
@@ -101,7 +101,6 @@ export const getVisitStatusHistory = <T extends AppOrEncounter>(resource: T): Vi
     console.log(2, ext);
     const reduced: VisitStatusHistoryEntry = (ext.extension ?? []).reduce(
       (accum, currentExt) => {
-        console.log(1, currentExt);
         if (currentExt.url === 'status') {
           accum.status = currentExt.valueString as VisitStatus;
           accum.label = accum.status ?? 'unknown';

diff --git a/packages/ehr-utils/package.json b/packages/ehr-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ehr-utils",
   "private": true,
-  "version": "0.4",
+  "version": "0.5.0",
   "main": "lib/main.ts",
   "types": "lib/main.ts",
   "scripts": {
@@ -13,10 +13,10 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "ottehr-utils": "*"
+    "ottehr-utils": "workspace:*"
   },
   "devDependencies": {
     "@types/fhir": "^0.0.35",
     "vite": "^4.3.9"
   }
-}
+}
diff --git a/packages/ottehr-components/package.json b/packages/ottehr-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ottehr-components",
   "private": true,
-  "version": "0.4",
+  "version": "0.5.0",
   "main": "lib/main.ts",
   "types": "lib/main.ts",
   "scripts": {
@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "tsconfig": "*",
-    "ottehr-utils": "*"
+    "ottehr-utils": "workspace:*"
   }
-}
+}
diff --git a/packages/telemed-ehr/app/env/.env.local-template b/packages/telemed-ehr/app/env/.env.local-template
@@ -27,4 +27,5 @@ VITE_APP_SAVE_CHART_DATA_ZAMBDA_ID=save-chart-data
 VITE_APP_CHANGE_TELEMED_APPOINTMENT_STATUS_ZAMBDA_ID=change-telemed-appointment-status
 VITE_APP_DELETE_CHART_DATA_ZAMBDA_ID=delete-chart-data
 VITE_APP_GET_TOKEN_FOR_CONVERSATION_ZAMBDA_ID=get-token-for-conversation
+VITE_APP_CANCEL_TELEMED_APPOINTMENT_ZAMBDA_ID=cancel-appointment
 VITE_APP_QRS_URL=http://localhost:3002
diff --git a/packages/telemed-ehr/app/package.json b/packages/telemed-ehr/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "telemed-ehr-app",
-  "version": "0.4",
+  "version": "0.5.0",
   "private": true,
   "browserslist": {
     "production": [
@@ -60,4 +60,4 @@
     "@types/styled-components": "^5.1.34",
     "@types/react-page-visibility": "^6.4.4"
   }
-}
+}
diff --git a/packages/telemed-ehr/app/src/components/schedule/Schedule.tsx b/packages/telemed-ehr/app/src/components/schedule/Schedule.tsx
@@ -134,7 +134,7 @@ function InfoForDay({ day, setDay, updateItem, loading }: InfoForDayProps): Reac
   function createOpenCloseBufferSelectField(type: 'Open' | 'Close', day: Day): ReactElement {
     const typeVerb = type === 'Close' ? 'Closing' : 'Opening';
     const typeLowercase = typeVerb.toLocaleLowerCase();
-    const bufferValue = type === 'Open' ? openingBuffer ?? '' : closingBuffer ?? '';
+    const bufferValue = type === 'Open' ? (openingBuffer ?? '') : (closingBuffer ?? '');
 
     return (
       <FormControl sx={{ marginRight: 2 }}>

diff --git a/packages/telemed-ehr/app/src/pages/Appointments.tsx b/packages/telemed-ehr/app/src/pages/Appointments.tsx
@@ -365,7 +365,6 @@ function AppointmentsBody(props: AppointmentsBodyProps): ReactElement {
                     } else {
                       localStorage.removeItem('selectedVisitTypes');
                     }
-                    console.log(1, value);
                     if (handleSubmit) {
                       handleSubmit(event as any, value, 'visittypes');
                     }

diff --git a/packages/telemed-ehr/app/src/telemed/features/tracking-board/TrackingBoardTabs.tsx b/packages/telemed-ehr/app/src/telemed/features/tracking-board/TrackingBoardTabs.tsx
@@ -25,7 +25,6 @@ export function TrackingBoardTabs(): ReactElement {
   };
 
   const apiClient = useZapEHRAPIClient();
-  console.log(1, providers, groups, 4);
 
   const { isFetching, isFetchedAfterMount } = useGetTelemedAppointments(
     {

diff --git a/packages/telemed-ehr/zambdas/package.json b/packages/telemed-ehr/zambdas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "telemed-ehrzambdas",
-  "version": "0.4",
+  "version": "0.5.0",
   "private": true,
   "scripts": {
     "start": "npm run start:local",
@@ -19,10 +19,6 @@
     "package": "tsc && sls package && npm run rebundle",
     "rebundle": "bash scripts/package-for-release.sh"
   },
-  "engines": {
-    "npm": ">=8.0.0",
-    "node": ">=18.0.0"
-  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.272.0",
     "@sendgrid/mail": "^7.7.0",
@@ -38,4 +34,4 @@
     "esbuild": "^0.18.14",
     "serverless-esbuild": "^1.48.0"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ export function TrackingBoardTabs(): ReactElement { @@
       };
       const apiClient = useZapEHRAPIClient();
-      console.log(1, providers, groups, 4);
       const { isFetching, isFetchedAfterMount } = useGetTelemedAppointments(
         {
@@ Expand Down @@