Merge pull request #19 from mcode/dev

smalho01 · web-flow · commit dffdbff91b79 · 2023-12-04T15:10:13.000-05:00
Dev
diff --git a/.docker-sync/daemon.log b/.docker-sync/daemon.log
@@ -0,0 +1,4 @@
+objc[62277]: +[NSPlaceholderMutableString initialize] may have been in progress in another thread when fork() was called.
+objc[62277]: +[NSPlaceholderMutableString initialize] may have been in progress in another thread when fork() was called. We cannot safely call it or ignore it in the fork() child process. Crashing instead. Set a breakpoint on objc_initializeAfterForkError to debug.
+objc[71443]: +[NSPlaceholderMutableString initialize] may have been in progress in another thread when fork() was called.
+objc[71443]: +[NSPlaceholderMutableString initialize] may have been in progress in another thread when fork() was called. We cannot safely call it or ignore it in the fork() child process. Crashing instead. Set a breakpoint on objc_initializeAfterForkError to debug.
diff --git a/.docker-sync/daemon.pid b/.docker-sync/daemon.pid
@@ -0,0 +1 @@
+71443
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-VSAC_API_KEY=#Replace_me_with_your_api_key
+VSAC_API_KEY=f6486e93-5f75-481c-a5c1-b6395d7a217d
 COMPOSE_PROJECT_NAME=rems_demo
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -0,0 +1,27 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    # timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    # - name: Run Playwright tests
+    #   run: npx playwright test
+    # - uses: actions/upload-artifact@v3
+    #   if: always()
+    #   with:
+    #     name: playwright-report
+    #     path: playwright-report/
+    #     retention-days: 30
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 .env
 .env.local
-
+/playwright-report/
+/playwright/.cache/
+/test-results/
+node_modules/
diff --git a/EnvironmentVariables.md b/EnvironmentVariables.md
@@ -68,7 +68,14 @@
     - `REACT_APP_PHARMACY_SERVER_BASE`: `http://localhost:5051`
     - `REACT_APP_ETASU_STATUS_ENABLED`: `true`
     - `REACT_APP_PHARMACY_STATUS_ENABLED`: `true`
+    - `REACT_APP_SEND_RX_ENABLED` = `true`
+    - `REACT_APP_SEND_FHIR_AUTH_ENABLED` = `false`
     - `PORT`: `4040`
+    - `REACT_APP_CLIENT_ID`: `app-login`
+    - `REACT_APP_CLIENT_SCOPES`: `launch openid profile user/Patient.read patient/Patient.read user/Practitioner.read`
+    - `REACT_APP_DEVELOPER_MODE`: `true`
+    - `GENERATE_SOURCEMAP`: `false`
+    - `BROWSER`: `none`
 
 - mcode/test-ehr
   - src/main/resources/application.yml
@@ -151,6 +158,7 @@
     - `REACT_APP_PUBLIC_KEYS`
   - src/util/data.js
     - `REACT_APP_EHR_SERVER`
+    - `REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
     - `REACT_APP_CDS_SERVICE`
     - `REACT_APP_ORDER_SELECT`
     - `REACT_APP_ORDER_SIGN`
@@ -188,7 +196,14 @@
 - mcode/rems-smart-on-fhir
   - src/views/Patient/MedReqDropDown/MedReqDropDown.tsx
     - `REACT_APP_REMS_ADMIN_SERVER_BASE`
+    - `REACT_APP_SEND_RX_ENABLED`
+    - `REACT_APP_SEND_FHIR_AUTH_ENABLED`
   - src/views/Patient/MedReqDropDown/etasuStatus/EtasuStatus.tsx
     - `REACT_APP_REMS_ADMIN_SERVER_BASE`
   - src/views/Patient/MedReqDropDown/pharmacyStatus/PharmacyStatus.tsx
     - `REACT_APP_REMS_ADMIN_SERVER_BASE`
+  - src/index.tsx
+    - `REACT_APP_CLIENT_ID`
+    - `REACT_APP_CLIENT_SCOPES`
+  - src/views/Questionnaire/SmartApp.tsx
+    - `REACT_APP_DEVELOPER_MODE`
diff --git a/REMS.code-workspace b/REMS.code-workspace
@@ -107,11 +107,14 @@
 		"debug.onTaskErrors": "debugAnyway",
 		"cSpell.words": [
 			"BUILDKIT",
+			"Codeable",
 			"davinci",
+			"deidentify",
 			"DRLS",
 			"drlsroot",
 			"ehrserver",
 			"ETASU",
+			"glyphicon",
 			"INITDB",
 			"Keycloak",
 			"mcode",
@@ -130,7 +133,8 @@
 			"mitre-health.vscode-language-fsh",
 			"redhat.java",
 			"mongodb.mongodb-vscode",
-			"VisualStudioExptTeam.vscodeintellicode"
+			"VisualStudioExptTeam.vscodeintellicode",
+			"streetsidesoftware.code-spell-checker"
 		]
 	},
 
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -53,7 +53,7 @@ services:
       dockerfile: Dockerfile.dev
     container_name: rems_dev_request-generator
     environment:
-      - REACT_APP_REMS_CONFIG=true
+      - REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH=http://host.docker.internal:8080/test-ehr/r4
     ports:
       - "3000:3000"
       - "3001:3001"
@@ -63,6 +63,8 @@ services:
       - rems_dev_request-generator-databaseData:/home/node/app/request-generator/databaseData
       - rems_dev_request-generator-build:/home/node/app/request-generator/build
       - rems_dev_request-generator-logs:/home/node/app/request-generator/logs
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   rems-smart-on-fhir:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,10 +29,12 @@ services:
     image: codexrems/request-generator:REMSvCurrent
     container_name: rems_prod_request-generator
     environment:
-      - REACT_APP_REMS_CONFIG=true
+      - REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH=http://host.docker.internal:8080/test-ehr/r4
     ports: # Port binding to host from docker container
       - "3000:3000" # Bind port 3000 of host to 3000 of container
       - "3001:3001"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   # Create rems-smart-on-fhir container
   rems-smart-on-fhir:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -0,0 +1,9 @@
+{
+  "devDependencies": {
+    "@playwright/test": "^1.37.1"
+  },
+  "scripts": {},
+  "dependencies": {
+    "playwright": "^1.40.1"
+  }
+}
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -0,0 +1,78 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './tests',
+  timeout: 60000,
+  /* Run tests in files in parallel */
+  fullyParallel: false,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : 1,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://127.0.0.1:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://127.0.0.1:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});
diff --git a/tests/smoke.spec.ts b/tests/smoke.spec.ts
@@ -0,0 +1,8 @@
+import { test, expect } from "@playwright/test";
+
+// Smoke test to ensure GUI is actually up and running.
+
+test("checks if a page is visible at localhost:3000", async ({ page }) => {
+  await page.goto("localhost:3000");
+  await expect(page).toHaveTitle(/EHR/);
+});
diff --git a/tests/useCase1/uc1.spec.ts b/tests/useCase1/uc1.spec.ts
diff --git a/tests/util/fillOutForm.ts b/tests/util/fillOutForm.ts
diff --git a/tests/util/keycloakLogin.ts b/tests/util/keycloakLogin.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-VSAC_API_KEY=#Replace_me_with_your_api_key`
	`1`	`+VSAC_API_KEY=f6486e93-5f75-481c-a5c1-b6395d7a217d`
`2`	`2`	`COMPOSE_PROJECT_NAME=rems_demo`