masslight · GiladSchneider · Aug 12, 2024 · Jul 31, 2024 · Jul 31, 2024 · Aug 1, 2024
diff --git a/.github/workflows/build-and-deploy-telemed-ehr.yml b/.github/workflows/build-and-deploy-telemed-ehr.yml
@@ -110,7 +110,7 @@ jobs:
         run: pnpm install
 
       - name: Deploy App
-        run: pnpm telemed-ehr-deploy ${{ github.event.inputs.environment }}
+        run: cd ${{ env.PACKAGE_LOCATION }} && pnpm run deploy:${{ github.event.inputs.environment }}
 
       - name: Setup zapehr secrets
         run: cd ${{ env.ZAMBDAS_LOCATION }} && pnpm setup-zapehr-secrets ${{ github.event.inputs.environment }}

diff --git a/.github/workflows/build-and-deploy-telemed-intake.yml b/.github/workflows/build-and-deploy-telemed-intake.yml
@@ -1,5 +1,10 @@
 name: Deploy Intake
 
+env:
+  CI: false
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
 on:
   workflow_dispatch:
     inputs:
@@ -105,7 +110,7 @@ jobs:
         run: pnpm install
 
       - name: Deploy App
-        run: pnpm telemed-intake-deploy ${{ github.event.inputs.environment }}
+        run: cd ${{ env.PACKAGE_LOCATION }} && pnpm run deploy:${{ github.event.inputs.environment }}
 
       - name: Setup zapehr secrets
         run: cd ${{ env.ZAMBDAS_LOCATION }} && pnpm setup-zapehr-secrets ${{ github.event.inputs.environment }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ottehr",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "test": "pnpm recursive run test",

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.5.0",
+  "version": "0.6.0",
   "main": "lib/main.ts",
   "types": "lib/main.ts",
   "scripts": {

diff --git a/packages/ottehr-components/lib/components/CustomContainerFactory.tsx b/packages/ottehr-components/lib/components/CustomContainerFactory.tsx
@@ -73,7 +73,9 @@ export const CustomContainer: FC<ContainerProps> = ({
     if (logoutHandler !== undefined) {
       logoutHandler();
     } else {
-      logout({ returnTo: 'https://ottehr.com' });
+      logout({
+        returnTo: window.location.origin,
+      });
     }
   }, [logout, logoutHandler]);
 

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.5.0",
+  "version": "0.6.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
@@ -1,6 +1,6 @@
 {
   "name": "telemed-ehr-app",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "browserslist": {
     "production": [
@@ -20,6 +20,7 @@
     "preview": "vite preview --port 4002",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "build": "tsc && vite build",
+    "build:dev": "tsc && vite build --mode dev",
     "build:development": "ENV=development npm run build-skeleton",
     "build:testing": "ENV=testing npm run build-skeleton",
     "build:staging": "ENV=staging npm run build-skeleton",
@@ -28,8 +29,8 @@
     "build-skeleton": "tsc && vite build --mode ${ENV}",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "deploy": " PREFIX=development CLOUDFRONT_ID=E10TA6FN58D1OS pnpm run ci-deploy-skeleton ENV=${ENV}",
-    "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 && 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"
+    "deploy:dev": " 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": {
     "@mui/icons-material": "^5.14.9",
@@ -60,4 +61,4 @@
     "@types/styled-components": "^5.1.34",
     "@types/react-page-visibility": "^6.4.4"
   }
-}
+}
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.5.0",
+  "version": "0.6.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
@@ -1,13 +1,14 @@
 {
   "name": "telemed-intake-app",
   "private": true,
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "scripts": {
     "start:local": "vite",
+    "build:dev": "tsc && vite build --mode dev",
     "build": "tsc && vite build",
-    "deploy": "PREFIX=development CLOUDFRONT_ID=EIYX001DGGQK8 pnpm run ci-deploy-skeleton ENV=${ENV}",
-    "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 && 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"
+    "deploy:dev": "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": {
     "@mui/x-date-pickers": "^7.7.0",
@@ -22,4 +23,4 @@
   "devDependencies": {
     "@types/styled-components": "^5.1.34"
   }
-}
+}
diff --git a/packages/telemed-intake/app/src/App.tsx b/packages/telemed-intake/app/src/App.tsx
@@ -9,7 +9,7 @@ import { useIOSAppSync } from './features/ios-communication/useIOSAppSync';
 import './lib/i18n';
 import AuthPage from './pages/AuthPage';
 import CreateAccount from './pages/CreateAccount';
-import Homepage from './pages/Homepage';
+import PatientPortal from './pages/PatientPortal';
 import { IOSPatientManageParticipantsPage } from './pages/IOS/IOSManageParticipantsPage';
 import { IOSPatientPhotosEditPage } from './pages/IOS/IOSPatientPhotosEditPage';
 import { IOSVideoCallMenu } from './pages/IOS/IOSVideoCallMenu';
@@ -62,7 +62,7 @@ const queryClient = new QueryClient({
 });
 
 export class IntakeFlowPageRoute {
-  static readonly Homepage = new IntakeFlowPageRoute('/home', <Homepage />);
+  static readonly PatientPortal = new IntakeFlowPageRoute('/home', <PatientPortal />);
   static readonly SelectPatient = new IntakeFlowPageRoute('/select-patient', <SelectPatient />);
   static readonly PastVisits = new IntakeFlowPageRoute('/past-visits', <PastVisits />);
   static readonly VisitDetails = new IntakeFlowPageRoute('/visit-details', <VisitDetails />);
@@ -113,6 +113,17 @@ function App(): JSX.Element {
               path={IntakeFlowPageRoute.InvitedVideoCall.path}
               element={IntakeFlowPageRoute.InvitedVideoCall.page}
             />
+            <Route
+              element={
+                <ProtectedRoute
+                  loadingFallback={<LoadingScreen />}
+                  errorFallback={<ErrorFallbackScreen />}
+                  unauthorizedFallback={<Navigate to={IntakeFlowPageRoute.AuthPage.path} />}
+                />
+              }
+            >
+              <Route path={IntakeFlowPageRoute.PatientPortal.path} element={IntakeFlowPageRoute.PatientPortal.page} />
+            </Route>
             <Route
               element={
                 <ProtectedRoute
@@ -124,7 +135,6 @@ function App(): JSX.Element {
             >
               <Route path="/" element={<UserFlowRoot />} />
               <Route path={IntakeFlowPageRoute.NewUser.path} element={IntakeFlowPageRoute.NewUser.page} />
-              <Route path={IntakeFlowPageRoute.Homepage.path} element={IntakeFlowPageRoute.Homepage.page} />
               <Route path={IntakeFlowPageRoute.SelectPatient.path} element={IntakeFlowPageRoute.SelectPatient.page} />
               <Route path={IntakeFlowPageRoute.PastVisits.path} element={IntakeFlowPageRoute.PastVisits.page} />
               <Route path={IntakeFlowPageRoute.VisitDetails.path} element={IntakeFlowPageRoute.VisitDetails.page} />
@@ -163,7 +173,7 @@ function App(): JSX.Element {
               element={IntakeFlowPageRoute.IOSVideoCallMenu.page}
             />
             <Route path={IntakeFlowPageRoute.ThankYou.path} element={IntakeFlowPageRoute.ThankYou.page} />
-            <Route path="*" element={<Navigate to={IntakeFlowPageRoute.Welcome.path} />} />
+            {/* <Route path="*" element={<Navigate to={IntakeFlowPageRoute.Welcome.path} />} /> */}
           </Routes>
         </Router>
       </IntakeThemeProvider>

diff --git a/packages/telemed-intake/app/src/components/CancelVisitDialog.tsx b/packages/telemed-intake/app/src/components/CancelVisitDialog.tsx
@@ -27,7 +27,7 @@ export const CancelVisitDialog: FC<CancelVisitDialogProps> = ({ onClose }) => {
       throw new Error('apiClient is not defined');
     }
 
-    navigate(IntakeFlowPageRoute.Homepage.path);
+    navigate(IntakeFlowPageRoute.PatientPortal.path);
     cancelAppointment.mutate(
       {
         apiClient: apiClient,
@@ -36,7 +36,7 @@ export const CancelVisitDialog: FC<CancelVisitDialogProps> = ({ onClose }) => {
       },
       {
         onSuccess: () => {
-          navigate(IntakeFlowPageRoute.Homepage.path);
+          navigate(IntakeFlowPageRoute.PatientPortal.path);
           handleClose();
         },
         onError: (error) => {

diff --git a/packages/telemed-intake/app/src/features/auth/ProtectedRoute.tsx b/packages/telemed-intake/app/src/features/auth/ProtectedRoute.tsx
@@ -1,6 +1,7 @@
 import { useAuth0 } from '@auth0/auth0-react';
 import { FC } from 'react';
 import { Outlet } from 'react-router-dom';
+import { IntakeFlowPageRoute } from '../../App';
 
 export const ProtectedRoute: FC<{
   loadingFallback: JSX.Element;
@@ -17,6 +18,9 @@ export const ProtectedRoute: FC<{
   }
 
   if (!isAuthenticated) {
+    if (location.pathname === IntakeFlowPageRoute.PatientPortal.path) {
+      localStorage.setItem('fromHome', 'true');
+    }
     return unauthorizedFallback;
   }
 

diff --git a/packages/telemed-intake/app/src/features/common/CustomContainer.tsx b/packages/telemed-intake/app/src/features/common/CustomContainer.tsx
@@ -5,7 +5,7 @@ import Footer from '../../components/Footer';
 
 const imageForBackground = (page: string): string => {
   switch (page) {
-    case IntakeFlowPageRoute.Homepage.path:
+    case IntakeFlowPageRoute.PatientPortal.path:
       return bg1;
     default:
       return bg1;

diff --git a/packages/telemed-intake/app/src/features/common/ErrorFallbackScreen.tsx b/packages/telemed-intake/app/src/features/common/ErrorFallbackScreen.tsx
@@ -14,7 +14,7 @@ export const ErrorFallbackScreen = (): JSX.Element => {
     <CustomContainer
       title="Error occurred"
       description="Something went wrong during authorization process. Please, try again."
-      bgVariant={IntakeFlowPageRoute.Homepage.path}
+      bgVariant={IntakeFlowPageRoute.PatientPortal.path}
     >
       <PageForm onSubmit={onSubmit} controlButtons={{ submitLabel: 'Login', backButton: false }} />
     </CustomContainer>

diff --git a/packages/telemed-intake/app/src/features/common/LoadingScreen.tsx b/packages/telemed-intake/app/src/features/common/LoadingScreen.tsx
@@ -5,7 +5,7 @@ import { CustomContainer } from './CustomContainer';
 
 export const LoadingScreen = (): JSX.Element => {
   return (
-    <CustomContainer title="" description="" bgVariant={IntakeFlowPageRoute.Homepage.path}>
+    <CustomContainer title="" description="" bgVariant={IntakeFlowPageRoute.PatientPortal.path}>
       <Box sx={{ display: 'flex', justifyContent: 'center' }}>
         <CircularProgress />
       </Box>

diff --git a/packages/telemed-intake/app/src/pages/AuthPage.tsx b/packages/telemed-intake/app/src/pages/AuthPage.tsx
@@ -7,7 +7,6 @@ import { ErrorFallbackScreen, LoadingScreen } from '../features/common';
 const AuthPage: FC = () => {
   const { isAuthenticated, loginWithRedirect, isLoading, error } = useAuth0();
   const authRef = useRef<Promise<void> | null>(null);
-
   if (error) {
     return <ErrorFallbackScreen />;
   }
@@ -22,8 +21,11 @@ const AuthPage: FC = () => {
     }
     return <LoadingScreen />;
   }
-
-  return <Navigate to={IntakeFlowPageRoute.Homepage.path} />;
+  if (localStorage.getItem('fromHome') === 'true') {
+    localStorage.removeItem('fromHome');
+    return <Navigate to={IntakeFlowPageRoute.PatientPortal.path} />;
+  }
+  return <Navigate to={`${IntakeFlowPageRoute.SelectPatient.path}?flow=requestVisit`} />;
 };
 
 export default AuthPage;
diff --git a/packages/telemed-intake/app/src/pages/CreateAccount.tsx b/packages/telemed-intake/app/src/pages/CreateAccount.tsx
@@ -18,7 +18,7 @@ const CreateAccount = (): JSX.Element => {
   };
 
   return (
-    <CustomContainer title="Create account" description="" bgVariant={IntakeFlowPageRoute.Homepage.path}>
+    <CustomContainer title="Create account" description="" bgVariant={IntakeFlowPageRoute.PatientPortal.path}>
       <PageForm
         formElements={[
           {

diff --git a/packages/telemed-intake/app/src/pages/PastVisits.tsx b/packages/telemed-intake/app/src/pages/PastVisits.tsx
@@ -40,7 +40,7 @@ const PastVisits = (): JSX.Element => {
       title={patientFullName}
       subtext={`Birthday: ${formattedPatientBirthDay}`}
       description=""
-      bgVariant={IntakeFlowPageRoute.Homepage.path}
+      bgVariant={IntakeFlowPageRoute.PatientPortal.path}
       isFirstPage={true}
     >
       <Typography variant="h2" color="primary.main">
@@ -126,7 +126,7 @@ const PastVisits = (): JSX.Element => {
           mt: 2,
         }}
         onClick={() => {
-          navigate(IntakeFlowPageRoute.Homepage.path);
+          navigate(IntakeFlowPageRoute.PatientPortal.path);
         }}
       >
         Back to homepage

diff --git a/packages/telemed-intake/app/src/pages/PatientInformation.tsx b/packages/telemed-intake/app/src/pages/PatientInformation.tsx
@@ -344,7 +344,7 @@ const PatientInformation = (): JSX.Element => {
           },
         ]}
         controlButtons={{
-          onBack: () => navigate(IntakeFlowPageRoute.Homepage.path),
+          onBack: () => navigate(IntakeFlowPageRoute.PatientPortal.path),
           loading: createAppointment.isLoading || getPaperworkQuery.isLoading || updateAppointment.isLoading,
           submitLabel: 'Continue',
         }}

diff --git a/...telemed-intake/app/src/pages/Homepage.tsx → ...ed-intake/app/src/pages/PatientPortal.tsx b/...telemed-intake/app/src/pages/Homepage.tsx → ...ed-intake/app/src/pages/PatientPortal.tsx
@@ -8,7 +8,7 @@ import HomepageOption from '../features/homepage/HomepageOption';
 import { useZapEHRAPIClient } from '../utils';
 import { requestVisit, pastVisits, contactSupport } from '../assets/icons';
 
-const Homepage = (): JSX.Element => {
+const PatientPortal = (): JSX.Element => {
   const apiClient = useZapEHRAPIClient();
   const navigate = useNavigate();
 
@@ -23,7 +23,9 @@ const Homepage = (): JSX.Element => {
   const appointmentID = activeAppointment?.id || '';
 
   const handleRequestVisit = (): void => {
-    navigate(`${IntakeFlowPageRoute.SelectPatient.path}?flow=requestVisit`);
+    navigate(
+      `${IntakeFlowPageRoute.Welcome.path.replace(':schedule-type', 'provider').replace(':slug', 'daniel').replace(':visit-service', 'in-person').replace(':visit-type', 'prebook')}`,
+    );
   };
 
   const handleReturnToCall = (): void => {
@@ -42,7 +44,7 @@ const Homepage = (): JSX.Element => {
     <CustomContainer
       title="Welcome to Ottehr Telemedicine"
       description=""
-      bgVariant={IntakeFlowPageRoute.Homepage.path}
+      bgVariant={IntakeFlowPageRoute.PatientPortal.path}
       isFirstPage={true}
     >
       {isFetching ? (
@@ -97,4 +99,4 @@ const Homepage = (): JSX.Element => {
   );
 };
 
-export default Homepage;
+export default PatientPortal;
diff --git a/packages/telemed-intake/app/src/pages/SelectPatient.tsx b/packages/telemed-intake/app/src/pages/SelectPatient.tsx
@@ -82,12 +82,12 @@ const SelectPatient = (): JSX.Element => {
   };
 
   const onBack = (): void => {
-    navigate(IntakeFlowPageRoute.Homepage.path);
+    navigate(IntakeFlowPageRoute.PatientPortal.path);
   };
 
   if (location.state?.patientId) {
     return (
-      <CustomContainer title="Loading patient" description="" bgVariant={IntakeFlowPageRoute.Homepage.path}>
+      <CustomContainer title="Loading patient" description="" bgVariant={IntakeFlowPageRoute.PatientPortal.path}>
         <Box sx={{ display: 'flex', justifyContent: 'center' }}>
           <CircularProgress />
         </Box>
@@ -96,7 +96,7 @@ const SelectPatient = (): JSX.Element => {
   }
 
   return (
-    <CustomContainer title="Select patient" description="" bgVariant={IntakeFlowPageRoute.Homepage.path}>
+    <CustomContainer title="Select patient" description="" bgVariant={IntakeFlowPageRoute.PatientPortal.path}>
       {isFetching ? (
         <Box sx={{ pt: 2 }}>
           <BoldPurpleInputLabel shrink>Select patient *</BoldPurpleInputLabel>

diff --git a/packages/telemed-intake/app/src/pages/ThankYou.tsx b/packages/telemed-intake/app/src/pages/ThankYou.tsx
@@ -22,7 +22,7 @@ const ThankYou = (): JSX.Element => {
     <CustomContainer
       title="Thank you for choosing Ottehr Telemedicine"
       description="We look forward to helping you soon!"
-      bgVariant={IntakeFlowPageRoute.Homepage.path}
+      bgVariant={IntakeFlowPageRoute.PatientPortal.path}
     >
       <>
         <Divider />

diff --git a/packages/telemed-intake/app/src/pages/UserFlowRoot.tsx b/packages/telemed-intake/app/src/pages/UserFlowRoot.tsx
@@ -13,7 +13,12 @@ const UserFlowRoot = (): JSX.Element => {
   const getPatients = useGetPatients(apiClient, (data) => {
     usePatientsStore.setState({ patients: data.patients });
     if (data?.patients.length > 0) {
-      navigate(IntakeFlowPageRoute.Homepage.path);
+      if (localStorage.getItem('fromHome') === 'true') {
+        localStorage.removeItem('fromHome');
+        navigate(IntakeFlowPageRoute.PatientPortal.path);
+      } else {
+        navigate(`${IntakeFlowPageRoute.SelectPatient.path}?flow=requestVisit`);
+      }
     } else {
       usePatientInfoStore.getState().setNewPatient();
       navigate(IntakeFlowPageRoute.NewUser.path);

diff --git a/packages/telemed-intake/app/src/pages/VisitDetails.tsx b/packages/telemed-intake/app/src/pages/VisitDetails.tsx
@@ -19,7 +19,7 @@ const VisitDetails = (): JSX.Element => {
       title={patientFullName}
       subtext={`Birthday: ${formattedPatientBirthDay}`}
       description=""
-      bgVariant={IntakeFlowPageRoute.Homepage.path}
+      bgVariant={IntakeFlowPageRoute.PatientPortal.path}
       isFirstPage={true}
     >
       <Typography variant="h2" color="primary.main" sx={{ mb: 2 }}>