Merge branch 'main' into kcd/get-rid-of-vsGroup

CDCgov · Jan 10, 2025 · 530823f · 530823f
2 parents 3475965 + eaf17fd
commit 530823f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 35 deletions.
diff --git a/query-connector/e2e/alternate_queries.spec.ts b/query-connector/e2e/alternate_queries.spec.ts
@@ -13,7 +13,7 @@ test.describe("alternate queries with the Query Connector", () => {
   test("query using form-fillable demo patient by phone number", async ({
     page,
   }) => {
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
     await page.getByRole("button", { name: "Fill fields" }).click();
 
     // Delete Last name and MRN to force phone number as one of the 3 fields
@@ -50,7 +50,7 @@ test.describe("alternate queries with the Query Connector", () => {
 
   // test("social determinants query with generalized function", async ({
   test("cancer query with generalized function", async ({ page }) => {
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
     await page.getByRole("button", { name: "Fill fields" }).click();
     // Select FHIR server from drop down
     await page.getByRole("button", { name: "Advanced" }).click();
@@ -77,7 +77,7 @@ test.describe("alternate queries with the Query Connector", () => {
   test("form-fillable STI query using generalized function", async ({
     page,
   }) => {
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
     await page.getByRole("button", { name: "Fill fields" }).click();
     // Select FHIR server from drop down
     await page.getByRole("button", { name: "Advanced" }).click();

diff --git a/query-connector/e2e/customize_query.spec.ts b/query-connector/e2e/customize_query.spec.ts
@@ -10,7 +10,7 @@ test.describe("querying with the Query Connector", () => {
   // Start every test by navigating to the customize query workflow
   test.beforeEach(async ({ page }) => {
     await page.goto(TEST_URL);
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
 
     // Check that the info alert is visible and contains the correct text
     const alert = page.locator(".custom-alert");

diff --git a/query-connector/e2e/load.spec.ts b/query-connector/e2e/load.spec.ts
@@ -18,7 +18,5 @@ test("landing page loads", async ({ page }) => {
 
   // Check that interactable elements are present (header and Get Started)
   await expect(page.getByRole("link", { name: metadata.title })).toBeVisible();
-  await expect(
-    page.getByRole("button", { name: "Go to the demo" }),
-  ).toBeVisible();
+  await expect(page.getByRole("button", { name: "Try it out" })).toBeVisible();
 });
diff --git a/query-connector/e2e/query_workflow.spec.ts b/query-connector/e2e/query_workflow.spec.ts
@@ -16,7 +16,7 @@ test.describe("querying with the Query Connector", () => {
   });
 
   test("unsuccessful user query: no patients", async ({ page }) => {
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
     await page.getByRole("button", { name: "Fill fields" }).click();
     await page.getByLabel("First name").fill("Shouldnt");
     await page.getByLabel("Last name").fill("Findanyone");
@@ -41,7 +41,7 @@ test.describe("querying with the Query Connector", () => {
   });
 
   test("successful demo user query", async ({ page }) => {
-    await page.getByRole("button", { name: "Go to the demo" }).click();
+    await page.getByRole("button", { name: "Try it out" }).click();
 
     // Check that the info alert is visible and contains the correct text
     const alert = page.locator(".custom-alert");

diff --git a/query-connector/src/app/page.module.scss b/query-connector/src/app/page.module.scss
@@ -1,14 +1,14 @@
 .pageSubtitle {
-    margin: 2rem 0 0.5rem 0;
+  margin: 2rem 0 0.5rem 0;
 }
 
-.pageSubtitle:last-of-type{
-    margin-top: 1.5rem;
+.pageSubtitle:last-of-type {
+  margin-top: 1.5rem;
 }
 
 .pageContent {
-    font-weight: 300;
-    margin-top: 0;
-    font-size:1rem;
-    margin-bottom: 0.5rem
-}
+  font-weight: 300;
+  margin-top: 0;
+  font-size: 1rem;
+  margin-bottom: 1rem;
+}
diff --git a/query-connector/src/app/page.tsx b/query-connector/src/app/page.tsx
@@ -30,6 +30,15 @@ export default function LandingPage() {
               network of healthcare providers through your existing data use
               agreements, giving you access to more complete and timely data
             </h2>
+
+            <Button
+              className="next-button margin-bottom-2"
+              type="button"
+              id="next-button"
+              onClick={() => handleGoToDemo()}
+            >
+              Try it out
+            </Button>
           </div>
           <Image
             alt="Graphic illustrating what TEFCA is"
@@ -81,24 +90,6 @@ export default function LandingPage() {
           </ProcessListItem>
         </ProcessList>
       </div>
-      <div className="blue-background-container">
-        <div className="flex-justify-center flex-column">
-          <div className="text-holder">
-            <h2 className="font-sans-xs text-light margin-top-0">
-              Check out the Query Connector demo to try out features using
-              sample data.
-            </h2>
-            <Button
-              className="next-button"
-              type="button"
-              id="next-button"
-              onClick={() => handleGoToDemo()}
-            >
-              Go to the demo
-            </Button>
-          </div>
-        </div>
-      </div>
     </div>
   );
 }