From bb879cba61228c3f2fbf9968ae89a7ec5d3c2b1f Mon Sep 17 00:00:00 2001 From: Bob Zhao Date: Thu, 31 Oct 2024 18:16:59 -0400 Subject: [PATCH] rehouse files --- query-connector/e2e/alternate_queries.spec.ts | 2 +- query-connector/e2e/customize_query.spec.ts | 6 +++--- query-connector/e2e/query_workflow.spec.ts | 2 +- query-connector/src/app/query/components/CustomizeQuery.tsx | 2 +- .../src/app/query/components/PatientSearchResults.tsx | 2 +- query-connector/src/app/query/components/ResultsView.tsx | 2 +- query-connector/src/app/query/components/SearchForm.tsx | 2 +- .../patientSearchResults/PatientSearchResultsTable.tsx | 2 +- .../app/query/components/selectQuery/SelectSavedQuery.tsx | 2 +- .../query/{ => components}/stepIndicator/StepIndicator.tsx | 0 .../stepIndicator/stepIndicator.module.scss | 2 +- query-connector/src/app/query/page.tsx | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename query-connector/src/app/query/{ => components}/stepIndicator/StepIndicator.tsx (100%) rename query-connector/src/app/query/{ => components}/stepIndicator/stepIndicator.module.scss (79%) diff --git a/query-connector/e2e/alternate_queries.spec.ts b/query-connector/e2e/alternate_queries.spec.ts index 2f07aef13..9e1436552 100644 --- a/query-connector/e2e/alternate_queries.spec.ts +++ b/query-connector/e2e/alternate_queries.spec.ts @@ -1,6 +1,6 @@ import { test, expect } from "@playwright/test"; import { TEST_URL } from "../playwright-setup"; -import { PAGE_TITLES } from "@/app/query/stepIndicator/StepIndicator"; +import { PAGE_TITLES } from "@/app/query/components/stepIndicator/StepIndicator"; import { TEST_PATIENT, TEST_PATIENT_NAME } from "./constants"; diff --git a/query-connector/e2e/customize_query.spec.ts b/query-connector/e2e/customize_query.spec.ts index b935c528b..79269b15b 100644 --- a/query-connector/e2e/customize_query.spec.ts +++ b/query-connector/e2e/customize_query.spec.ts @@ -2,7 +2,7 @@ import { test, expect } from "@playwright/test"; import { TEST_URL } from "../playwright-setup"; -import { PAGE_TITLES } from "@/app/query/stepIndicator/StepIndicator"; +import { PAGE_TITLES } from "@/app/query/components/stepIndicator/StepIndicator"; import { TEST_PATIENT, TEST_PATIENT_NAME } from "./constants"; @@ -182,8 +182,8 @@ test.describe("querying with the Query Connector", () => { for (let i = 1; i < 6; i++) { const row = obsRows.nth(i); const typeText = await row.locator("td").nth(1).textContent(); - const presentKey = acceptableSdohKeywords.find((key) => - typeText?.toLowerCase().includes(key), + const presentKey = acceptableSdohKeywords.find( + (key) => typeText?.toLowerCase().includes(key), ); expect(presentKey).toBeDefined(); expect(typeText?.includes("chlamydia")).toBeFalsy(); diff --git a/query-connector/e2e/query_workflow.spec.ts b/query-connector/e2e/query_workflow.spec.ts index 2437a4530..9cff37987 100644 --- a/query-connector/e2e/query_workflow.spec.ts +++ b/query-connector/e2e/query_workflow.spec.ts @@ -2,7 +2,7 @@ import { test, expect } from "@playwright/test"; import { TEST_URL } from "../playwright-setup"; -import { PAGE_TITLES } from "@/app/query/stepIndicator/StepIndicator"; +import { PAGE_TITLES } from "@/app/query/components/stepIndicator/StepIndicator"; import { CONTACT_US_DISCLAIMER_EMAIL, CONTACT_US_DISCLAIMER_TEXT, diff --git a/query-connector/src/app/query/components/CustomizeQuery.tsx b/query-connector/src/app/query/components/CustomizeQuery.tsx index 62990d4c1..9a98ad641 100644 --- a/query-connector/src/app/query/components/CustomizeQuery.tsx +++ b/query-connector/src/app/query/components/CustomizeQuery.tsx @@ -23,7 +23,7 @@ import { countDibbsConceptTypeToVsMapItems, } from "./customizeQuery/customizeQueryUtils"; import Backlink from "./backLink/Backlink"; -import { RETURN_LABEL } from "../stepIndicator/StepIndicator"; +import { RETURN_LABEL } from "./stepIndicator/StepIndicator"; interface CustomizeQueryProps { useCaseQueryResponse: UseCaseQueryResponse; diff --git a/query-connector/src/app/query/components/PatientSearchResults.tsx b/query-connector/src/app/query/components/PatientSearchResults.tsx index 5ac19f407..e4356726e 100644 --- a/query-connector/src/app/query/components/PatientSearchResults.tsx +++ b/query-connector/src/app/query/components/PatientSearchResults.tsx @@ -5,7 +5,7 @@ import { Mode } from "@/app/constants"; import Backlink from "./backLink/Backlink"; import PatientSearchResultsTable from "./patientSearchResults/PatientSearchResultsTable"; import NoPatientsFound from "./patientSearchResults/NoPatientsFound"; -import { RETURN_LABEL } from "@/app/query/stepIndicator/StepIndicator"; +import { RETURN_LABEL } from "@/app/query/components/stepIndicator/StepIndicator"; /** * The props for the PatientSearchResults component. diff --git a/query-connector/src/app/query/components/ResultsView.tsx b/query-connector/src/app/query/components/ResultsView.tsx index 518e3172e..095be31e3 100644 --- a/query-connector/src/app/query/components/ResultsView.tsx +++ b/query-connector/src/app/query/components/ResultsView.tsx @@ -16,7 +16,7 @@ import { USE_CASES, demoQueryValToLabelMap } from "@/app/constants"; import { PAGE_TITLES, RETURN_LABEL, -} from "@/app/query/stepIndicator/StepIndicator"; +} from "@/app/query/components/stepIndicator/StepIndicator"; type ResultsViewProps = { useCaseQueryResponse: UseCaseQueryResponse; diff --git a/query-connector/src/app/query/components/SearchForm.tsx b/query-connector/src/app/query/components/SearchForm.tsx index 5be044800..ce8292c79 100644 --- a/query-connector/src/app/query/components/SearchForm.tsx +++ b/query-connector/src/app/query/components/SearchForm.tsx @@ -17,7 +17,7 @@ import { UseCaseQueryResponse, UseCaseQuery } from "@/app/query-service"; import { fhirServers } from "@/app/fhir-servers"; import styles from "./searchForm/searchForm.module.scss"; import { FormatPhoneAsDigits } from "@/app/format-service"; -import { PAGE_TITLES } from "@/app/query/stepIndicator/StepIndicator"; +import { PAGE_TITLES } from "@/app/query/components/stepIndicator/StepIndicator"; interface SearchFormProps { useCase: USE_CASES; diff --git a/query-connector/src/app/query/components/patientSearchResults/PatientSearchResultsTable.tsx b/query-connector/src/app/query/components/patientSearchResults/PatientSearchResultsTable.tsx index 293669a94..f13089651 100644 --- a/query-connector/src/app/query/components/patientSearchResults/PatientSearchResultsTable.tsx +++ b/query-connector/src/app/query/components/patientSearchResults/PatientSearchResultsTable.tsx @@ -6,7 +6,7 @@ import { formatMRN, formatName, } from "@/app/format-service"; -import { PAGE_TITLES } from "@/app/query/stepIndicator/StepIndicator"; +import { PAGE_TITLES } from "@/app/query/components/stepIndicator/StepIndicator"; type PatientSeacrchResultsTableProps = { patients: Patient[]; diff --git a/query-connector/src/app/query/components/selectQuery/SelectSavedQuery.tsx b/query-connector/src/app/query/components/selectQuery/SelectSavedQuery.tsx index ccd5f21f2..36634a754 100644 --- a/query-connector/src/app/query/components/selectQuery/SelectSavedQuery.tsx +++ b/query-connector/src/app/query/components/selectQuery/SelectSavedQuery.tsx @@ -11,7 +11,7 @@ import { useState } from "react"; import { PAGE_TITLES, RETURN_LABEL, -} from "@/app/query/stepIndicator/StepIndicator"; +} from "@/app/query/components/stepIndicator/StepIndicator"; type SelectSavedQueryProps = { selectedQuery: string; diff --git a/query-connector/src/app/query/stepIndicator/StepIndicator.tsx b/query-connector/src/app/query/components/stepIndicator/StepIndicator.tsx similarity index 100% rename from query-connector/src/app/query/stepIndicator/StepIndicator.tsx rename to query-connector/src/app/query/components/stepIndicator/StepIndicator.tsx diff --git a/query-connector/src/app/query/stepIndicator/stepIndicator.module.scss b/query-connector/src/app/query/components/stepIndicator/stepIndicator.module.scss similarity index 79% rename from query-connector/src/app/query/stepIndicator/stepIndicator.module.scss rename to query-connector/src/app/query/components/stepIndicator/stepIndicator.module.scss index ea9e4024c..53b627ffa 100644 --- a/query-connector/src/app/query/stepIndicator/stepIndicator.module.scss +++ b/query-connector/src/app/query/components/stepIndicator/stepIndicator.module.scss @@ -1,4 +1,4 @@ -@use "../../../styles/_variables" as *; +@use "../../../../styles/_variables" as *; .container > ol { justify-content: space-between; diff --git a/query-connector/src/app/query/page.tsx b/query-connector/src/app/query/page.tsx index c01382661..e08b2634b 100644 --- a/query-connector/src/app/query/page.tsx +++ b/query-connector/src/app/query/page.tsx @@ -17,7 +17,7 @@ import { ToastContainer } from "react-toastify"; import "react-toastify/dist/ReactToastify.min.css"; import StepIndicator, { CUSTOMIZE_QUERY_STEPS, -} from "./stepIndicator/StepIndicator"; +} from "./components/stepIndicator/StepIndicator"; import SiteAlert from "./designSystem/SiteAlert"; import { Patient } from "fhir/r4";