From 136e6ab88c2a87876c57fe144af16b48dfd48207 Mon Sep 17 00:00:00 2001 From: aykhanahmadli Date: Tue, 17 Sep 2024 17:02:44 +0200 Subject: [PATCH 01/24] fix: confirm DOB translation --- package.json | 1 + .../app/src/pages/ConfirmDateOfBirth.tsx | 11 +++++++---- pnpm-lock.yaml | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4b910103..6cbe41a5 100644 --- a/package.json +++ b/package.json @@ -129,6 +129,7 @@ "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-react-hooks": "^4.6.0", "happy-dom": "^12.10.3", + "html-entities": "2.5.2", "husky": "^8.0.0", "inquirer": "^8.0.0", "jest": "^29.7.0", diff --git a/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx b/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx index d6ece882..5589ab85 100644 --- a/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx +++ b/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx @@ -16,6 +16,7 @@ import { CustomContainer } from '../features/common'; import { useGetPaperwork, usePaperworkStore } from '../features/paperwork'; import { usePatientInfoStore } from '../features/patient-info'; import { useZapEHRAPIClient } from '../utils'; +import { decode } from 'html-entities'; const ConfirmDateOfBirth = (): JSX.Element => { const navigate = useNavigate(); @@ -223,10 +224,12 @@ const ConfirmDateOfBirth = (): JSX.Element => { {t('confirmDateOfBirth.notConfirmed')} - {t('dateOfBirthErrorMessage', { - formattedDOB: formattedDOB ? `(${formattedDOB})` : '', - patientFirstName: patientInfo?.firstName ? `(${patientInfo?.firstName})` : '', - })} + {decode( + t('confirmDateOfBirth.dateOfBirthErrorMessage', { + formattedDOB: formattedDOB ? formattedDOB : '', + patientFirstName: patientInfo?.firstName || '', + }), + )} {t('confirmDateOfBirth.tryAgain')} Date: Tue, 17 Sep 2024 17:22:56 +0200 Subject: [PATCH 02/24] fix: custom radio button icon --- .../lib/components/form/CustomRadioButtonIcon.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/ottehr-components/lib/components/form/CustomRadioButtonIcon.tsx b/packages/ottehr-components/lib/components/form/CustomRadioButtonIcon.tsx index ada62952..d9bd3e89 100644 --- a/packages/ottehr-components/lib/components/form/CustomRadioButtonIcon.tsx +++ b/packages/ottehr-components/lib/components/form/CustomRadioButtonIcon.tsx @@ -12,9 +12,15 @@ const CustomRadioButtonIcon: FC = ({ checked, alt, }: CustomRadioIconProps): JSX.Element => ( - - - + + {checked ? ( + <> + + + + ) : ( + + )} ); From 82c10793c0215aec8a1cddd075c42ebb0bce9e85 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Tue, 17 Sep 2024 13:37:27 -0400 Subject: [PATCH 03/24] issue #403 --- .../app/src/telemed/features/telemed-admin/EditState.tsx | 7 ++----- packages/telemed-intake/app/src/App.tsx | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx index 45db4a02..a8d0c09d 100644 --- a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx @@ -27,7 +27,7 @@ export default function EditStatePage(): JSX.Element { const theme = useTheme(); const [isOperateInStateChecked, setIsOperateInStateChecked] = useState(false); const { state } = useParams(); - const fullLabel = `${state} - ${AllStatesToNames[state as StateType]}`; + const [fullLabel, setFullLabel] = useState(`${state} - ${AllStatesToNames[state as StateType]}`); if (!fhirClient || !state) { throw new Error('fhirClient or state is not initialized.'); @@ -93,14 +93,11 @@ export default function EditStatePage(): JSX.Element { diff --git a/packages/telemed-intake/app/src/App.tsx b/packages/telemed-intake/app/src/App.tsx index 950de939..da57c6a5 100644 --- a/packages/telemed-intake/app/src/App.tsx +++ b/packages/telemed-intake/app/src/App.tsx @@ -136,7 +136,7 @@ function App(): JSX.Element { } errorFallback={} - unauthorizedFallback={} + unauthorizedFallback={} /> } > From 971ef33ecae59e5003e644de84f2c2c5b76115d3 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Tue, 17 Sep 2024 14:56:02 -0400 Subject: [PATCH 04/24] issues #366 and #367 --- .../features/telemed-admin/EditState.tsx | 43 ++++++++++++------- .../telemed-admin/telemed-admin.queries.tsx | 8 ++-- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx index a8d0c09d..8409caea 100644 --- a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx @@ -26,8 +26,9 @@ export default function EditStatePage(): JSX.Element { const { fhirClient } = useApiClients(); const theme = useTheme(); const [isOperateInStateChecked, setIsOperateInStateChecked] = useState(false); + const [stateName, setStateName] = useState(undefined); const { state } = useParams(); - const [fullLabel, setFullLabel] = useState(`${state} - ${AllStatesToNames[state as StateType]}`); + const fullLabel = `${state} - ${AllStatesToNames[state as StateType]}`; if (!fhirClient || !state) { throw new Error('fhirClient or state is not initialized.'); @@ -39,12 +40,13 @@ export default function EditStatePage(): JSX.Element { { onSuccess: (location) => { setIsOperateInStateChecked(Boolean(location && location.status === 'active')); + setStateName(location?.name); }, }, ); const mutation = useMutation(({ location, newStatus }: { location: Location; newStatus: string }) => - updateStateLocationStatus(fhirClient, location, newStatus), + updateStateLocationStatusAndName(fhirClient, location, newStatus, stateName ?? ''), ); const onSwitchChange = (value: boolean): void => { @@ -68,7 +70,7 @@ export default function EditStatePage(): JSX.Element { {/* Breadcrumbs */} }, ]} /> @@ -92,13 +94,18 @@ export default function EditStatePage(): JSX.Element { - + {isFetching ? ( + + ) : ( + setStateName(e.target.value)} + sx={{ marginBottom: 2 }} + margin="dense" + /> + )} {isFetching ? ( @@ -166,10 +173,10 @@ async function getStateLocation(fhirClient: FhirClient, state: StateType): Promi name: 'address-state', value: state, }, - { - name: 'name:contains', - value: 'virtual', - }, + // { + // name: 'name:contains', + // value: 'virtual', + // }, ], })) as Location[]; @@ -180,10 +187,11 @@ async function getStateLocation(fhirClient: FhirClient, state: StateType): Promi ); } -async function updateStateLocationStatus( +async function updateStateLocationStatusAndName( fhirClient: FhirClient, location: Location, status: string, + name: string, ): Promise { const updatedLocation = await fhirClient.patchResource({ resourceType: 'Location', @@ -194,6 +202,11 @@ async function updateStateLocationStatus( path: '/status', value: status, }, + { + op: location.name ? 'replace' : 'add', + path: '/name', + value: name, + }, ], }); return updatedLocation; diff --git a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/telemed-admin.queries.tsx b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/telemed-admin.queries.tsx index 934730fd..988b9ab7 100644 --- a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/telemed-admin.queries.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/telemed-admin.queries.tsx @@ -18,10 +18,10 @@ export const useStatesQuery = () => { name: 'address-state:missing', value: 'false', }, - { - name: 'name:contains', - value: 'virtual', - }, + // { + // name: 'name:contains', + // value: 'virtual', + // }, ], }); From e4ac486499b0df08a7a895d6e9993918d11d496f Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Tue, 17 Sep 2024 15:03:01 -0400 Subject: [PATCH 05/24] removed changes from other branch --- packages/telemed-intake/app/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telemed-intake/app/src/App.tsx b/packages/telemed-intake/app/src/App.tsx index da57c6a5..950de939 100644 --- a/packages/telemed-intake/app/src/App.tsx +++ b/packages/telemed-intake/app/src/App.tsx @@ -136,7 +136,7 @@ function App(): JSX.Element { } errorFallback={} - unauthorizedFallback={} + unauthorizedFallback={} /> } > From 569547eb3660fbdc37d144eb43e796cf0ad5b847 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Tue, 17 Sep 2024 15:04:49 -0400 Subject: [PATCH 06/24] State name -> State --- .../app/src/telemed/features/telemed-admin/States.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/States.tsx b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/States.tsx index a4cc4d16..32057c3e 100644 --- a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/States.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/States.tsx @@ -96,7 +96,7 @@ export default function StatesPage(): ReactElement { {/* Label Row */} - State name + State Operate in state From 15bc2ad860bd487fd09501bb83798d048dc9d92a Mon Sep 17 00:00:00 2001 From: Michael Timpson Date: Tue, 17 Sep 2024 21:00:18 -0400 Subject: [PATCH 07/24] Add missing FavIcon files for Intake & EHR app --- .../telemed-ehr/app/public/favicon-16x16.png | Bin 0 -> 545 bytes .../telemed-ehr/app/public/favicon-32x32.png | Bin 0 -> 1084 bytes packages/telemed-ehr/app/public/favicon.ico | Bin 0 -> 5073 bytes packages/telemed-ehr/app/public/manifest.json | 2 +- packages/telemed-intake/app/index.html | 2 +- .../telemed-intake/app/public/favicon-16x16.png | Bin 0 -> 545 bytes .../telemed-intake/app/public/favicon-32x32.png | Bin 0 -> 1084 bytes packages/telemed-intake/app/public/favicon.ico | Bin 0 -> 5073 bytes packages/telemed-intake/app/public/manifest.json | 15 +++++++++++++++ 9 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 packages/telemed-ehr/app/public/favicon-16x16.png create mode 100644 packages/telemed-ehr/app/public/favicon-32x32.png create mode 100644 packages/telemed-ehr/app/public/favicon.ico create mode 100644 packages/telemed-intake/app/public/favicon-16x16.png create mode 100644 packages/telemed-intake/app/public/favicon-32x32.png create mode 100644 packages/telemed-intake/app/public/favicon.ico create mode 100644 packages/telemed-intake/app/public/manifest.json diff --git a/packages/telemed-ehr/app/public/favicon-16x16.png b/packages/telemed-ehr/app/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..2f08a5095ecf8bd54759a83d7f652673b53e979b GIT binary patch literal 545 zcmV++0^a?JP)Px$+et)0R5(wiliy2IVI0Ok@8*vY1tlVLxzxoJRu1fdXJ z47VLaAp#+xo5-uY5V0H<-Rv(Y4+Rz$D~?KYP8lUgFm*d`oCCA=BO>-*zVGus-{<>$ zpRb_IBg*_wNdix2uNT9(iIk_z0#fin*zC{rH_yKm7AzzX9={R-0un0z1PjQ3ZB*A@ zs3vFbEswzCzY>-hA)A1cjSiaYDlOdd<{lqc(-;y{vZ`y5a1nteJDXiD|7wlk0^nwwamZWrv3N<8r)45WG%je_Vp*-=MFJ8n_@EhBcf}Oo+5%1#~jLh zzzvQ%XuQsJ^fS_s+_>O_)oDm?(mnRg^rHkpM~`~x?7`r~fD;@}Xu8H?EP<48y43|M zGmuVl=V_9c+V=hBg-9@8L1(Y`_Qk_XgO_Xa##d;@qgUTE6R)?5O*DaP(V?)b#%`JO zx0Bq;s`Xvt#bdM*C#B%sy%5L%1wq0Jk{G4^fhvS39i&`U`Tnk#tmp&UtUH@nL>N=z j%)@_1`M-Co>}~u79rmOVr89rP00000NkvXXu0mjfa}xd+ literal 0 HcmV?d00001 diff --git a/packages/telemed-ehr/app/public/favicon-32x32.png b/packages/telemed-ehr/app/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..28ee3196d6b2e059d93f8caae713e69222b9b90f GIT binary patch literal 1084 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 literal 0 HcmV?d00001 diff --git a/packages/telemed-ehr/app/public/manifest.json b/packages/telemed-ehr/app/public/manifest.json index 8f0c12fa..92f769d3 100644 --- a/packages/telemed-ehr/app/public/manifest.json +++ b/packages/telemed-ehr/app/public/manifest.json @@ -4,7 +4,7 @@ "icons": [ { "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", + "sizes": "32x32 16x16", "type": "image/x-icon" } ], diff --git a/packages/telemed-intake/app/index.html b/packages/telemed-intake/app/index.html index a938db6a..9c82b14a 100644 --- a/packages/telemed-intake/app/index.html +++ b/packages/telemed-intake/app/index.html @@ -2,7 +2,7 @@ - + Ottehr Telemedicine diff --git a/packages/telemed-intake/app/public/favicon-16x16.png b/packages/telemed-intake/app/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..2f08a5095ecf8bd54759a83d7f652673b53e979b GIT binary patch literal 545 zcmV++0^a?JP)Px$+et)0R5(wiliy2IVI0Ok@8*vY1tlVLxzxoJRu1fdXJ z47VLaAp#+xo5-uY5V0H<-Rv(Y4+Rz$D~?KYP8lUgFm*d`oCCA=BO>-*zVGus-{<>$ zpRb_IBg*_wNdix2uNT9(iIk_z0#fin*zC{rH_yKm7AzzX9={R-0un0z1PjQ3ZB*A@ zs3vFbEswzCzY>-hA)A1cjSiaYDlOdd<{lqc(-;y{vZ`y5a1nteJDXiD|7wlk0^nwwamZWrv3N<8r)45WG%je_Vp*-=MFJ8n_@EhBcf}Oo+5%1#~jLh zzzvQ%XuQsJ^fS_s+_>O_)oDm?(mnRg^rHkpM~`~x?7`r~fD;@}Xu8H?EP<48y43|M zGmuVl=V_9c+V=hBg-9@8L1(Y`_Qk_XgO_Xa##d;@qgUTE6R)?5O*DaP(V?)b#%`JO zx0Bq;s`Xvt#bdM*C#B%sy%5L%1wq0Jk{G4^fhvS39i&`U`Tnk#tmp&UtUH@nL>N=z j%)@_1`M-Co>}~u79rmOVr89rP00000NkvXXu0mjfa}xd+ literal 0 HcmV?d00001 diff --git a/packages/telemed-intake/app/public/favicon-32x32.png b/packages/telemed-intake/app/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..28ee3196d6b2e059d93f8caae713e69222b9b90f GIT binary patch literal 1084 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 literal 0 HcmV?d00001 diff --git a/packages/telemed-intake/app/public/manifest.json b/packages/telemed-intake/app/public/manifest.json new file mode 100644 index 00000000..92f769d3 --- /dev/null +++ b/packages/telemed-intake/app/public/manifest.json @@ -0,0 +1,15 @@ +{ + "short_name": "Ottehr EHR", + "name": "Ottehr EHR", + "icons": [ + { + "src": "favicon.ico", + "sizes": "32x32 16x16", + "type": "image/x-icon" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} From a9e4f54ee17f335d64096260f8c8d48481524b4a Mon Sep 17 00:00:00 2001 From: Aykhan Ahmadli Date: Thu, 19 Sep 2024 01:39:36 +0200 Subject: [PATCH 08/24] refactor Co-authored-by: Gilad Schneider <73044725+GiladSchneider@users.noreply.github.com> Signed-off-by: Aykhan Ahmadli --- packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx b/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx index 5589ab85..7dd80b40 100644 --- a/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx +++ b/packages/telemed-intake/app/src/pages/ConfirmDateOfBirth.tsx @@ -226,7 +226,7 @@ const ConfirmDateOfBirth = (): JSX.Element => { {decode( t('confirmDateOfBirth.dateOfBirthErrorMessage', { - formattedDOB: formattedDOB ? formattedDOB : '', + formattedDOB: formattedDOB ?? '', patientFirstName: patientInfo?.firstName || '', }), )} From 5485ff04c72bd3b57024f796f3ac35f3bf326ad7 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 11:41:47 -0400 Subject: [PATCH 09/24] adds required to textfield --- .../app/src/telemed/features/telemed-admin/EditState.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx index 8409caea..831d0895 100644 --- a/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/telemed-admin/EditState.tsx @@ -104,6 +104,7 @@ export default function EditStatePage(): JSX.Element { onChange={(e) => setStateName(e.target.value)} sx={{ marginBottom: 2 }} margin="dense" + required /> )} From 15891e76d28970f9870c95489a4ccde3f8a3ece6 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 15:02:02 -0400 Subject: [PATCH 10/24] dev -> development --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cb6b5f3..91548810 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,11 +34,11 @@ jobs: name: 'secrets.json' json: ${{ secrets.OTTEHR_SECRETS_JSON }} - - name: Set the telemed-ehr/zambdas/.env/dev.json - run: cp packages/telemed-ehr/zambdas/.env/local.template.json packages/telemed-ehr/zambdas/.env/dev.json + - name: Set the telemed-ehr/zambdas/.env/development.json + run: cp packages/telemed-ehr/zambdas/.env/local.template.json packages/telemed-ehr/zambdas/.env/development.json - - name: Set the telemed-intake/zambdas/.env/dev.json - run: cp packages/telemed-intake/zambdas/.env/local.template.json packages/telemed-intake/zambdas/.env/dev.json + - name: Set the telemed-intake/zambdas/.env/development.json + run: cp packages/telemed-intake/zambdas/.env/local.template.json packages/telemed-intake/zambdas/.env/development.json - name: Set the urgent-care-intake/zambdas/.env/dev.json run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/dev.json From 548913c33539bd9f983141544137f7cc65c2340f Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 15:03:05 -0400 Subject: [PATCH 11/24] dev -> development --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91548810..e1ce2d59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,8 @@ jobs: - name: Set the telemed-intake/zambdas/.env/development.json run: cp packages/telemed-intake/zambdas/.env/local.template.json packages/telemed-intake/zambdas/.env/development.json - - name: Set the urgent-care-intake/zambdas/.env/dev.json - run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/dev.json + - name: Set the urgent-care-intake/zambdas/.env/development.json + run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/development.json - id: get-store-path run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT From 25426549abb1b7838f74592ef3db2726a002c492 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 16:10:05 -0400 Subject: [PATCH 12/24] fixes build probably --- .../telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts | 2 +- packages/telemed-intake/zambdas/scripts/common.ts | 2 +- packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts b/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts index d39e018a..4856e548 100644 --- a/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts +++ b/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts @@ -1,4 +1,4 @@ -import devConfig from '../.env/dev.json'; +import devConfig from '../.env/development.json'; // import testingConfig from '../.env/testing.json'; import { getAuth0Token } from '../src/shared'; import { ZambdaClient } from '@zapehr/sdk'; diff --git a/packages/telemed-intake/zambdas/scripts/common.ts b/packages/telemed-intake/zambdas/scripts/common.ts index cfca6856..9e17db08 100644 --- a/packages/telemed-intake/zambdas/scripts/common.ts +++ b/packages/telemed-intake/zambdas/scripts/common.ts @@ -1,4 +1,4 @@ -import devConfig from '../.env/dev.json'; +import devConfig from '../.env/development.json'; // import testingConfig from '../.env/testing.json'; import { FhirClient, ZambdaClient } from '@zapehr/sdk'; import { getM2MClientToken } from '../src/shared'; diff --git a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts index d01e6397..26cffa3c 100644 --- a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts +++ b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts @@ -1,7 +1,7 @@ import { BatchInputDeleteRequest, BatchInputPostRequest, FhirClient, ZambdaClient } from '@zapehr/sdk'; import { Subscription } from 'fhir/r4'; import fs from 'fs'; -import devConfig from '../.env/dev.json'; +import devConfig from '../.env/development.json'; // import productionConfig from '../.env/production.json'; // import stagingConfig from '../.env/staging.json'; // import testingConfig from '../.env/testing.json'; From 3e1dbe4a8ad7c4bc1c673101e47be50cd9af5c78 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 16:14:56 -0400 Subject: [PATCH 13/24] fixes build probably --- .github/workflows/build.yml | 4 ++-- packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ce2d59..91548810 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,8 @@ jobs: - name: Set the telemed-intake/zambdas/.env/development.json run: cp packages/telemed-intake/zambdas/.env/local.template.json packages/telemed-intake/zambdas/.env/development.json - - name: Set the urgent-care-intake/zambdas/.env/development.json - run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/development.json + - name: Set the urgent-care-intake/zambdas/.env/dev.json + run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/dev.json - id: get-store-path run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT diff --git a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts index 26cffa3c..d01e6397 100644 --- a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts +++ b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts @@ -1,7 +1,7 @@ import { BatchInputDeleteRequest, BatchInputPostRequest, FhirClient, ZambdaClient } from '@zapehr/sdk'; import { Subscription } from 'fhir/r4'; import fs from 'fs'; -import devConfig from '../.env/development.json'; +import devConfig from '../.env/dev.json'; // import productionConfig from '../.env/production.json'; // import stagingConfig from '../.env/staging.json'; // import testingConfig from '../.env/testing.json'; From ee62665e665038df58be1abc4e9538498feb25df Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 16:36:44 -0400 Subject: [PATCH 14/24] probably maybe fixes build --- packages/telemed-ehr/zambdas/package.json | 2 +- packages/telemed-intake/zambdas/package.json | 2 +- packages/urgent-care-intake/zambdas/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/telemed-ehr/zambdas/package.json b/packages/telemed-ehr/zambdas/package.json index 20e382a1..9ff8379a 100644 --- a/packages/telemed-ehr/zambdas/package.json +++ b/packages/telemed-ehr/zambdas/package.json @@ -14,7 +14,7 @@ "debug": "export SLS_DEBUG=* && node --inspect ../../../node_modules/serverless/bin/serverless offline --stage=local", "setup-zapehr-secrets": "ts-node scripts/configure-zapehr-secrets.ts ${ENV}", "deploy-zambdas": "pnpm run package && ts-node scripts/deploy-zambdas.ts ${ENV}", - "build": "tsc && sls package --stage dev", + "build": "tsc && sls package --stage development", "lint": "eslint . --ext ts --report-unused-disable-directives --max-warnings 0", "package": "tsc && sls package && npm run rebundle", "rebundle": "bash scripts/package-for-release.sh" diff --git a/packages/telemed-intake/zambdas/package.json b/packages/telemed-intake/zambdas/package.json index e0298c4d..4a1a7b14 100644 --- a/packages/telemed-intake/zambdas/package.json +++ b/packages/telemed-intake/zambdas/package.json @@ -15,7 +15,7 @@ "deploy-zambdas": "pnpm run package && ts-node scripts/deploy-zambdas.ts ${ENV}", "setup-default-locations": "ts-node scripts/setup-default-locations.ts", "update-permissions-for-users": "ts-node scripts/update-permissions-for-users.ts", - "build": "tsc && sls package --stage dev", + "build": "tsc && sls package --stage development", "package": "tsc && sls package && npm run rebundle", "rebundle": "bash scripts/package-for-release.sh", "test": "jest", diff --git a/packages/urgent-care-intake/zambdas/package.json b/packages/urgent-care-intake/zambdas/package.json index 262ccbb1..9ea8a6cf 100644 --- a/packages/urgent-care-intake/zambdas/package.json +++ b/packages/urgent-care-intake/zambdas/package.json @@ -6,7 +6,7 @@ "start": "npm run start:local", "start:local": "ENV=local pnpm run start-help", "start-help": "sls offline --stage ${ENV} --httpPort 3000", - "build": "tsc && sls package --stage dev", + "build": "tsc && sls package --stage development", "deploy-zambdas:dev": "ENV=dev pnpm deploy-zambdas-help", "deploy-zambdas-help": "pnpm package && ts-node scripts/deploy-zambdas.ts ${ENV}", "package": "tsc && sls package && npm run rebundle", From bcd14a71076e9802a089a2375ab8ba6bdbd3a9cb Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 16:51:43 -0400 Subject: [PATCH 15/24] fixes --- packages/urgent-care-intake/zambdas/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/urgent-care-intake/zambdas/package.json b/packages/urgent-care-intake/zambdas/package.json index 9ea8a6cf..262ccbb1 100644 --- a/packages/urgent-care-intake/zambdas/package.json +++ b/packages/urgent-care-intake/zambdas/package.json @@ -6,7 +6,7 @@ "start": "npm run start:local", "start:local": "ENV=local pnpm run start-help", "start-help": "sls offline --stage ${ENV} --httpPort 3000", - "build": "tsc && sls package --stage development", + "build": "tsc && sls package --stage dev", "deploy-zambdas:dev": "ENV=dev pnpm deploy-zambdas-help", "deploy-zambdas-help": "pnpm package && ts-node scripts/deploy-zambdas.ts ${ENV}", "package": "tsc && sls package && npm run rebundle", From 75edbf912f44ff11d5dcdf79a908c66d890ba9ac Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:07:35 -0400 Subject: [PATCH 16/24] maybe fixes stuff --- .github/workflows/build.yml | 4 ++-- packages/urgent-care-intake/zambdas/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91548810..e1ce2d59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,8 @@ jobs: - name: Set the telemed-intake/zambdas/.env/development.json run: cp packages/telemed-intake/zambdas/.env/local.template.json packages/telemed-intake/zambdas/.env/development.json - - name: Set the urgent-care-intake/zambdas/.env/dev.json - run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/dev.json + - name: Set the urgent-care-intake/zambdas/.env/development.json + run: cp packages/urgent-care-intake/zambdas/.env/local.template.json packages/urgent-care-intake/zambdas/.env/development.json - id: get-store-path run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT diff --git a/packages/urgent-care-intake/zambdas/package.json b/packages/urgent-care-intake/zambdas/package.json index 262ccbb1..9ea8a6cf 100644 --- a/packages/urgent-care-intake/zambdas/package.json +++ b/packages/urgent-care-intake/zambdas/package.json @@ -6,7 +6,7 @@ "start": "npm run start:local", "start:local": "ENV=local pnpm run start-help", "start-help": "sls offline --stage ${ENV} --httpPort 3000", - "build": "tsc && sls package --stage dev", + "build": "tsc && sls package --stage development", "deploy-zambdas:dev": "ENV=dev pnpm deploy-zambdas-help", "deploy-zambdas-help": "pnpm package && ts-node scripts/deploy-zambdas.ts ${ENV}", "package": "tsc && sls package && npm run rebundle", From f9d308186726737ac87810119ce3d399f580e122 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:14:00 -0400 Subject: [PATCH 17/24] maybe fixes stuff --- packages/telemed-ehr/zambdas/scripts/deploy-zambdas.ts | 2 +- packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/telemed-ehr/zambdas/scripts/deploy-zambdas.ts b/packages/telemed-ehr/zambdas/scripts/deploy-zambdas.ts index 649cdc60..9f177c7a 100644 --- a/packages/telemed-ehr/zambdas/scripts/deploy-zambdas.ts +++ b/packages/telemed-ehr/zambdas/scripts/deploy-zambdas.ts @@ -72,7 +72,7 @@ const ZAMBDAS: { [name: string]: DeployZambda } = { schedule: { expression: 'cron(*/5 * * * ? *)', // every 3 minutes }, - environments: ['dev', 'testing', 'staging', 'training'], + environments: ['development', 'testing', 'staging', 'training'], }, 'SYNC-USER': { type: 'http_auth', diff --git a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts index d01e6397..13f9f010 100644 --- a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts +++ b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts @@ -82,7 +82,7 @@ const ZAMBDAS: { [name: string]: DeployZambda } = { expression: 'cron(0,15,30,45 * * * ? *)', // every 0, 15, 30 and 45 minute mark // expression: 'cron(* * * * ? *)', // for testing, sends every minute }, - environments: ['dev', 'testing', 'staging', 'training', 'production'], + environments: ['development', 'testing', 'staging', 'training', 'production'], }, 'GET-APPOINTMENT-DETAILS': { type: 'http_open', From 8d6e2c1449cba5a22d15845086f4043074e7d19f Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:20:21 -0400 Subject: [PATCH 18/24] missed one --- packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts index 13f9f010..361c907d 100644 --- a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts +++ b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts @@ -1,7 +1,7 @@ import { BatchInputDeleteRequest, BatchInputPostRequest, FhirClient, ZambdaClient } from '@zapehr/sdk'; import { Subscription } from 'fhir/r4'; import fs from 'fs'; -import devConfig from '../.env/dev.json'; +import devConfig from '../.env/development.json'; // import productionConfig from '../.env/production.json'; // import stagingConfig from '../.env/staging.json'; // import testingConfig from '../.env/testing.json'; From c56190a4752b071be7f19710b56805e68ce8a99d Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:37:57 -0400 Subject: [PATCH 19/24] missed one --- .github/workflows/build-and-deploy-telemed-ehr.yml | 4 ++-- .github/workflows/build-and-deploy-telemed-intake.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-telemed-ehr.yml b/.github/workflows/build-and-deploy-telemed-ehr.yml index 1e776ba5..9d679d40 100644 --- a/.github/workflows/build-and-deploy-telemed-ehr.yml +++ b/.github/workflows/build-and-deploy-telemed-ehr.yml @@ -12,9 +12,9 @@ on: description: 'Environment name' required: true type: choice - default: 'dev' + default: 'development' options: - - dev + - development - dev2 - testing - staging diff --git a/.github/workflows/build-and-deploy-telemed-intake.yml b/.github/workflows/build-and-deploy-telemed-intake.yml index 2065a3c2..47057651 100644 --- a/.github/workflows/build-and-deploy-telemed-intake.yml +++ b/.github/workflows/build-and-deploy-telemed-intake.yml @@ -12,9 +12,9 @@ on: description: 'Environment name' required: true type: choice - default: 'dev' + default: 'development' options: - - dev + - development - dev2 - testing - staging From 90609e471153faef2b3dabd9443f7f704684cadf Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:45:23 -0400 Subject: [PATCH 20/24] deploy:developmet --- packages/telemed-ehr/app/package.json | 2 +- packages/telemed-intake/app/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/telemed-ehr/app/package.json b/packages/telemed-ehr/app/package.json index 660ba9aa..e0b5b8d3 100644 --- a/packages/telemed-ehr/app/package.json +++ b/packages/telemed-ehr/app/package.json @@ -29,7 +29,7 @@ "build-skeleton": "tsc && vite build --mode ${ENV}", "test": "react-scripts test", "eject": "react-scripts eject", - "deploy:dev": " PREFIX=development CLOUDFRONT_ID=E10TA6FN58D1OS ENV=dev pnpm run ci-deploy-skeleton", + "deploy:development": " PREFIX=development CLOUDFRONT_ID=E10TA6FN58D1OS ENV=dev pnpm run ci-deploy-skeleton", "ci-deploy-skeleton": "ENV=${ENV} VITE_APP_SHA=${GIT_HEAD:-$(git rev-parse --short HEAD)} VITE_APP_VERSION=$(node -pe 'require(\"./package.json\").version') pnpm run build:dev && aws s3 sync build/ s3://ehr.ottehr.com --region us-east-1 --delete && aws cloudfront create-invalidation --distribution-id ${CLOUDFRONT_ID} --paths '/*' --region us-east-1" }, "dependencies": { diff --git a/packages/telemed-intake/app/package.json b/packages/telemed-intake/app/package.json index b0cfa0b4..93c099c1 100644 --- a/packages/telemed-intake/app/package.json +++ b/packages/telemed-intake/app/package.json @@ -7,7 +7,7 @@ "start:local": "vite", "build:dev": "tsc && vite build --mode dev", "build": "tsc && vite build", - "deploy:dev": "PREFIX=development CLOUDFRONT_ID=EIYX001DGGQK8 ENV=dev pnpm run ci-deploy-skeleton", + "deploy:development": "PREFIX=development CLOUDFRONT_ID=EIYX001DGGQK8 ENV=dev pnpm run ci-deploy-skeleton", "ci-deploy-skeleton": "ENV=${ENV} VITE_APP_SHA=${GIT_HEAD:-$(git rev-parse --short HEAD)} VITE_APP_VERSION=$(node -pe 'require(\"./package.json\").version') pnpm run build:dev && aws s3 sync build/ s3://telemed.ottehr.com --region us-east-1 --delete && aws cloudfront create-invalidation --distribution-id ${CLOUDFRONT_ID} --paths '/*' --region us-east-1" }, "dependencies": { From 58322e31f9a5381f871ca2d01c2b0eaf73247a29 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Thu, 19 Sep 2024 17:47:59 -0400 Subject: [PATCH 21/24] deploy:developmet --- .../telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts | 2 +- packages/telemed-intake/zambdas/scripts/common.ts | 2 +- packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts b/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts index 4856e548..e9e2a238 100644 --- a/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts +++ b/packages/telemed-ehr/zambdas/scripts/configure-zapehr-secrets.ts @@ -34,7 +34,7 @@ const main = async (): Promise => { const env = process.argv[2]; switch (env) { - case 'dev': + case 'development': await setupSecrets(devConfig); break; // case 'testing': diff --git a/packages/telemed-intake/zambdas/scripts/common.ts b/packages/telemed-intake/zambdas/scripts/common.ts index 9e17db08..ceeb258d 100644 --- a/packages/telemed-intake/zambdas/scripts/common.ts +++ b/packages/telemed-intake/zambdas/scripts/common.ts @@ -7,7 +7,7 @@ export const performEffectWithEnvFile = async (callback: (config: any) => void) const env = process.argv[2]; switch (env) { - case 'dev': + case 'development': await callback(devConfig); break; // case 'testing': diff --git a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts index 361c907d..9616a3c4 100644 --- a/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts +++ b/packages/urgent-care-intake/zambdas/scripts/deploy-zambdas.ts @@ -366,7 +366,7 @@ const main = async (): Promise => { const env = process.argv[2]; switch (env) { - case 'dev': + case 'development': await updateZambdas(devConfig); break; // case 'testing': From 4e501d1a1a4753e087ce72ce3a90b5a902627911 Mon Sep 17 00:00:00 2001 From: aykhanahmadli Date: Fri, 20 Sep 2024 13:50:17 +0200 Subject: [PATCH 22/24] fix: get appointments error --- .../app/src/helpers/create-sample-appointments.ts | 2 ++ .../telemed/features/tracking-board/CreateDemoVisits.tsx | 9 +++++---- .../zambdas/src/appointment/create-appointment/index.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/telemed-ehr/app/src/helpers/create-sample-appointments.ts b/packages/telemed-ehr/app/src/helpers/create-sample-appointments.ts index 11237468..17498ccb 100644 --- a/packages/telemed-ehr/app/src/helpers/create-sample-appointments.ts +++ b/packages/telemed-ehr/app/src/helpers/create-sample-appointments.ts @@ -75,6 +75,8 @@ export const createSampleAppointments = async ( console.log('Succesfully created appointments', responses); } catch (error: any) { console.error('Error creating appointments:', error); + } finally { + localStorage.removeItem('selectedLocationID'); } }; diff --git a/packages/telemed-ehr/app/src/telemed/features/tracking-board/CreateDemoVisits.tsx b/packages/telemed-ehr/app/src/telemed/features/tracking-board/CreateDemoVisits.tsx index 714e582d..fb950ee5 100644 --- a/packages/telemed-ehr/app/src/telemed/features/tracking-board/CreateDemoVisits.tsx +++ b/packages/telemed-ehr/app/src/telemed/features/tracking-board/CreateDemoVisits.tsx @@ -26,7 +26,7 @@ const CreateDemoVisits = (): ReactElement => { const { getAccessTokenSilently } = useAuth0(); const handleCreateSampleAppointments = async (phoneNumber: string): Promise => { - if (!phoneNumber || phoneNumber.length < 10 || !phoneNumber.startsWith('+1')) { + if (!phoneNumber || phoneNumber.length !== 12 || !phoneNumber.startsWith('+1')) { setInputError(true); return; } @@ -34,7 +34,8 @@ const CreateDemoVisits = (): ReactElement => { setLoading(true); setInputError(false); const authToken = await getAccessTokenSilently(); - const response = await createSampleAppointments(fhirClient, authToken, phoneNumber); + const formattedPhoneNumber = phoneNumber.slice(2); + const response = await createSampleAppointments(fhirClient, authToken, formattedPhoneNumber); console.log('response', response); setSnackbar({ open: true, @@ -62,7 +63,7 @@ const CreateDemoVisits = (): ReactElement => { const handleChange = (e: React.ChangeEvent): void => { setPhoneNumber(e.target.value); - if (e.target.value.length === 11 && e.target.value.startsWith('+1')) { + if (e.target.value.length === 12 && e.target.value.startsWith('+1')) { setInputError(false); } }; @@ -108,7 +109,7 @@ const CreateDemoVisits = (): ReactElement => { }} required error={inputError} - helperText={inputError ? 'Please enter a valid phone number in the format +1234567890' : ''} + helperText={inputError ? 'Please enter a valid phone number in the format +12345678900' : ''} /> Date: Fri, 20 Sep 2024 12:58:17 -0400 Subject: [PATCH 23/24] issue #403 --- packages/telemed-intake/app/src/pages/Welcome.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/telemed-intake/app/src/pages/Welcome.tsx b/packages/telemed-intake/app/src/pages/Welcome.tsx index 2406dc57..c31f37c9 100644 --- a/packages/telemed-intake/app/src/pages/Welcome.tsx +++ b/packages/telemed-intake/app/src/pages/Welcome.tsx @@ -11,6 +11,7 @@ import { CustomContainer } from '../features/common'; import { useZapEHRAPIClient } from '../utils'; import Schedule from '../components/Schedule'; import { ErrorDialog } from 'ottehr-components'; +import { useAuth0 } from '@auth0/auth0-react'; interface Parameters { 'schedule-type': 'location' | 'provider'; @@ -28,6 +29,8 @@ const Welcome = (): JSX.Element => { const { selectedSlot, setAppointment } = useAppointmentStore((state) => state); const { t } = useTranslation(); + const { isAuthenticated } = useAuth0(); + if (!slug) { throw new Error('slug is not defined'); } @@ -51,8 +54,10 @@ const Welcome = (): JSX.Element => { const onSubmit = (): void => { if (!selectedSlot) { setChoiceErrorDialogOpen(true); - } else { + } else if (!isAuthenticated) { navigate(IntakeFlowPageRoute.AuthPage.path); + } else { + navigate(`${IntakeFlowPageRoute.SelectPatient.path}?flow=requestVisit`); } }; From 925b8ab64f1da77fa370bb9729eee289df3802b2 Mon Sep 17 00:00:00 2001 From: Gilad Schneider Date: Mon, 23 Sep 2024 10:53:48 -0400 Subject: [PATCH 24/24] version bump --- package.json | 2 +- packages/ehr-utils/package.json | 2 +- packages/ottehr-components/package.json | 2 +- packages/telemed-ehr/app/package.json | 2 +- packages/telemed-ehr/zambdas/package.json | 2 +- packages/telemed-intake/app/package.json | 2 +- packages/telemed-intake/zambdas/package.json | 2 +- packages/utils/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6cbe41a5..2a0bf440 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ottehr", - "version": "0.11.0", + "version": "0.12.0", "private": true, "scripts": { "test": "pnpm recursive run test", diff --git a/packages/ehr-utils/package.json b/packages/ehr-utils/package.json index 4095dd70..ef6801d1 100644 --- a/packages/ehr-utils/package.json +++ b/packages/ehr-utils/package.json @@ -1,7 +1,7 @@ { "name": "ehr-utils", "private": true, - "version": "0.11.0", + "version": "0.12.0", "main": "lib/main.ts", "types": "lib/main.ts", "scripts": { diff --git a/packages/ottehr-components/package.json b/packages/ottehr-components/package.json index c80adf10..f0ca69ec 100644 --- a/packages/ottehr-components/package.json +++ b/packages/ottehr-components/package.json @@ -1,7 +1,7 @@ { "name": "ottehr-components", "private": true, - "version": "0.11.0", + "version": "0.12.0", "main": "lib/main.ts", "types": "lib/main.ts", "scripts": { diff --git a/packages/telemed-ehr/app/package.json b/packages/telemed-ehr/app/package.json index e0b5b8d3..f97eccdc 100644 --- a/packages/telemed-ehr/app/package.json +++ b/packages/telemed-ehr/app/package.json @@ -1,6 +1,6 @@ { "name": "telemed-ehr-app", - "version": "0.11.0", + "version": "0.12.0", "private": true, "browserslist": { "production": [ diff --git a/packages/telemed-ehr/zambdas/package.json b/packages/telemed-ehr/zambdas/package.json index 9ff8379a..25daac3b 100644 --- a/packages/telemed-ehr/zambdas/package.json +++ b/packages/telemed-ehr/zambdas/package.json @@ -1,6 +1,6 @@ { "name": "telemed-ehrzambdas", - "version": "0.11.0", + "version": "0.12.0", "private": true, "scripts": { "start": "npm run start:local", diff --git a/packages/telemed-intake/app/package.json b/packages/telemed-intake/app/package.json index 93c099c1..c5f15b0a 100644 --- a/packages/telemed-intake/app/package.json +++ b/packages/telemed-intake/app/package.json @@ -1,7 +1,7 @@ { "name": "telemed-intake-app", "private": true, - "version": "0.11.0", + "version": "0.12.0", "type": "module", "scripts": { "start:local": "vite", diff --git a/packages/telemed-intake/zambdas/package.json b/packages/telemed-intake/zambdas/package.json index 4a1a7b14..c25feca6 100644 --- a/packages/telemed-intake/zambdas/package.json +++ b/packages/telemed-intake/zambdas/package.json @@ -1,6 +1,6 @@ { "name": "telemed-intake-zambdas", - "version": "0.11.0", + "version": "0.12.0", "private": true, "scripts": { "start": "npm run start:local", diff --git a/packages/utils/package.json b/packages/utils/package.json index b0daceca..42d7e6f1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { "name": "ottehr-utils", "private": true, - "version": "0.11.0", + "version": "0.12.0", "main": "lib/main.ts", "types": "lib/main.ts", "scripts": {