From 073c5ed53aa4df6ee39193a607d45989356104d9 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 16:38:43 -0400 Subject: [PATCH 01/12] rename 'src' directory to 'app' directory to work with common framework requirements --- client/{src => app}/App.scss | 0 client/{src => app}/App.tsx | 0 client/{src => app}/components/Auth/LoginForm.tsx | 0 client/{src => app}/components/Auth/index.ts | 0 .../GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx | 0 .../Charts/ManifestCountBarChart/ManifestCountBarChart.tsx | 0 .../ManifestStatusPieChart/ManifestStatusPieChart.tsx | 0 client/{src => app}/components/Charts/index.ts | 0 client/{src => app}/components/Error/Error404.tsx | 0 client/{src => app}/components/Error/ErrorBoundary.tsx | 0 client/{src => app}/components/Error/index.ts | 0 .../HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx | 0 .../components/HaztrakSite/SiteFilter/SiteFilterForm.tsx | 0 .../HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx | 0 .../components/HaztrakSite/SiteListGroup/SiteListGroup.tsx | 0 .../HaztrakSite/SiteListItem/SiteListItem.spec.tsx | 0 .../components/HaztrakSite/SiteListItem/SiteListItem.tsx | 0 .../HaztrakSite/SiteListItem/SiteListItemActions.tsx | 0 .../components/HaztrakSite/haztrakSiteSchema.ts | 0 client/{src => app}/components/HaztrakSite/index.ts | 0 client/{src => app}/components/Help/HaztrakLicense.tsx | 0 client/{src => app}/components/Help/SectionTitle.tsx | 0 client/{src => app}/components/Help/index.ts | 0 client/{src => app}/components/Layout/Nav/NavItem.tsx | 0 client/{src => app}/components/Layout/Nav/NavSection.tsx | 0 client/{src => app}/components/Layout/PrivateRoute.tsx | 0 client/{src => app}/components/Layout/Root.tsx | 0 .../{src => app}/components/Layout/Sidebar/Sidebar.spec.tsx | 0 client/{src => app}/components/Layout/Sidebar/Sidebar.tsx | 0 .../components/Layout/Sidebar/SidebarRoutes.tsx | 0 .../{src => app}/components/Layout/TopNav/TopNav.spec.tsx | 0 client/{src => app}/components/Layout/TopNav/TopNav.tsx | 0 client/{src => app}/components/Layout/index.ts | 0 .../components/Manifest/Actions/ManifestCancelBtn.tsx | 0 .../components/Manifest/Actions/ManifestEditBtn.tsx | 0 .../components/Manifest/Actions/ManifestFABs.spec.tsx | 0 .../components/Manifest/Actions/ManifestFABs.tsx | 0 .../components/Manifest/Actions/ManifestSaveBtn.tsx | 0 client/{src => app}/components/Manifest/Actions/index.ts | 0 .../Manifest/AdditionalInfo/AdditionalInfoForm.tsx | 0 .../Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx | 0 .../Manifest/AdditionalInfo/additionalInfoSchema.ts | 0 .../components/Manifest/AdditionalInfo/index.ts | 0 .../components/Manifest/Address/AddressForm.spec.tsx | 0 .../components/Manifest/Address/AddressForm.tsx | 0 .../components/Manifest/Address/GeneratorAddress.tsx | 0 .../components/Manifest/Address/StateSelect.tsx | 0 client/{src => app}/components/Manifest/Address/index.ts | 0 .../components/Manifest/Contact/ContactForm.spec.tsx | 0 .../components/Manifest/Contact/ContactForm.tsx | 0 .../components/Manifest/Contact/PhoneForm.spec.tsx | 0 .../{src => app}/components/Manifest/Contact/PhoneForm.tsx | 0 client/{src => app}/components/Manifest/Contact/index.ts | 0 .../Manifest/GeneralInfo/GeneralInfoForm.spec.tsx | 0 .../components/Manifest/GeneralInfo/GeneralInfoForm.tsx | 0 .../Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx | 0 .../Manifest/GeneralInfo/ManifestStatusSelect.tsx | 0 .../Manifest/GeneralInfo/ManifestTypeField.spec.tsx | 0 .../components/Manifest/GeneralInfo/ManifestTypeSelect.tsx | 0 .../{src => app}/components/Manifest/GeneralInfo/index.ts | 0 .../components/Manifest/Generator/GeneratorForm.spec.tsx | 0 .../components/Manifest/Generator/GeneratorForm.tsx | 0 .../components/Manifest/Generator/GeneratorSection.spec.tsx | 0 .../components/Manifest/Generator/GeneratorSection.tsx | 0 client/{src => app}/components/Manifest/Generator/index.ts | 0 .../Manifest/Handler/Search/HandlerSearchForm.spec.tsx | 0 .../Manifest/Handler/Search/HandlerSearchForm.tsx | 0 .../Manifest/Handler/Search/HandlerSearchModal.tsx | 0 .../Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx | 0 client/{src => app}/components/Manifest/Handler/index.ts | 0 .../{src => app}/components/Manifest/ManifestForm.spec.tsx | 0 client/{src => app}/components/Manifest/ManifestForm.tsx | 0 client/{src => app}/components/Manifest/NewManifestBtn.tsx | 0 .../Manifest/QuickerSign/QuickerSignForm.spec.tsx | 0 .../components/Manifest/QuickerSign/QuickerSignForm.tsx | 0 .../components/Manifest/QuickerSign/QuickerSignModal.tsx | 0 .../Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx | 0 .../Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx | 0 .../{src => app}/components/Manifest/QuickerSign/index.ts | 0 .../components/Manifest/SiteSelect/SiteSelect.spec.tsx | 0 .../components/Manifest/SiteSelect/SiteSelect.tsx | 0 .../components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx | 0 .../components/Manifest/SiteSelect/SiteTypeSelect.tsx | 0 client/{src => app}/components/Manifest/SiteSelect/index.ts | 0 .../Manifest/Transporter/TransporterRowActions.tsx | 0 .../components/Manifest/Transporter/TransporterSection.tsx | 0 .../Manifest/Transporter/TransporterTable.spec.tsx | 0 .../components/Manifest/Transporter/TransporterTable.tsx | 0 .../{src => app}/components/Manifest/Transporter/index.ts | 0 .../components/Manifest/Tsdf/TsdfSection.spec.tsx | 0 .../{src => app}/components/Manifest/Tsdf/TsdfSection.tsx | 0 client/{src => app}/components/Manifest/Tsdf/index.ts | 0 .../components/Manifest/UpdateRcra/UpdateRcra.tsx | 0 .../components/Manifest/WasteLine/DotIdSelect.tsx | 0 .../components/Manifest/WasteLine/EditWasteModal.tsx | 0 .../WasteLine/HazardousWasteForm/HazardousWasteForm.tsx | 0 .../WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx | 0 .../Manifest/WasteLine/HazardousWasteForm/index.ts | 0 .../components/Manifest/WasteLine/QuantityForm.spec.tsx | 0 .../components/Manifest/WasteLine/QuantityForm.tsx | 0 .../components/Manifest/WasteLine/WasteLineForm.spec.tsx | 0 .../components/Manifest/WasteLine/WasteLineForm.tsx | 0 .../components/Manifest/WasteLine/WasteLineSection.tsx | 0 .../Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx | 0 .../Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx | 0 .../components/Manifest/WasteLine/WasteLineTable/index.ts | 0 client/{src => app}/components/Manifest/WasteLine/index.ts | 0 .../components/Manifest/WasteLine/wasteLineSchema.ts | 0 client/{src => app}/components/Manifest/index.ts | 0 client/{src => app}/components/Manifest/manifestSchema.ts | 0 client/{src => app}/components/Mtn/MtnRowActions.tsx | 0 .../components/Mtn/MtnSearchField/MtnSearchField.tsx | 0 .../components/Mtn/MtnStatusField/MtnStatusField.tsx | 0 client/{src => app}/components/Mtn/MtnTable.spec.tsx | 0 client/{src => app}/components/Mtn/MtnTable.tsx | 0 client/{src => app}/components/Mtn/index.ts | 0 .../{src => app}/components/Notifications/Notifications.tsx | 0 .../components/Notifications/ProgressTracker.tsx | 0 client/{src => app}/components/Org/OrgSitesTable.tsx | 0 client/{src => app}/components/Org/UserOrg.tsx | 0 client/{src => app}/components/Org/index.ts | 0 client/{src => app}/components/RcraProfile/RcraProfile.tsx | 0 .../components/RcraProfile/SyncRcrainfoProfileBtn.tsx | 0 client/{src => app}/components/RcraProfile/index.ts | 0 .../{src => app}/components/RcraSite/AddressListGroup.tsx | 0 .../components/RcraSite/RcraSiteDetails.spec.tsx | 0 client/{src => app}/components/RcraSite/RcraSiteDetails.tsx | 0 client/{src => app}/components/RcraSite/index.ts | 0 client/{src => app}/components/RcraSite/rcraSiteSchema.ts | 0 .../Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx | 0 .../Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx | 0 .../buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx | 0 .../Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx | 0 client/{src => app}/components/Rcrainfo/index.ts | 0 client/{src => app}/components/UI/FeatureDescription.tsx | 0 client/{src => app}/components/UI/FloatingActionBtn.tsx | 0 client/{src => app}/components/UI/HtButton.tsx | 0 client/{src => app}/components/UI/HtCard/HtCard.spec.tsx | 0 client/{src => app}/components/UI/HtCard/HtCard.tsx | 0 client/{src => app}/components/UI/HtForm.tsx | 0 client/{src => app}/components/UI/HtModal/HtModal.spec.tsx | 0 client/{src => app}/components/UI/HtModal/HtModal.tsx | 0 client/{src => app}/components/UI/HtPaginate/HtPageBtns.tsx | 0 .../components/UI/HtPaginate/HtPageControls.tsx | 0 .../components/UI/HtPaginate/HtPaginate.spec.tsx | 0 client/{src => app}/components/UI/HtPaginate/HtPaginate.tsx | 0 client/{src => app}/components/UI/HtSpinner.tsx | 0 .../{src => app}/components/UI/HtTooltip/HtTooltip.spec.tsx | 0 client/{src => app}/components/UI/HtTooltip/HtTooltip.tsx | 0 client/{src => app}/components/UI/HtTooltip/index.ts | 0 client/{src => app}/components/UI/README.md | 0 client/{src => app}/components/UI/index.ts | 0 client/{src => app}/components/User/SiteAccess.tsx | 0 client/{src => app}/components/User/UserInfoForm.spec.tsx | 0 client/{src => app}/components/User/UserInfoForm.tsx | 0 client/{src => app}/components/User/index.ts | 0 client/{src => app}/env.d.ts | 0 client/{src => app}/features/About/About.tsx | 0 client/{src => app}/features/About/index.ts | 0 client/{src => app}/features/Dashboard/Dashboard.spec.tsx | 0 client/{src => app}/features/Dashboard/Dashboard.tsx | 0 client/{src => app}/features/Dashboard/index.ts | 0 client/{src => app}/features/ErrorPage/ErrorPage.tsx | 0 client/{src => app}/features/ErrorPage/index.ts | 0 client/{src => app}/features/Login/Login.tsx | 0 client/{src => app}/features/Login/index.ts | 0 client/{src => app}/features/Login/login.spec.tsx | 0 .../features/ManifestDetails/ManifestDetails.tsx | 0 client/{src => app}/features/ManifestDetails/index.ts | 0 client/{src => app}/features/ManifestList/ManifestList.tsx | 0 client/{src => app}/features/ManifestList/index.ts | 0 .../{src => app}/features/NewManifest/NewManifest.spec.tsx | 0 client/{src => app}/features/NewManifest/NewManifest.tsx | 0 client/{src => app}/features/NewManifest/index.ts | 0 client/{src => app}/features/Profile/Profile.tsx | 0 client/{src => app}/features/Profile/index.ts | 0 client/{src => app}/features/RegisterHero/RegisterHero.tsx | 0 client/{src => app}/features/RegisterHero/index.ts | 0 client/{src => app}/features/SiteDetails/SiteDetails.tsx | 0 client/{src => app}/features/SiteDetails/index.ts | 0 client/{src => app}/features/SiteList/SiteList.spec.tsx | 0 client/{src => app}/features/SiteList/SiteList.tsx | 0 client/{src => app}/features/SiteList/index.ts | 0 client/{src => app}/hooks/index.ts | 0 client/{src => app}/hooks/manifest/index.ts | 0 .../manifest/useManifestStatus/useManifestStatus.spec.tsx | 0 .../hooks/manifest/useManifestStatus/useManifestStatus.tsx | 0 .../useOpenHandlerSearch/useHandlerSearchConfig.tsx | 0 .../useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx | 0 .../hooks/manifest/useReadOnly/useReadOnly.spec.tsx | 0 .../{src => app}/hooks/manifest/useReadOnly/useReadOnly.tsx | 0 .../hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx | 0 .../hooks/manifest/useSaveManifest/useSaveManifest.tsx | 0 client/{src => app}/hooks/useDebounce/useDebounce.spec.tsx | 0 client/{src => app}/hooks/useDebounce/useDebounce.tsx | 0 .../{src => app}/hooks/usePagination/usePagination.spec.tsx | 0 client/{src => app}/hooks/usePagination/usePagination.tsx | 0 .../hooks/useProgressTracker/useProgressTracker.spec.tsx | 0 .../hooks/useProgressTracker/useProgressTracker.tsx | 0 client/{src => app}/hooks/useTitle/useTitle.spec.tsx | 0 client/{src => app}/hooks/useTitle/useTitle.tsx | 0 .../hooks/useUserSiteIds/useUserSiteIds.spec.tsx | 0 client/{src => app}/hooks/useUserSiteIds/useUserSiteIds.tsx | 0 client/{src => app}/index.tsx | 0 client/{src => app}/routes.tsx | 0 client/{src => app}/services/APIs/htApi.ts | 0 client/{src => app}/services/index.ts | 0 client/{src => app}/services/manifest/manifest.spec.ts | 0 client/{src => app}/services/manifest/manifest.ts | 0 client/{src => app}/setupTests.ts | 0 client/{src => app}/store/authSlice/auth.slice.spec.tsx | 0 client/{src => app}/store/authSlice/auth.slice.ts | 0 client/{src => app}/store/errorSlice/error.slice.ts | 0 client/{src => app}/store/htApi.slice.ts | 0 client/{src => app}/store/index.ts | 0 .../store/manifestSlice/manifest.slice.spec.tsx | 0 client/{src => app}/store/manifestSlice/manifest.slice.ts | 0 .../store/notificationSlice/notification.slice.spec.tsx | 0 .../store/notificationSlice/notification.slice.ts | 0 client/{src => app}/store/rootStore.ts | 0 client/{src => app}/store/userSlice/user.slice.spec.tsx | 0 client/{src => app}/store/userSlice/user.slice.ts | 0 client/{src => app}/test-utils/fixtures/index.ts | 0 client/{src => app}/test-utils/fixtures/mockHandler.ts | 0 client/{src => app}/test-utils/fixtures/mockManifest.ts | 0 client/{src => app}/test-utils/fixtures/mockUser.ts | 0 client/{src => app}/test-utils/fixtures/mockWaste.ts | 0 client/{src => app}/test-utils/index.ts | 0 client/{src => app}/test-utils/mock/index.ts | 0 .../{src => app}/test-utils/mock/mockManifestEndpoints.ts | 0 client/{src => app}/test-utils/mock/mockSiteEndpoints.ts | 0 client/{src => app}/test-utils/mock/mockUserEndpoints.ts | 0 client/{src => app}/test-utils/mock/mockWasteEndpoints.ts | 0 client/{src => app}/test-utils/render.tsx | 0 client/index.html | 2 +- client/tsconfig.json | 4 ++-- client/vite.config.ts | 6 +++--- 237 files changed, 6 insertions(+), 6 deletions(-) rename client/{src => app}/App.scss (100%) rename client/{src => app}/App.tsx (100%) rename client/{src => app}/components/Auth/LoginForm.tsx (100%) rename client/{src => app}/components/Auth/index.ts (100%) rename client/{src => app}/components/Charts/GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx (100%) rename client/{src => app}/components/Charts/ManifestCountBarChart/ManifestCountBarChart.tsx (100%) rename client/{src => app}/components/Charts/ManifestStatusPieChart/ManifestStatusPieChart.tsx (100%) rename client/{src => app}/components/Charts/index.ts (100%) rename client/{src => app}/components/Error/Error404.tsx (100%) rename client/{src => app}/components/Error/ErrorBoundary.tsx (100%) rename client/{src => app}/components/Error/index.ts (100%) rename client/{src => app}/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteListItem/SiteListItem.tsx (100%) rename client/{src => app}/components/HaztrakSite/SiteListItem/SiteListItemActions.tsx (100%) rename client/{src => app}/components/HaztrakSite/haztrakSiteSchema.ts (100%) rename client/{src => app}/components/HaztrakSite/index.ts (100%) rename client/{src => app}/components/Help/HaztrakLicense.tsx (100%) rename client/{src => app}/components/Help/SectionTitle.tsx (100%) rename client/{src => app}/components/Help/index.ts (100%) rename client/{src => app}/components/Layout/Nav/NavItem.tsx (100%) rename client/{src => app}/components/Layout/Nav/NavSection.tsx (100%) rename client/{src => app}/components/Layout/PrivateRoute.tsx (100%) rename client/{src => app}/components/Layout/Root.tsx (100%) rename client/{src => app}/components/Layout/Sidebar/Sidebar.spec.tsx (100%) rename client/{src => app}/components/Layout/Sidebar/Sidebar.tsx (100%) rename client/{src => app}/components/Layout/Sidebar/SidebarRoutes.tsx (100%) rename client/{src => app}/components/Layout/TopNav/TopNav.spec.tsx (100%) rename client/{src => app}/components/Layout/TopNav/TopNav.tsx (100%) rename client/{src => app}/components/Layout/index.ts (100%) rename client/{src => app}/components/Manifest/Actions/ManifestCancelBtn.tsx (100%) rename client/{src => app}/components/Manifest/Actions/ManifestEditBtn.tsx (100%) rename client/{src => app}/components/Manifest/Actions/ManifestFABs.spec.tsx (100%) rename client/{src => app}/components/Manifest/Actions/ManifestFABs.tsx (100%) rename client/{src => app}/components/Manifest/Actions/ManifestSaveBtn.tsx (100%) rename client/{src => app}/components/Manifest/Actions/index.ts (100%) rename client/{src => app}/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx (100%) rename client/{src => app}/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/AdditionalInfo/additionalInfoSchema.ts (100%) rename client/{src => app}/components/Manifest/AdditionalInfo/index.ts (100%) rename client/{src => app}/components/Manifest/Address/AddressForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/Address/AddressForm.tsx (100%) rename client/{src => app}/components/Manifest/Address/GeneratorAddress.tsx (100%) rename client/{src => app}/components/Manifest/Address/StateSelect.tsx (100%) rename client/{src => app}/components/Manifest/Address/index.ts (100%) rename client/{src => app}/components/Manifest/Contact/ContactForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/Contact/ContactForm.tsx (100%) rename client/{src => app}/components/Manifest/Contact/PhoneForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/Contact/PhoneForm.tsx (100%) rename client/{src => app}/components/Manifest/Contact/index.ts (100%) rename client/{src => app}/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/GeneralInfoForm.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx (100%) rename client/{src => app}/components/Manifest/GeneralInfo/index.ts (100%) rename client/{src => app}/components/Manifest/Generator/GeneratorForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/Generator/GeneratorForm.tsx (100%) rename client/{src => app}/components/Manifest/Generator/GeneratorSection.spec.tsx (100%) rename client/{src => app}/components/Manifest/Generator/GeneratorSection.tsx (100%) rename client/{src => app}/components/Manifest/Generator/index.ts (100%) rename client/{src => app}/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/Handler/Search/HandlerSearchForm.tsx (100%) rename client/{src => app}/components/Manifest/Handler/Search/HandlerSearchModal.tsx (100%) rename client/{src => app}/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx (100%) rename client/{src => app}/components/Manifest/Handler/index.ts (100%) rename client/{src => app}/components/Manifest/ManifestForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/ManifestForm.tsx (100%) rename client/{src => app}/components/Manifest/NewManifestBtn.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/QuickerSignForm.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/QuickerSignModal.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx (100%) rename client/{src => app}/components/Manifest/QuickerSign/index.ts (100%) rename client/{src => app}/components/Manifest/SiteSelect/SiteSelect.spec.tsx (100%) rename client/{src => app}/components/Manifest/SiteSelect/SiteSelect.tsx (100%) rename client/{src => app}/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx (100%) rename client/{src => app}/components/Manifest/SiteSelect/SiteTypeSelect.tsx (100%) rename client/{src => app}/components/Manifest/SiteSelect/index.ts (100%) rename client/{src => app}/components/Manifest/Transporter/TransporterRowActions.tsx (100%) rename client/{src => app}/components/Manifest/Transporter/TransporterSection.tsx (100%) rename client/{src => app}/components/Manifest/Transporter/TransporterTable.spec.tsx (100%) rename client/{src => app}/components/Manifest/Transporter/TransporterTable.tsx (100%) rename client/{src => app}/components/Manifest/Transporter/index.ts (100%) rename client/{src => app}/components/Manifest/Tsdf/TsdfSection.spec.tsx (100%) rename client/{src => app}/components/Manifest/Tsdf/TsdfSection.tsx (100%) rename client/{src => app}/components/Manifest/Tsdf/index.ts (100%) rename client/{src => app}/components/Manifest/UpdateRcra/UpdateRcra.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/DotIdSelect.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/EditWasteModal.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/HazardousWasteForm/index.ts (100%) rename client/{src => app}/components/Manifest/WasteLine/QuantityForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/QuantityForm.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineForm.spec.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineForm.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineSection.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx (100%) rename client/{src => app}/components/Manifest/WasteLine/WasteLineTable/index.ts (100%) rename client/{src => app}/components/Manifest/WasteLine/index.ts (100%) rename client/{src => app}/components/Manifest/WasteLine/wasteLineSchema.ts (100%) rename client/{src => app}/components/Manifest/index.ts (100%) rename client/{src => app}/components/Manifest/manifestSchema.ts (100%) rename client/{src => app}/components/Mtn/MtnRowActions.tsx (100%) rename client/{src => app}/components/Mtn/MtnSearchField/MtnSearchField.tsx (100%) rename client/{src => app}/components/Mtn/MtnStatusField/MtnStatusField.tsx (100%) rename client/{src => app}/components/Mtn/MtnTable.spec.tsx (100%) rename client/{src => app}/components/Mtn/MtnTable.tsx (100%) rename client/{src => app}/components/Mtn/index.ts (100%) rename client/{src => app}/components/Notifications/Notifications.tsx (100%) rename client/{src => app}/components/Notifications/ProgressTracker.tsx (100%) rename client/{src => app}/components/Org/OrgSitesTable.tsx (100%) rename client/{src => app}/components/Org/UserOrg.tsx (100%) rename client/{src => app}/components/Org/index.ts (100%) rename client/{src => app}/components/RcraProfile/RcraProfile.tsx (100%) rename client/{src => app}/components/RcraProfile/SyncRcrainfoProfileBtn.tsx (100%) rename client/{src => app}/components/RcraProfile/index.ts (100%) rename client/{src => app}/components/RcraSite/AddressListGroup.tsx (100%) rename client/{src => app}/components/RcraSite/RcraSiteDetails.spec.tsx (100%) rename client/{src => app}/components/RcraSite/RcraSiteDetails.tsx (100%) rename client/{src => app}/components/RcraSite/index.ts (100%) rename client/{src => app}/components/RcraSite/rcraSiteSchema.ts (100%) rename client/{src => app}/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx (100%) rename client/{src => app}/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx (100%) rename client/{src => app}/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx (100%) rename client/{src => app}/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx (100%) rename client/{src => app}/components/Rcrainfo/index.ts (100%) rename client/{src => app}/components/UI/FeatureDescription.tsx (100%) rename client/{src => app}/components/UI/FloatingActionBtn.tsx (100%) rename client/{src => app}/components/UI/HtButton.tsx (100%) rename client/{src => app}/components/UI/HtCard/HtCard.spec.tsx (100%) rename client/{src => app}/components/UI/HtCard/HtCard.tsx (100%) rename client/{src => app}/components/UI/HtForm.tsx (100%) rename client/{src => app}/components/UI/HtModal/HtModal.spec.tsx (100%) rename client/{src => app}/components/UI/HtModal/HtModal.tsx (100%) rename client/{src => app}/components/UI/HtPaginate/HtPageBtns.tsx (100%) rename client/{src => app}/components/UI/HtPaginate/HtPageControls.tsx (100%) rename client/{src => app}/components/UI/HtPaginate/HtPaginate.spec.tsx (100%) rename client/{src => app}/components/UI/HtPaginate/HtPaginate.tsx (100%) rename client/{src => app}/components/UI/HtSpinner.tsx (100%) rename client/{src => app}/components/UI/HtTooltip/HtTooltip.spec.tsx (100%) rename client/{src => app}/components/UI/HtTooltip/HtTooltip.tsx (100%) rename client/{src => app}/components/UI/HtTooltip/index.ts (100%) rename client/{src => app}/components/UI/README.md (100%) rename client/{src => app}/components/UI/index.ts (100%) rename client/{src => app}/components/User/SiteAccess.tsx (100%) rename client/{src => app}/components/User/UserInfoForm.spec.tsx (100%) rename client/{src => app}/components/User/UserInfoForm.tsx (100%) rename client/{src => app}/components/User/index.ts (100%) rename client/{src => app}/env.d.ts (100%) rename client/{src => app}/features/About/About.tsx (100%) rename client/{src => app}/features/About/index.ts (100%) rename client/{src => app}/features/Dashboard/Dashboard.spec.tsx (100%) rename client/{src => app}/features/Dashboard/Dashboard.tsx (100%) rename client/{src => app}/features/Dashboard/index.ts (100%) rename client/{src => app}/features/ErrorPage/ErrorPage.tsx (100%) rename client/{src => app}/features/ErrorPage/index.ts (100%) rename client/{src => app}/features/Login/Login.tsx (100%) rename client/{src => app}/features/Login/index.ts (100%) rename client/{src => app}/features/Login/login.spec.tsx (100%) rename client/{src => app}/features/ManifestDetails/ManifestDetails.tsx (100%) rename client/{src => app}/features/ManifestDetails/index.ts (100%) rename client/{src => app}/features/ManifestList/ManifestList.tsx (100%) rename client/{src => app}/features/ManifestList/index.ts (100%) rename client/{src => app}/features/NewManifest/NewManifest.spec.tsx (100%) rename client/{src => app}/features/NewManifest/NewManifest.tsx (100%) rename client/{src => app}/features/NewManifest/index.ts (100%) rename client/{src => app}/features/Profile/Profile.tsx (100%) rename client/{src => app}/features/Profile/index.ts (100%) rename client/{src => app}/features/RegisterHero/RegisterHero.tsx (100%) rename client/{src => app}/features/RegisterHero/index.ts (100%) rename client/{src => app}/features/SiteDetails/SiteDetails.tsx (100%) rename client/{src => app}/features/SiteDetails/index.ts (100%) rename client/{src => app}/features/SiteList/SiteList.spec.tsx (100%) rename client/{src => app}/features/SiteList/SiteList.tsx (100%) rename client/{src => app}/features/SiteList/index.ts (100%) rename client/{src => app}/hooks/index.ts (100%) rename client/{src => app}/hooks/manifest/index.ts (100%) rename client/{src => app}/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx (100%) rename client/{src => app}/hooks/manifest/useManifestStatus/useManifestStatus.tsx (100%) rename client/{src => app}/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx (100%) rename client/{src => app}/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx (100%) rename client/{src => app}/hooks/manifest/useReadOnly/useReadOnly.spec.tsx (100%) rename client/{src => app}/hooks/manifest/useReadOnly/useReadOnly.tsx (100%) rename client/{src => app}/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx (100%) rename client/{src => app}/hooks/manifest/useSaveManifest/useSaveManifest.tsx (100%) rename client/{src => app}/hooks/useDebounce/useDebounce.spec.tsx (100%) rename client/{src => app}/hooks/useDebounce/useDebounce.tsx (100%) rename client/{src => app}/hooks/usePagination/usePagination.spec.tsx (100%) rename client/{src => app}/hooks/usePagination/usePagination.tsx (100%) rename client/{src => app}/hooks/useProgressTracker/useProgressTracker.spec.tsx (100%) rename client/{src => app}/hooks/useProgressTracker/useProgressTracker.tsx (100%) rename client/{src => app}/hooks/useTitle/useTitle.spec.tsx (100%) rename client/{src => app}/hooks/useTitle/useTitle.tsx (100%) rename client/{src => app}/hooks/useUserSiteIds/useUserSiteIds.spec.tsx (100%) rename client/{src => app}/hooks/useUserSiteIds/useUserSiteIds.tsx (100%) rename client/{src => app}/index.tsx (100%) rename client/{src => app}/routes.tsx (100%) rename client/{src => app}/services/APIs/htApi.ts (100%) rename client/{src => app}/services/index.ts (100%) rename client/{src => app}/services/manifest/manifest.spec.ts (100%) rename client/{src => app}/services/manifest/manifest.ts (100%) rename client/{src => app}/setupTests.ts (100%) rename client/{src => app}/store/authSlice/auth.slice.spec.tsx (100%) rename client/{src => app}/store/authSlice/auth.slice.ts (100%) rename client/{src => app}/store/errorSlice/error.slice.ts (100%) rename client/{src => app}/store/htApi.slice.ts (100%) rename client/{src => app}/store/index.ts (100%) rename client/{src => app}/store/manifestSlice/manifest.slice.spec.tsx (100%) rename client/{src => app}/store/manifestSlice/manifest.slice.ts (100%) rename client/{src => app}/store/notificationSlice/notification.slice.spec.tsx (100%) rename client/{src => app}/store/notificationSlice/notification.slice.ts (100%) rename client/{src => app}/store/rootStore.ts (100%) rename client/{src => app}/store/userSlice/user.slice.spec.tsx (100%) rename client/{src => app}/store/userSlice/user.slice.ts (100%) rename client/{src => app}/test-utils/fixtures/index.ts (100%) rename client/{src => app}/test-utils/fixtures/mockHandler.ts (100%) rename client/{src => app}/test-utils/fixtures/mockManifest.ts (100%) rename client/{src => app}/test-utils/fixtures/mockUser.ts (100%) rename client/{src => app}/test-utils/fixtures/mockWaste.ts (100%) rename client/{src => app}/test-utils/index.ts (100%) rename client/{src => app}/test-utils/mock/index.ts (100%) rename client/{src => app}/test-utils/mock/mockManifestEndpoints.ts (100%) rename client/{src => app}/test-utils/mock/mockSiteEndpoints.ts (100%) rename client/{src => app}/test-utils/mock/mockUserEndpoints.ts (100%) rename client/{src => app}/test-utils/mock/mockWasteEndpoints.ts (100%) rename client/{src => app}/test-utils/render.tsx (100%) diff --git a/client/src/App.scss b/client/app/App.scss similarity index 100% rename from client/src/App.scss rename to client/app/App.scss diff --git a/client/src/App.tsx b/client/app/App.tsx similarity index 100% rename from client/src/App.tsx rename to client/app/App.tsx diff --git a/client/src/components/Auth/LoginForm.tsx b/client/app/components/Auth/LoginForm.tsx similarity index 100% rename from client/src/components/Auth/LoginForm.tsx rename to client/app/components/Auth/LoginForm.tsx diff --git a/client/src/components/Auth/index.ts b/client/app/components/Auth/index.ts similarity index 100% rename from client/src/components/Auth/index.ts rename to client/app/components/Auth/index.ts diff --git a/client/src/components/Charts/GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx b/client/app/components/Charts/GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx similarity index 100% rename from client/src/components/Charts/GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx rename to client/app/components/Charts/GeneratorStatusAreaChart/GeneratorStatusAreaChart.tsx diff --git a/client/src/components/Charts/ManifestCountBarChart/ManifestCountBarChart.tsx b/client/app/components/Charts/ManifestCountBarChart/ManifestCountBarChart.tsx similarity index 100% rename from client/src/components/Charts/ManifestCountBarChart/ManifestCountBarChart.tsx rename to client/app/components/Charts/ManifestCountBarChart/ManifestCountBarChart.tsx diff --git a/client/src/components/Charts/ManifestStatusPieChart/ManifestStatusPieChart.tsx b/client/app/components/Charts/ManifestStatusPieChart/ManifestStatusPieChart.tsx similarity index 100% rename from client/src/components/Charts/ManifestStatusPieChart/ManifestStatusPieChart.tsx rename to client/app/components/Charts/ManifestStatusPieChart/ManifestStatusPieChart.tsx diff --git a/client/src/components/Charts/index.ts b/client/app/components/Charts/index.ts similarity index 100% rename from client/src/components/Charts/index.ts rename to client/app/components/Charts/index.ts diff --git a/client/src/components/Error/Error404.tsx b/client/app/components/Error/Error404.tsx similarity index 100% rename from client/src/components/Error/Error404.tsx rename to client/app/components/Error/Error404.tsx diff --git a/client/src/components/Error/ErrorBoundary.tsx b/client/app/components/Error/ErrorBoundary.tsx similarity index 100% rename from client/src/components/Error/ErrorBoundary.tsx rename to client/app/components/Error/ErrorBoundary.tsx diff --git a/client/src/components/Error/index.ts b/client/app/components/Error/index.ts similarity index 100% rename from client/src/components/Error/index.ts rename to client/app/components/Error/index.ts diff --git a/client/src/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx rename to client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx diff --git a/client/src/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx rename to client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx diff --git a/client/src/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx rename to client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx diff --git a/client/src/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx rename to client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx diff --git a/client/src/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx rename to client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx diff --git a/client/src/components/HaztrakSite/SiteListItem/SiteListItem.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteListItem/SiteListItem.tsx rename to client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx diff --git a/client/src/components/HaztrakSite/SiteListItem/SiteListItemActions.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItemActions.tsx similarity index 100% rename from client/src/components/HaztrakSite/SiteListItem/SiteListItemActions.tsx rename to client/app/components/HaztrakSite/SiteListItem/SiteListItemActions.tsx diff --git a/client/src/components/HaztrakSite/haztrakSiteSchema.ts b/client/app/components/HaztrakSite/haztrakSiteSchema.ts similarity index 100% rename from client/src/components/HaztrakSite/haztrakSiteSchema.ts rename to client/app/components/HaztrakSite/haztrakSiteSchema.ts diff --git a/client/src/components/HaztrakSite/index.ts b/client/app/components/HaztrakSite/index.ts similarity index 100% rename from client/src/components/HaztrakSite/index.ts rename to client/app/components/HaztrakSite/index.ts diff --git a/client/src/components/Help/HaztrakLicense.tsx b/client/app/components/Help/HaztrakLicense.tsx similarity index 100% rename from client/src/components/Help/HaztrakLicense.tsx rename to client/app/components/Help/HaztrakLicense.tsx diff --git a/client/src/components/Help/SectionTitle.tsx b/client/app/components/Help/SectionTitle.tsx similarity index 100% rename from client/src/components/Help/SectionTitle.tsx rename to client/app/components/Help/SectionTitle.tsx diff --git a/client/src/components/Help/index.ts b/client/app/components/Help/index.ts similarity index 100% rename from client/src/components/Help/index.ts rename to client/app/components/Help/index.ts diff --git a/client/src/components/Layout/Nav/NavItem.tsx b/client/app/components/Layout/Nav/NavItem.tsx similarity index 100% rename from client/src/components/Layout/Nav/NavItem.tsx rename to client/app/components/Layout/Nav/NavItem.tsx diff --git a/client/src/components/Layout/Nav/NavSection.tsx b/client/app/components/Layout/Nav/NavSection.tsx similarity index 100% rename from client/src/components/Layout/Nav/NavSection.tsx rename to client/app/components/Layout/Nav/NavSection.tsx diff --git a/client/src/components/Layout/PrivateRoute.tsx b/client/app/components/Layout/PrivateRoute.tsx similarity index 100% rename from client/src/components/Layout/PrivateRoute.tsx rename to client/app/components/Layout/PrivateRoute.tsx diff --git a/client/src/components/Layout/Root.tsx b/client/app/components/Layout/Root.tsx similarity index 100% rename from client/src/components/Layout/Root.tsx rename to client/app/components/Layout/Root.tsx diff --git a/client/src/components/Layout/Sidebar/Sidebar.spec.tsx b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx similarity index 100% rename from client/src/components/Layout/Sidebar/Sidebar.spec.tsx rename to client/app/components/Layout/Sidebar/Sidebar.spec.tsx diff --git a/client/src/components/Layout/Sidebar/Sidebar.tsx b/client/app/components/Layout/Sidebar/Sidebar.tsx similarity index 100% rename from client/src/components/Layout/Sidebar/Sidebar.tsx rename to client/app/components/Layout/Sidebar/Sidebar.tsx diff --git a/client/src/components/Layout/Sidebar/SidebarRoutes.tsx b/client/app/components/Layout/Sidebar/SidebarRoutes.tsx similarity index 100% rename from client/src/components/Layout/Sidebar/SidebarRoutes.tsx rename to client/app/components/Layout/Sidebar/SidebarRoutes.tsx diff --git a/client/src/components/Layout/TopNav/TopNav.spec.tsx b/client/app/components/Layout/TopNav/TopNav.spec.tsx similarity index 100% rename from client/src/components/Layout/TopNav/TopNav.spec.tsx rename to client/app/components/Layout/TopNav/TopNav.spec.tsx diff --git a/client/src/components/Layout/TopNav/TopNav.tsx b/client/app/components/Layout/TopNav/TopNav.tsx similarity index 100% rename from client/src/components/Layout/TopNav/TopNav.tsx rename to client/app/components/Layout/TopNav/TopNav.tsx diff --git a/client/src/components/Layout/index.ts b/client/app/components/Layout/index.ts similarity index 100% rename from client/src/components/Layout/index.ts rename to client/app/components/Layout/index.ts diff --git a/client/src/components/Manifest/Actions/ManifestCancelBtn.tsx b/client/app/components/Manifest/Actions/ManifestCancelBtn.tsx similarity index 100% rename from client/src/components/Manifest/Actions/ManifestCancelBtn.tsx rename to client/app/components/Manifest/Actions/ManifestCancelBtn.tsx diff --git a/client/src/components/Manifest/Actions/ManifestEditBtn.tsx b/client/app/components/Manifest/Actions/ManifestEditBtn.tsx similarity index 100% rename from client/src/components/Manifest/Actions/ManifestEditBtn.tsx rename to client/app/components/Manifest/Actions/ManifestEditBtn.tsx diff --git a/client/src/components/Manifest/Actions/ManifestFABs.spec.tsx b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx similarity index 100% rename from client/src/components/Manifest/Actions/ManifestFABs.spec.tsx rename to client/app/components/Manifest/Actions/ManifestFABs.spec.tsx diff --git a/client/src/components/Manifest/Actions/ManifestFABs.tsx b/client/app/components/Manifest/Actions/ManifestFABs.tsx similarity index 100% rename from client/src/components/Manifest/Actions/ManifestFABs.tsx rename to client/app/components/Manifest/Actions/ManifestFABs.tsx diff --git a/client/src/components/Manifest/Actions/ManifestSaveBtn.tsx b/client/app/components/Manifest/Actions/ManifestSaveBtn.tsx similarity index 100% rename from client/src/components/Manifest/Actions/ManifestSaveBtn.tsx rename to client/app/components/Manifest/Actions/ManifestSaveBtn.tsx diff --git a/client/src/components/Manifest/Actions/index.ts b/client/app/components/Manifest/Actions/index.ts similarity index 100% rename from client/src/components/Manifest/Actions/index.ts rename to client/app/components/Manifest/Actions/index.ts diff --git a/client/src/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx similarity index 100% rename from client/src/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx rename to client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx diff --git a/client/src/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx rename to client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx diff --git a/client/src/components/Manifest/AdditionalInfo/additionalInfoSchema.ts b/client/app/components/Manifest/AdditionalInfo/additionalInfoSchema.ts similarity index 100% rename from client/src/components/Manifest/AdditionalInfo/additionalInfoSchema.ts rename to client/app/components/Manifest/AdditionalInfo/additionalInfoSchema.ts diff --git a/client/src/components/Manifest/AdditionalInfo/index.ts b/client/app/components/Manifest/AdditionalInfo/index.ts similarity index 100% rename from client/src/components/Manifest/AdditionalInfo/index.ts rename to client/app/components/Manifest/AdditionalInfo/index.ts diff --git a/client/src/components/Manifest/Address/AddressForm.spec.tsx b/client/app/components/Manifest/Address/AddressForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/Address/AddressForm.spec.tsx rename to client/app/components/Manifest/Address/AddressForm.spec.tsx diff --git a/client/src/components/Manifest/Address/AddressForm.tsx b/client/app/components/Manifest/Address/AddressForm.tsx similarity index 100% rename from client/src/components/Manifest/Address/AddressForm.tsx rename to client/app/components/Manifest/Address/AddressForm.tsx diff --git a/client/src/components/Manifest/Address/GeneratorAddress.tsx b/client/app/components/Manifest/Address/GeneratorAddress.tsx similarity index 100% rename from client/src/components/Manifest/Address/GeneratorAddress.tsx rename to client/app/components/Manifest/Address/GeneratorAddress.tsx diff --git a/client/src/components/Manifest/Address/StateSelect.tsx b/client/app/components/Manifest/Address/StateSelect.tsx similarity index 100% rename from client/src/components/Manifest/Address/StateSelect.tsx rename to client/app/components/Manifest/Address/StateSelect.tsx diff --git a/client/src/components/Manifest/Address/index.ts b/client/app/components/Manifest/Address/index.ts similarity index 100% rename from client/src/components/Manifest/Address/index.ts rename to client/app/components/Manifest/Address/index.ts diff --git a/client/src/components/Manifest/Contact/ContactForm.spec.tsx b/client/app/components/Manifest/Contact/ContactForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/Contact/ContactForm.spec.tsx rename to client/app/components/Manifest/Contact/ContactForm.spec.tsx diff --git a/client/src/components/Manifest/Contact/ContactForm.tsx b/client/app/components/Manifest/Contact/ContactForm.tsx similarity index 100% rename from client/src/components/Manifest/Contact/ContactForm.tsx rename to client/app/components/Manifest/Contact/ContactForm.tsx diff --git a/client/src/components/Manifest/Contact/PhoneForm.spec.tsx b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/Contact/PhoneForm.spec.tsx rename to client/app/components/Manifest/Contact/PhoneForm.spec.tsx diff --git a/client/src/components/Manifest/Contact/PhoneForm.tsx b/client/app/components/Manifest/Contact/PhoneForm.tsx similarity index 100% rename from client/src/components/Manifest/Contact/PhoneForm.tsx rename to client/app/components/Manifest/Contact/PhoneForm.tsx diff --git a/client/src/components/Manifest/Contact/index.ts b/client/app/components/Manifest/Contact/index.ts similarity index 100% rename from client/src/components/Manifest/Contact/index.ts rename to client/app/components/Manifest/Contact/index.ts diff --git a/client/src/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx rename to client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx diff --git a/client/src/components/Manifest/GeneralInfo/GeneralInfoForm.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/GeneralInfoForm.tsx rename to client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx diff --git a/client/src/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx rename to client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx diff --git a/client/src/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx rename to client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx diff --git a/client/src/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx rename to client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx diff --git a/client/src/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx similarity index 100% rename from client/src/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx rename to client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx diff --git a/client/src/components/Manifest/GeneralInfo/index.ts b/client/app/components/Manifest/GeneralInfo/index.ts similarity index 100% rename from client/src/components/Manifest/GeneralInfo/index.ts rename to client/app/components/Manifest/GeneralInfo/index.ts diff --git a/client/src/components/Manifest/Generator/GeneratorForm.spec.tsx b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/Generator/GeneratorForm.spec.tsx rename to client/app/components/Manifest/Generator/GeneratorForm.spec.tsx diff --git a/client/src/components/Manifest/Generator/GeneratorForm.tsx b/client/app/components/Manifest/Generator/GeneratorForm.tsx similarity index 100% rename from client/src/components/Manifest/Generator/GeneratorForm.tsx rename to client/app/components/Manifest/Generator/GeneratorForm.tsx diff --git a/client/src/components/Manifest/Generator/GeneratorSection.spec.tsx b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx similarity index 100% rename from client/src/components/Manifest/Generator/GeneratorSection.spec.tsx rename to client/app/components/Manifest/Generator/GeneratorSection.spec.tsx diff --git a/client/src/components/Manifest/Generator/GeneratorSection.tsx b/client/app/components/Manifest/Generator/GeneratorSection.tsx similarity index 100% rename from client/src/components/Manifest/Generator/GeneratorSection.tsx rename to client/app/components/Manifest/Generator/GeneratorSection.tsx diff --git a/client/src/components/Manifest/Generator/index.ts b/client/app/components/Manifest/Generator/index.ts similarity index 100% rename from client/src/components/Manifest/Generator/index.ts rename to client/app/components/Manifest/Generator/index.ts diff --git a/client/src/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx rename to client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx diff --git a/client/src/components/Manifest/Handler/Search/HandlerSearchForm.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx similarity index 100% rename from client/src/components/Manifest/Handler/Search/HandlerSearchForm.tsx rename to client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx diff --git a/client/src/components/Manifest/Handler/Search/HandlerSearchModal.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx similarity index 100% rename from client/src/components/Manifest/Handler/Search/HandlerSearchModal.tsx rename to client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx diff --git a/client/src/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx b/client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx similarity index 100% rename from client/src/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx rename to client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx diff --git a/client/src/components/Manifest/Handler/index.ts b/client/app/components/Manifest/Handler/index.ts similarity index 100% rename from client/src/components/Manifest/Handler/index.ts rename to client/app/components/Manifest/Handler/index.ts diff --git a/client/src/components/Manifest/ManifestForm.spec.tsx b/client/app/components/Manifest/ManifestForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/ManifestForm.spec.tsx rename to client/app/components/Manifest/ManifestForm.spec.tsx diff --git a/client/src/components/Manifest/ManifestForm.tsx b/client/app/components/Manifest/ManifestForm.tsx similarity index 100% rename from client/src/components/Manifest/ManifestForm.tsx rename to client/app/components/Manifest/ManifestForm.tsx diff --git a/client/src/components/Manifest/NewManifestBtn.tsx b/client/app/components/Manifest/NewManifestBtn.tsx similarity index 100% rename from client/src/components/Manifest/NewManifestBtn.tsx rename to client/app/components/Manifest/NewManifestBtn.tsx diff --git a/client/src/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx rename to client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx diff --git a/client/src/components/Manifest/QuickerSign/QuickerSignForm.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx similarity index 100% rename from client/src/components/Manifest/QuickerSign/QuickerSignForm.tsx rename to client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx diff --git a/client/src/components/Manifest/QuickerSign/QuickerSignModal.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx similarity index 100% rename from client/src/components/Manifest/QuickerSign/QuickerSignModal.tsx rename to client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx diff --git a/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx similarity index 100% rename from client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx rename to client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx diff --git a/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx similarity index 100% rename from client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx rename to client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx diff --git a/client/src/components/Manifest/QuickerSign/index.ts b/client/app/components/Manifest/QuickerSign/index.ts similarity index 100% rename from client/src/components/Manifest/QuickerSign/index.ts rename to client/app/components/Manifest/QuickerSign/index.ts diff --git a/client/src/components/Manifest/SiteSelect/SiteSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx similarity index 100% rename from client/src/components/Manifest/SiteSelect/SiteSelect.spec.tsx rename to client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx diff --git a/client/src/components/Manifest/SiteSelect/SiteSelect.tsx b/client/app/components/Manifest/SiteSelect/SiteSelect.tsx similarity index 100% rename from client/src/components/Manifest/SiteSelect/SiteSelect.tsx rename to client/app/components/Manifest/SiteSelect/SiteSelect.tsx diff --git a/client/src/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx similarity index 100% rename from client/src/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx rename to client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx diff --git a/client/src/components/Manifest/SiteSelect/SiteTypeSelect.tsx b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx similarity index 100% rename from client/src/components/Manifest/SiteSelect/SiteTypeSelect.tsx rename to client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx diff --git a/client/src/components/Manifest/SiteSelect/index.ts b/client/app/components/Manifest/SiteSelect/index.ts similarity index 100% rename from client/src/components/Manifest/SiteSelect/index.ts rename to client/app/components/Manifest/SiteSelect/index.ts diff --git a/client/src/components/Manifest/Transporter/TransporterRowActions.tsx b/client/app/components/Manifest/Transporter/TransporterRowActions.tsx similarity index 100% rename from client/src/components/Manifest/Transporter/TransporterRowActions.tsx rename to client/app/components/Manifest/Transporter/TransporterRowActions.tsx diff --git a/client/src/components/Manifest/Transporter/TransporterSection.tsx b/client/app/components/Manifest/Transporter/TransporterSection.tsx similarity index 100% rename from client/src/components/Manifest/Transporter/TransporterSection.tsx rename to client/app/components/Manifest/Transporter/TransporterSection.tsx diff --git a/client/src/components/Manifest/Transporter/TransporterTable.spec.tsx b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx similarity index 100% rename from client/src/components/Manifest/Transporter/TransporterTable.spec.tsx rename to client/app/components/Manifest/Transporter/TransporterTable.spec.tsx diff --git a/client/src/components/Manifest/Transporter/TransporterTable.tsx b/client/app/components/Manifest/Transporter/TransporterTable.tsx similarity index 100% rename from client/src/components/Manifest/Transporter/TransporterTable.tsx rename to client/app/components/Manifest/Transporter/TransporterTable.tsx diff --git a/client/src/components/Manifest/Transporter/index.ts b/client/app/components/Manifest/Transporter/index.ts similarity index 100% rename from client/src/components/Manifest/Transporter/index.ts rename to client/app/components/Manifest/Transporter/index.ts diff --git a/client/src/components/Manifest/Tsdf/TsdfSection.spec.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx similarity index 100% rename from client/src/components/Manifest/Tsdf/TsdfSection.spec.tsx rename to client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx diff --git a/client/src/components/Manifest/Tsdf/TsdfSection.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.tsx similarity index 100% rename from client/src/components/Manifest/Tsdf/TsdfSection.tsx rename to client/app/components/Manifest/Tsdf/TsdfSection.tsx diff --git a/client/src/components/Manifest/Tsdf/index.ts b/client/app/components/Manifest/Tsdf/index.ts similarity index 100% rename from client/src/components/Manifest/Tsdf/index.ts rename to client/app/components/Manifest/Tsdf/index.ts diff --git a/client/src/components/Manifest/UpdateRcra/UpdateRcra.tsx b/client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx similarity index 100% rename from client/src/components/Manifest/UpdateRcra/UpdateRcra.tsx rename to client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx diff --git a/client/src/components/Manifest/WasteLine/DotIdSelect.tsx b/client/app/components/Manifest/WasteLine/DotIdSelect.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/DotIdSelect.tsx rename to client/app/components/Manifest/WasteLine/DotIdSelect.tsx diff --git a/client/src/components/Manifest/WasteLine/EditWasteModal.tsx b/client/app/components/Manifest/WasteLine/EditWasteModal.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/EditWasteModal.tsx rename to client/app/components/Manifest/WasteLine/EditWasteModal.tsx diff --git a/client/src/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx b/client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx rename to client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx diff --git a/client/src/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx b/client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx rename to client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx diff --git a/client/src/components/Manifest/WasteLine/HazardousWasteForm/index.ts b/client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts similarity index 100% rename from client/src/components/Manifest/WasteLine/HazardousWasteForm/index.ts rename to client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts diff --git a/client/src/components/Manifest/WasteLine/QuantityForm.spec.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/QuantityForm.spec.tsx rename to client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx diff --git a/client/src/components/Manifest/WasteLine/QuantityForm.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/QuantityForm.tsx rename to client/app/components/Manifest/WasteLine/QuantityForm.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineForm.spec.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineForm.spec.tsx rename to client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineForm.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineForm.tsx rename to client/app/components/Manifest/WasteLine/WasteLineForm.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineSection.tsx b/client/app/components/Manifest/WasteLine/WasteLineSection.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineSection.tsx rename to client/app/components/Manifest/WasteLine/WasteLineSection.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx rename to client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx rename to client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx diff --git a/client/src/components/Manifest/WasteLine/WasteLineTable/index.ts b/client/app/components/Manifest/WasteLine/WasteLineTable/index.ts similarity index 100% rename from client/src/components/Manifest/WasteLine/WasteLineTable/index.ts rename to client/app/components/Manifest/WasteLine/WasteLineTable/index.ts diff --git a/client/src/components/Manifest/WasteLine/index.ts b/client/app/components/Manifest/WasteLine/index.ts similarity index 100% rename from client/src/components/Manifest/WasteLine/index.ts rename to client/app/components/Manifest/WasteLine/index.ts diff --git a/client/src/components/Manifest/WasteLine/wasteLineSchema.ts b/client/app/components/Manifest/WasteLine/wasteLineSchema.ts similarity index 100% rename from client/src/components/Manifest/WasteLine/wasteLineSchema.ts rename to client/app/components/Manifest/WasteLine/wasteLineSchema.ts diff --git a/client/src/components/Manifest/index.ts b/client/app/components/Manifest/index.ts similarity index 100% rename from client/src/components/Manifest/index.ts rename to client/app/components/Manifest/index.ts diff --git a/client/src/components/Manifest/manifestSchema.ts b/client/app/components/Manifest/manifestSchema.ts similarity index 100% rename from client/src/components/Manifest/manifestSchema.ts rename to client/app/components/Manifest/manifestSchema.ts diff --git a/client/src/components/Mtn/MtnRowActions.tsx b/client/app/components/Mtn/MtnRowActions.tsx similarity index 100% rename from client/src/components/Mtn/MtnRowActions.tsx rename to client/app/components/Mtn/MtnRowActions.tsx diff --git a/client/src/components/Mtn/MtnSearchField/MtnSearchField.tsx b/client/app/components/Mtn/MtnSearchField/MtnSearchField.tsx similarity index 100% rename from client/src/components/Mtn/MtnSearchField/MtnSearchField.tsx rename to client/app/components/Mtn/MtnSearchField/MtnSearchField.tsx diff --git a/client/src/components/Mtn/MtnStatusField/MtnStatusField.tsx b/client/app/components/Mtn/MtnStatusField/MtnStatusField.tsx similarity index 100% rename from client/src/components/Mtn/MtnStatusField/MtnStatusField.tsx rename to client/app/components/Mtn/MtnStatusField/MtnStatusField.tsx diff --git a/client/src/components/Mtn/MtnTable.spec.tsx b/client/app/components/Mtn/MtnTable.spec.tsx similarity index 100% rename from client/src/components/Mtn/MtnTable.spec.tsx rename to client/app/components/Mtn/MtnTable.spec.tsx diff --git a/client/src/components/Mtn/MtnTable.tsx b/client/app/components/Mtn/MtnTable.tsx similarity index 100% rename from client/src/components/Mtn/MtnTable.tsx rename to client/app/components/Mtn/MtnTable.tsx diff --git a/client/src/components/Mtn/index.ts b/client/app/components/Mtn/index.ts similarity index 100% rename from client/src/components/Mtn/index.ts rename to client/app/components/Mtn/index.ts diff --git a/client/src/components/Notifications/Notifications.tsx b/client/app/components/Notifications/Notifications.tsx similarity index 100% rename from client/src/components/Notifications/Notifications.tsx rename to client/app/components/Notifications/Notifications.tsx diff --git a/client/src/components/Notifications/ProgressTracker.tsx b/client/app/components/Notifications/ProgressTracker.tsx similarity index 100% rename from client/src/components/Notifications/ProgressTracker.tsx rename to client/app/components/Notifications/ProgressTracker.tsx diff --git a/client/src/components/Org/OrgSitesTable.tsx b/client/app/components/Org/OrgSitesTable.tsx similarity index 100% rename from client/src/components/Org/OrgSitesTable.tsx rename to client/app/components/Org/OrgSitesTable.tsx diff --git a/client/src/components/Org/UserOrg.tsx b/client/app/components/Org/UserOrg.tsx similarity index 100% rename from client/src/components/Org/UserOrg.tsx rename to client/app/components/Org/UserOrg.tsx diff --git a/client/src/components/Org/index.ts b/client/app/components/Org/index.ts similarity index 100% rename from client/src/components/Org/index.ts rename to client/app/components/Org/index.ts diff --git a/client/src/components/RcraProfile/RcraProfile.tsx b/client/app/components/RcraProfile/RcraProfile.tsx similarity index 100% rename from client/src/components/RcraProfile/RcraProfile.tsx rename to client/app/components/RcraProfile/RcraProfile.tsx diff --git a/client/src/components/RcraProfile/SyncRcrainfoProfileBtn.tsx b/client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx similarity index 100% rename from client/src/components/RcraProfile/SyncRcrainfoProfileBtn.tsx rename to client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx diff --git a/client/src/components/RcraProfile/index.ts b/client/app/components/RcraProfile/index.ts similarity index 100% rename from client/src/components/RcraProfile/index.ts rename to client/app/components/RcraProfile/index.ts diff --git a/client/src/components/RcraSite/AddressListGroup.tsx b/client/app/components/RcraSite/AddressListGroup.tsx similarity index 100% rename from client/src/components/RcraSite/AddressListGroup.tsx rename to client/app/components/RcraSite/AddressListGroup.tsx diff --git a/client/src/components/RcraSite/RcraSiteDetails.spec.tsx b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx similarity index 100% rename from client/src/components/RcraSite/RcraSiteDetails.spec.tsx rename to client/app/components/RcraSite/RcraSiteDetails.spec.tsx diff --git a/client/src/components/RcraSite/RcraSiteDetails.tsx b/client/app/components/RcraSite/RcraSiteDetails.tsx similarity index 100% rename from client/src/components/RcraSite/RcraSiteDetails.tsx rename to client/app/components/RcraSite/RcraSiteDetails.tsx diff --git a/client/src/components/RcraSite/index.ts b/client/app/components/RcraSite/index.ts similarity index 100% rename from client/src/components/RcraSite/index.ts rename to client/app/components/RcraSite/index.ts diff --git a/client/src/components/RcraSite/rcraSiteSchema.ts b/client/app/components/RcraSite/rcraSiteSchema.ts similarity index 100% rename from client/src/components/RcraSite/rcraSiteSchema.ts rename to client/app/components/RcraSite/rcraSiteSchema.ts diff --git a/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx similarity index 100% rename from client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx rename to client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx diff --git a/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx similarity index 100% rename from client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx rename to client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx diff --git a/client/src/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx similarity index 100% rename from client/src/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx rename to client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx diff --git a/client/src/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx similarity index 100% rename from client/src/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx rename to client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx diff --git a/client/src/components/Rcrainfo/index.ts b/client/app/components/Rcrainfo/index.ts similarity index 100% rename from client/src/components/Rcrainfo/index.ts rename to client/app/components/Rcrainfo/index.ts diff --git a/client/src/components/UI/FeatureDescription.tsx b/client/app/components/UI/FeatureDescription.tsx similarity index 100% rename from client/src/components/UI/FeatureDescription.tsx rename to client/app/components/UI/FeatureDescription.tsx diff --git a/client/src/components/UI/FloatingActionBtn.tsx b/client/app/components/UI/FloatingActionBtn.tsx similarity index 100% rename from client/src/components/UI/FloatingActionBtn.tsx rename to client/app/components/UI/FloatingActionBtn.tsx diff --git a/client/src/components/UI/HtButton.tsx b/client/app/components/UI/HtButton.tsx similarity index 100% rename from client/src/components/UI/HtButton.tsx rename to client/app/components/UI/HtButton.tsx diff --git a/client/src/components/UI/HtCard/HtCard.spec.tsx b/client/app/components/UI/HtCard/HtCard.spec.tsx similarity index 100% rename from client/src/components/UI/HtCard/HtCard.spec.tsx rename to client/app/components/UI/HtCard/HtCard.spec.tsx diff --git a/client/src/components/UI/HtCard/HtCard.tsx b/client/app/components/UI/HtCard/HtCard.tsx similarity index 100% rename from client/src/components/UI/HtCard/HtCard.tsx rename to client/app/components/UI/HtCard/HtCard.tsx diff --git a/client/src/components/UI/HtForm.tsx b/client/app/components/UI/HtForm.tsx similarity index 100% rename from client/src/components/UI/HtForm.tsx rename to client/app/components/UI/HtForm.tsx diff --git a/client/src/components/UI/HtModal/HtModal.spec.tsx b/client/app/components/UI/HtModal/HtModal.spec.tsx similarity index 100% rename from client/src/components/UI/HtModal/HtModal.spec.tsx rename to client/app/components/UI/HtModal/HtModal.spec.tsx diff --git a/client/src/components/UI/HtModal/HtModal.tsx b/client/app/components/UI/HtModal/HtModal.tsx similarity index 100% rename from client/src/components/UI/HtModal/HtModal.tsx rename to client/app/components/UI/HtModal/HtModal.tsx diff --git a/client/src/components/UI/HtPaginate/HtPageBtns.tsx b/client/app/components/UI/HtPaginate/HtPageBtns.tsx similarity index 100% rename from client/src/components/UI/HtPaginate/HtPageBtns.tsx rename to client/app/components/UI/HtPaginate/HtPageBtns.tsx diff --git a/client/src/components/UI/HtPaginate/HtPageControls.tsx b/client/app/components/UI/HtPaginate/HtPageControls.tsx similarity index 100% rename from client/src/components/UI/HtPaginate/HtPageControls.tsx rename to client/app/components/UI/HtPaginate/HtPageControls.tsx diff --git a/client/src/components/UI/HtPaginate/HtPaginate.spec.tsx b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx similarity index 100% rename from client/src/components/UI/HtPaginate/HtPaginate.spec.tsx rename to client/app/components/UI/HtPaginate/HtPaginate.spec.tsx diff --git a/client/src/components/UI/HtPaginate/HtPaginate.tsx b/client/app/components/UI/HtPaginate/HtPaginate.tsx similarity index 100% rename from client/src/components/UI/HtPaginate/HtPaginate.tsx rename to client/app/components/UI/HtPaginate/HtPaginate.tsx diff --git a/client/src/components/UI/HtSpinner.tsx b/client/app/components/UI/HtSpinner.tsx similarity index 100% rename from client/src/components/UI/HtSpinner.tsx rename to client/app/components/UI/HtSpinner.tsx diff --git a/client/src/components/UI/HtTooltip/HtTooltip.spec.tsx b/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx similarity index 100% rename from client/src/components/UI/HtTooltip/HtTooltip.spec.tsx rename to client/app/components/UI/HtTooltip/HtTooltip.spec.tsx diff --git a/client/src/components/UI/HtTooltip/HtTooltip.tsx b/client/app/components/UI/HtTooltip/HtTooltip.tsx similarity index 100% rename from client/src/components/UI/HtTooltip/HtTooltip.tsx rename to client/app/components/UI/HtTooltip/HtTooltip.tsx diff --git a/client/src/components/UI/HtTooltip/index.ts b/client/app/components/UI/HtTooltip/index.ts similarity index 100% rename from client/src/components/UI/HtTooltip/index.ts rename to client/app/components/UI/HtTooltip/index.ts diff --git a/client/src/components/UI/README.md b/client/app/components/UI/README.md similarity index 100% rename from client/src/components/UI/README.md rename to client/app/components/UI/README.md diff --git a/client/src/components/UI/index.ts b/client/app/components/UI/index.ts similarity index 100% rename from client/src/components/UI/index.ts rename to client/app/components/UI/index.ts diff --git a/client/src/components/User/SiteAccess.tsx b/client/app/components/User/SiteAccess.tsx similarity index 100% rename from client/src/components/User/SiteAccess.tsx rename to client/app/components/User/SiteAccess.tsx diff --git a/client/src/components/User/UserInfoForm.spec.tsx b/client/app/components/User/UserInfoForm.spec.tsx similarity index 100% rename from client/src/components/User/UserInfoForm.spec.tsx rename to client/app/components/User/UserInfoForm.spec.tsx diff --git a/client/src/components/User/UserInfoForm.tsx b/client/app/components/User/UserInfoForm.tsx similarity index 100% rename from client/src/components/User/UserInfoForm.tsx rename to client/app/components/User/UserInfoForm.tsx diff --git a/client/src/components/User/index.ts b/client/app/components/User/index.ts similarity index 100% rename from client/src/components/User/index.ts rename to client/app/components/User/index.ts diff --git a/client/src/env.d.ts b/client/app/env.d.ts similarity index 100% rename from client/src/env.d.ts rename to client/app/env.d.ts diff --git a/client/src/features/About/About.tsx b/client/app/features/About/About.tsx similarity index 100% rename from client/src/features/About/About.tsx rename to client/app/features/About/About.tsx diff --git a/client/src/features/About/index.ts b/client/app/features/About/index.ts similarity index 100% rename from client/src/features/About/index.ts rename to client/app/features/About/index.ts diff --git a/client/src/features/Dashboard/Dashboard.spec.tsx b/client/app/features/Dashboard/Dashboard.spec.tsx similarity index 100% rename from client/src/features/Dashboard/Dashboard.spec.tsx rename to client/app/features/Dashboard/Dashboard.spec.tsx diff --git a/client/src/features/Dashboard/Dashboard.tsx b/client/app/features/Dashboard/Dashboard.tsx similarity index 100% rename from client/src/features/Dashboard/Dashboard.tsx rename to client/app/features/Dashboard/Dashboard.tsx diff --git a/client/src/features/Dashboard/index.ts b/client/app/features/Dashboard/index.ts similarity index 100% rename from client/src/features/Dashboard/index.ts rename to client/app/features/Dashboard/index.ts diff --git a/client/src/features/ErrorPage/ErrorPage.tsx b/client/app/features/ErrorPage/ErrorPage.tsx similarity index 100% rename from client/src/features/ErrorPage/ErrorPage.tsx rename to client/app/features/ErrorPage/ErrorPage.tsx diff --git a/client/src/features/ErrorPage/index.ts b/client/app/features/ErrorPage/index.ts similarity index 100% rename from client/src/features/ErrorPage/index.ts rename to client/app/features/ErrorPage/index.ts diff --git a/client/src/features/Login/Login.tsx b/client/app/features/Login/Login.tsx similarity index 100% rename from client/src/features/Login/Login.tsx rename to client/app/features/Login/Login.tsx diff --git a/client/src/features/Login/index.ts b/client/app/features/Login/index.ts similarity index 100% rename from client/src/features/Login/index.ts rename to client/app/features/Login/index.ts diff --git a/client/src/features/Login/login.spec.tsx b/client/app/features/Login/login.spec.tsx similarity index 100% rename from client/src/features/Login/login.spec.tsx rename to client/app/features/Login/login.spec.tsx diff --git a/client/src/features/ManifestDetails/ManifestDetails.tsx b/client/app/features/ManifestDetails/ManifestDetails.tsx similarity index 100% rename from client/src/features/ManifestDetails/ManifestDetails.tsx rename to client/app/features/ManifestDetails/ManifestDetails.tsx diff --git a/client/src/features/ManifestDetails/index.ts b/client/app/features/ManifestDetails/index.ts similarity index 100% rename from client/src/features/ManifestDetails/index.ts rename to client/app/features/ManifestDetails/index.ts diff --git a/client/src/features/ManifestList/ManifestList.tsx b/client/app/features/ManifestList/ManifestList.tsx similarity index 100% rename from client/src/features/ManifestList/ManifestList.tsx rename to client/app/features/ManifestList/ManifestList.tsx diff --git a/client/src/features/ManifestList/index.ts b/client/app/features/ManifestList/index.ts similarity index 100% rename from client/src/features/ManifestList/index.ts rename to client/app/features/ManifestList/index.ts diff --git a/client/src/features/NewManifest/NewManifest.spec.tsx b/client/app/features/NewManifest/NewManifest.spec.tsx similarity index 100% rename from client/src/features/NewManifest/NewManifest.spec.tsx rename to client/app/features/NewManifest/NewManifest.spec.tsx diff --git a/client/src/features/NewManifest/NewManifest.tsx b/client/app/features/NewManifest/NewManifest.tsx similarity index 100% rename from client/src/features/NewManifest/NewManifest.tsx rename to client/app/features/NewManifest/NewManifest.tsx diff --git a/client/src/features/NewManifest/index.ts b/client/app/features/NewManifest/index.ts similarity index 100% rename from client/src/features/NewManifest/index.ts rename to client/app/features/NewManifest/index.ts diff --git a/client/src/features/Profile/Profile.tsx b/client/app/features/Profile/Profile.tsx similarity index 100% rename from client/src/features/Profile/Profile.tsx rename to client/app/features/Profile/Profile.tsx diff --git a/client/src/features/Profile/index.ts b/client/app/features/Profile/index.ts similarity index 100% rename from client/src/features/Profile/index.ts rename to client/app/features/Profile/index.ts diff --git a/client/src/features/RegisterHero/RegisterHero.tsx b/client/app/features/RegisterHero/RegisterHero.tsx similarity index 100% rename from client/src/features/RegisterHero/RegisterHero.tsx rename to client/app/features/RegisterHero/RegisterHero.tsx diff --git a/client/src/features/RegisterHero/index.ts b/client/app/features/RegisterHero/index.ts similarity index 100% rename from client/src/features/RegisterHero/index.ts rename to client/app/features/RegisterHero/index.ts diff --git a/client/src/features/SiteDetails/SiteDetails.tsx b/client/app/features/SiteDetails/SiteDetails.tsx similarity index 100% rename from client/src/features/SiteDetails/SiteDetails.tsx rename to client/app/features/SiteDetails/SiteDetails.tsx diff --git a/client/src/features/SiteDetails/index.ts b/client/app/features/SiteDetails/index.ts similarity index 100% rename from client/src/features/SiteDetails/index.ts rename to client/app/features/SiteDetails/index.ts diff --git a/client/src/features/SiteList/SiteList.spec.tsx b/client/app/features/SiteList/SiteList.spec.tsx similarity index 100% rename from client/src/features/SiteList/SiteList.spec.tsx rename to client/app/features/SiteList/SiteList.spec.tsx diff --git a/client/src/features/SiteList/SiteList.tsx b/client/app/features/SiteList/SiteList.tsx similarity index 100% rename from client/src/features/SiteList/SiteList.tsx rename to client/app/features/SiteList/SiteList.tsx diff --git a/client/src/features/SiteList/index.ts b/client/app/features/SiteList/index.ts similarity index 100% rename from client/src/features/SiteList/index.ts rename to client/app/features/SiteList/index.ts diff --git a/client/src/hooks/index.ts b/client/app/hooks/index.ts similarity index 100% rename from client/src/hooks/index.ts rename to client/app/hooks/index.ts diff --git a/client/src/hooks/manifest/index.ts b/client/app/hooks/manifest/index.ts similarity index 100% rename from client/src/hooks/manifest/index.ts rename to client/app/hooks/manifest/index.ts diff --git a/client/src/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx similarity index 100% rename from client/src/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx rename to client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx diff --git a/client/src/hooks/manifest/useManifestStatus/useManifestStatus.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx similarity index 100% rename from client/src/hooks/manifest/useManifestStatus/useManifestStatus.tsx rename to client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx diff --git a/client/src/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx similarity index 100% rename from client/src/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx rename to client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx diff --git a/client/src/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx similarity index 100% rename from client/src/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx rename to client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx diff --git a/client/src/hooks/manifest/useReadOnly/useReadOnly.spec.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx similarity index 100% rename from client/src/hooks/manifest/useReadOnly/useReadOnly.spec.tsx rename to client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx diff --git a/client/src/hooks/manifest/useReadOnly/useReadOnly.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.tsx similarity index 100% rename from client/src/hooks/manifest/useReadOnly/useReadOnly.tsx rename to client/app/hooks/manifest/useReadOnly/useReadOnly.tsx diff --git a/client/src/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx similarity index 100% rename from client/src/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx rename to client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx diff --git a/client/src/hooks/manifest/useSaveManifest/useSaveManifest.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx similarity index 100% rename from client/src/hooks/manifest/useSaveManifest/useSaveManifest.tsx rename to client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx diff --git a/client/src/hooks/useDebounce/useDebounce.spec.tsx b/client/app/hooks/useDebounce/useDebounce.spec.tsx similarity index 100% rename from client/src/hooks/useDebounce/useDebounce.spec.tsx rename to client/app/hooks/useDebounce/useDebounce.spec.tsx diff --git a/client/src/hooks/useDebounce/useDebounce.tsx b/client/app/hooks/useDebounce/useDebounce.tsx similarity index 100% rename from client/src/hooks/useDebounce/useDebounce.tsx rename to client/app/hooks/useDebounce/useDebounce.tsx diff --git a/client/src/hooks/usePagination/usePagination.spec.tsx b/client/app/hooks/usePagination/usePagination.spec.tsx similarity index 100% rename from client/src/hooks/usePagination/usePagination.spec.tsx rename to client/app/hooks/usePagination/usePagination.spec.tsx diff --git a/client/src/hooks/usePagination/usePagination.tsx b/client/app/hooks/usePagination/usePagination.tsx similarity index 100% rename from client/src/hooks/usePagination/usePagination.tsx rename to client/app/hooks/usePagination/usePagination.tsx diff --git a/client/src/hooks/useProgressTracker/useProgressTracker.spec.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx similarity index 100% rename from client/src/hooks/useProgressTracker/useProgressTracker.spec.tsx rename to client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx diff --git a/client/src/hooks/useProgressTracker/useProgressTracker.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.tsx similarity index 100% rename from client/src/hooks/useProgressTracker/useProgressTracker.tsx rename to client/app/hooks/useProgressTracker/useProgressTracker.tsx diff --git a/client/src/hooks/useTitle/useTitle.spec.tsx b/client/app/hooks/useTitle/useTitle.spec.tsx similarity index 100% rename from client/src/hooks/useTitle/useTitle.spec.tsx rename to client/app/hooks/useTitle/useTitle.spec.tsx diff --git a/client/src/hooks/useTitle/useTitle.tsx b/client/app/hooks/useTitle/useTitle.tsx similarity index 100% rename from client/src/hooks/useTitle/useTitle.tsx rename to client/app/hooks/useTitle/useTitle.tsx diff --git a/client/src/hooks/useUserSiteIds/useUserSiteIds.spec.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx similarity index 100% rename from client/src/hooks/useUserSiteIds/useUserSiteIds.spec.tsx rename to client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx diff --git a/client/src/hooks/useUserSiteIds/useUserSiteIds.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.tsx similarity index 100% rename from client/src/hooks/useUserSiteIds/useUserSiteIds.tsx rename to client/app/hooks/useUserSiteIds/useUserSiteIds.tsx diff --git a/client/src/index.tsx b/client/app/index.tsx similarity index 100% rename from client/src/index.tsx rename to client/app/index.tsx diff --git a/client/src/routes.tsx b/client/app/routes.tsx similarity index 100% rename from client/src/routes.tsx rename to client/app/routes.tsx diff --git a/client/src/services/APIs/htApi.ts b/client/app/services/APIs/htApi.ts similarity index 100% rename from client/src/services/APIs/htApi.ts rename to client/app/services/APIs/htApi.ts diff --git a/client/src/services/index.ts b/client/app/services/index.ts similarity index 100% rename from client/src/services/index.ts rename to client/app/services/index.ts diff --git a/client/src/services/manifest/manifest.spec.ts b/client/app/services/manifest/manifest.spec.ts similarity index 100% rename from client/src/services/manifest/manifest.spec.ts rename to client/app/services/manifest/manifest.spec.ts diff --git a/client/src/services/manifest/manifest.ts b/client/app/services/manifest/manifest.ts similarity index 100% rename from client/src/services/manifest/manifest.ts rename to client/app/services/manifest/manifest.ts diff --git a/client/src/setupTests.ts b/client/app/setupTests.ts similarity index 100% rename from client/src/setupTests.ts rename to client/app/setupTests.ts diff --git a/client/src/store/authSlice/auth.slice.spec.tsx b/client/app/store/authSlice/auth.slice.spec.tsx similarity index 100% rename from client/src/store/authSlice/auth.slice.spec.tsx rename to client/app/store/authSlice/auth.slice.spec.tsx diff --git a/client/src/store/authSlice/auth.slice.ts b/client/app/store/authSlice/auth.slice.ts similarity index 100% rename from client/src/store/authSlice/auth.slice.ts rename to client/app/store/authSlice/auth.slice.ts diff --git a/client/src/store/errorSlice/error.slice.ts b/client/app/store/errorSlice/error.slice.ts similarity index 100% rename from client/src/store/errorSlice/error.slice.ts rename to client/app/store/errorSlice/error.slice.ts diff --git a/client/src/store/htApi.slice.ts b/client/app/store/htApi.slice.ts similarity index 100% rename from client/src/store/htApi.slice.ts rename to client/app/store/htApi.slice.ts diff --git a/client/src/store/index.ts b/client/app/store/index.ts similarity index 100% rename from client/src/store/index.ts rename to client/app/store/index.ts diff --git a/client/src/store/manifestSlice/manifest.slice.spec.tsx b/client/app/store/manifestSlice/manifest.slice.spec.tsx similarity index 100% rename from client/src/store/manifestSlice/manifest.slice.spec.tsx rename to client/app/store/manifestSlice/manifest.slice.spec.tsx diff --git a/client/src/store/manifestSlice/manifest.slice.ts b/client/app/store/manifestSlice/manifest.slice.ts similarity index 100% rename from client/src/store/manifestSlice/manifest.slice.ts rename to client/app/store/manifestSlice/manifest.slice.ts diff --git a/client/src/store/notificationSlice/notification.slice.spec.tsx b/client/app/store/notificationSlice/notification.slice.spec.tsx similarity index 100% rename from client/src/store/notificationSlice/notification.slice.spec.tsx rename to client/app/store/notificationSlice/notification.slice.spec.tsx diff --git a/client/src/store/notificationSlice/notification.slice.ts b/client/app/store/notificationSlice/notification.slice.ts similarity index 100% rename from client/src/store/notificationSlice/notification.slice.ts rename to client/app/store/notificationSlice/notification.slice.ts diff --git a/client/src/store/rootStore.ts b/client/app/store/rootStore.ts similarity index 100% rename from client/src/store/rootStore.ts rename to client/app/store/rootStore.ts diff --git a/client/src/store/userSlice/user.slice.spec.tsx b/client/app/store/userSlice/user.slice.spec.tsx similarity index 100% rename from client/src/store/userSlice/user.slice.spec.tsx rename to client/app/store/userSlice/user.slice.spec.tsx diff --git a/client/src/store/userSlice/user.slice.ts b/client/app/store/userSlice/user.slice.ts similarity index 100% rename from client/src/store/userSlice/user.slice.ts rename to client/app/store/userSlice/user.slice.ts diff --git a/client/src/test-utils/fixtures/index.ts b/client/app/test-utils/fixtures/index.ts similarity index 100% rename from client/src/test-utils/fixtures/index.ts rename to client/app/test-utils/fixtures/index.ts diff --git a/client/src/test-utils/fixtures/mockHandler.ts b/client/app/test-utils/fixtures/mockHandler.ts similarity index 100% rename from client/src/test-utils/fixtures/mockHandler.ts rename to client/app/test-utils/fixtures/mockHandler.ts diff --git a/client/src/test-utils/fixtures/mockManifest.ts b/client/app/test-utils/fixtures/mockManifest.ts similarity index 100% rename from client/src/test-utils/fixtures/mockManifest.ts rename to client/app/test-utils/fixtures/mockManifest.ts diff --git a/client/src/test-utils/fixtures/mockUser.ts b/client/app/test-utils/fixtures/mockUser.ts similarity index 100% rename from client/src/test-utils/fixtures/mockUser.ts rename to client/app/test-utils/fixtures/mockUser.ts diff --git a/client/src/test-utils/fixtures/mockWaste.ts b/client/app/test-utils/fixtures/mockWaste.ts similarity index 100% rename from client/src/test-utils/fixtures/mockWaste.ts rename to client/app/test-utils/fixtures/mockWaste.ts diff --git a/client/src/test-utils/index.ts b/client/app/test-utils/index.ts similarity index 100% rename from client/src/test-utils/index.ts rename to client/app/test-utils/index.ts diff --git a/client/src/test-utils/mock/index.ts b/client/app/test-utils/mock/index.ts similarity index 100% rename from client/src/test-utils/mock/index.ts rename to client/app/test-utils/mock/index.ts diff --git a/client/src/test-utils/mock/mockManifestEndpoints.ts b/client/app/test-utils/mock/mockManifestEndpoints.ts similarity index 100% rename from client/src/test-utils/mock/mockManifestEndpoints.ts rename to client/app/test-utils/mock/mockManifestEndpoints.ts diff --git a/client/src/test-utils/mock/mockSiteEndpoints.ts b/client/app/test-utils/mock/mockSiteEndpoints.ts similarity index 100% rename from client/src/test-utils/mock/mockSiteEndpoints.ts rename to client/app/test-utils/mock/mockSiteEndpoints.ts diff --git a/client/src/test-utils/mock/mockUserEndpoints.ts b/client/app/test-utils/mock/mockUserEndpoints.ts similarity index 100% rename from client/src/test-utils/mock/mockUserEndpoints.ts rename to client/app/test-utils/mock/mockUserEndpoints.ts diff --git a/client/src/test-utils/mock/mockWasteEndpoints.ts b/client/app/test-utils/mock/mockWasteEndpoints.ts similarity index 100% rename from client/src/test-utils/mock/mockWasteEndpoints.ts rename to client/app/test-utils/mock/mockWasteEndpoints.ts diff --git a/client/src/test-utils/render.tsx b/client/app/test-utils/render.tsx similarity index 100% rename from client/src/test-utils/render.tsx rename to client/app/test-utils/render.tsx diff --git a/client/index.html b/client/index.html index 9bf0d86fa..23c284269 100644 --- a/client/index.html +++ b/client/index.html @@ -12,6 +12,6 @@
- + diff --git a/client/tsconfig.json b/client/tsconfig.json index 4648b4277..c236d491d 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "baseUrl": "src", + "baseUrl": "app", "target": "es5", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, @@ -18,6 +18,6 @@ "jsx": "react-jsx", "incremental": true }, - "include": ["src"], + "include": ["app"], "exclude": ["node_modules", "build"] } diff --git a/client/vite.config.ts b/client/vite.config.ts index d4d491d86..ddd5fb0bc 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -54,14 +54,14 @@ export default defineConfig({ '**/build/**', '**/dist/**', '**/coverage/**', - '**/src/setupTests.ts', - '**/src/reportWebVitals.ts', + '**/app/setupTests.ts', + '**/app/reportWebVitals.ts', '**/public/**', '**/*.d.ts', '**/index.ts', ], }, globals: true, - setupFiles: ['src/setupTests.ts'], + setupFiles: ['app/setupTests.ts'], }, }); From ceaed62dba17bb5d3956b029ec8b2ae5064217ab Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 16:44:31 -0400 Subject: [PATCH 02/12] move 'features' directory to 'routes' to work with remix project structure we're not planning on migrating to Remix (give the news that remix is essentually being merged into react router v7) however, given this news, incrementally adopting more of the react reouter v6 features may help us take advantage of some of the useful features of remix when react router v7 comes out --- client/app/features/ErrorPage/index.ts | 1 - client/app/routes.tsx | 28 +++++++++---------- .../app/{features => routes}/About/About.tsx | 0 .../app/{features => routes}/About/index.ts | 0 .../Dashboard/Dashboard.spec.tsx | 2 +- .../Dashboard/Dashboard.tsx | 0 .../{features => routes}/Dashboard/index.ts | 2 +- .../ErrorPage/ErrorPage.tsx | 0 client/app/routes/ErrorPage/index.ts | 1 + .../app/{features => routes}/Login/Login.tsx | 0 .../app/{features => routes}/Login/index.ts | 0 .../{features => routes}/Login/login.spec.tsx | 4 +-- .../ManifestDetails/ManifestDetails.tsx | 0 .../ManifestDetails/index.ts | 0 .../ManifestList/ManifestList.tsx | 0 .../ManifestList/index.ts | 0 .../NewManifest/NewManifest.spec.tsx | 2 +- .../NewManifest/NewManifest.tsx | 0 .../{features => routes}/NewManifest/index.ts | 0 .../{features => routes}/Profile/Profile.tsx | 0 .../app/{features => routes}/Profile/index.ts | 0 .../RegisterHero/RegisterHero.tsx | 0 .../RegisterHero/index.ts | 2 +- .../SiteDetails/SiteDetails.tsx | 0 .../{features => routes}/SiteDetails/index.ts | 2 +- .../SiteList/SiteList.spec.tsx | 0 .../SiteList/SiteList.tsx | 0 .../{features => routes}/SiteList/index.ts | 2 +- client/vite.config.ts | 4 +-- 29 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 client/app/features/ErrorPage/index.ts rename client/app/{features => routes}/About/About.tsx (100%) rename client/app/{features => routes}/About/index.ts (100%) rename client/app/{features => routes}/Dashboard/Dashboard.spec.tsx (95%) rename client/app/{features => routes}/Dashboard/Dashboard.tsx (100%) rename client/app/{features => routes}/Dashboard/index.ts (51%) rename client/app/{features => routes}/ErrorPage/ErrorPage.tsx (100%) create mode 100644 client/app/routes/ErrorPage/index.ts rename client/app/{features => routes}/Login/Login.tsx (100%) rename client/app/{features => routes}/Login/index.ts (100%) rename client/app/{features => routes}/Login/login.spec.tsx (83%) rename client/app/{features => routes}/ManifestDetails/ManifestDetails.tsx (100%) rename client/app/{features => routes}/ManifestDetails/index.ts (100%) rename client/app/{features => routes}/ManifestList/ManifestList.tsx (100%) rename client/app/{features => routes}/ManifestList/index.ts (100%) rename client/app/{features => routes}/NewManifest/NewManifest.spec.tsx (96%) rename client/app/{features => routes}/NewManifest/NewManifest.tsx (100%) rename client/app/{features => routes}/NewManifest/index.ts (100%) rename client/app/{features => routes}/Profile/Profile.tsx (100%) rename client/app/{features => routes}/Profile/index.ts (100%) rename client/app/{features => routes}/RegisterHero/RegisterHero.tsx (100%) rename client/app/{features => routes}/RegisterHero/index.ts (50%) rename client/app/{features => routes}/SiteDetails/SiteDetails.tsx (100%) rename client/app/{features => routes}/SiteDetails/index.ts (50%) rename client/app/{features => routes}/SiteList/SiteList.spec.tsx (100%) rename client/app/{features => routes}/SiteList/SiteList.tsx (100%) rename client/app/{features => routes}/SiteList/index.ts (52%) diff --git a/client/app/features/ErrorPage/index.ts b/client/app/features/ErrorPage/index.ts deleted file mode 100644 index 6034fd81e..000000000 --- a/client/app/features/ErrorPage/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ErrorPage as Component } from 'features/ErrorPage/ErrorPage'; diff --git a/client/app/routes.tsx b/client/app/routes.tsx index c264b0502..27e47deab 100644 --- a/client/app/routes.tsx +++ b/client/app/routes.tsx @@ -1,13 +1,13 @@ -import { ErrorPage } from 'features/ErrorPage/ErrorPage'; -import { Login } from 'features/Login'; +import { ErrorPage } from 'routes/ErrorPage/ErrorPage'; +import { Login } from 'routes/Login'; import React from 'react'; import { createBrowserRouter } from 'react-router-dom'; -const Dashboard = React.lazy(() => import('features/Dashboard')); -const Profile = React.lazy(() => import('features/Profile')); -const SiteList = React.lazy(() => import('features/SiteList')); -const SiteDetails = React.lazy(() => import('features/SiteDetails')); -const Help = React.lazy(() => import('features/About')); +const Dashboard = React.lazy(() => import('routes/Dashboard')); +const Profile = React.lazy(() => import('routes/Profile')); +const SiteList = React.lazy(() => import('routes/SiteList')); +const SiteDetails = React.lazy(() => import('routes/SiteDetails')); +const Help = React.lazy(() => import('routes/About')); export const router = createBrowserRouter([ { @@ -38,15 +38,15 @@ export const router = createBrowserRouter([ children: [ { path: '', - lazy: () => import('./features/ManifestList'), + lazy: () => import('./routes/ManifestList'), }, { path: 'new', - lazy: () => import('./features/NewManifest'), + lazy: () => import('./routes/NewManifest'), }, { path: ':mtn/:action', - lazy: () => import('./features/ManifestDetails'), + lazy: () => import('./routes/ManifestDetails'), }, ], }, @@ -57,15 +57,15 @@ export const router = createBrowserRouter([ children: [ { path: '', - lazy: () => import('./features/ManifestList'), + lazy: () => import('./routes/ManifestList'), }, { path: 'new', - lazy: () => import('./features/NewManifest'), + lazy: () => import('./routes/NewManifest'), }, { path: ':mtn/:action', - lazy: () => import('./features/ManifestDetails'), + lazy: () => import('./routes/ManifestDetails'), }, ], }, @@ -81,7 +81,7 @@ export const router = createBrowserRouter([ }, { path: '/register', - lazy: () => import('./features/RegisterHero'), + lazy: () => import('./routes/RegisterHero'), }, { path: '*', diff --git a/client/app/features/About/About.tsx b/client/app/routes/About/About.tsx similarity index 100% rename from client/app/features/About/About.tsx rename to client/app/routes/About/About.tsx diff --git a/client/app/features/About/index.ts b/client/app/routes/About/index.ts similarity index 100% rename from client/app/features/About/index.ts rename to client/app/routes/About/index.ts diff --git a/client/app/features/Dashboard/Dashboard.spec.tsx b/client/app/routes/Dashboard/Dashboard.spec.tsx similarity index 95% rename from client/app/features/Dashboard/Dashboard.spec.tsx rename to client/app/routes/Dashboard/Dashboard.spec.tsx index 38fe39285..32676d6f3 100644 --- a/client/app/features/Dashboard/Dashboard.spec.tsx +++ b/client/app/routes/Dashboard/Dashboard.spec.tsx @@ -1,5 +1,5 @@ import '@testing-library/jest-dom'; -import { Dashboard } from 'features/Dashboard/Dashboard'; +import { Dashboard } from 'routes/Dashboard/Dashboard'; import { setupServer } from 'msw/node'; import React, { createElement } from 'react'; import { cleanup, renderWithProviders, screen } from 'test-utils'; diff --git a/client/app/features/Dashboard/Dashboard.tsx b/client/app/routes/Dashboard/Dashboard.tsx similarity index 100% rename from client/app/features/Dashboard/Dashboard.tsx rename to client/app/routes/Dashboard/Dashboard.tsx diff --git a/client/app/features/Dashboard/index.ts b/client/app/routes/Dashboard/index.ts similarity index 51% rename from client/app/features/Dashboard/index.ts rename to client/app/routes/Dashboard/index.ts index 137191e49..6a3b11501 100644 --- a/client/app/features/Dashboard/index.ts +++ b/client/app/routes/Dashboard/index.ts @@ -1,4 +1,4 @@ -import { Dashboard } from 'features/Dashboard/Dashboard'; +import { Dashboard } from 'routes/Dashboard/Dashboard'; export { Dashboard as Component }; export default Dashboard; diff --git a/client/app/features/ErrorPage/ErrorPage.tsx b/client/app/routes/ErrorPage/ErrorPage.tsx similarity index 100% rename from client/app/features/ErrorPage/ErrorPage.tsx rename to client/app/routes/ErrorPage/ErrorPage.tsx diff --git a/client/app/routes/ErrorPage/index.ts b/client/app/routes/ErrorPage/index.ts new file mode 100644 index 000000000..6ab78f84c --- /dev/null +++ b/client/app/routes/ErrorPage/index.ts @@ -0,0 +1 @@ +export { ErrorPage as Component } from 'routes/ErrorPage/ErrorPage'; diff --git a/client/app/features/Login/Login.tsx b/client/app/routes/Login/Login.tsx similarity index 100% rename from client/app/features/Login/Login.tsx rename to client/app/routes/Login/Login.tsx diff --git a/client/app/features/Login/index.ts b/client/app/routes/Login/index.ts similarity index 100% rename from client/app/features/Login/index.ts rename to client/app/routes/Login/index.ts diff --git a/client/app/features/Login/login.spec.tsx b/client/app/routes/Login/login.spec.tsx similarity index 83% rename from client/app/features/Login/login.spec.tsx rename to client/app/routes/Login/login.spec.tsx index 029e00134..a22c0b97e 100644 --- a/client/app/features/Login/login.spec.tsx +++ b/client/app/routes/Login/login.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import React from 'react'; import { renderWithProviders, screen } from 'test-utils'; -import { Login } from 'features/Login'; -import { describe, test, expect } from 'vitest'; +import { Login } from 'routes/Login'; +import { describe, expect, test } from 'vitest'; describe('Login component', () => { test('renders', () => { diff --git a/client/app/features/ManifestDetails/ManifestDetails.tsx b/client/app/routes/ManifestDetails/ManifestDetails.tsx similarity index 100% rename from client/app/features/ManifestDetails/ManifestDetails.tsx rename to client/app/routes/ManifestDetails/ManifestDetails.tsx diff --git a/client/app/features/ManifestDetails/index.ts b/client/app/routes/ManifestDetails/index.ts similarity index 100% rename from client/app/features/ManifestDetails/index.ts rename to client/app/routes/ManifestDetails/index.ts diff --git a/client/app/features/ManifestList/ManifestList.tsx b/client/app/routes/ManifestList/ManifestList.tsx similarity index 100% rename from client/app/features/ManifestList/ManifestList.tsx rename to client/app/routes/ManifestList/ManifestList.tsx diff --git a/client/app/features/ManifestList/index.ts b/client/app/routes/ManifestList/index.ts similarity index 100% rename from client/app/features/ManifestList/index.ts rename to client/app/routes/ManifestList/index.ts diff --git a/client/app/features/NewManifest/NewManifest.spec.tsx b/client/app/routes/NewManifest/NewManifest.spec.tsx similarity index 96% rename from client/app/features/NewManifest/NewManifest.spec.tsx rename to client/app/routes/NewManifest/NewManifest.spec.tsx index 79a495bef..839d8a22c 100644 --- a/client/app/features/NewManifest/NewManifest.spec.tsx +++ b/client/app/routes/NewManifest/NewManifest.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; -import { NewManifest } from 'features/NewManifest/NewManifest'; +import { NewManifest } from 'routes/NewManifest/NewManifest'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; diff --git a/client/app/features/NewManifest/NewManifest.tsx b/client/app/routes/NewManifest/NewManifest.tsx similarity index 100% rename from client/app/features/NewManifest/NewManifest.tsx rename to client/app/routes/NewManifest/NewManifest.tsx diff --git a/client/app/features/NewManifest/index.ts b/client/app/routes/NewManifest/index.ts similarity index 100% rename from client/app/features/NewManifest/index.ts rename to client/app/routes/NewManifest/index.ts diff --git a/client/app/features/Profile/Profile.tsx b/client/app/routes/Profile/Profile.tsx similarity index 100% rename from client/app/features/Profile/Profile.tsx rename to client/app/routes/Profile/Profile.tsx diff --git a/client/app/features/Profile/index.ts b/client/app/routes/Profile/index.ts similarity index 100% rename from client/app/features/Profile/index.ts rename to client/app/routes/Profile/index.ts diff --git a/client/app/features/RegisterHero/RegisterHero.tsx b/client/app/routes/RegisterHero/RegisterHero.tsx similarity index 100% rename from client/app/features/RegisterHero/RegisterHero.tsx rename to client/app/routes/RegisterHero/RegisterHero.tsx diff --git a/client/app/features/RegisterHero/index.ts b/client/app/routes/RegisterHero/index.ts similarity index 50% rename from client/app/features/RegisterHero/index.ts rename to client/app/routes/RegisterHero/index.ts index d52ac76a3..d44238431 100644 --- a/client/app/features/RegisterHero/index.ts +++ b/client/app/routes/RegisterHero/index.ts @@ -1,4 +1,4 @@ -import { RegisterHero } from 'features/RegisterHero/RegisterHero'; +import { RegisterHero } from 'routes/RegisterHero/RegisterHero'; export { RegisterHero as Component }; export default RegisterHero; diff --git a/client/app/features/SiteDetails/SiteDetails.tsx b/client/app/routes/SiteDetails/SiteDetails.tsx similarity index 100% rename from client/app/features/SiteDetails/SiteDetails.tsx rename to client/app/routes/SiteDetails/SiteDetails.tsx diff --git a/client/app/features/SiteDetails/index.ts b/client/app/routes/SiteDetails/index.ts similarity index 50% rename from client/app/features/SiteDetails/index.ts rename to client/app/routes/SiteDetails/index.ts index 2289b1b1c..e3c42cf3a 100644 --- a/client/app/features/SiteDetails/index.ts +++ b/client/app/routes/SiteDetails/index.ts @@ -1,4 +1,4 @@ -import { SiteDetails } from 'features/SiteDetails/SiteDetails'; +import { SiteDetails } from 'routes/SiteDetails/SiteDetails'; export { SiteDetails as Component }; export default SiteDetails; diff --git a/client/app/features/SiteList/SiteList.spec.tsx b/client/app/routes/SiteList/SiteList.spec.tsx similarity index 100% rename from client/app/features/SiteList/SiteList.spec.tsx rename to client/app/routes/SiteList/SiteList.spec.tsx diff --git a/client/app/features/SiteList/SiteList.tsx b/client/app/routes/SiteList/SiteList.tsx similarity index 100% rename from client/app/features/SiteList/SiteList.tsx rename to client/app/routes/SiteList/SiteList.tsx diff --git a/client/app/features/SiteList/index.ts b/client/app/routes/SiteList/index.ts similarity index 52% rename from client/app/features/SiteList/index.ts rename to client/app/routes/SiteList/index.ts index 7680b866f..622c0a00c 100644 --- a/client/app/features/SiteList/index.ts +++ b/client/app/routes/SiteList/index.ts @@ -1,4 +1,4 @@ -import { SiteList } from 'features/SiteList/SiteList'; +import { SiteList } from 'routes/SiteList/SiteList'; export { SiteList as Component }; export default SiteList; diff --git a/client/vite.config.ts b/client/vite.config.ts index ddd5fb0bc..664abfd69 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -1,5 +1,5 @@ /// -import react from '@vitejs/plugin-react'; +import viteReact from '@vitejs/plugin-react'; import * as path from 'path'; import { defineConfig } from 'vite'; import eslint from 'vite-plugin-eslint'; @@ -36,7 +36,7 @@ export default defineConfig({ }, }, }, - plugins: [react(), viteTsconfigPaths(), eslint()], + plugins: [viteReact(), viteTsconfigPaths(), eslint()], server: { host: true, port: 3000, From 3a95af13df78901aa9570e9767d5ebde7857bc00 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 19:36:21 -0400 Subject: [PATCH 03/12] update tsconfig to use a remix vite spa template config --- client/app/routes/About/About.tsx | 4 ++-- client/tsconfig.json | 31 ++++++++++++++++--------------- client/vite.config.ts | 3 ++- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/client/app/routes/About/About.tsx b/client/app/routes/About/About.tsx index 091535079..b90bd091a 100644 --- a/client/app/routes/About/About.tsx +++ b/client/app/routes/About/About.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Col, Container, Row } from 'react-bootstrap'; -import { useTitle } from 'hooks'; -import { HaztrakLicense, SectionTitle } from 'components/Help'; +import { useTitle } from '~/hooks'; +import { HaztrakLicense, SectionTitle } from '~/components/Help'; /** * Static page that talks about Haztrak's licensing, maybe versioning in future diff --git a/client/tsconfig.json b/client/tsconfig.json index c236d491d..a09102233 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,23 +1,24 @@ { + "include": ["env.d.ts", "**/*.ts", "**/*.tsx"], "compilerOptions": { - "baseUrl": "app", - "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "types": ["vite/client"], + "isolatedModules": true, "esModuleInterop": true, - "allowSyntheticDefaultImports": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "resolveJsonModule": true, + "target": "ES2022", "strict": true, + "allowJs": true, + "skipLibCheck": true, "forceConsistentCasingInFileNames": true, - "noFallthroughCasesInSwitch": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, + "baseUrl": ".", + "paths": { + "~/*": ["./app/*"] + }, "noEmit": true, - "jsx": "react-jsx", "incremental": true - }, - "include": ["app"], - "exclude": ["node_modules", "build"] + } } diff --git a/client/vite.config.ts b/client/vite.config.ts index 664abfd69..9ea7b7ef7 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -2,15 +2,16 @@ import viteReact from '@vitejs/plugin-react'; import * as path from 'path'; import { defineConfig } from 'vite'; +// @ts-expect-error - error with vite-plugin-eslint import eslint from 'vite-plugin-eslint'; import viteTsconfigPaths from 'vite-tsconfig-paths'; -// @ts-expect-error - we know package.json exists import { dependencies } from './package.json'; function renderChunks(deps: Record) { const chunks = {}; Object.keys(deps).forEach((key) => { if (['react', 'react-router-dom', 'react-dom'].includes(key)) return; + // @ts-expect-error - error with vite-plugin-eslint chunks[key] = [key]; }); return chunks; From 5832bc3fc9c276ec17f57cd8d52c30ac3482f908 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 19:43:33 -0400 Subject: [PATCH 04/12] modify imports to use alias imports --- client/app/App.tsx | 8 +++--- client/app/components/Auth/LoginForm.tsx | 4 +-- .../SiteFilter/SiteFilterForm.spec.tsx | 6 ++--- .../HaztrakSite/SiteFilter/SiteFilterForm.tsx | 2 +- .../SiteListGroup/SiteListGroup.spec.tsx | 6 ++--- .../SiteListGroup/SiteListGroup.tsx | 6 ++--- .../SiteListItem/SiteListItem.spec.tsx | 4 +-- .../HaztrakSite/SiteListItem/SiteListItem.tsx | 4 +-- .../HaztrakSite/haztrakSiteSchema.ts | 2 +- client/app/components/Help/HaztrakLicense.tsx | 2 +- client/app/components/Help/index.ts | 4 +-- client/app/components/Layout/Nav/NavItem.tsx | 4 +-- .../app/components/Layout/Nav/NavSection.tsx | 4 +-- client/app/components/Layout/PrivateRoute.tsx | 2 +- client/app/components/Layout/Root.tsx | 4 +-- .../Layout/Sidebar/Sidebar.spec.tsx | 4 +-- .../app/components/Layout/Sidebar/Sidebar.tsx | 8 +++--- .../components/Layout/TopNav/TopNav.spec.tsx | 4 +-- .../app/components/Layout/TopNav/TopNav.tsx | 4 +-- .../Manifest/Actions/ManifestCancelBtn.tsx | 8 +++--- .../Manifest/Actions/ManifestEditBtn.tsx | 6 ++--- .../Manifest/Actions/ManifestFABs.spec.tsx | 10 +++---- .../Manifest/Actions/ManifestFABs.tsx | 12 ++++----- .../Manifest/Actions/ManifestSaveBtn.tsx | 4 +-- .../AdditionalInfo/AdditionalInfoForm.tsx | 8 +++--- .../AdditionalinfoForm.spec.tsx | 4 +-- .../Manifest/Address/AddressForm.spec.tsx | 2 +- .../Manifest/Address/AddressForm.tsx | 2 +- .../Manifest/Address/GeneratorAddress.tsx | 10 +++---- .../Manifest/Contact/ContactForm.spec.tsx | 2 +- .../Manifest/Contact/ContactForm.tsx | 8 +++--- .../Manifest/Contact/PhoneForm.spec.tsx | 4 +-- .../components/Manifest/Contact/PhoneForm.tsx | 4 +-- .../GeneralInfo/GeneralInfoForm.spec.tsx | 2 +- .../Manifest/GeneralInfo/GeneralInfoForm.tsx | 10 +++---- .../GeneralInfo/ManifestStatusSelect.spec.tsx | 12 ++++----- .../GeneralInfo/ManifestStatusSelect.tsx | 10 +++---- .../GeneralInfo/ManifestTypeField.spec.tsx | 8 +++--- .../GeneralInfo/ManifestTypeSelect.tsx | 6 ++--- .../Manifest/Generator/GeneratorForm.spec.tsx | 4 +-- .../Manifest/Generator/GeneratorForm.tsx | 8 +++--- .../Generator/GeneratorSection.spec.tsx | 4 +-- .../Manifest/Generator/GeneratorSection.tsx | 16 ++++++------ .../Handler/Search/HandlerSearchForm.spec.tsx | 10 +++---- .../Handler/Search/HandlerSearchForm.tsx | 14 +++++----- .../Handler/Search/HandlerSearchModal.tsx | 8 +++--- .../Search/RcrainfoSiteSearchBadge.tsx | 2 +- .../app/components/Manifest/Handler/index.ts | 2 +- .../components/Manifest/ManifestForm.spec.tsx | 6 ++--- .../app/components/Manifest/ManifestForm.tsx | 26 +++++++++---------- .../QuickerSign/QuickerSignForm.spec.tsx | 6 ++--- .../Manifest/QuickerSign/QuickerSignForm.tsx | 10 +++---- .../Manifest/QuickerSign/QuickerSignModal.tsx | 4 +-- .../QuickerSign/SignBtn/QuickSignBtn.spec.tsx | 12 ++++----- .../QuickerSign/SignBtn/QuickSignBtn.tsx | 8 +++--- .../components/Manifest/QuickerSign/index.ts | 2 +- .../Manifest/SiteSelect/SiteSelect.spec.tsx | 4 +-- .../Manifest/SiteSelect/SiteSelect.tsx | 8 +++--- .../SiteSelect/SiteTypeSelect.spec.tsx | 6 ++--- .../Manifest/SiteSelect/SiteTypeSelect.tsx | 4 +-- .../Transporter/TransporterSection.tsx | 10 +++---- .../Transporter/TransporterTable.spec.tsx | 8 +++--- .../Manifest/Transporter/TransporterTable.tsx | 8 +++--- .../components/Manifest/Transporter/index.ts | 2 +- .../Manifest/Tsdf/TsdfSection.spec.tsx | 4 +-- .../components/Manifest/Tsdf/TsdfSection.tsx | 14 +++++----- .../Manifest/UpdateRcra/UpdateRcra.tsx | 4 +-- .../Manifest/WasteLine/DotIdSelect.tsx | 4 +-- .../Manifest/WasteLine/EditWasteModal.tsx | 8 +++--- .../HazardousWasteForm/HazardousWasteForm.tsx | 10 +++---- .../StateWasteCodeSelect.tsx | 2 +- .../WasteLine/HazardousWasteForm/index.ts | 2 +- .../Manifest/WasteLine/QuantityForm.spec.tsx | 4 +-- .../Manifest/WasteLine/QuantityForm.tsx | 4 +-- .../Manifest/WasteLine/WasteLineForm.spec.tsx | 4 +-- .../Manifest/WasteLine/WasteLineForm.tsx | 14 +++++----- .../Manifest/WasteLine/WasteLineSection.tsx | 10 +++---- .../WasteLineTable/WasteLineTable.tsx | 10 +++---- .../WasteLineTable/WasteRowActions.tsx | 2 +- .../components/Manifest/WasteLine/index.ts | 4 +-- .../app/components/Manifest/manifestSchema.ts | 4 +-- client/app/components/Mtn/MtnTable.spec.tsx | 4 +-- client/app/components/Mtn/MtnTable.tsx | 8 +++--- .../Notifications/Notifications.tsx | 4 +-- .../Notifications/ProgressTracker.tsx | 4 +-- client/app/components/Org/OrgSitesTable.tsx | 4 +-- client/app/components/Org/UserOrg.tsx | 4 +-- .../components/RcraProfile/RcraProfile.tsx | 10 +++---- .../RcraProfile/SyncRcrainfoProfileBtn.tsx | 4 +-- client/app/components/RcraProfile/index.ts | 2 +- .../components/RcraSite/AddressListGroup.tsx | 2 +- .../RcraSite/RcraSiteDetails.spec.tsx | 6 ++--- .../components/RcraSite/RcraSiteDetails.tsx | 4 +-- .../RcraApiUserBtn/RcraApiUserBtn.spec.tsx | 4 +-- .../buttons/RcraApiUserBtn/RcraApiUserBtn.tsx | 2 +- .../SyncManifestBtn/SyncManifestBtn.spec.tsx | 8 +++--- .../SyncManifestBtn/SyncManifestBtn.tsx | 6 ++--- .../app/components/UI/HtCard/HtCard.spec.tsx | 4 +-- client/app/components/UI/HtCard/HtCard.tsx | 2 +- .../components/UI/HtModal/HtModal.spec.tsx | 4 +-- .../components/UI/HtPaginate/HtPageBtns.tsx | 2 +- .../UI/HtPaginate/HtPaginate.spec.tsx | 4 +-- .../components/UI/HtPaginate/HtPaginate.tsx | 2 +- .../UI/HtTooltip/HtTooltip.spec.tsx | 2 +- client/app/components/UI/index.ts | 10 +++---- client/app/components/User/SiteAccess.tsx | 2 +- .../app/components/User/UserInfoForm.spec.tsx | 10 +++---- client/app/components/User/UserInfoForm.tsx | 4 +-- client/app/components/User/index.ts | 2 +- .../useManifestStatus.spec.tsx | 4 +-- .../useManifestStatus/useManifestStatus.tsx | 6 ++--- .../useHandlerSearchConfig.tsx | 4 +-- .../useOpenHandlerSearch.spec.tsx | 6 ++--- .../manifest/useReadOnly/useReadOnly.spec.tsx | 2 +- .../manifest/useReadOnly/useReadOnly.tsx | 4 +-- .../useSaveManifest/useSaveManifest.spec.tsx | 8 +++--- .../useSaveManifest/useSaveManifest.tsx | 4 +-- .../usePagination/usePagination.spec.tsx | 2 +- .../useProgressTracker.spec.tsx | 6 ++--- .../useProgressTracker/useProgressTracker.tsx | 2 +- client/app/hooks/useTitle/useTitle.spec.tsx | 4 +-- .../useUserSiteIds/useUserSiteIds.spec.tsx | 12 ++++----- .../hooks/useUserSiteIds/useUserSiteIds.tsx | 2 +- client/app/index.tsx | 2 +- client/app/routes.tsx | 14 +++++----- .../app/routes/Dashboard/Dashboard.spec.tsx | 8 +++--- client/app/routes/Dashboard/Dashboard.tsx | 12 ++++----- client/app/routes/Dashboard/index.ts | 2 +- client/app/routes/ErrorPage/ErrorPage.tsx | 4 +-- client/app/routes/ErrorPage/index.ts | 2 +- client/app/routes/Login/Login.tsx | 4 +-- client/app/routes/Login/login.spec.tsx | 4 +-- .../ManifestDetails/ManifestDetails.tsx | 10 +++---- .../app/routes/ManifestList/ManifestList.tsx | 12 ++++----- .../routes/NewManifest/NewManifest.spec.tsx | 10 +++---- client/app/routes/NewManifest/NewManifest.tsx | 16 ++++++------ client/app/routes/Profile/Profile.tsx | 12 ++++----- .../app/routes/RegisterHero/RegisterHero.tsx | 2 +- client/app/routes/RegisterHero/index.ts | 2 +- client/app/routes/SiteDetails/SiteDetails.tsx | 6 ++--- client/app/routes/SiteDetails/index.ts | 2 +- client/app/routes/SiteList/SiteList.spec.tsx | 6 ++--- client/app/routes/SiteList/SiteList.tsx | 8 +++--- client/app/routes/SiteList/index.ts | 2 +- client/app/services/APIs/htApi.ts | 2 +- client/app/services/index.ts | 4 +-- client/app/services/manifest/manifest.spec.ts | 8 +++--- client/app/services/manifest/manifest.ts | 6 ++--- .../app/store/authSlice/auth.slice.spec.tsx | 4 +-- client/app/store/htApi.slice.ts | 14 +++++----- client/app/store/index.ts | 10 +++---- .../manifestSlice/manifest.slice.spec.tsx | 6 ++--- .../app/store/manifestSlice/manifest.slice.ts | 2 +- .../notification.slice.spec.tsx | 4 +-- .../notificationSlice/notification.slice.ts | 2 +- client/app/store/rootStore.ts | 4 +-- .../app/store/userSlice/user.slice.spec.tsx | 6 ++--- client/app/store/userSlice/user.slice.ts | 6 ++--- client/app/test-utils/fixtures/mockHandler.ts | 12 ++++----- .../app/test-utils/fixtures/mockManifest.ts | 6 ++--- client/app/test-utils/fixtures/mockUser.ts | 6 ++--- client/app/test-utils/fixtures/mockWaste.ts | 2 +- client/app/test-utils/index.ts | 2 +- client/app/test-utils/mock/index.ts | 8 +++--- .../test-utils/mock/mockManifestEndpoints.ts | 2 +- .../app/test-utils/mock/mockUserEndpoints.ts | 8 +++--- .../app/test-utils/mock/mockWasteEndpoints.ts | 2 +- client/app/test-utils/render.tsx | 2 +- 168 files changed, 484 insertions(+), 484 deletions(-) diff --git a/client/app/App.tsx b/client/app/App.tsx index b880ed2e2..298114dcb 100644 --- a/client/app/App.tsx +++ b/client/app/App.tsx @@ -1,12 +1,12 @@ -import { ErrorBoundary } from 'components/Error'; -import { Notifications } from 'components/Notifications/Notifications'; -import { HtSpinner } from 'components/UI'; +import { ErrorBoundary } from '~/components/Error'; +import { Notifications } from '~/components/Notifications/Notifications'; +import { HtSpinner } from '~/components/UI'; import React, { ReactElement, Suspense } from 'react'; import { Container } from 'react-bootstrap'; import { RouterProvider } from 'react-router-dom'; import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; -import { router } from 'routes'; +import { router } from '~/routes'; import './App.scss'; const GlobalSpinner = () => ( diff --git a/client/app/components/Auth/LoginForm.tsx b/client/app/components/Auth/LoginForm.tsx index 83546daae..72e4c0bf5 100644 --- a/client/app/components/Auth/LoginForm.tsx +++ b/client/app/components/Auth/LoginForm.tsx @@ -1,5 +1,5 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { HtForm, HtSpinner } from 'components/UI'; +import { HtForm, HtSpinner } from '~/components/UI'; import React, { useEffect, useState } from 'react'; import { FloatingLabel, Form } from 'react-bootstrap'; import { useForm } from 'react-hook-form'; @@ -10,7 +10,7 @@ import { useAppDispatch, useAppSelector, useLoginMutation, -} from 'store'; +} from '~/store'; import { z } from 'zod'; const loginSchema = z.object({ diff --git a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx index 3c6118e88..2b2323119 100644 --- a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx +++ b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React, { useState } from 'react'; -import { cleanup, renderWithProviders } from 'test-utils'; +import { cleanup, renderWithProviders } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; -import { createMockHandler, createMockSite } from 'test-utils/fixtures/mockHandler'; -import { SiteFilterForm } from 'components/HaztrakSite/SiteFilter/SiteFilterForm'; +import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { SiteFilterForm } from '~/components/HaztrakSite/SiteFilter/SiteFilterForm'; import { useSearchParams } from 'react-router-dom'; import userEvent from '@testing-library/user-event'; diff --git a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx index becbdc06a..feb38f880 100644 --- a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx +++ b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.tsx @@ -3,7 +3,7 @@ import { useForm } from 'react-hook-form'; import { FloatingLabel, Form } from 'react-bootstrap'; import { z } from 'zod'; import { zodResolver } from '@hookform/resolvers/zod'; -import { HaztrakSite } from 'components/HaztrakSite/haztrakSiteSchema'; +import { HaztrakSite } from '~/components/HaztrakSite/haztrakSiteSchema'; import { useSearchParams } from 'react-router-dom'; interface SiteFilterFormProps { diff --git a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx index 1bdf7bf9a..ff037fe92 100644 --- a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx +++ b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React from 'react'; -import { cleanup, renderWithProviders } from 'test-utils'; +import { cleanup, renderWithProviders } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; -import { SiteListGroup } from 'components/HaztrakSite/SiteListGroup/SiteListGroup'; -import { createMockHandler, createMockSite } from 'test-utils/fixtures/mockHandler'; +import { SiteListGroup } from '~/components/HaztrakSite/SiteListGroup/SiteListGroup'; +import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; afterEach(() => { cleanup(); diff --git a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx index 04d6e9f81..4aebed470 100644 --- a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx +++ b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.tsx @@ -1,7 +1,7 @@ -import { HaztrakSite } from 'components/HaztrakSite/haztrakSiteSchema'; +import { HaztrakSite } from '~/components/HaztrakSite/haztrakSiteSchema'; import { Col, Container, ListGroup, Row } from 'react-bootstrap'; -import { SiteListItem } from 'components/HaztrakSite/SiteListItem/SiteListItem'; -import { SiteFilterForm } from 'components/HaztrakSite/SiteFilter/SiteFilterForm'; +import { SiteListItem } from '~/components/HaztrakSite/SiteListItem/SiteListItem'; +import { SiteFilterForm } from '~/components/HaztrakSite/SiteFilter/SiteFilterForm'; import React, { useState } from 'react'; import winkingRobot from '/assets/img/robot/robot-wink.jpg'; import { useAutoAnimate } from '@formkit/auto-animate/react'; diff --git a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx index 4db3eb534..04e345d7a 100644 --- a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx +++ b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx @@ -1,9 +1,9 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React from 'react'; -import { cleanup, renderWithProviders } from 'test-utils'; +import { cleanup, renderWithProviders } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; -import { createMockSite } from 'test-utils/fixtures/mockHandler'; +import { createMockSite } from '~/test-utils/fixtures/mockHandler'; import { SiteListItem } from './SiteListItem'; afterEach(() => { diff --git a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx index 20ecdf4b3..9840954cf 100644 --- a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx +++ b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { HaztrakSite } from 'components/HaztrakSite/haztrakSiteSchema'; +import { HaztrakSite } from '~/components/HaztrakSite/haztrakSiteSchema'; import { ListGroup } from 'react-bootstrap'; import { Link } from 'react-router-dom'; -import { SiteListItemActions } from 'components/HaztrakSite/SiteListItem/SiteListItemActions'; +import { SiteListItemActions } from '~/components/HaztrakSite/SiteListItem/SiteListItemActions'; interface SiteListItemProps { site: HaztrakSite; diff --git a/client/app/components/HaztrakSite/haztrakSiteSchema.ts b/client/app/components/HaztrakSite/haztrakSiteSchema.ts index 633f23f59..cd8b21bdb 100644 --- a/client/app/components/HaztrakSite/haztrakSiteSchema.ts +++ b/client/app/components/HaztrakSite/haztrakSiteSchema.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { rcraSite } from 'components/RcraSite'; +import { rcraSite } from '~/components/RcraSite'; const haztrakSiteSchema = z.object({ name: z.string(), diff --git a/client/app/components/Help/HaztrakLicense.tsx b/client/app/components/Help/HaztrakLicense.tsx index 00c9021ef..bb49ac7da 100644 --- a/client/app/components/Help/HaztrakLicense.tsx +++ b/client/app/components/Help/HaztrakLicense.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { HtCard } from 'components/UI'; +import { HtCard } from '~/components/UI'; export function HaztrakLicense() { return ( diff --git a/client/app/components/Help/index.ts b/client/app/components/Help/index.ts index 8c3879d6f..ab4f444ae 100644 --- a/client/app/components/Help/index.ts +++ b/client/app/components/Help/index.ts @@ -1,2 +1,2 @@ -export { HaztrakLicense } from 'components/Help/HaztrakLicense'; -export { SectionTitle } from 'components/Help/SectionTitle'; +export { HaztrakLicense } from '~/components/Help/HaztrakLicense'; +export { SectionTitle } from '~/components/Help/SectionTitle'; diff --git a/client/app/components/Layout/Nav/NavItem.tsx b/client/app/components/Layout/Nav/NavItem.tsx index ed1cd9af7..0cc79895a 100644 --- a/client/app/components/Layout/Nav/NavItem.tsx +++ b/client/app/components/Layout/Nav/NavItem.tsx @@ -1,7 +1,7 @@ import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { NavContext, NavContextProps } from 'components/Layout/Root'; -import { Route } from 'components/Layout/Sidebar/SidebarRoutes'; +import { NavContext, NavContextProps } from '~/components/Layout/Root'; +import { Route } from '~/components/Layout/Sidebar/SidebarRoutes'; import React, { useContext } from 'react'; import { Link } from 'react-router-dom'; import { NavLink } from 'react-bootstrap'; diff --git a/client/app/components/Layout/Nav/NavSection.tsx b/client/app/components/Layout/Nav/NavSection.tsx index 21ce40a17..5c9fb5e5f 100644 --- a/client/app/components/Layout/Nav/NavSection.tsx +++ b/client/app/components/Layout/Nav/NavSection.tsx @@ -1,5 +1,5 @@ -import { NavItem } from 'components/Layout/Nav/NavItem'; -import { RoutesSection } from 'components/Layout/Sidebar/SidebarRoutes'; +import { NavItem } from '~/components/Layout/Nav/NavItem'; +import { RoutesSection } from '~/components/Layout/Sidebar/SidebarRoutes'; import React from 'react'; interface SidebarSectionProps { diff --git a/client/app/components/Layout/PrivateRoute.tsx b/client/app/components/Layout/PrivateRoute.tsx index a1d286756..bbe845d7c 100644 --- a/client/app/components/Layout/PrivateRoute.tsx +++ b/client/app/components/Layout/PrivateRoute.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from 'react'; import { Navigate } from 'react-router-dom'; -import { selectAuthenticated, useAppSelector } from 'store'; +import { selectAuthenticated, useAppSelector } from '~/store'; interface Props { children: ReactElement; diff --git a/client/app/components/Layout/Root.tsx b/client/app/components/Layout/Root.tsx index 78f688d01..d84da102f 100644 --- a/client/app/components/Layout/Root.tsx +++ b/client/app/components/Layout/Root.tsx @@ -1,5 +1,5 @@ -import { ErrorBoundary } from 'components/Error'; -import { HtSpinner } from 'components/UI'; +import { ErrorBoundary } from '~/components/Error'; +import { HtSpinner } from '~/components/UI'; import React, { createContext, Dispatch, SetStateAction, Suspense, useState } from 'react'; import { Container } from 'react-bootstrap'; import { Outlet } from 'react-router-dom'; diff --git a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx index 083854b10..ca4856037 100644 --- a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx +++ b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { Sidebar } from 'components/Layout/Sidebar/Sidebar'; +import { Sidebar } from '~/components/Layout/Sidebar/Sidebar'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Layout/Sidebar/Sidebar.tsx b/client/app/components/Layout/Sidebar/Sidebar.tsx index e598647cd..0f9ccb261 100644 --- a/client/app/components/Layout/Sidebar/Sidebar.tsx +++ b/client/app/components/Layout/Sidebar/Sidebar.tsx @@ -1,12 +1,12 @@ import logo from '/assets/img/haztrak-logos/haztrak-logo-zip-file/png/logo-black-crop.png'; -import { NavSection } from 'components/Layout/Nav/NavSection'; -import { NavItem } from 'components/Layout/Nav/NavItem'; -import { NavContext, NavContextProps } from 'components/Layout/Root'; +import { NavSection } from '~/components/Layout/Nav/NavSection'; +import { NavItem } from '~/components/Layout/Nav/NavItem'; +import { NavContext, NavContextProps } from '~/components/Layout/Root'; import React, { ReactElement, useContext } from 'react'; import { Nav, Offcanvas } from 'react-bootstrap'; import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; -import { RootState } from 'store'; +import { RootState } from '~/store'; import { routes } from './SidebarRoutes'; /** Vertical sidebar for navigation that disappears when the viewport is small*/ diff --git a/client/app/components/Layout/TopNav/TopNav.spec.tsx b/client/app/components/Layout/TopNav/TopNav.spec.tsx index bc9753cfc..64424636d 100644 --- a/client/app/components/Layout/TopNav/TopNav.spec.tsx +++ b/client/app/components/Layout/TopNav/TopNav.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { TopNav } from 'components/Layout/TopNav/TopNav'; +import { TopNav } from '~/components/Layout/TopNav/TopNav'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Layout/TopNav/TopNav.tsx b/client/app/components/Layout/TopNav/TopNav.tsx index 18817b0e0..1eba8e4d4 100644 --- a/client/app/components/Layout/TopNav/TopNav.tsx +++ b/client/app/components/Layout/TopNav/TopNav.tsx @@ -1,12 +1,12 @@ import logo from '/assets/img/haztrak-logos/haztrak-logo-zip-file/svg/logo-no-background.svg'; import { faArrowRightFromBracket, faBars, faGear, faUser } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { NavContext, NavContextProps } from 'components/Layout/Root'; +import { NavContext, NavContextProps } from '~/components/Layout/Root'; import React, { useContext } from 'react'; import { Button, Dropdown } from 'react-bootstrap'; import { useDispatch, useSelector } from 'react-redux'; import { Link, useNavigate } from 'react-router-dom'; -import { removeCredentials, selectAuthenticated, useLogoutMutation } from 'store'; +import { removeCredentials, selectAuthenticated, useLogoutMutation } from '~/store'; export function TopNav() { const { showSidebar, setShowSidebar } = useContext(NavContext); diff --git a/client/app/components/Manifest/Actions/ManifestCancelBtn.tsx b/client/app/components/Manifest/Actions/ManifestCancelBtn.tsx index 2a41eed0d..523d4d3c3 100644 --- a/client/app/components/Manifest/Actions/ManifestCancelBtn.tsx +++ b/client/app/components/Manifest/Actions/ManifestCancelBtn.tsx @@ -1,9 +1,9 @@ import { faTrash } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { HtButton } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { HtButton } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React, { useContext } from 'react'; import { useFormContext } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; diff --git a/client/app/components/Manifest/Actions/ManifestEditBtn.tsx b/client/app/components/Manifest/Actions/ManifestEditBtn.tsx index a4ef114f9..663142744 100644 --- a/client/app/components/Manifest/Actions/ManifestEditBtn.tsx +++ b/client/app/components/Manifest/Actions/ManifestEditBtn.tsx @@ -1,8 +1,8 @@ import { faPenToSquare } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { HtButton } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { HtButton } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React, { useContext } from 'react'; import { ButtonProps } from 'react-bootstrap'; import { useNavigate } from 'react-router-dom'; diff --git a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx index 395d64133..6970bb606 100644 --- a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx +++ b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; -import { ManifestFABs } from 'components/Manifest/Actions/ManifestFABs'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { ManifestStatus } from 'components/Manifest/manifestSchema'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestFABs } from '~/components/Manifest/Actions/ManifestFABs'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { ManifestStatus } from '~/components/Manifest/manifestSchema'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; const TestComponent = ({ diff --git a/client/app/components/Manifest/Actions/ManifestFABs.tsx b/client/app/components/Manifest/Actions/ManifestFABs.tsx index 69797f631..c98d341d5 100644 --- a/client/app/components/Manifest/Actions/ManifestFABs.tsx +++ b/client/app/components/Manifest/Actions/ManifestFABs.tsx @@ -1,9 +1,9 @@ -import { ManifestEditBtn } from 'components/Manifest/Actions/ManifestEditBtn'; -import { ManifestSaveBtn } from 'components/Manifest/Actions/ManifestSaveBtn'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { QuickSignBtn } from 'components/Manifest/QuickerSign'; -import { FloatingActionBtn } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestEditBtn } from '~/components/Manifest/Actions/ManifestEditBtn'; +import { ManifestSaveBtn } from '~/components/Manifest/Actions/ManifestSaveBtn'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign'; +import { FloatingActionBtn } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React, { ReactElement, useContext } from 'react'; interface ManifestActionBtnsProps { diff --git a/client/app/components/Manifest/Actions/ManifestSaveBtn.tsx b/client/app/components/Manifest/Actions/ManifestSaveBtn.tsx index 7f8bae0f7..b601c7ed0 100644 --- a/client/app/components/Manifest/Actions/ManifestSaveBtn.tsx +++ b/client/app/components/Manifest/Actions/ManifestSaveBtn.tsx @@ -1,7 +1,7 @@ import { faFloppyDisk } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { HtButton } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { HtButton } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { ButtonProps } from 'react-bootstrap'; diff --git a/client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx index fffa1f6d5..59884bce9 100644 --- a/client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx +++ b/client/app/components/Manifest/AdditionalInfo/AdditionalInfoForm.tsx @@ -1,9 +1,9 @@ import { faTimesCircle } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Manifest } from 'components/Manifest'; -import { WasteLine } from 'components/Manifest/WasteLine'; -import { HtForm } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest } from '~/components/Manifest'; +import { WasteLine } from '~/components/Manifest/WasteLine'; +import { HtForm } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { Button, Col, Form, Row } from 'react-bootstrap'; import { useFieldArray, useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx index df7fea8c3..f505c0a55 100644 --- a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx +++ b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; -import { AdditionalInfoForm } from 'components/Manifest/AdditionalInfo'; +import { AdditionalInfoForm } from '~/components/Manifest/AdditionalInfo'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/Address/AddressForm.spec.tsx b/client/app/components/Manifest/Address/AddressForm.spec.tsx index b3d504bc3..423422cf2 100644 --- a/client/app/components/Manifest/Address/AddressForm.spec.tsx +++ b/client/app/components/Manifest/Address/AddressForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { AddressForm } from './AddressForm'; import { afterEach, describe, test, expect } from 'vitest'; diff --git a/client/app/components/Manifest/Address/AddressForm.tsx b/client/app/components/Manifest/Address/AddressForm.tsx index 9f8d75316..f143ebf5f 100644 --- a/client/app/components/Manifest/Address/AddressForm.tsx +++ b/client/app/components/Manifest/Address/AddressForm.tsx @@ -1,4 +1,4 @@ -import { GeneratorAddress } from 'components/Manifest/Address/GeneratorAddress'; +import { GeneratorAddress } from '~/components/Manifest/Address/GeneratorAddress'; import React from 'react'; interface Props { diff --git a/client/app/components/Manifest/Address/GeneratorAddress.tsx b/client/app/components/Manifest/Address/GeneratorAddress.tsx index 1d17ac583..9311d8a94 100644 --- a/client/app/components/Manifest/Address/GeneratorAddress.tsx +++ b/client/app/components/Manifest/Address/GeneratorAddress.tsx @@ -1,9 +1,9 @@ import { ErrorMessage } from '@hookform/error-message'; -import { CountryCode, StateCode } from 'components/Manifest/Address/StateSelect'; -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { RcraAddress } from 'components/RcraSite'; -import { HtForm } from 'components/UI'; +import { CountryCode, StateCode } from '~/components/Manifest/Address/StateSelect'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { RcraAddress } from '~/components/RcraSite'; +import { HtForm } from '~/components/UI'; import React, { useContext } from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { Controller, FieldError, FieldErrorsImpl, Merge, useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Contact/ContactForm.spec.tsx b/client/app/components/Manifest/Contact/ContactForm.spec.tsx index 010e35abc..b07eb2ecc 100644 --- a/client/app/components/Manifest/Contact/ContactForm.spec.tsx +++ b/client/app/components/Manifest/Contact/ContactForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { ContactForm } from './ContactForm'; import { afterEach, describe, test, expect } from 'vitest'; diff --git a/client/app/components/Manifest/Contact/ContactForm.tsx b/client/app/components/Manifest/Contact/ContactForm.tsx index 5dd80c4a0..1fe50e50b 100644 --- a/client/app/components/Manifest/Contact/ContactForm.tsx +++ b/client/app/components/Manifest/Contact/ContactForm.tsx @@ -1,7 +1,7 @@ -import { Manifest } from 'components/Manifest'; -import { PhoneForm } from 'components/Manifest/Contact/PhoneForm'; -import { HtForm } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest } from '~/components/Manifest'; +import { PhoneForm } from '~/components/Manifest/Contact/PhoneForm'; +import { HtForm } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx index b224d361a..c011f4286 100644 --- a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx +++ b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { PhoneForm } from 'components/Manifest/Contact'; +import { PhoneForm } from '~/components/Manifest/Contact'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/Contact/PhoneForm.tsx b/client/app/components/Manifest/Contact/PhoneForm.tsx index 08a269f6e..371cd57d5 100644 --- a/client/app/components/Manifest/Contact/PhoneForm.tsx +++ b/client/app/components/Manifest/Contact/PhoneForm.tsx @@ -1,5 +1,5 @@ -import { Manifest } from 'components/Manifest'; -import { HtForm } from 'components/UI'; +import { Manifest } from '~/components/Manifest'; +import { HtForm } from '~/components/UI'; import React, { useState } from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx index 8247fbc36..de5eb2723 100644 --- a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneralInfoForm } from './GeneralInfoForm'; diff --git a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx index df38f00ac..7c2fc999c 100644 --- a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx +++ b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.tsx @@ -1,8 +1,8 @@ -import { ManifestStatusSelect } from 'components/Manifest/GeneralInfo/ManifestStatusSelect'; -import { ManifestTypeSelect } from 'components/Manifest/GeneralInfo/ManifestTypeSelect'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { HtForm, InfoIconTooltip } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestStatusSelect } from '~/components/Manifest/GeneralInfo/ManifestStatusSelect'; +import { ManifestTypeSelect } from '~/components/Manifest/GeneralInfo/ManifestTypeSelect'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { HtForm, InfoIconTooltip } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx index 4c2bb8be3..3ed2c240e 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx @@ -1,14 +1,14 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; -import { ManifestStatusSelect } from 'components/Manifest/GeneralInfo/ManifestStatusSelect'; +import { ManifestStatusSelect } from '~/components/Manifest/GeneralInfo/ManifestStatusSelect'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockHandler, createMockSite } from 'test-utils/fixtures'; -import { createMockProfileResponse } from 'test-utils/fixtures/mockUser'; -import { mockUserEndpoints } from 'test-utils/mock'; -import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler, createMockSite } from '~/test-utils/fixtures'; +import { createMockProfileResponse } from '~/test-utils/fixtures/mockUser'; +import { mockUserEndpoints } from '~/test-utils/mock'; +import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx index 8800f96af..040993a2e 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.tsx @@ -1,11 +1,11 @@ -import { Manifest, ManifestStatus } from 'components/Manifest/manifestSchema'; -import { HtForm, InfoIconTooltip } from 'components/UI'; -import { useManifestStatus } from 'hooks/manifest'; +import { Manifest, ManifestStatus } from '~/components/Manifest/manifestSchema'; +import { HtForm, InfoIconTooltip } from '~/components/UI'; +import { useManifestStatus } from '~/hooks/manifest'; import React from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import Select, { SingleValue } from 'react-select'; -import { manifest } from 'services'; -import { useGetProfileQuery } from 'store'; +import { manifest } from '~/services'; +import { useGetProfileQuery } from '~/store'; interface StatusOption { value: ManifestStatus; diff --git a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx index 15ca31b5d..9ab66d814 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx @@ -1,11 +1,11 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; -import { ManifestTypeSelect } from 'components/Manifest/GeneralInfo/ManifestTypeSelect'; +import { ManifestTypeSelect } from '~/components/Manifest/GeneralInfo/ManifestTypeSelect'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockHandler } from 'test-utils/fixtures'; -import { mockUserEndpoints } from 'test-utils/mock'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler } from '~/test-utils/fixtures'; +import { mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx index b40a3458f..1318724ce 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestTypeSelect.tsx @@ -1,6 +1,6 @@ -import { Manifest, ManifestStatus, SubmissionType } from 'components/Manifest/manifestSchema'; -import { HtForm } from 'components/UI'; -import { useManifestStatus } from 'hooks/manifest'; +import { Manifest, ManifestStatus, SubmissionType } from '~/components/Manifest/manifestSchema'; +import { HtForm } from '~/components/UI'; +import { useManifestStatus } from '~/hooks/manifest'; import React, { useState } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import Select, { SingleValue } from 'react-select'; diff --git a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx index 1bfa33bdf..8ae3a48b1 100644 --- a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx +++ b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; -import { siteType } from 'components/Manifest/manifestSchema'; +import { siteType } from '~/components/Manifest/manifestSchema'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneratorForm } from './GeneratorForm'; diff --git a/client/app/components/Manifest/Generator/GeneratorForm.tsx b/client/app/components/Manifest/Generator/GeneratorForm.tsx index c71df9af4..d503c55da 100644 --- a/client/app/components/Manifest/Generator/GeneratorForm.tsx +++ b/client/app/components/Manifest/Generator/GeneratorForm.tsx @@ -1,7 +1,7 @@ -import { Manifest } from 'components/Manifest'; -import { AddressForm } from 'components/Manifest/Address'; -import { HtForm } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest } from '~/components/Manifest'; +import { AddressForm } from '~/components/Manifest/Address'; +import { HtForm } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import { ReactElement, useEffect, useState } from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx index cdfa61757..595f44a1c 100644 --- a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx +++ b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockHandler } from 'test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler } from '~/test-utils/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneratorSection } from './GeneratorSection'; diff --git a/client/app/components/Manifest/Generator/GeneratorSection.tsx b/client/app/components/Manifest/Generator/GeneratorSection.tsx index 0e00b99c7..d52e41df5 100644 --- a/client/app/components/Manifest/Generator/GeneratorSection.tsx +++ b/client/app/components/Manifest/Generator/GeneratorSection.tsx @@ -1,16 +1,16 @@ import { ErrorMessage } from '@hookform/error-message'; -import { ContactForm, PhoneForm } from 'components/Manifest/Contact'; -import { Handler, Manifest } from 'components/Manifest/manifestSchema'; -import { QuickSignBtn } from 'components/Manifest/QuickerSign'; -import { RcraSiteDetails } from 'components/RcraSite'; -import { HtButton, HtSpinner } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; -import { useHandlerSearchConfig } from 'hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; +import { ContactForm, PhoneForm } from '~/components/Manifest/Contact'; +import { Handler, Manifest } from '~/components/Manifest/manifestSchema'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign'; +import { RcraSiteDetails } from '~/components/RcraSite'; +import { HtButton, HtSpinner } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; +import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import React, { useEffect, useState } from 'react'; import { Alert, Button, Col, Stack } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; import { useSearchParams } from 'react-router-dom'; -import { useGetRcrainfoSiteQuery } from 'store'; +import { useGetRcrainfoSiteQuery } from '~/store'; import { GeneratorForm } from './GeneratorForm'; interface GeneratorSectionProps { diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx index 85f5704a9..db162785e 100644 --- a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx +++ b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx @@ -3,11 +3,11 @@ import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; import '@testing-library/jest-dom'; -import { HaztrakProfileResponse } from 'store/userSlice/user.slice'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockRcrainfoSite } from 'test-utils/fixtures'; -import { mockUserEndpoints } from 'test-utils/mock'; -import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints'; +import { HaztrakProfileResponse } from '~/store/userSlice/user.slice'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockRcrainfoSite } from '~/test-utils/fixtures'; +import { mockUserEndpoints } from '~/test-utils/mock'; +import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { HandlerSearchForm } from './HandlerSearchForm'; diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx index 2b8c2da6f..2a4479695 100644 --- a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx +++ b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.tsx @@ -1,8 +1,8 @@ -import { RcrainfoSiteSearchBadge } from 'components/Manifest/Handler/Search/RcrainfoSiteSearchBadge'; -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { Manifest, SiteType, Transporter } from 'components/Manifest/manifestSchema'; -import { RcraSite } from 'components/RcraSite'; -import { HtForm } from 'components/UI'; +import { RcrainfoSiteSearchBadge } from '~/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { Manifest, SiteType, Transporter } from '~/components/Manifest/manifestSchema'; +import { RcraSite } from '~/components/RcraSite'; +import { HtForm } from '~/components/UI'; import React, { useContext, useEffect, useState } from 'react'; import { Button, Col, Row } from 'react-bootstrap'; import { @@ -14,8 +14,8 @@ import { } from 'react-hook-form'; import { useSearchParams } from 'react-router-dom'; import Select from 'react-select'; -import { useGetProfileQuery, useSearchRcrainfoSitesQuery, useSearchRcraSitesQuery } from 'store'; -import { useDebounce } from 'hooks'; +import { useGetProfileQuery, useSearchRcrainfoSitesQuery, useSearchRcraSitesQuery } from '~/store'; +import { useDebounce } from '~/hooks'; interface Props { handleClose: () => void; diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx index 754b3a8fe..683186d1e 100644 --- a/client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx +++ b/client/app/components/Manifest/Handler/Search/HandlerSearchModal.tsx @@ -1,7 +1,7 @@ -import { HandlerSearchForm } from 'components/Manifest/Handler'; -import { Manifest, Transporter } from 'components/Manifest/manifestSchema'; -import { HtModal } from 'components/UI'; -import { useHandlerSearchConfig } from 'hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; +import { HandlerSearchForm } from '~/components/Manifest/Handler'; +import { Manifest, Transporter } from '~/components/Manifest/manifestSchema'; +import { HtModal } from '~/components/UI'; +import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import React from 'react'; import { Col, Row } from 'react-bootstrap'; import { useFieldArray, useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx b/client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx index 228858390..61b1d039e 100644 --- a/client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx +++ b/client/app/components/Manifest/Handler/Search/RcrainfoSiteSearchBadge.tsx @@ -1,6 +1,6 @@ import { faCheck, faXmark } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { HtSpinner } from 'components/UI'; +import { HtSpinner } from '~/components/UI'; import React from 'react'; import { Badge } from 'react-bootstrap'; diff --git a/client/app/components/Manifest/Handler/index.ts b/client/app/components/Manifest/Handler/index.ts index 76c4baa98..b62357dc3 100644 --- a/client/app/components/Manifest/Handler/index.ts +++ b/client/app/components/Manifest/Handler/index.ts @@ -1,4 +1,4 @@ -import { Handler, handlerSchema, Signer } from 'components/Manifest/manifestSchema'; +import { Handler, handlerSchema, Signer } from '~/components/Manifest/manifestSchema'; import { HandlerSearchForm } from './Search/HandlerSearchForm'; import { HandlerSearchModal } from './Search/HandlerSearchModal'; diff --git a/client/app/components/Manifest/ManifestForm.spec.tsx b/client/app/components/Manifest/ManifestForm.spec.tsx index b78366863..b007964a6 100644 --- a/client/app/components/Manifest/ManifestForm.spec.tsx +++ b/client/app/components/Manifest/ManifestForm.spec.tsx @@ -1,11 +1,11 @@ import '@testing-library/jest-dom'; import { fireEvent, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ManifestForm } from 'components/Manifest'; +import { ManifestForm } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders } from 'test-utils'; -import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock'; +import { cleanup, renderWithProviders } from '~/test-utils'; +import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints); diff --git a/client/app/components/Manifest/ManifestForm.tsx b/client/app/components/Manifest/ManifestForm.tsx index f6199a5e2..bc05f886b 100644 --- a/client/app/components/Manifest/ManifestForm.tsx +++ b/client/app/components/Manifest/ManifestForm.tsx @@ -4,24 +4,24 @@ import { ManifestEditBtn, ManifestFABs, ManifestSaveBtn, -} from 'components/Manifest/Actions'; -import { AdditionalInfoForm } from 'components/Manifest/AdditionalInfo'; -import { GeneralInfoForm } from 'components/Manifest/GeneralInfo'; -import { GeneratorSection } from 'components/Manifest/Generator'; -import { TransporterSection } from 'components/Manifest/Transporter/TransporterSection'; -import { TsdfSection } from 'components/Manifest/Tsdf'; -import { UpdateRcra } from 'components/Manifest/UpdateRcra/UpdateRcra'; -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { WasteLineSection } from 'components/Manifest/WasteLine/WasteLineSection'; -import { HtCard, HtForm } from 'components/UI'; -import { useUserSiteIds } from 'hooks'; -import { useManifestStatus, useReadOnly, useSaveManifest } from 'hooks/manifest'; +} from '~/components/Manifest/Actions'; +import { AdditionalInfoForm } from '~/components/Manifest/AdditionalInfo'; +import { GeneralInfoForm } from '~/components/Manifest/GeneralInfo'; +import { GeneratorSection } from '~/components/Manifest/Generator'; +import { TransporterSection } from '~/components/Manifest/Transporter/TransporterSection'; +import { TsdfSection } from '~/components/Manifest/Tsdf'; +import { UpdateRcra } from '~/components/Manifest/UpdateRcra/UpdateRcra'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { WasteLineSection } from '~/components/Manifest/WasteLine/WasteLineSection'; +import { HtCard, HtForm } from '~/components/UI'; +import { useUserSiteIds } from '~/hooks'; +import { useManifestStatus, useReadOnly, useSaveManifest } from '~/hooks/manifest'; import React, { createContext, useEffect, useState } from 'react'; import { Container, Stack } from 'react-bootstrap'; import { FormProvider, SubmitHandler, useFieldArray, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; import { toast } from 'react-toastify'; -import { manifest } from 'services'; +import { manifest } from '~/services'; import { HandlerSearchModal } from './Handler'; import { Manifest, manifestSchema, SiteType } from './manifestSchema'; import { QuickerSignData, QuickerSignModal } from './QuickerSign'; diff --git a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx index 120395ea4..7d9c1b29b 100644 --- a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx +++ b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; -import { QuickerSignForm } from 'components/Manifest/QuickerSign'; +import { QuickerSignForm } from '~/components/Manifest/QuickerSign'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockMTNHandler } from 'test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockMTNHandler } from '~/test-utils/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx index 42e7a9a88..682b27846 100644 --- a/client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx +++ b/client/app/components/Manifest/QuickerSign/QuickerSignForm.tsx @@ -1,9 +1,9 @@ import { faFileSignature, faPen } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Handler, RcraSiteType } from 'components/Manifest/manifestSchema'; -import { Transporter } from 'components/Manifest/Transporter'; -import { HtForm } from 'components/UI'; -import { useProgressTracker } from 'hooks'; +import { Handler, RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { Transporter } from '~/components/Manifest/Transporter'; +import { HtForm } from '~/components/UI'; +import { useProgressTracker } from '~/hooks'; import React, { useEffect, useState } from 'react'; import { Button, Col, Container, Form, ListGroup, Row, Stack } from 'react-bootstrap'; import { SubmitHandler, useForm } from 'react-hook-form'; @@ -15,7 +15,7 @@ import { useAppDispatch, useAppSelector, useSignEManifestMutation, -} from 'store'; +} from '~/store'; import { z } from 'zod'; const siteType = z.enum(['Transporter', 'Generator', 'Tsdf', 'Broker']); diff --git a/client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx index 53a2fe943..e36b0fd8c 100644 --- a/client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx +++ b/client/app/components/Manifest/QuickerSign/QuickerSignModal.tsx @@ -1,5 +1,5 @@ -import { Handler, RcraSiteType } from 'components/Manifest/manifestSchema'; -import { HtModal } from 'components/UI'; +import { Handler, RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { HtModal } from '~/components/UI'; import React from 'react'; import { QuickerSignForm } from './QuickerSignForm'; diff --git a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx index 212f651bb..805af2d71 100644 --- a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx +++ b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx @@ -1,12 +1,12 @@ import '@testing-library/jest-dom'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { Handler, RcraSiteType } from 'components/Manifest/manifestSchema'; -import { QuickSignBtn } from 'components/Manifest/QuickerSign/index'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { Handler, RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign/index'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockMTNHandler } from 'test-utils/fixtures'; -import { mockUserEndpoints } from 'test-utils/mock'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockMTNHandler } from '~/test-utils/fixtures'; +import { mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; import { undefined } from 'zod'; diff --git a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx index 859358ee9..c49414bd1 100644 --- a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx +++ b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.tsx @@ -1,12 +1,12 @@ import { faFeather } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { createSelector } from '@reduxjs/toolkit'; -import { ManifestContext } from 'components/Manifest/ManifestForm'; -import { Handler } from 'components/Manifest/manifestSchema'; -import { RcraApiUserBtn } from 'components/Rcrainfo'; +import { ManifestContext } from '~/components/Manifest/ManifestForm'; +import { Handler } from '~/components/Manifest/manifestSchema'; +import { RcraApiUserBtn } from '~/components/Rcrainfo'; import React, { useContext, useMemo } from 'react'; import { ButtonProps } from 'react-bootstrap'; -import { ProfileSlice, useGetProfileQuery } from 'store'; +import { ProfileSlice, useGetProfileQuery } from '~/store'; interface QuickSignBtnProps extends ButtonProps { mtnHandler?: Handler; diff --git a/client/app/components/Manifest/QuickerSign/index.ts b/client/app/components/Manifest/QuickerSign/index.ts index 3ce4b25a8..b86c95fbc 100644 --- a/client/app/components/Manifest/QuickerSign/index.ts +++ b/client/app/components/Manifest/QuickerSign/index.ts @@ -1,4 +1,4 @@ -import { QuickSignBtn } from 'components/Manifest/QuickerSign/SignBtn/QuickSignBtn'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign/SignBtn/QuickSignBtn'; import { QuickerSignature, QuickerSignData, QuickerSignForm } from './QuickerSignForm'; import { QuickerSignModal } from './QuickerSignModal'; diff --git a/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx index 5b2b9be54..87a41116d 100644 --- a/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx @@ -1,8 +1,8 @@ import { screen } from '@testing-library/react'; -import { SiteSelect } from 'components/Manifest/SiteSelect/SiteSelect'; +import { SiteSelect } from '~/components/Manifest/SiteSelect/SiteSelect'; import React, { useState } from 'react'; import { useForm } from 'react-hook-form'; -import { renderWithProviders } from 'test-utils'; +import { renderWithProviders } from '~/test-utils'; import { describe, expect, test } from 'vitest'; function TestComponent() { diff --git a/client/app/components/Manifest/SiteSelect/SiteSelect.tsx b/client/app/components/Manifest/SiteSelect/SiteSelect.tsx index 9aeecbd40..f94e4225a 100644 --- a/client/app/components/Manifest/SiteSelect/SiteSelect.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteSelect.tsx @@ -1,11 +1,11 @@ import { createSelector } from '@reduxjs/toolkit'; -import { RcraSite } from 'components/RcraSite'; -import { HtForm } from 'components/UI'; +import { RcraSite } from '~/components/RcraSite'; +import { HtForm } from '~/components/UI'; import React, { useMemo } from 'react'; import { Control, Controller } from 'react-hook-form'; import Select from 'react-select'; -import { useGetUserHaztrakSitesQuery } from 'store'; -import { HaztrakSite } from 'components/HaztrakSite'; +import { useGetUserHaztrakSitesQuery } from '~/store'; +import { HaztrakSite } from '~/components/HaztrakSite'; interface SiteSelectProps { control: Control; diff --git a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx index 266e29597..629d7a62c 100644 --- a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx @@ -1,9 +1,9 @@ import { screen } from '@testing-library/react'; -import { RcraSiteType } from 'components/Manifest/manifestSchema'; -import { SiteTypeSelect } from 'components/Manifest/SiteSelect/SiteTypeSelect'; +import { RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { SiteTypeSelect } from '~/components/Manifest/SiteSelect/SiteTypeSelect'; import React, { useState } from 'react'; import { useForm } from 'react-hook-form'; -import { renderWithProviders } from 'test-utils'; +import { renderWithProviders } from '~/test-utils'; import { describe, expect, test } from 'vitest'; function TestComponent({ siteType }: { siteType?: RcraSiteType }) { diff --git a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx index 536a503a0..468959b14 100644 --- a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.tsx @@ -1,5 +1,5 @@ -import { RcraSiteType } from 'components/Manifest/manifestSchema'; -import { HtForm } from 'components/UI'; +import { RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { HtForm } from '~/components/UI'; import React from 'react'; import { Form } from 'react-bootstrap'; import { Control, Controller } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Transporter/TransporterSection.tsx b/client/app/components/Manifest/Transporter/TransporterSection.tsx index 7aff9dcdc..04f10ba9e 100644 --- a/client/app/components/Manifest/Transporter/TransporterSection.tsx +++ b/client/app/components/Manifest/Transporter/TransporterSection.tsx @@ -1,9 +1,9 @@ import { ErrorMessage } from '@hookform/error-message'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { TransporterTable } from 'components/Manifest/Transporter/TransporterTable'; -import { HtButton } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; -import { useHandlerSearchConfig } from 'hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { TransporterTable } from '~/components/Manifest/Transporter/TransporterTable'; +import { HtButton } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; +import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import { Alert } from 'react-bootstrap'; import { useFieldArray, useFormContext } from 'react-hook-form'; import { v4 as uuidv4 } from 'uuid'; diff --git a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx index 12880f549..449e452d5 100644 --- a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx +++ b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx @@ -1,11 +1,11 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; -import { Transporter } from 'components/Manifest'; +import { Transporter } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockTransporter } from 'test-utils/fixtures'; -import { mockUserEndpoints } from 'test-utils/mock'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockTransporter } from '~/test-utils/fixtures'; +import { mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { TransporterTable } from './index'; diff --git a/client/app/components/Manifest/Transporter/TransporterTable.tsx b/client/app/components/Manifest/Transporter/TransporterTable.tsx index 5206ddd6f..a4a5b1dfe 100644 --- a/client/app/components/Manifest/Transporter/TransporterTable.tsx +++ b/client/app/components/Manifest/Transporter/TransporterTable.tsx @@ -1,10 +1,10 @@ import { useAutoAnimate } from '@formkit/auto-animate/react'; import { faAngleRight, faCheck, faSignature } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Transporter } from 'components/Manifest'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { QuickSignBtn } from 'components/Manifest/QuickerSign'; -import { useReadOnly } from 'hooks/manifest'; +import { Transporter } from '~/components/Manifest'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign'; +import { useReadOnly } from '~/hooks/manifest'; import React, { useState } from 'react'; import { Accordion, Button, Card, Col, Row, Table, useAccordionButton } from 'react-bootstrap'; import { UseFieldArrayReturn } from 'react-hook-form'; diff --git a/client/app/components/Manifest/Transporter/index.ts b/client/app/components/Manifest/Transporter/index.ts index d22fbef0d..47276038c 100644 --- a/client/app/components/Manifest/Transporter/index.ts +++ b/client/app/components/Manifest/Transporter/index.ts @@ -1,5 +1,5 @@ import { TransporterTable } from './TransporterTable'; -import { Transporter } from 'components/Manifest'; +import { Transporter } from '~/components/Manifest'; export { TransporterTable }; export type { Transporter }; diff --git a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx index a2f3818e5..b6122135c 100644 --- a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx +++ b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockHandler } from 'test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler } from '~/test-utils/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; import { TsdfSection } from './TsdfSection'; diff --git a/client/app/components/Manifest/Tsdf/TsdfSection.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.tsx index 8a6d47f14..65908d9a2 100644 --- a/client/app/components/Manifest/Tsdf/TsdfSection.tsx +++ b/client/app/components/Manifest/Tsdf/TsdfSection.tsx @@ -1,15 +1,15 @@ import { ErrorMessage } from '@hookform/error-message'; -import { Handler, Manifest } from 'components/Manifest/manifestSchema'; -import { QuickSignBtn } from 'components/Manifest/QuickerSign'; -import { RcraSiteDetails } from 'components/RcraSite'; -import { HtButton, HtSpinner } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; -import { useHandlerSearchConfig } from 'hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; +import { Handler, Manifest } from '~/components/Manifest/manifestSchema'; +import { QuickSignBtn } from '~/components/Manifest/QuickerSign'; +import { RcraSiteDetails } from '~/components/RcraSite'; +import { HtButton, HtSpinner } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; +import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import React, { useEffect } from 'react'; import { Alert, Col } from 'react-bootstrap'; import { useFormContext } from 'react-hook-form'; import { useSearchParams } from 'react-router-dom'; -import { useGetRcrainfoSiteQuery } from 'store'; +import { useGetRcrainfoSiteQuery } from '~/store'; interface TsdfSectionProps { setupSign: () => void; diff --git a/client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx b/client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx index 587199a12..a0529ee61 100644 --- a/client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx +++ b/client/app/components/Manifest/UpdateRcra/UpdateRcra.tsx @@ -1,7 +1,7 @@ -import { HtSpinner } from 'components/UI'; +import { HtSpinner } from '~/components/UI'; import React, { useEffect } from 'react'; import { Navigate } from 'react-router-dom'; -import { addAlert, useAppDispatch, useGetTaskStatusQuery } from 'store'; +import { addAlert, useAppDispatch, useGetTaskStatusQuery } from '~/store'; interface UpdateRcraProps { taskId: string; diff --git a/client/app/components/Manifest/WasteLine/DotIdSelect.tsx b/client/app/components/Manifest/WasteLine/DotIdSelect.tsx index fdc238199..a1cea29a2 100644 --- a/client/app/components/Manifest/WasteLine/DotIdSelect.tsx +++ b/client/app/components/Manifest/WasteLine/DotIdSelect.tsx @@ -1,7 +1,7 @@ -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; import React, { useEffect, useState } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; -import { useLazyGetDotIdNumbersQuery } from 'store'; +import { useLazyGetDotIdNumbersQuery } from '~/store'; import Select from 'react-select'; interface DotIdOption { diff --git a/client/app/components/Manifest/WasteLine/EditWasteModal.tsx b/client/app/components/Manifest/WasteLine/EditWasteModal.tsx index d2dc86f9f..863c46e0c 100644 --- a/client/app/components/Manifest/WasteLine/EditWasteModal.tsx +++ b/client/app/components/Manifest/WasteLine/EditWasteModal.tsx @@ -1,7 +1,7 @@ -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { HtModal } from 'components/UI'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { HtModal } from '~/components/UI'; import React, { useContext } from 'react'; import { Col, Row } from 'react-bootstrap'; import { UseFieldArrayReturn } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx b/client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx index d8f4948e1..940071892 100644 --- a/client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx +++ b/client/app/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm.tsx @@ -1,13 +1,13 @@ import { ErrorMessage } from '@hookform/error-message'; -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { StateWasteCodeSelect } from 'components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect'; -import { Code, WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { HtForm } from 'components/UI'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { StateWasteCodeSelect } from '~/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect'; +import { Code, WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { HtForm } from '~/components/UI'; import React, { useContext } from 'react'; import { Col, Row } from 'react-bootstrap'; import { Controller, useFormContext } from 'react-hook-form'; import Select, { components, StylesConfig } from 'react-select'; -import { useGetFedWasteCodesQuery } from 'store'; +import { useGetFedWasteCodesQuery } from '~/store'; interface HazardousWasteFormProps { epaWaste: boolean; diff --git a/client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx b/client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx index 91472f3bd..b29a9d825 100644 --- a/client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx +++ b/client/app/components/Manifest/WasteLine/HazardousWasteForm/StateWasteCodeSelect.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import Select, { components } from 'react-select'; -import { useGetStateWasteCodesQuery } from 'store'; +import { useGetStateWasteCodesQuery } from '~/store'; interface StateWasteCodeSelectProps { stateId?: string; diff --git a/client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts b/client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts index 22d0bf6f6..11d9af341 100644 --- a/client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts +++ b/client/app/components/Manifest/WasteLine/HazardousWasteForm/index.ts @@ -1,3 +1,3 @@ -import { HazardousWasteForm } from 'components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm'; +import { HazardousWasteForm } from '~/components/Manifest/WasteLine/HazardousWasteForm/HazardousWasteForm'; export { HazardousWasteForm }; diff --git a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx index 3312a11dc..6436e31e6 100644 --- a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx +++ b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { QuantityForm } from 'components/Manifest/WasteLine/QuantityForm'; +import { QuantityForm } from '~/components/Manifest/WasteLine/QuantityForm'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => cleanup()); diff --git a/client/app/components/Manifest/WasteLine/QuantityForm.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.tsx index ee28510db..e29cf2bbb 100644 --- a/client/app/components/Manifest/WasteLine/QuantityForm.tsx +++ b/client/app/components/Manifest/WasteLine/QuantityForm.tsx @@ -3,8 +3,8 @@ import { ContainerType, QuantityUOM, WasteLine, -} from 'components/Manifest/WasteLine/wasteLineSchema'; -import { HtForm } from 'components/UI'; +} from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { HtForm } from '~/components/UI'; import React from 'react'; import { Col, Form, Row } from 'react-bootstrap'; import { Controller, useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx index 84e0a0516..bbfea8d0b 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx @@ -2,8 +2,8 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { WasteLineForm } from './WasteLineForm'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineForm.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.tsx index a15911e95..8d8f630b7 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineForm.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineForm.tsx @@ -1,11 +1,11 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { AdditionalInfoForm } from 'components/Manifest/AdditionalInfo'; -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { DotIdSelect } from 'components/Manifest/WasteLine/DotIdSelect'; -import { HazardousWasteForm } from 'components/Manifest/WasteLine/HazardousWasteForm'; -import { WasteLine, wasteLineSchema } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { HtCard, HtForm } from 'components/UI'; +import { AdditionalInfoForm } from '~/components/Manifest/AdditionalInfo'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { DotIdSelect } from '~/components/Manifest/WasteLine/DotIdSelect'; +import { HazardousWasteForm } from '~/components/Manifest/WasteLine/HazardousWasteForm'; +import { WasteLine, wasteLineSchema } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { HtCard, HtForm } from '~/components/UI'; import React, { useContext, useState } from 'react'; import { Button, Col, Container, Form, Row, Stack } from 'react-bootstrap'; import { Controller, FormProvider, UseFieldArrayReturn, useForm } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineSection.tsx b/client/app/components/Manifest/WasteLine/WasteLineSection.tsx index 8a26a5a12..47ce8ffb8 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineSection.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineSection.tsx @@ -1,9 +1,9 @@ import { ErrorMessage } from '@hookform/error-message'; -import { Manifest } from 'components/Manifest/manifestSchema'; -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { WasteLineTable } from 'components/Manifest/WasteLine/WasteLineTable'; -import { HtButton } from 'components/UI'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { WasteLineTable } from '~/components/Manifest/WasteLine/WasteLineTable'; +import { HtButton } from '~/components/UI'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { Alert } from 'react-bootstrap'; import { useFieldArray, useFormContext } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx index d2a4a9980..58360a864 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteLineTable.tsx @@ -1,11 +1,11 @@ import { useAutoAnimate } from '@formkit/auto-animate/react'; import { faAngleRight, faCheckCircle, faCircleXmark } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Manifest } from 'components/Manifest'; -import { ManifestContext, ManifestContextType } from 'components/Manifest/ManifestForm'; -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { WasteRowActions } from 'components/Manifest/WasteLine/WasteLineTable/WasteRowActions'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest } from '~/components/Manifest'; +import { ManifestContext, ManifestContextType } from '~/components/Manifest/ManifestForm'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { WasteRowActions } from '~/components/Manifest/WasteLine/WasteLineTable/WasteRowActions'; +import { useReadOnly } from '~/hooks/manifest'; import React, { useContext, useState } from 'react'; import { Accordion, Button, Card, Col, Row, useAccordionButton } from 'react-bootstrap'; import { UseFieldArrayReturn } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx index e8fa6c60e..e8c1c26f8 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineTable/WasteRowActions.tsx @@ -6,7 +6,7 @@ import { faTrash, } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Manifest } from 'components/Manifest'; +import { Manifest } from '~/components/Manifest'; import React, { MouseEventHandler, ReactElement, useState } from 'react'; import { Col, Dropdown, Row, useAccordionButton } from 'react-bootstrap'; import { UseFieldArrayReturn } from 'react-hook-form'; diff --git a/client/app/components/Manifest/WasteLine/index.ts b/client/app/components/Manifest/WasteLine/index.ts index 773161257..254cd5ede 100644 --- a/client/app/components/Manifest/WasteLine/index.ts +++ b/client/app/components/Manifest/WasteLine/index.ts @@ -1,6 +1,6 @@ -import { EditWasteModal } from 'components/Manifest/WasteLine/EditWasteModal'; +import { EditWasteModal } from '~/components/Manifest/WasteLine/EditWasteModal'; import { WasteLineTable } from './WasteLineTable'; -import { WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; +import { WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; export { WasteLineTable, EditWasteModal }; export type { WasteLine }; diff --git a/client/app/components/Manifest/manifestSchema.ts b/client/app/components/Manifest/manifestSchema.ts index 575a6ae01..5efc9b8e6 100644 --- a/client/app/components/Manifest/manifestSchema.ts +++ b/client/app/components/Manifest/manifestSchema.ts @@ -1,5 +1,5 @@ -import { additionalInfoSchema } from 'components/Manifest/AdditionalInfo/additionalInfoSchema'; -import { rcraPhoneSchema, rcraSite } from 'components/RcraSite'; +import { additionalInfoSchema } from '~/components/Manifest/AdditionalInfo/additionalInfoSchema'; +import { rcraPhoneSchema, rcraSite } from '~/components/RcraSite'; import { z } from 'zod'; export const siteType = z.enum(['generator', 'designatedFacility', 'transporter']); diff --git a/client/app/components/Mtn/MtnTable.spec.tsx b/client/app/components/Mtn/MtnTable.spec.tsx index ae882bf73..e9d7291b2 100644 --- a/client/app/components/Mtn/MtnTable.spec.tsx +++ b/client/app/components/Mtn/MtnTable.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; -import { MtnDetails, MtnTable } from 'components/Mtn'; +import { MtnDetails, MtnTable } from '~/components/Mtn'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; +import { renderWithProviders, screen } from '~/test-utils'; import { describe, expect, test } from 'vitest'; const DEFAULT_MTN_DETAILS: MtnDetails = { diff --git a/client/app/components/Mtn/MtnTable.tsx b/client/app/components/Mtn/MtnTable.tsx index 72f4c71e5..67ceefc0f 100644 --- a/client/app/components/Mtn/MtnTable.tsx +++ b/client/app/components/Mtn/MtnTable.tsx @@ -16,10 +16,10 @@ import { getSortedRowModel, useReactTable, } from '@tanstack/react-table'; -import { MtnRowActions } from 'components/Mtn/MtnRowActions'; -import { MtnSearchField } from 'components/Mtn/MtnSearchField/MtnSearchField'; -import { MtnStatusField, StatusOption } from 'components/Mtn/MtnStatusField/MtnStatusField'; -import { HtPageBtns, HtPageControls } from 'components/UI'; +import { MtnRowActions } from '~/components/Mtn/MtnRowActions'; +import { MtnSearchField } from '~/components/Mtn/MtnSearchField/MtnSearchField'; +import { MtnStatusField, StatusOption } from '~/components/Mtn/MtnStatusField/MtnStatusField'; +import { HtPageBtns, HtPageControls } from '~/components/UI'; import React, { ChangeEvent, useState } from 'react'; import { Button, Col, Table } from 'react-bootstrap'; import { Link, useSearchParams } from 'react-router-dom'; diff --git a/client/app/components/Notifications/Notifications.tsx b/client/app/components/Notifications/Notifications.tsx index 7e5031df1..b782f6ada 100644 --- a/client/app/components/Notifications/Notifications.tsx +++ b/client/app/components/Notifications/Notifications.tsx @@ -1,5 +1,5 @@ -import { ProgressTracker } from 'components/Notifications/ProgressTracker'; -import { LongRunningTask, selectAllTasks, useAppSelector } from 'store'; +import { ProgressTracker } from '~/components/Notifications/ProgressTracker'; +import { LongRunningTask, selectAllTasks, useAppSelector } from '~/store'; export function Notifications() { const tasks: LongRunningTask[] = useAppSelector(selectAllTasks); diff --git a/client/app/components/Notifications/ProgressTracker.tsx b/client/app/components/Notifications/ProgressTracker.tsx index d602cde7d..7c3a75eef 100644 --- a/client/app/components/Notifications/ProgressTracker.tsx +++ b/client/app/components/Notifications/ProgressTracker.tsx @@ -1,7 +1,7 @@ -import { useProgressTracker } from 'hooks'; +import { useProgressTracker } from '~/hooks'; import { useEffect } from 'react'; import { toast } from 'react-toastify'; -import { LongRunningTask } from 'store'; +import { LongRunningTask } from '~/store'; export interface NotificationProps { task: LongRunningTask; diff --git a/client/app/components/Org/OrgSitesTable.tsx b/client/app/components/Org/OrgSitesTable.tsx index cc76cd4c0..dcf38d50f 100644 --- a/client/app/components/Org/OrgSitesTable.tsx +++ b/client/app/components/Org/OrgSitesTable.tsx @@ -1,7 +1,7 @@ -import { HaztrakSite } from 'components/HaztrakSite'; +import { HaztrakSite } from '~/components/HaztrakSite'; import React from 'react'; import { Row, Table } from 'react-bootstrap'; -import { HaztrakProfileOrg, useGetOrgSitesQuery } from 'store'; +import { HaztrakProfileOrg, useGetOrgSitesQuery } from '~/store'; interface OrgSitesProps { org: HaztrakProfileOrg; diff --git a/client/app/components/Org/UserOrg.tsx b/client/app/components/Org/UserOrg.tsx index 628cbdd79..28e85f8c4 100644 --- a/client/app/components/Org/UserOrg.tsx +++ b/client/app/components/Org/UserOrg.tsx @@ -1,9 +1,9 @@ import { faCheck, faX } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { SiteAccess } from 'components/User/SiteAccess'; +import { SiteAccess } from '~/components/User/SiteAccess'; import React from 'react'; import { Col, Row, Tab, Tabs } from 'react-bootstrap'; -import { ProfileSlice } from 'store'; +import { ProfileSlice } from '~/store'; import { OrgSitesTable } from './OrgSitesTable'; interface UserOrgProps { diff --git a/client/app/components/RcraProfile/RcraProfile.tsx b/client/app/components/RcraProfile/RcraProfile.tsx index b17a1e452..3ca4ca616 100644 --- a/client/app/components/RcraProfile/RcraProfile.tsx +++ b/client/app/components/RcraProfile/RcraProfile.tsx @@ -1,12 +1,12 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { SyncRcrainfoProfileBtn } from 'components/RcraProfile/SyncRcrainfoProfileBtn'; -import { HtForm, HtSpinner } from 'components/UI'; -import { useProgressTracker } from 'hooks'; +import { SyncRcrainfoProfileBtn } from '~/components/RcraProfile/SyncRcrainfoProfileBtn'; +import { HtForm, HtSpinner } from '~/components/UI'; +import { useProgressTracker } from '~/hooks'; import React, { useEffect, useState } from 'react'; import { Button, Col, Container, Form, Row, Table } from 'react-bootstrap'; import { useForm } from 'react-hook-form'; -import { RcrainfoProfileState, useAppDispatch, useUpdateRcrainfoProfileMutation } from 'store'; -import { userApi } from 'store/userSlice/user.slice'; +import { RcrainfoProfileState, useAppDispatch, useUpdateRcrainfoProfileMutation } from '~/store'; +import { userApi } from '~/store/userSlice/user.slice'; import { z } from 'zod'; interface ProfileViewProps { diff --git a/client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx b/client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx index bf92226a6..a3c3ada01 100644 --- a/client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx +++ b/client/app/components/RcraProfile/SyncRcrainfoProfileBtn.tsx @@ -1,6 +1,6 @@ -import { RcraApiUserBtn } from 'components/Rcrainfo'; +import { RcraApiUserBtn } from '~/components/Rcrainfo'; import React, { useEffect } from 'react'; -import { addTask, updateTask, useAppDispatch, useSyncRcrainfoProfileMutation } from 'store'; +import { addTask, updateTask, useAppDispatch, useSyncRcrainfoProfileMutation } from '~/store'; interface SyncRcrainfoProfileBtnProps { taskId?: string; diff --git a/client/app/components/RcraProfile/index.ts b/client/app/components/RcraProfile/index.ts index 8331f31f0..ec2ab2d0e 100644 --- a/client/app/components/RcraProfile/index.ts +++ b/client/app/components/RcraProfile/index.ts @@ -1,3 +1,3 @@ -import { RcraProfile } from 'components/RcraProfile/RcraProfile'; +import { RcraProfile } from '~/components/RcraProfile/RcraProfile'; export { RcraProfile }; diff --git a/client/app/components/RcraSite/AddressListGroup.tsx b/client/app/components/RcraSite/AddressListGroup.tsx index babf9a0ff..8ccdfe87d 100644 --- a/client/app/components/RcraSite/AddressListGroup.tsx +++ b/client/app/components/RcraSite/AddressListGroup.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { ListGroup } from 'react-bootstrap'; -import { RcraAddress } from 'components/RcraSite'; +import { RcraAddress } from '~/components/RcraSite'; interface AddressListGroupProps { title: string; diff --git a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx index 21e3c0f5d..e7a006879 100644 --- a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx +++ b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; -import { RcraSiteDetails } from 'components/RcraSite'; +import { RcraSiteDetails } from '~/components/RcraSite'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockMTNHandler } from 'test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockMTNHandler } from '~/test-utils/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/RcraSite/RcraSiteDetails.tsx b/client/app/components/RcraSite/RcraSiteDetails.tsx index f227ade43..7d2f6c3a3 100644 --- a/client/app/components/RcraSite/RcraSiteDetails.tsx +++ b/client/app/components/RcraSite/RcraSiteDetails.tsx @@ -1,7 +1,7 @@ import { faCircleCheck, faCircleXmark, faSignature } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { Handler } from 'components/Manifest'; -import { AddressListGroup, RcraSite } from 'components/RcraSite'; +import { Handler } from '~/components/Manifest'; +import { AddressListGroup, RcraSite } from '~/components/RcraSite'; import React from 'react'; import { Col, Row } from 'react-bootstrap'; diff --git a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx index f1d9bd0a6..f9bb34fa4 100644 --- a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx +++ b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { RcraApiUserBtn } from 'components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn'; +import { RcraApiUserBtn } from '~/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test, vi } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx index e8cc292d5..d3231cbc2 100644 --- a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx +++ b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx @@ -1,5 +1,5 @@ import { Button, ButtonProps } from 'react-bootstrap'; -import { useGetProfileQuery } from 'store'; +import { useGetProfileQuery } from '~/store'; interface HtApiUserBtnProps extends ButtonProps {} diff --git a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx index 8b501990b..49d44011a 100644 --- a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx +++ b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx @@ -1,11 +1,11 @@ import '@testing-library/jest-dom'; -import { SyncManifestBtn } from 'components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn'; +import { SyncManifestBtn } from '~/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { mockUserEndpoints } from 'test-utils/mock'; -import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { mockUserEndpoints } from '~/test-utils/mock'; +import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const testTaskID = 'testTaskId'; diff --git a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx index a11a1b5e7..23bbc86fa 100644 --- a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx +++ b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.tsx @@ -1,9 +1,9 @@ import { faSync } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { RcraApiUserBtn } from 'components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn'; -import { useProgressTracker } from 'hooks'; +import { RcraApiUserBtn } from '~/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn'; +import { useProgressTracker } from '~/hooks'; import React, { useEffect, useState } from 'react'; -import { addTask, updateTask, useAppDispatch, useSyncEManifestMutation } from 'store'; +import { addTask, updateTask, useAppDispatch, useSyncEManifestMutation } from '~/store'; interface SyncManifestProps { siteId?: string; diff --git a/client/app/components/UI/HtCard/HtCard.spec.tsx b/client/app/components/UI/HtCard/HtCard.spec.tsx index f1df03e1d..42f3fb937 100644 --- a/client/app/components/UI/HtCard/HtCard.spec.tsx +++ b/client/app/components/UI/HtCard/HtCard.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { HtCard } from 'components/UI'; +import { HtCard } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from 'test-utils'; +import { cleanup, render, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/UI/HtCard/HtCard.tsx b/client/app/components/UI/HtCard/HtCard.tsx index d99f44722..a3cf227bf 100644 --- a/client/app/components/UI/HtCard/HtCard.tsx +++ b/client/app/components/UI/HtCard/HtCard.tsx @@ -1,4 +1,4 @@ -import { ErrorBoundary } from 'components/Error'; +import { ErrorBoundary } from '~/components/Error'; import React, { ReactElement } from 'react'; import { Card, CardHeaderProps, CardProps, Container } from 'react-bootstrap'; diff --git a/client/app/components/UI/HtModal/HtModal.spec.tsx b/client/app/components/UI/HtModal/HtModal.spec.tsx index f3b9bcebb..a06a96505 100644 --- a/client/app/components/UI/HtModal/HtModal.spec.tsx +++ b/client/app/components/UI/HtModal/HtModal.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { HtModal } from 'components/UI'; +import { HtModal } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from 'test-utils'; +import { cleanup, render, screen } from '~/test-utils'; import { afterEach, describe, expect, test, vi } from 'vitest'; afterEach(() => { diff --git a/client/app/components/UI/HtPaginate/HtPageBtns.tsx b/client/app/components/UI/HtPaginate/HtPageBtns.tsx index d604decda..d8cd30b53 100644 --- a/client/app/components/UI/HtPaginate/HtPageBtns.tsx +++ b/client/app/components/UI/HtPaginate/HtPageBtns.tsx @@ -6,7 +6,7 @@ import { } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Table } from '@tanstack/react-table'; -import { usePagination } from 'hooks'; +import { usePagination } from '~/hooks'; import React from 'react'; import { Pagination } from 'react-bootstrap'; diff --git a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx index 2abda4fa7..17af346ce 100644 --- a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx +++ b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; -import { HtPaginate } from 'components/UI'; +import { HtPaginate } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from 'test-utils'; +import { cleanup, render, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/UI/HtPaginate/HtPaginate.tsx b/client/app/components/UI/HtPaginate/HtPaginate.tsx index 053e5c89d..6c38ac081 100644 --- a/client/app/components/UI/HtPaginate/HtPaginate.tsx +++ b/client/app/components/UI/HtPaginate/HtPaginate.tsx @@ -1,4 +1,4 @@ -import { usePagination } from 'hooks'; +import { usePagination } from '~/hooks'; import React from 'react'; import { Pagination } from 'react-bootstrap'; diff --git a/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx b/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx index c6f4dc2fc..ceef707fc 100644 --- a/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx +++ b/client/app/components/UI/HtTooltip/HtTooltip.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import { cleanup, fireEvent, render, screen } from '@testing-library/react'; -import { HtTooltip } from 'components/UI'; +import { HtTooltip } from '~/components/UI'; import React from 'react'; import { afterEach, describe, expect, test } from 'vitest'; diff --git a/client/app/components/UI/index.ts b/client/app/components/UI/index.ts index 9193aea01..d16d0b364 100644 --- a/client/app/components/UI/index.ts +++ b/client/app/components/UI/index.ts @@ -1,8 +1,8 @@ -export { HtButton } from 'components/UI/HtButton'; -export { HtForm } from 'components/UI/HtForm'; -export { HtPageBtns } from 'components/UI/HtPaginate/HtPageBtns'; -export { HtPageControls } from 'components/UI/HtPaginate/HtPageControls'; -export { HtPaginate } from 'components/UI/HtPaginate/HtPaginate'; +export { HtButton } from '~/components/UI/HtButton'; +export { HtForm } from '~/components/UI/HtForm'; +export { HtPageBtns } from '~/components/UI/HtPaginate/HtPageBtns'; +export { HtPageControls } from '~/components/UI/HtPaginate/HtPageControls'; +export { HtPaginate } from '~/components/UI/HtPaginate/HtPaginate'; export { HtCard } from './HtCard/HtCard'; export { HtModal } from './HtModal/HtModal'; export { HtSpinner } from './HtSpinner'; diff --git a/client/app/components/User/SiteAccess.tsx b/client/app/components/User/SiteAccess.tsx index 2056b4694..a9a8ab421 100644 --- a/client/app/components/User/SiteAccess.tsx +++ b/client/app/components/User/SiteAccess.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Row, Table } from 'react-bootstrap'; import { Link } from 'react-router-dom'; -import { HaztrakProfileSite } from 'store'; +import { HaztrakProfileSite } from '~/store'; interface SiteAccessProps { sites?: Record; diff --git a/client/app/components/User/UserInfoForm.spec.tsx b/client/app/components/User/UserInfoForm.spec.tsx index 41a831b87..5d1bb1633 100644 --- a/client/app/components/User/UserInfoForm.spec.tsx +++ b/client/app/components/User/UserInfoForm.spec.tsx @@ -1,13 +1,13 @@ import '@testing-library/jest-dom'; import { cleanup } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserInfoForm } from 'components/User/UserInfoForm'; +import { UserInfoForm } from '~/components/User/UserInfoForm'; import { setupServer } from 'msw/node'; import React from 'react'; -import { HaztrakUser, ProfileSlice } from 'store'; -import { renderWithProviders, screen } from 'test-utils'; -import { createMockHaztrakUser } from 'test-utils/fixtures'; -import { mockUserEndpoints } from 'test-utils/mock'; +import { HaztrakUser, ProfileSlice } from '~/store'; +import { renderWithProviders, screen } from '~/test-utils'; +import { createMockHaztrakUser } from '~/test-utils/fixtures'; +import { mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/User/UserInfoForm.tsx b/client/app/components/User/UserInfoForm.tsx index 115b139a5..5d28d039e 100644 --- a/client/app/components/User/UserInfoForm.tsx +++ b/client/app/components/User/UserInfoForm.tsx @@ -1,11 +1,11 @@ import { faUser } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { zodResolver } from '@hookform/resolvers/zod'; -import { HtForm, HtSpinner } from 'components/UI'; +import { HtForm, HtSpinner } from '~/components/UI'; import React, { createRef, useState } from 'react'; import { Button, Col, Form, Row } from 'react-bootstrap'; import { useForm } from 'react-hook-form'; -import { HaztrakUser, ProfileSlice, useUpdateUserMutation } from 'store'; +import { HaztrakUser, ProfileSlice, useUpdateUserMutation } from '~/store'; import { z } from 'zod'; interface UserProfileProps { diff --git a/client/app/components/User/index.ts b/client/app/components/User/index.ts index 53933f2e6..42ae563fd 100644 --- a/client/app/components/User/index.ts +++ b/client/app/components/User/index.ts @@ -1 +1 @@ -export { UserInfoForm } from 'components/User/UserInfoForm'; +export { UserInfoForm } from '~/components/User/UserInfoForm'; diff --git a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx index 99e8c6fb3..6e2fa341a 100644 --- a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx +++ b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx @@ -2,10 +2,10 @@ import '@testing-library/jest-dom'; import { afterEach, describe, expect, it } from 'vitest'; import { cleanup } from '@testing-library/react'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; +import { renderWithProviders, screen } from '~/test-utils'; import { useManifestStatus } from './useManifestStatus'; import userEvent from '@testing-library/user-event'; -import { ManifestStatus } from 'components/Manifest/manifestSchema'; +import { ManifestStatus } from '~/components/Manifest/manifestSchema'; const TestChildComponent = () => { const [status] = useManifestStatus(); diff --git a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx index 9a5246882..4f05bfb55 100644 --- a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx +++ b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; -import { ManifestStatus } from 'components/Manifest/manifestSchema'; -import { useAppDispatch, useAppSelector } from 'store'; -import { selectManifestStatus, setManifestStatus } from 'store/manifestSlice/manifest.slice'; +import { ManifestStatus } from '~/components/Manifest/manifestSchema'; +import { useAppDispatch, useAppSelector } from '~/store'; +import { selectManifestStatus, setManifestStatus } from '~/store/manifestSlice/manifest.slice'; /** State management for the e-Manifest status (e.g., 'NotAssigned', 'Scheduled') * @example const [status, setStatus] = useManifestStatus(optionalDefault); diff --git a/client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx index d4a1aa556..e1f2467f3 100644 --- a/client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx +++ b/client/app/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig.tsx @@ -1,10 +1,10 @@ import { useEffect, useState } from 'react'; -import { useAppDispatch, useAppSelector } from 'store'; +import { useAppDispatch, useAppSelector } from '~/store'; import { HandlerSearchConfig, selectHandlerSearchConfigs, setHandlerSearchConfigs, -} from 'store/manifestSlice/manifest.slice'; +} from '~/store/manifestSlice/manifest.slice'; /** hook used to control the handler Search Form modal * @example const [open, setOpen] = useOpenHandlerSearch(); diff --git a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx index 32e4028e0..4809717cb 100644 --- a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx +++ b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; import { cleanup } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { SiteType } from 'components/Manifest/manifestSchema'; -import { useHandlerSearchConfig } from 'hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; +import { SiteType } from '~/components/Manifest/manifestSchema'; +import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; +import { renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, it } from 'vitest'; const TestChildComponent = () => { diff --git a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx index 18c59d7b2..16614c08e 100644 --- a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx +++ b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { cleanup } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; +import { renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, it } from 'vitest'; import { useReadOnly } from './useReadOnly'; diff --git a/client/app/hooks/manifest/useReadOnly/useReadOnly.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.tsx index 6cec6b25f..423b3ae93 100644 --- a/client/app/hooks/manifest/useReadOnly/useReadOnly.tsx +++ b/client/app/hooks/manifest/useReadOnly/useReadOnly.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; -import { useAppDispatch, useAppSelector } from 'store'; -import { selectManifestReadOnly, setManifestReadOnly } from 'store/manifestSlice/manifest.slice'; +import { useAppDispatch, useAppSelector } from '~/store'; +import { selectManifestReadOnly, setManifestReadOnly } from '~/store/manifestSlice/manifest.slice'; /** State management for whether a manifest is editable/read only * @example const [status, setStatus] = useReadOnly(); diff --git a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx index 665ad941f..4ecf97ee4 100644 --- a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx +++ b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx @@ -1,12 +1,12 @@ import '@testing-library/jest-dom'; import { cleanup, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { Manifest } from 'components/Manifest'; +import { Manifest } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; -import { createMockManifest } from 'test-utils/fixtures'; -import { mockManifestEndpoints } from 'test-utils/mock'; +import { renderWithProviders, screen } from '~/test-utils'; +import { createMockManifest } from '~/test-utils/fixtures'; +import { mockManifestEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; import { useSaveManifest } from './useSaveManifest'; diff --git a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx index 2f73e3539..2ccfdae18 100644 --- a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx +++ b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.tsx @@ -1,10 +1,10 @@ -import { Manifest } from 'components/Manifest'; +import { Manifest } from '~/components/Manifest'; import { useEffect, useState } from 'react'; import { useCreateManifestMutation, useSaveEManifestMutation, useUpdateManifestMutation, -} from 'store'; +} from '~/store'; /** * encapsulates the logic for making requests to the back end to save a manifest (create, update, or save to e-Manifest) diff --git a/client/app/hooks/usePagination/usePagination.spec.tsx b/client/app/hooks/usePagination/usePagination.spec.tsx index dd3d65a69..59d468f44 100644 --- a/client/app/hooks/usePagination/usePagination.spec.tsx +++ b/client/app/hooks/usePagination/usePagination.spec.tsx @@ -1,6 +1,6 @@ import { cleanup, fireEvent, waitFor } from '@testing-library/react'; import React, { useState } from 'react'; -import { render, screen } from 'test-utils'; +import { render, screen } from '~/test-utils'; import { afterEach, describe, expect, test } from 'vitest'; import { usePagination } from './usePagination'; diff --git a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx index fa14b2cbc..4d66982e2 100644 --- a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx +++ b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx @@ -2,11 +2,11 @@ import '@testing-library/jest-dom'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React, { useState } from 'react'; -import { renderWithProviders, screen, waitFor, cleanup } from 'test-utils'; +import { renderWithProviders, screen, waitFor, cleanup } from '~/test-utils'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; -import { useProgressTracker } from 'hooks/useProgressTracker/useProgressTracker'; +import { useProgressTracker } from '~/hooks/useProgressTracker/useProgressTracker'; import userEvent from '@testing-library/user-event'; -import { addTask, useAppDispatch } from 'store'; +import { addTask, useAppDispatch } from '~/store'; function TestComponent({ taskUUID }: { taskUUID: string }) { const dispatch = useAppDispatch(); diff --git a/client/app/hooks/useProgressTracker/useProgressTracker.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.tsx index 200a5386c..06ce92e83 100644 --- a/client/app/hooks/useProgressTracker/useProgressTracker.tsx +++ b/client/app/hooks/useProgressTracker/useProgressTracker.tsx @@ -8,7 +8,7 @@ import { useAppDispatch, useAppSelector, useGetTaskStatusQuery, -} from 'store'; +} from '~/store'; interface UseProgressTrackerConfig { taskId: string | undefined; diff --git a/client/app/hooks/useTitle/useTitle.spec.tsx b/client/app/hooks/useTitle/useTitle.spec.tsx index d207c2be0..cc1ffd043 100644 --- a/client/app/hooks/useTitle/useTitle.spec.tsx +++ b/client/app/hooks/useTitle/useTitle.spec.tsx @@ -2,8 +2,8 @@ import '@testing-library/jest-dom'; import { describe, expect, afterEach, it } from 'vitest'; import { cleanup, fireEvent } from '@testing-library/react'; import React from 'react'; -import { render, screen } from 'test-utils'; -import { useTitle } from 'hooks'; +import { render, screen } from '~/test-utils'; +import { useTitle } from '~/hooks'; const originalPageTitle = 'originalPageTitle'; const newPageTitle = 'newPageTitle'; diff --git a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx index 6717d0d4a..c6c6ef8e1 100644 --- a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx +++ b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx @@ -1,14 +1,14 @@ import '@testing-library/jest-dom'; import { cleanup, waitFor } from '@testing-library/react'; -import { useUserSiteIds } from 'hooks'; +import { useUserSiteIds } from '~/hooks'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; -import { createMockHandler, createMockSite } from 'test-utils/fixtures'; -import { createMockProfileResponse } from 'test-utils/fixtures/mockUser'; -import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock'; -import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints'; +import { renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler, createMockSite } from '~/test-utils/fixtures'; +import { createMockProfileResponse } from '~/test-utils/fixtures/mockUser'; +import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; +import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; function TestComponent() { diff --git a/client/app/hooks/useUserSiteIds/useUserSiteIds.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.tsx index eec70cc1d..1309b5742 100644 --- a/client/app/hooks/useUserSiteIds/useUserSiteIds.tsx +++ b/client/app/hooks/useUserSiteIds/useUserSiteIds.tsx @@ -1,6 +1,6 @@ import { createSelector } from '@reduxjs/toolkit'; import { useMemo } from 'react'; -import { ProfileSlice, useGetProfileQuery } from 'store'; +import { ProfileSlice, useGetProfileQuery } from '~/store'; /** * Get select details for sites that the user has access to diff --git a/client/app/index.tsx b/client/app/index.tsx index a39040d89..b23501b6a 100644 --- a/client/app/index.tsx +++ b/client/app/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { createRoot } from 'react-dom/client'; import { Provider } from 'react-redux'; -import { rootStore } from 'store'; +import { rootStore } from '~/store'; import App from './App'; const container = document.getElementById('root') as HTMLElement; diff --git a/client/app/routes.tsx b/client/app/routes.tsx index 27e47deab..6c5fbe4fc 100644 --- a/client/app/routes.tsx +++ b/client/app/routes.tsx @@ -1,13 +1,13 @@ -import { ErrorPage } from 'routes/ErrorPage/ErrorPage'; -import { Login } from 'routes/Login'; +import { ErrorPage } from '~/routes/ErrorPage/ErrorPage'; +import { Login } from '~/routes/Login'; import React from 'react'; import { createBrowserRouter } from 'react-router-dom'; -const Dashboard = React.lazy(() => import('routes/Dashboard')); -const Profile = React.lazy(() => import('routes/Profile')); -const SiteList = React.lazy(() => import('routes/SiteList')); -const SiteDetails = React.lazy(() => import('routes/SiteDetails')); -const Help = React.lazy(() => import('routes/About')); +const Dashboard = React.lazy(() => import('~/routes/Dashboard')); +const Profile = React.lazy(() => import('~/routes/Profile')); +const SiteList = React.lazy(() => import('~/routes/SiteList')); +const SiteDetails = React.lazy(() => import('~/routes/SiteDetails')); +const Help = React.lazy(() => import('~/routes/About')); export const router = createBrowserRouter([ { diff --git a/client/app/routes/Dashboard/Dashboard.spec.tsx b/client/app/routes/Dashboard/Dashboard.spec.tsx index 32676d6f3..efc033468 100644 --- a/client/app/routes/Dashboard/Dashboard.spec.tsx +++ b/client/app/routes/Dashboard/Dashboard.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; -import { Dashboard } from 'routes/Dashboard/Dashboard'; +import { Dashboard } from '~/routes/Dashboard/Dashboard'; import { setupServer } from 'msw/node'; import React, { createElement } from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { mockUserEndpoints } from 'test-utils/mock'; -import { mockSiteEndpoints } from 'test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { mockUserEndpoints } from '~/test-utils/mock'; +import { mockSiteEndpoints } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const USERNAME = 'testuser1'; diff --git a/client/app/routes/Dashboard/Dashboard.tsx b/client/app/routes/Dashboard/Dashboard.tsx index 86c04fae8..8a4ea3327 100644 --- a/client/app/routes/Dashboard/Dashboard.tsx +++ b/client/app/routes/Dashboard/Dashboard.tsx @@ -1,16 +1,16 @@ -import { NewManifestBtn } from 'components/Manifest'; -import { HtButton, HtCard } from 'components/UI'; -import { useTitle } from 'hooks'; +import { NewManifestBtn } from '~/components/Manifest'; +import { HtButton, HtCard } from '~/components/UI'; +import { useTitle } from '~/hooks'; import React, { ReactElement } from 'react'; import { Accordion, Button, Col, Container, Row } from 'react-bootstrap'; import { Link } from 'react-router-dom'; -import { htApi } from 'services'; -import { addAlert, addTask, useAppDispatch } from 'store'; +import { htApi } from '~/services'; +import { addAlert, addTask, useAppDispatch } from '~/store'; import { GeneratorStatusAreaChart, ManifestCountBarChart, ManifestStatusPieChart, -} from 'components/Charts'; +} from '~/components/Charts'; /** Dashboard page for logged-in user*/ export function Dashboard(): ReactElement { diff --git a/client/app/routes/Dashboard/index.ts b/client/app/routes/Dashboard/index.ts index 6a3b11501..1db2db83c 100644 --- a/client/app/routes/Dashboard/index.ts +++ b/client/app/routes/Dashboard/index.ts @@ -1,4 +1,4 @@ -import { Dashboard } from 'routes/Dashboard/Dashboard'; +import { Dashboard } from '~/routes/Dashboard/Dashboard'; export { Dashboard as Component }; export default Dashboard; diff --git a/client/app/routes/ErrorPage/ErrorPage.tsx b/client/app/routes/ErrorPage/ErrorPage.tsx index d714870ce..7b620e99a 100644 --- a/client/app/routes/ErrorPage/ErrorPage.tsx +++ b/client/app/routes/ErrorPage/ErrorPage.tsx @@ -1,5 +1,5 @@ -import { Error404 } from 'components/Error'; -import { HtCard } from 'components/UI'; +import { Error404 } from '~/components/Error'; +import { HtCard } from '~/components/UI'; import React, { ReactElement } from 'react'; import { Button, Container } from 'react-bootstrap'; import { useNavigate } from 'react-router-dom'; diff --git a/client/app/routes/ErrorPage/index.ts b/client/app/routes/ErrorPage/index.ts index 6ab78f84c..5542a7d1c 100644 --- a/client/app/routes/ErrorPage/index.ts +++ b/client/app/routes/ErrorPage/index.ts @@ -1 +1 @@ -export { ErrorPage as Component } from 'routes/ErrorPage/ErrorPage'; +export { ErrorPage as Component } from '~/routes/ErrorPage/ErrorPage'; diff --git a/client/app/routes/Login/Login.tsx b/client/app/routes/Login/Login.tsx index efcf6337f..014315d0d 100644 --- a/client/app/routes/Login/Login.tsx +++ b/client/app/routes/Login/Login.tsx @@ -1,6 +1,6 @@ import logo from '/assets/img/haztrak-logos/low-resolution/svg/haztrak-low-resolution-logo-black-on-transparent-background.svg'; -import { LoginForm } from 'components/Auth'; -import { useTitle } from 'hooks'; +import { LoginForm } from '~/components/Auth'; +import { useTitle } from '~/hooks'; import React, { ReactElement } from 'react'; import { Container } from 'react-bootstrap'; diff --git a/client/app/routes/Login/login.spec.tsx b/client/app/routes/Login/login.spec.tsx index a22c0b97e..69107e0b0 100644 --- a/client/app/routes/Login/login.spec.tsx +++ b/client/app/routes/Login/login.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; -import { Login } from 'routes/Login'; +import { renderWithProviders, screen } from '~/test-utils'; +import { Login } from '~/routes/Login'; import { describe, expect, test } from 'vitest'; describe('Login component', () => { diff --git a/client/app/routes/ManifestDetails/ManifestDetails.tsx b/client/app/routes/ManifestDetails/ManifestDetails.tsx index 00e93f16a..5f5887ab3 100644 --- a/client/app/routes/ManifestDetails/ManifestDetails.tsx +++ b/client/app/routes/ManifestDetails/ManifestDetails.tsx @@ -1,10 +1,10 @@ -import { ManifestForm } from 'components/Manifest'; -import { HtSpinner } from 'components/UI'; -import { useTitle } from 'hooks'; -import { useReadOnly } from 'hooks/manifest'; +import { ManifestForm } from '~/components/Manifest'; +import { HtSpinner } from '~/components/UI'; +import { useTitle } from '~/hooks'; +import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; import { useParams } from 'react-router-dom'; -import { useGetManifestQuery } from 'store'; +import { useGetManifestQuery } from '~/store'; export function ManifestDetails() { const { mtn, action, siteId } = useParams(); diff --git a/client/app/routes/ManifestList/ManifestList.tsx b/client/app/routes/ManifestList/ManifestList.tsx index dbe0e5310..37ff5da0c 100644 --- a/client/app/routes/ManifestList/ManifestList.tsx +++ b/client/app/routes/ManifestList/ManifestList.tsx @@ -1,12 +1,12 @@ -import { NewManifestBtn } from 'components/Manifest'; -import { MtnTable } from 'components/Mtn'; -import { SyncManifestBtn } from 'components/Rcrainfo'; -import { HtCard, HtSpinner } from 'components/UI'; -import { useTitle } from 'hooks'; +import { NewManifestBtn } from '~/components/Manifest'; +import { MtnTable } from '~/components/Mtn'; +import { SyncManifestBtn } from '~/components/Rcrainfo'; +import { HtCard, HtSpinner } from '~/components/UI'; +import { useTitle } from '~/hooks'; import React, { ReactElement, useState } from 'react'; import { Container, Row, Stack } from 'react-bootstrap'; import { useParams } from 'react-router-dom'; -import { useGetMTNQuery } from 'store'; +import { useGetMTNQuery } from '~/store'; /** * Fetch and display all the manifest tracking number (MTN) known by haztrak diff --git a/client/app/routes/NewManifest/NewManifest.spec.tsx b/client/app/routes/NewManifest/NewManifest.spec.tsx index 839d8a22c..ceb9ad7b6 100644 --- a/client/app/routes/NewManifest/NewManifest.spec.tsx +++ b/client/app/routes/NewManifest/NewManifest.spec.tsx @@ -1,13 +1,13 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; -import { NewManifest } from 'routes/NewManifest/NewManifest'; +import { NewManifest } from '~/routes/NewManifest/NewManifest'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { createMockSite } from 'test-utils/fixtures'; -import { mockSiteEndpoints, mockUserEndpoints } from 'test-utils/mock'; -import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { createMockSite } from '~/test-utils/fixtures'; +import { mockSiteEndpoints, mockUserEndpoints } from '~/test-utils/mock'; +import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const mockSites = [createMockSite(), createMockSite()]; diff --git a/client/app/routes/NewManifest/NewManifest.tsx b/client/app/routes/NewManifest/NewManifest.tsx index e10137e75..9cdd2dcdf 100644 --- a/client/app/routes/NewManifest/NewManifest.tsx +++ b/client/app/routes/NewManifest/NewManifest.tsx @@ -1,16 +1,16 @@ import { createSelector } from '@reduxjs/toolkit'; -import { Manifest, ManifestForm } from 'components/Manifest'; -import { RcraSiteType } from 'components/Manifest/manifestSchema'; -import { SiteSelect, SiteTypeSelect } from 'components/Manifest/SiteSelect'; -import { RcraSite } from 'components/RcraSite'; -import { HtCard, HtSpinner } from 'components/UI'; -import { useTitle } from 'hooks'; -import { useReadOnly } from 'hooks/manifest'; +import { Manifest, ManifestForm } from '~/components/Manifest'; +import { RcraSiteType } from '~/components/Manifest/manifestSchema'; +import { SiteSelect, SiteTypeSelect } from '~/components/Manifest/SiteSelect'; +import { RcraSite } from '~/components/RcraSite'; +import { HtCard, HtSpinner } from '~/components/UI'; +import { useTitle } from '~/hooks'; +import { useReadOnly } from '~/hooks/manifest'; import React, { useEffect, useMemo, useState } from 'react'; import { Col, Container, Form } from 'react-bootstrap'; import { useForm } from 'react-hook-form'; import { useParams, useSearchParams } from 'react-router-dom'; -import { useGetProfileQuery } from 'store'; +import { useGetProfileQuery } from '~/store'; /** * NewManifest component allows a user to create a new electronic manifest. diff --git a/client/app/routes/Profile/Profile.tsx b/client/app/routes/Profile/Profile.tsx index 4b18e1e71..1b6a4476f 100644 --- a/client/app/routes/Profile/Profile.tsx +++ b/client/app/routes/Profile/Profile.tsx @@ -1,11 +1,11 @@ -import { UserOrg } from 'components/Org'; -import { RcraProfile } from 'components/RcraProfile'; -import { HtCard, HtSpinner } from 'components/UI'; -import { UserInfoForm } from 'components/User'; -import { useTitle } from 'hooks'; +import { UserOrg } from '~/components/Org'; +import { RcraProfile } from '~/components/RcraProfile'; +import { HtCard, HtSpinner } from '~/components/UI'; +import { UserInfoForm } from '~/components/User'; +import { useTitle } from '~/hooks'; import React, { ReactElement } from 'react'; import { Col, Container, Row } from 'react-bootstrap'; -import { useGetProfileQuery, useGetRcrainfoProfileQuery, useGetUserQuery } from 'store'; +import { useGetProfileQuery, useGetRcrainfoProfileQuery, useGetUserQuery } from '~/store'; /** * Display user profile, including their Haztrak information, their organization, diff --git a/client/app/routes/RegisterHero/RegisterHero.tsx b/client/app/routes/RegisterHero/RegisterHero.tsx index bbe1fc627..97ae979fb 100644 --- a/client/app/routes/RegisterHero/RegisterHero.tsx +++ b/client/app/routes/RegisterHero/RegisterHero.tsx @@ -1,7 +1,7 @@ import React from 'react'; import logo from '/assets/img/haztrak-logos/high-resolution/png/haztrak-high-resolution-logo-black-on-transparent-background.png'; import { Button, Col, Container, Row, Stack } from 'react-bootstrap'; -import { FeatureDescription } from 'components/UI'; +import { FeatureDescription } from '~/components/UI'; import { faFileLines, faPen, faSitemap } from '@fortawesome/free-solid-svg-icons'; import { Link } from 'react-router-dom'; diff --git a/client/app/routes/RegisterHero/index.ts b/client/app/routes/RegisterHero/index.ts index d44238431..38dbc2fbf 100644 --- a/client/app/routes/RegisterHero/index.ts +++ b/client/app/routes/RegisterHero/index.ts @@ -1,4 +1,4 @@ -import { RegisterHero } from 'routes/RegisterHero/RegisterHero'; +import { RegisterHero } from '~/routes/RegisterHero/RegisterHero'; export { RegisterHero as Component }; export default RegisterHero; diff --git a/client/app/routes/SiteDetails/SiteDetails.tsx b/client/app/routes/SiteDetails/SiteDetails.tsx index ef4a252ff..811d28036 100644 --- a/client/app/routes/SiteDetails/SiteDetails.tsx +++ b/client/app/routes/SiteDetails/SiteDetails.tsx @@ -1,9 +1,9 @@ -import { RcraSiteDetails } from 'components/RcraSite'; -import { HtCard, HtSpinner } from 'components/UI'; +import { RcraSiteDetails } from '~/components/RcraSite'; +import { HtCard, HtSpinner } from '~/components/UI'; import React, { ReactElement } from 'react'; import { Button, Container, Stack } from 'react-bootstrap'; import { useNavigate, useParams } from 'react-router-dom'; -import { useGetUserHaztrakSiteQuery } from 'store'; +import { useGetUserHaztrakSiteQuery } from '~/store'; /** * GET and Display details of the Haztrak site including RCRA site details. diff --git a/client/app/routes/SiteDetails/index.ts b/client/app/routes/SiteDetails/index.ts index e3c42cf3a..7e5ee9b3e 100644 --- a/client/app/routes/SiteDetails/index.ts +++ b/client/app/routes/SiteDetails/index.ts @@ -1,4 +1,4 @@ -import { SiteDetails } from 'routes/SiteDetails/SiteDetails'; +import { SiteDetails } from '~/routes/SiteDetails/SiteDetails'; export { SiteDetails as Component }; export default SiteDetails; diff --git a/client/app/routes/SiteList/SiteList.spec.tsx b/client/app/routes/SiteList/SiteList.spec.tsx index d18d8934a..7bd943383 100644 --- a/client/app/routes/SiteList/SiteList.spec.tsx +++ b/client/app/routes/SiteList/SiteList.spec.tsx @@ -1,9 +1,9 @@ import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from 'test-utils'; -import { createMockHandler, createMockSite } from 'test-utils/fixtures/mockHandler'; -import { mockSiteEndpoints, mockUserEndpoints } from 'test-utils/mock'; +import { renderWithProviders, screen } from '~/test-utils'; +import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { mockSiteEndpoints, mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, beforeAll, describe, expect, test } from 'vitest'; import { SiteList } from './SiteList'; diff --git a/client/app/routes/SiteList/SiteList.tsx b/client/app/routes/SiteList/SiteList.tsx index d63fde6e6..6654e17e1 100644 --- a/client/app/routes/SiteList/SiteList.tsx +++ b/client/app/routes/SiteList/SiteList.tsx @@ -1,10 +1,10 @@ -import { SiteListGroup } from 'components/HaztrakSite'; -import { HtCard, HtSpinner } from 'components/UI'; -import { useTitle } from 'hooks'; +import { SiteListGroup } from '~/components/HaztrakSite'; +import { HtCard, HtSpinner } from '~/components/UI'; +import { useTitle } from '~/hooks'; import React from 'react'; import { Container } from 'react-bootstrap'; import { Link } from 'react-router-dom'; -import { useGetUserHaztrakSitesQuery } from 'store'; +import { useGetUserHaztrakSitesQuery } from '~/store'; /** Returns a table displaying the Haztrak sites a user has access to.*/ export function SiteList() { diff --git a/client/app/routes/SiteList/index.ts b/client/app/routes/SiteList/index.ts index 622c0a00c..7a63bfbbe 100644 --- a/client/app/routes/SiteList/index.ts +++ b/client/app/routes/SiteList/index.ts @@ -1,4 +1,4 @@ -import { SiteList } from 'routes/SiteList/SiteList'; +import { SiteList } from '~/routes/SiteList/SiteList'; export { SiteList as Component }; export default SiteList; diff --git a/client/app/services/APIs/htApi.ts b/client/app/services/APIs/htApi.ts index 43cb5f791..ea104ed72 100644 --- a/client/app/services/APIs/htApi.ts +++ b/client/app/services/APIs/htApi.ts @@ -1,6 +1,6 @@ /**htApi.ts - service for making requests to the Haztrak API*/ import axios, { InternalAxiosRequestConfig } from 'axios'; -import { rootStore } from 'store'; +import { rootStore } from '~/store'; /** An Axios instance with an interceptor to automatically apply authentication headers*/ export const htApi = axios.create({ diff --git a/client/app/services/index.ts b/client/app/services/index.ts index 131e298ef..5fd723ce2 100644 --- a/client/app/services/index.ts +++ b/client/app/services/index.ts @@ -1,2 +1,2 @@ -export { htApi } from 'services/APIs/htApi'; -export { manifest } from 'services/manifest/manifest'; +export { htApi } from '~/services/APIs/htApi'; +export { manifest } from '~/services/manifest/manifest'; diff --git a/client/app/services/manifest/manifest.spec.ts b/client/app/services/manifest/manifest.spec.ts index 8c9ed3cda..931e3c52a 100644 --- a/client/app/services/manifest/manifest.spec.ts +++ b/client/app/services/manifest/manifest.spec.ts @@ -1,13 +1,13 @@ -import { manifest } from 'services/manifest/manifest'; +import { manifest } from '~/services/manifest/manifest'; import { createMockManifest, createMockMTNHandler, createMockSite, createMockTransporter, -} from 'test-utils/fixtures'; +} from '~/test-utils/fixtures'; import { describe, expect, test } from 'vitest'; -import { ProfileSlice } from 'store'; -import { ManifestStatus } from 'components/Manifest/manifestSchema'; +import { ProfileSlice } from '~/store'; +import { ManifestStatus } from '~/components/Manifest/manifestSchema'; describe('manifest.getNextSigner', () => { test('returns the the generator if scheduled and no generator signature present', () => { diff --git a/client/app/services/manifest/manifest.ts b/client/app/services/manifest/manifest.ts index 128d9e28d..a6ce2a324 100644 --- a/client/app/services/manifest/manifest.ts +++ b/client/app/services/manifest/manifest.ts @@ -1,6 +1,6 @@ -import { Manifest } from 'components/Manifest'; -import { ManifestStatus, RcraSiteType, SiteType } from 'components/Manifest/manifestSchema'; -import { ProfileSlice } from 'store'; +import { Manifest } from '~/components/Manifest'; +import { ManifestStatus, RcraSiteType, SiteType } from '~/components/Manifest/manifestSchema'; +import { ProfileSlice } from '~/store'; export const manifest = { /** Returns EPA ID of the next site that can sign on a manifest or undefined if not applicable. */ diff --git a/client/app/store/authSlice/auth.slice.spec.tsx b/client/app/store/authSlice/auth.slice.spec.tsx index 2ee8c01fe..30b186351 100644 --- a/client/app/store/authSlice/auth.slice.spec.tsx +++ b/client/app/store/authSlice/auth.slice.spec.tsx @@ -6,8 +6,8 @@ import { setCredentials, useAppDispatch, useAppSelector, -} from 'store'; -import { renderWithProviders, screen } from 'test-utils'; +} from '~/store'; +import { renderWithProviders, screen } from '~/test-utils'; import { afterEach, describe, expect, test, vi } from 'vitest'; const getItemSpy = vi.spyOn(Storage.prototype, 'getItem'); diff --git a/client/app/store/htApi.slice.ts b/client/app/store/htApi.slice.ts index ef721e33d..4f14b2961 100644 --- a/client/app/store/htApi.slice.ts +++ b/client/app/store/htApi.slice.ts @@ -1,12 +1,12 @@ import { BaseQueryFn, createApi } from '@reduxjs/toolkit/query/react'; import { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios'; -import { HaztrakSite } from 'components/HaztrakSite'; -import { Manifest } from 'components/Manifest'; -import { QuickerSignature } from 'components/Manifest/QuickerSign'; -import { Code } from 'components/Manifest/WasteLine/wasteLineSchema'; -import { MtnDetails } from 'components/Mtn'; -import { RcraSite } from 'components/RcraSite'; -import { htApi } from 'services'; +import { HaztrakSite } from '~/components/HaztrakSite'; +import { Manifest } from '~/components/Manifest'; +import { QuickerSignature } from '~/components/Manifest/QuickerSign'; +import { Code } from '~/components/Manifest/WasteLine/wasteLineSchema'; +import { MtnDetails } from '~/components/Mtn'; +import { RcraSite } from '~/components/RcraSite'; +import { htApi } from '~/services'; export interface TaskResponse { taskId: string; diff --git a/client/app/store/index.ts b/client/app/store/index.ts index f2cf06620..a27ff1c14 100644 --- a/client/app/store/index.ts +++ b/client/app/store/index.ts @@ -1,6 +1,6 @@ // Haztrak API - RTK Query -import { haztrakApi } from 'store/htApi.slice'; -import { userApi } from 'store/userSlice/user.slice'; +import { haztrakApi } from '~/store/htApi.slice'; +import { userApi } from '~/store/userSlice/user.slice'; import type { AppDispatch, AppStore, RootState } from './rootStore'; // Root Store @@ -45,8 +45,8 @@ export { setCredentials, selectAuthenticated, removeCredentials, -} from 'store/authSlice/auth.slice'; -export type { HaztrakUser } from 'store/authSlice/auth.slice'; +} from '~/store/authSlice/auth.slice'; +export type { HaztrakUser } from '~/store/authSlice/auth.slice'; // Notification Slice export { @@ -66,7 +66,7 @@ export { addError, selectAllErrors } from './errorSlice/error.slice'; // Types export type { HaztrakError } from './errorSlice/error.slice'; -export type { TaskStatus } from 'store/htApi.slice'; +export type { TaskStatus } from '~/store/htApi.slice'; export type { LongRunningTask, HaztrakAlert } from './notificationSlice/notification.slice'; export type { ProfileSlice, diff --git a/client/app/store/manifestSlice/manifest.slice.spec.tsx b/client/app/store/manifestSlice/manifest.slice.spec.tsx index 9b8b332ba..4c4bc08ba 100644 --- a/client/app/store/manifestSlice/manifest.slice.spec.tsx +++ b/client/app/store/manifestSlice/manifest.slice.spec.tsx @@ -1,13 +1,13 @@ import '@testing-library/jest-dom'; -import { useAppSelector } from 'store'; +import { useAppSelector } from '~/store'; import reducer, { ManifestSlice, selectManifestReadOnly, setHandlerSearchConfigs, setManifestReadOnly, setManifestStatus, -} from 'store/manifestSlice/manifest.slice'; -import { renderWithProviders, screen } from 'test-utils'; +} from '~/store/manifestSlice/manifest.slice'; +import { renderWithProviders, screen } from '~/test-utils'; import { describe, expect, test } from 'vitest'; const TestComponent = () => { diff --git a/client/app/store/manifestSlice/manifest.slice.ts b/client/app/store/manifestSlice/manifest.slice.ts index 7dacf27ce..ff2dca82f 100644 --- a/client/app/store/manifestSlice/manifest.slice.ts +++ b/client/app/store/manifestSlice/manifest.slice.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { ManifestStatus, SiteType } from 'components/Manifest/manifestSchema'; +import { ManifestStatus, SiteType } from '~/components/Manifest/manifestSchema'; export interface HandlerSearchConfig { siteType: SiteType; diff --git a/client/app/store/notificationSlice/notification.slice.spec.tsx b/client/app/store/notificationSlice/notification.slice.spec.tsx index 01c53cc49..b34ff11e5 100644 --- a/client/app/store/notificationSlice/notification.slice.spec.tsx +++ b/client/app/store/notificationSlice/notification.slice.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { addAlert, HaztrakAlert, removeAlert, useAppSelector } from 'store'; -import { renderWithProviders, screen } from 'test-utils'; +import { addAlert, HaztrakAlert, removeAlert, useAppSelector } from '~/store'; +import { renderWithProviders, screen } from '~/test-utils'; import { describe, expect, test } from 'vitest'; import reducer, { selectAllAlerts } from './notification.slice'; diff --git a/client/app/store/notificationSlice/notification.slice.ts b/client/app/store/notificationSlice/notification.slice.ts index 0f0a827df..683dfe7a2 100644 --- a/client/app/store/notificationSlice/notification.slice.ts +++ b/client/app/store/notificationSlice/notification.slice.ts @@ -1,6 +1,6 @@ import { createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit'; import { toast } from 'react-toastify'; -import { RootState } from 'store/rootStore'; +import { RootState } from '~/store/rootStore'; import { v4 as uuidv4 } from 'uuid'; export interface LongRunningTask { diff --git a/client/app/store/rootStore.ts b/client/app/store/rootStore.ts index 7b32bed4f..3c21cbb06 100644 --- a/client/app/store/rootStore.ts +++ b/client/app/store/rootStore.ts @@ -1,7 +1,7 @@ import { combineReducers, configureStore } from '@reduxjs/toolkit'; import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'; -import authReducers from 'store/authSlice/auth.slice'; -import { haztrakApi } from 'store/htApi.slice'; +import authReducers from '~/store/authSlice/auth.slice'; +import { haztrakApi } from '~/store/htApi.slice'; import errorReducers from './errorSlice/error.slice'; import notificationReducers from './notificationSlice/notification.slice'; import manifestReducers from './manifestSlice/manifest.slice'; diff --git a/client/app/store/userSlice/user.slice.spec.tsx b/client/app/store/userSlice/user.slice.spec.tsx index 9f3db07a9..9e631cc42 100644 --- a/client/app/store/userSlice/user.slice.spec.tsx +++ b/client/app/store/userSlice/user.slice.spec.tsx @@ -2,9 +2,9 @@ import '@testing-library/jest-dom'; import { waitFor } from '@testing-library/react'; import { setupServer } from 'msw/node'; import { useEffect, useState } from 'react'; -import { useGetUserQuery, useUpdateUserMutation } from 'store'; -import { cleanup, renderWithProviders, screen } from 'test-utils'; -import { mockUserEndpoints } from 'test-utils/mock'; +import { useGetUserQuery, useUpdateUserMutation } from '~/store'; +import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { mockUserEndpoints } from '~/test-utils/mock'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/store/userSlice/user.slice.ts b/client/app/store/userSlice/user.slice.ts index f410a9fe3..e2d4105c2 100644 --- a/client/app/store/userSlice/user.slice.ts +++ b/client/app/store/userSlice/user.slice.ts @@ -1,6 +1,6 @@ -import { HaztrakSite } from 'components/HaztrakSite'; -import { HaztrakUser } from 'store/authSlice/auth.slice'; -import { haztrakApi, TaskResponse } from 'store/htApi.slice'; +import { HaztrakSite } from '~/components/HaztrakSite'; +import { HaztrakUser } from '~/store/authSlice/auth.slice'; +import { haztrakApi, TaskResponse } from '~/store/htApi.slice'; /**The user's RCRAInfo account data stored in the Redux store*/ export interface ProfileSlice { diff --git a/client/app/test-utils/fixtures/mockHandler.ts b/client/app/test-utils/fixtures/mockHandler.ts index 239d7770e..5f2651a3c 100644 --- a/client/app/test-utils/fixtures/mockHandler.ts +++ b/client/app/test-utils/fixtures/mockHandler.ts @@ -1,9 +1,9 @@ -import { HaztrakSite } from 'components/HaztrakSite'; -import { Handler } from 'components/Manifest'; -import { Transporter } from 'components/Manifest/Transporter'; -import { RcraAddress, RcraSite } from 'components/RcraSite'; -import { RcrainfoSitePermissions } from 'store'; -import { RcraContact } from 'components/RcraSite/rcraSiteSchema'; +import { HaztrakSite } from '~/components/HaztrakSite'; +import { Handler } from '~/components/Manifest'; +import { Transporter } from '~/components/Manifest/Transporter'; +import { RcraAddress, RcraSite } from '~/components/RcraSite'; +import { RcrainfoSitePermissions } from '~/store'; +import { RcraContact } from '~/components/RcraSite/rcraSiteSchema'; /** * A mock handler object for tests diff --git a/client/app/test-utils/fixtures/mockManifest.ts b/client/app/test-utils/fixtures/mockManifest.ts index c0b6d50a5..32910a08c 100644 --- a/client/app/test-utils/fixtures/mockManifest.ts +++ b/client/app/test-utils/fixtures/mockManifest.ts @@ -1,6 +1,6 @@ -import { Manifest } from 'components/Manifest/manifestSchema'; -import { createMockMTNHandler, createMockTransporter } from 'test-utils/fixtures/mockHandler'; -import { createMockWaste } from 'test-utils/fixtures/mockWaste'; +import { Manifest } from '~/components/Manifest/manifestSchema'; +import { createMockMTNHandler, createMockTransporter } from '~/test-utils/fixtures/mockHandler'; +import { createMockWaste } from '~/test-utils/fixtures/mockWaste'; const DEFAULT_MANIFEST: Manifest = { manifestTrackingNumber: '123456789ELC', diff --git a/client/app/test-utils/fixtures/mockUser.ts b/client/app/test-utils/fixtures/mockUser.ts index 0471f19dc..1c0027676 100644 --- a/client/app/test-utils/fixtures/mockUser.ts +++ b/client/app/test-utils/fixtures/mockUser.ts @@ -1,6 +1,6 @@ -import { HaztrakProfileOrg, HaztrakUser, RcrainfoProfile, RcrainfoProfileSite } from 'store'; -import { HaztrakProfileResponse } from 'store/userSlice/user.slice'; -import { createMockSite } from 'test-utils/fixtures/mockHandler'; +import { HaztrakProfileOrg, HaztrakUser, RcrainfoProfile, RcrainfoProfileSite } from '~/store'; +import { HaztrakProfileResponse } from '~/store/userSlice/user.slice'; +import { createMockSite } from '~/test-utils/fixtures/mockHandler'; export const DEFAULT_HAZTRAK_USER: HaztrakUser = { username: 'testuser1', diff --git a/client/app/test-utils/fixtures/mockWaste.ts b/client/app/test-utils/fixtures/mockWaste.ts index 65a903a0a..1347f4f50 100644 --- a/client/app/test-utils/fixtures/mockWaste.ts +++ b/client/app/test-utils/fixtures/mockWaste.ts @@ -1,4 +1,4 @@ -import { Code, WasteLine } from 'components/Manifest/WasteLine/wasteLineSchema'; +import { Code, WasteLine } from '~/components/Manifest/WasteLine/wasteLineSchema'; const DEFAULT_WASTELINE: WasteLine = { dotHazardous: false, diff --git a/client/app/test-utils/index.ts b/client/app/test-utils/index.ts index 07856dab0..5bb76fd8f 100644 --- a/client/app/test-utils/index.ts +++ b/client/app/test-utils/index.ts @@ -1,4 +1,4 @@ -import { renderWithProviders } from 'test-utils/render'; +import { renderWithProviders } from '~/test-utils/render'; export { renderWithProviders }; export * from '@testing-library/react'; diff --git a/client/app/test-utils/mock/index.ts b/client/app/test-utils/mock/index.ts index 79e3b452f..dbe3fce6b 100644 --- a/client/app/test-utils/mock/index.ts +++ b/client/app/test-utils/mock/index.ts @@ -1,4 +1,4 @@ -export { mockUserEndpoints } from 'test-utils/mock/mockUserEndpoints'; -export { mockSiteEndpoints } from 'test-utils/mock/mockSiteEndpoints'; -export { mockWasteEndpoints } from 'test-utils/mock/mockWasteEndpoints'; -export { mockManifestEndpoints } from 'test-utils/mock/mockManifestEndpoints'; +export { mockUserEndpoints } from '~/test-utils/mock/mockUserEndpoints'; +export { mockSiteEndpoints } from '~/test-utils/mock/mockSiteEndpoints'; +export { mockWasteEndpoints } from '~/test-utils/mock/mockWasteEndpoints'; +export { mockManifestEndpoints } from '~/test-utils/mock/mockManifestEndpoints'; diff --git a/client/app/test-utils/mock/mockManifestEndpoints.ts b/client/app/test-utils/mock/mockManifestEndpoints.ts index 19cea77ca..27c263492 100644 --- a/client/app/test-utils/mock/mockManifestEndpoints.ts +++ b/client/app/test-utils/mock/mockManifestEndpoints.ts @@ -1,4 +1,4 @@ -import { Manifest } from 'components/Manifest'; +import { Manifest } from '~/components/Manifest'; import { http, HttpResponse } from 'msw'; import { createMockManifest } from '../fixtures'; diff --git a/client/app/test-utils/mock/mockUserEndpoints.ts b/client/app/test-utils/mock/mockUserEndpoints.ts index 1de5858eb..89a81df40 100644 --- a/client/app/test-utils/mock/mockUserEndpoints.ts +++ b/client/app/test-utils/mock/mockUserEndpoints.ts @@ -1,11 +1,11 @@ import { http, HttpResponse } from 'msw'; -import { HaztrakUser } from 'store/authSlice/auth.slice'; -import { LoginResponse } from 'store/userSlice/user.slice'; -import { createMockHaztrakUser } from 'test-utils/fixtures'; +import { HaztrakUser } from '~/store/authSlice/auth.slice'; +import { LoginResponse } from '~/store/userSlice/user.slice'; +import { createMockHaztrakUser } from '~/test-utils/fixtures'; import { createMockProfileResponse, createMockRcrainfoProfileResponse, -} from 'test-utils/fixtures/mockUser'; +} from '~/test-utils/fixtures/mockUser'; /** mock Rest API*/ const API_BASE_URL = import.meta.env.VITE_HT_API_URL; diff --git a/client/app/test-utils/mock/mockWasteEndpoints.ts b/client/app/test-utils/mock/mockWasteEndpoints.ts index 8168cf177..256fbcf5a 100644 --- a/client/app/test-utils/mock/mockWasteEndpoints.ts +++ b/client/app/test-utils/mock/mockWasteEndpoints.ts @@ -1,5 +1,5 @@ import { http, HttpResponse } from 'msw'; -import { mockDotIdNumbers, mockFederalWasteCodes } from 'test-utils/fixtures/mockWaste'; +import { mockDotIdNumbers, mockFederalWasteCodes } from '~/test-utils/fixtures/mockWaste'; /** mock Rest API*/ const API_BASE_URL = import.meta.env.VITE_HT_API_URL; diff --git a/client/app/test-utils/render.tsx b/client/app/test-utils/render.tsx index e2ee00c05..43a240924 100644 --- a/client/app/test-utils/render.tsx +++ b/client/app/test-utils/render.tsx @@ -3,7 +3,7 @@ import React, { PropsWithChildren, ReactElement } from 'react'; import { FormProvider, useForm, UseFormProps } from 'react-hook-form'; import { Provider } from 'react-redux'; import { BrowserRouter } from 'react-router-dom'; -import { AppStore, RootState, setupStore } from 'store'; +import { AppStore, RootState, setupStore } from '~/store'; interface ExtendedRenderOptions extends Omit { preloadedState?: Partial; From 281d97a45c7bf70f304ae7130401a0f7d3f7f354 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 19:53:09 -0400 Subject: [PATCH 05/12] rename 'test-utils' to mocks --- .../HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx | 4 ++-- .../HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx | 4 ++-- .../HaztrakSite/SiteListItem/SiteListItem.spec.tsx | 4 ++-- client/app/components/Layout/Sidebar/Sidebar.spec.tsx | 2 +- client/app/components/Layout/TopNav/TopNav.spec.tsx | 2 +- .../components/Manifest/Actions/ManifestFABs.spec.tsx | 2 +- .../AdditionalInfo/AdditionalinfoForm.spec.tsx | 2 +- .../components/Manifest/Address/AddressForm.spec.tsx | 2 +- .../components/Manifest/Contact/ContactForm.spec.tsx | 2 +- .../app/components/Manifest/Contact/PhoneForm.spec.tsx | 2 +- .../Manifest/GeneralInfo/GeneralInfoForm.spec.tsx | 2 +- .../Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx | 10 +++++----- .../Manifest/GeneralInfo/ManifestTypeField.spec.tsx | 6 +++--- .../Manifest/Generator/GeneratorForm.spec.tsx | 2 +- .../Manifest/Generator/GeneratorSection.spec.tsx | 4 ++-- .../Manifest/Handler/Search/HandlerSearchForm.spec.tsx | 8 ++++---- client/app/components/Manifest/ManifestForm.spec.tsx | 4 ++-- .../Manifest/QuickerSign/QuickerSignForm.spec.tsx | 4 ++-- .../Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx | 6 +++--- .../components/Manifest/SiteSelect/SiteSelect.spec.tsx | 2 +- .../Manifest/SiteSelect/SiteTypeSelect.spec.tsx | 2 +- .../Manifest/Transporter/TransporterTable.spec.tsx | 6 +++--- .../app/components/Manifest/Tsdf/TsdfSection.spec.tsx | 4 ++-- .../Manifest/WasteLine/QuantityForm.spec.tsx | 2 +- .../Manifest/WasteLine/WasteLineForm.spec.tsx | 4 ++-- client/app/components/Mtn/MtnTable.spec.tsx | 2 +- .../app/components/RcraSite/RcraSiteDetails.spec.tsx | 4 ++-- .../buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx | 2 +- .../buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx | 6 +++--- client/app/components/UI/HtCard/HtCard.spec.tsx | 2 +- client/app/components/UI/HtModal/HtModal.spec.tsx | 2 +- .../app/components/UI/HtPaginate/HtPaginate.spec.tsx | 2 +- client/app/components/User/UserInfoForm.spec.tsx | 6 +++--- .../useManifestStatus/useManifestStatus.spec.tsx | 2 +- .../useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx | 2 +- .../hooks/manifest/useReadOnly/useReadOnly.spec.tsx | 2 +- .../manifest/useSaveManifest/useSaveManifest.spec.tsx | 6 +++--- client/app/hooks/usePagination/usePagination.spec.tsx | 2 +- .../useProgressTracker/useProgressTracker.spec.tsx | 2 +- client/app/hooks/useTitle/useTitle.spec.tsx | 2 +- .../app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx | 10 +++++----- client/app/index.tsx | 2 +- client/app/mocks/api/index.ts | 4 ++++ .../mock => mocks/api}/mockManifestEndpoints.ts | 0 .../mock => mocks/api}/mockSiteEndpoints.ts | 0 .../mock => mocks/api}/mockUserEndpoints.ts | 4 ++-- .../mock => mocks/api}/mockWasteEndpoints.ts | 2 +- client/app/{test-utils => mocks}/fixtures/index.ts | 0 .../app/{test-utils => mocks}/fixtures/mockHandler.ts | 2 +- .../app/{test-utils => mocks}/fixtures/mockManifest.ts | 4 ++-- client/app/{test-utils => mocks}/fixtures/mockUser.ts | 2 +- client/app/{test-utils => mocks}/fixtures/mockWaste.ts | 0 client/app/{test-utils => mocks}/index.ts | 2 +- client/app/{test-utils => mocks}/render.tsx | 0 client/app/routes/Dashboard/Dashboard.spec.tsx | 6 +++--- client/app/routes/Login/login.spec.tsx | 2 +- client/app/routes/NewManifest/NewManifest.spec.tsx | 8 ++++---- client/app/routes/SiteList/SiteList.spec.tsx | 6 +++--- client/app/services/manifest/manifest.spec.ts | 2 +- client/app/store/authSlice/auth.slice.spec.tsx | 2 +- client/app/store/manifestSlice/manifest.slice.spec.tsx | 2 +- .../notificationSlice/notification.slice.spec.tsx | 2 +- client/app/store/userSlice/user.slice.spec.tsx | 4 ++-- client/app/test-utils/mock/index.ts | 4 ---- 64 files changed, 103 insertions(+), 103 deletions(-) create mode 100644 client/app/mocks/api/index.ts rename client/app/{test-utils/mock => mocks/api}/mockManifestEndpoints.ts (100%) rename client/app/{test-utils/mock => mocks/api}/mockSiteEndpoints.ts (100%) rename client/app/{test-utils/mock => mocks/api}/mockUserEndpoints.ts (93%) rename client/app/{test-utils/mock => mocks/api}/mockWasteEndpoints.ts (88%) rename client/app/{test-utils => mocks}/fixtures/index.ts (100%) rename client/app/{test-utils => mocks}/fixtures/mockHandler.ts (98%) rename client/app/{test-utils => mocks}/fixtures/mockManifest.ts (83%) rename client/app/{test-utils => mocks}/fixtures/mockUser.ts (95%) rename client/app/{test-utils => mocks}/fixtures/mockWaste.ts (100%) rename client/app/{test-utils => mocks}/index.ts (55%) rename client/app/{test-utils => mocks}/render.tsx (100%) delete mode 100644 client/app/test-utils/mock/index.ts diff --git a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx index 2b2323119..aa5d44cd5 100644 --- a/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx +++ b/client/app/components/HaztrakSite/SiteFilter/SiteFilterForm.spec.tsx @@ -1,9 +1,9 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React, { useState } from 'react'; -import { cleanup, renderWithProviders } from '~/test-utils'; +import { cleanup, renderWithProviders } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; -import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { createMockHandler, createMockSite } from '~/mocks/fixtures/mockHandler'; import { SiteFilterForm } from '~/components/HaztrakSite/SiteFilter/SiteFilterForm'; import { useSearchParams } from 'react-router-dom'; import userEvent from '@testing-library/user-event'; diff --git a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx index ff037fe92..6b6e6642b 100644 --- a/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx +++ b/client/app/components/HaztrakSite/SiteListGroup/SiteListGroup.spec.tsx @@ -1,10 +1,10 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React from 'react'; -import { cleanup, renderWithProviders } from '~/test-utils'; +import { cleanup, renderWithProviders } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; import { SiteListGroup } from '~/components/HaztrakSite/SiteListGroup/SiteListGroup'; -import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { createMockHandler, createMockSite } from '~/mocks/fixtures/mockHandler'; afterEach(() => { cleanup(); diff --git a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx index 04e345d7a..eeb18b6e3 100644 --- a/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx +++ b/client/app/components/HaztrakSite/SiteListItem/SiteListItem.spec.tsx @@ -1,9 +1,9 @@ import '@testing-library/jest-dom'; import { screen } from '@testing-library/react'; import React from 'react'; -import { cleanup, renderWithProviders } from '~/test-utils'; +import { cleanup, renderWithProviders } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; -import { createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { createMockSite } from '~/mocks/fixtures/mockHandler'; import { SiteListItem } from './SiteListItem'; afterEach(() => { diff --git a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx index ca4856037..19d464dcd 100644 --- a/client/app/components/Layout/Sidebar/Sidebar.spec.tsx +++ b/client/app/components/Layout/Sidebar/Sidebar.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { Sidebar } from '~/components/Layout/Sidebar/Sidebar'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Layout/TopNav/TopNav.spec.tsx b/client/app/components/Layout/TopNav/TopNav.spec.tsx index 64424636d..2f008b62d 100644 --- a/client/app/components/Layout/TopNav/TopNav.spec.tsx +++ b/client/app/components/Layout/TopNav/TopNav.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { TopNav } from '~/components/Layout/TopNav/TopNav'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx index 6970bb606..9a4f9376f 100644 --- a/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx +++ b/client/app/components/Manifest/Actions/ManifestFABs.spec.tsx @@ -4,7 +4,7 @@ import { ManifestContext } from '~/components/Manifest/ManifestForm'; import { ManifestStatus } from '~/components/Manifest/manifestSchema'; import { useReadOnly } from '~/hooks/manifest'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; const TestComponent = ({ diff --git a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx index f505c0a55..a50fef40d 100644 --- a/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx +++ b/client/app/components/Manifest/AdditionalInfo/AdditionalinfoForm.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; import { AdditionalInfoForm } from '~/components/Manifest/AdditionalInfo'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/Address/AddressForm.spec.tsx b/client/app/components/Manifest/Address/AddressForm.spec.tsx index 423422cf2..0d95c94b9 100644 --- a/client/app/components/Manifest/Address/AddressForm.spec.tsx +++ b/client/app/components/Manifest/Address/AddressForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { AddressForm } from './AddressForm'; import { afterEach, describe, test, expect } from 'vitest'; diff --git a/client/app/components/Manifest/Contact/ContactForm.spec.tsx b/client/app/components/Manifest/Contact/ContactForm.spec.tsx index b07eb2ecc..833dba052 100644 --- a/client/app/components/Manifest/Contact/ContactForm.spec.tsx +++ b/client/app/components/Manifest/Contact/ContactForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { ContactForm } from './ContactForm'; import { afterEach, describe, test, expect } from 'vitest'; diff --git a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx index c011f4286..e7b128156 100644 --- a/client/app/components/Manifest/Contact/PhoneForm.spec.tsx +++ b/client/app/components/Manifest/Contact/PhoneForm.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { PhoneForm } from '~/components/Manifest/Contact'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx index de5eb2723..dd3448186 100644 --- a/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/GeneralInfoForm.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneralInfoForm } from './GeneralInfoForm'; diff --git a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx index 3ed2c240e..bf60d321c 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx @@ -4,11 +4,11 @@ import { ManifestStatusSelect } from '~/components/Manifest/GeneralInfo/Manifest import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler, createMockSite } from '~/test-utils/fixtures'; -import { createMockProfileResponse } from '~/test-utils/fixtures/mockUser'; -import { mockUserEndpoints } from '~/test-utils/mock'; -import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler, createMockSite } from '~/mocks/fixtures'; +import { createMockProfileResponse } from '~/mocks/fixtures/mockUser'; +import { mockUserEndpoints } from 'app/mocks/api'; +import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx index 9ab66d814..02fac7675 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx @@ -3,9 +3,9 @@ import userEvent from '@testing-library/user-event'; import { ManifestTypeSelect } from '~/components/Manifest/GeneralInfo/ManifestTypeSelect'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler } from '~/test-utils/fixtures'; -import { mockUserEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler } from '~/mocks/fixtures'; +import { mockUserEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx index 8ae3a48b1..c8004e459 100644 --- a/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx +++ b/client/app/components/Manifest/Generator/GeneratorForm.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; import { siteType } from '~/components/Manifest/manifestSchema'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneratorForm } from './GeneratorForm'; diff --git a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx index 595f44a1c..e5a265a8f 100644 --- a/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx +++ b/client/app/components/Manifest/Generator/GeneratorSection.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler } from '~/test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler } from '~/mocks/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; import { GeneratorSection } from './GeneratorSection'; diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx index db162785e..2d37108df 100644 --- a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx +++ b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx @@ -4,10 +4,10 @@ import { setupServer } from 'msw/node'; import React from 'react'; import '@testing-library/jest-dom'; import { HaztrakProfileResponse } from '~/store/userSlice/user.slice'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockRcrainfoSite } from '~/test-utils/fixtures'; -import { mockUserEndpoints } from '~/test-utils/mock'; -import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockRcrainfoSite } from '~/mocks/fixtures'; +import { mockUserEndpoints } from 'app/mocks/api'; +import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { HandlerSearchForm } from './HandlerSearchForm'; diff --git a/client/app/components/Manifest/ManifestForm.spec.tsx b/client/app/components/Manifest/ManifestForm.spec.tsx index b007964a6..e15f6349b 100644 --- a/client/app/components/Manifest/ManifestForm.spec.tsx +++ b/client/app/components/Manifest/ManifestForm.spec.tsx @@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event'; import { ManifestForm } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders } from '~/test-utils'; -import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders } from 'app/mocks'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints); diff --git a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx index 7d9c1b29b..9537d2351 100644 --- a/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx +++ b/client/app/components/Manifest/QuickerSign/QuickerSignForm.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import { QuickerSignForm } from '~/components/Manifest/QuickerSign'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockMTNHandler } from '~/test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockMTNHandler } from '~/mocks/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx index 805af2d71..81e88a9ab 100644 --- a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx +++ b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx @@ -4,9 +4,9 @@ import { Handler, RcraSiteType } from '~/components/Manifest/manifestSchema'; import { QuickSignBtn } from '~/components/Manifest/QuickerSign/index'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockMTNHandler } from '~/test-utils/fixtures'; -import { mockUserEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockMTNHandler } from '~/mocks/fixtures'; +import { mockUserEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; import { undefined } from 'zod'; diff --git a/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx index 87a41116d..ecb20f61e 100644 --- a/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteSelect.spec.tsx @@ -2,7 +2,7 @@ import { screen } from '@testing-library/react'; import { SiteSelect } from '~/components/Manifest/SiteSelect/SiteSelect'; import React, { useState } from 'react'; import { useForm } from 'react-hook-form'; -import { renderWithProviders } from '~/test-utils'; +import { renderWithProviders } from 'app/mocks'; import { describe, expect, test } from 'vitest'; function TestComponent() { diff --git a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx index 629d7a62c..c2688523f 100644 --- a/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx +++ b/client/app/components/Manifest/SiteSelect/SiteTypeSelect.spec.tsx @@ -3,7 +3,7 @@ import { RcraSiteType } from '~/components/Manifest/manifestSchema'; import { SiteTypeSelect } from '~/components/Manifest/SiteSelect/SiteTypeSelect'; import React, { useState } from 'react'; import { useForm } from 'react-hook-form'; -import { renderWithProviders } from '~/test-utils'; +import { renderWithProviders } from 'app/mocks'; import { describe, expect, test } from 'vitest'; function TestComponent({ siteType }: { siteType?: RcraSiteType }) { diff --git a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx index 449e452d5..d8c90f7e6 100644 --- a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx +++ b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx @@ -3,9 +3,9 @@ import userEvent from '@testing-library/user-event'; import { Transporter } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockTransporter } from '~/test-utils/fixtures'; -import { mockUserEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockTransporter } from '~/mocks/fixtures'; +import { mockUserEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { TransporterTable } from './index'; diff --git a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx index b6122135c..53f10f0a9 100644 --- a/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx +++ b/client/app/components/Manifest/Tsdf/TsdfSection.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler } from '~/test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler } from '~/mocks/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; import { TsdfSection } from './TsdfSection'; diff --git a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx index 6436e31e6..9a69270ff 100644 --- a/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx +++ b/client/app/components/Manifest/WasteLine/QuantityForm.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { QuantityForm } from '~/components/Manifest/WasteLine/QuantityForm'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => cleanup()); diff --git a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx index bbfea8d0b..447ec9c59 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx @@ -2,8 +2,8 @@ import '@testing-library/jest-dom'; import userEvent from '@testing-library/user-event'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { WasteLineForm } from './WasteLineForm'; diff --git a/client/app/components/Mtn/MtnTable.spec.tsx b/client/app/components/Mtn/MtnTable.spec.tsx index e9d7291b2..2ab22b162 100644 --- a/client/app/components/Mtn/MtnTable.spec.tsx +++ b/client/app/components/Mtn/MtnTable.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { fireEvent } from '@testing-library/react'; import { MtnDetails, MtnTable } from '~/components/Mtn'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { describe, expect, test } from 'vitest'; const DEFAULT_MTN_DETAILS: MtnDetails = { diff --git a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx index e7a006879..259512c1a 100644 --- a/client/app/components/RcraSite/RcraSiteDetails.spec.tsx +++ b/client/app/components/RcraSite/RcraSiteDetails.spec.tsx @@ -1,8 +1,8 @@ import '@testing-library/jest-dom'; import { RcraSiteDetails } from '~/components/RcraSite'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockMTNHandler } from '~/test-utils/fixtures'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockMTNHandler } from '~/mocks/fixtures'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx index f9bb34fa4..be2164cdf 100644 --- a/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx +++ b/client/app/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { RcraApiUserBtn } from '~/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test, vi } from 'vitest'; afterEach(() => { diff --git a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx index 49d44011a..2891e0d13 100644 --- a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx +++ b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx @@ -3,9 +3,9 @@ import { SyncManifestBtn } from '~/components/Rcrainfo/buttons/SyncManifestBtn/S import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { mockUserEndpoints } from '~/test-utils/mock'; -import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { mockUserEndpoints } from 'app/mocks/api'; +import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const testTaskID = 'testTaskId'; diff --git a/client/app/components/UI/HtCard/HtCard.spec.tsx b/client/app/components/UI/HtCard/HtCard.spec.tsx index 42f3fb937..78ddba717 100644 --- a/client/app/components/UI/HtCard/HtCard.spec.tsx +++ b/client/app/components/UI/HtCard/HtCard.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { HtCard } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from '~/test-utils'; +import { cleanup, render, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/UI/HtModal/HtModal.spec.tsx b/client/app/components/UI/HtModal/HtModal.spec.tsx index a06a96505..8e339658f 100644 --- a/client/app/components/UI/HtModal/HtModal.spec.tsx +++ b/client/app/components/UI/HtModal/HtModal.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { HtModal } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from '~/test-utils'; +import { cleanup, render, screen } from 'app/mocks'; import { afterEach, describe, expect, test, vi } from 'vitest'; afterEach(() => { diff --git a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx index 17af346ce..7fa87cf59 100644 --- a/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx +++ b/client/app/components/UI/HtPaginate/HtPaginate.spec.tsx @@ -1,7 +1,7 @@ import '@testing-library/jest-dom'; import { HtPaginate } from '~/components/UI'; import React from 'react'; -import { cleanup, render, screen } from '~/test-utils'; +import { cleanup, render, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; afterEach(() => { diff --git a/client/app/components/User/UserInfoForm.spec.tsx b/client/app/components/User/UserInfoForm.spec.tsx index 5d1bb1633..0451e47b9 100644 --- a/client/app/components/User/UserInfoForm.spec.tsx +++ b/client/app/components/User/UserInfoForm.spec.tsx @@ -5,9 +5,9 @@ import { UserInfoForm } from '~/components/User/UserInfoForm'; import { setupServer } from 'msw/node'; import React from 'react'; import { HaztrakUser, ProfileSlice } from '~/store'; -import { renderWithProviders, screen } from '~/test-utils'; -import { createMockHaztrakUser } from '~/test-utils/fixtures'; -import { mockUserEndpoints } from '~/test-utils/mock'; +import { renderWithProviders, screen } from 'app/mocks'; +import { createMockHaztrakUser } from '~/mocks/fixtures'; +import { mockUserEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx index 6e2fa341a..7d2d4ba29 100644 --- a/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx +++ b/client/app/hooks/manifest/useManifestStatus/useManifestStatus.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { afterEach, describe, expect, it } from 'vitest'; import { cleanup } from '@testing-library/react'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { useManifestStatus } from './useManifestStatus'; import userEvent from '@testing-library/user-event'; import { ManifestStatus } from '~/components/Manifest/manifestSchema'; diff --git a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx index 4809717cb..16989f6ce 100644 --- a/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx +++ b/client/app/hooks/manifest/useOpenHandlerSearch/useOpenHandlerSearch.spec.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { SiteType } from '~/components/Manifest/manifestSchema'; import { useHandlerSearchConfig } from '~/hooks/manifest/useOpenHandlerSearch/useHandlerSearchConfig'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, it } from 'vitest'; const TestChildComponent = () => { diff --git a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx index 16614c08e..d83ef34fe 100644 --- a/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx +++ b/client/app/hooks/manifest/useReadOnly/useReadOnly.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { cleanup } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, it } from 'vitest'; import { useReadOnly } from './useReadOnly'; diff --git a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx index 4ecf97ee4..21ae82afc 100644 --- a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx +++ b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx @@ -4,9 +4,9 @@ import userEvent from '@testing-library/user-event'; import { Manifest } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; -import { createMockManifest } from '~/test-utils/fixtures'; -import { mockManifestEndpoints } from '~/test-utils/mock'; +import { renderWithProviders, screen } from 'app/mocks'; +import { createMockManifest } from '~/mocks/fixtures'; +import { mockManifestEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; import { useSaveManifest } from './useSaveManifest'; diff --git a/client/app/hooks/usePagination/usePagination.spec.tsx b/client/app/hooks/usePagination/usePagination.spec.tsx index 59d468f44..7f96c4fb3 100644 --- a/client/app/hooks/usePagination/usePagination.spec.tsx +++ b/client/app/hooks/usePagination/usePagination.spec.tsx @@ -1,6 +1,6 @@ import { cleanup, fireEvent, waitFor } from '@testing-library/react'; import React, { useState } from 'react'; -import { render, screen } from '~/test-utils'; +import { render, screen } from 'app/mocks'; import { afterEach, describe, expect, test } from 'vitest'; import { usePagination } from './usePagination'; diff --git a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx index 4d66982e2..4f843eb3f 100644 --- a/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx +++ b/client/app/hooks/useProgressTracker/useProgressTracker.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React, { useState } from 'react'; -import { renderWithProviders, screen, waitFor, cleanup } from '~/test-utils'; +import { renderWithProviders, screen, waitFor, cleanup } from 'app/mocks'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { useProgressTracker } from '~/hooks/useProgressTracker/useProgressTracker'; import userEvent from '@testing-library/user-event'; diff --git a/client/app/hooks/useTitle/useTitle.spec.tsx b/client/app/hooks/useTitle/useTitle.spec.tsx index cc1ffd043..bfbc7bfff 100644 --- a/client/app/hooks/useTitle/useTitle.spec.tsx +++ b/client/app/hooks/useTitle/useTitle.spec.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { describe, expect, afterEach, it } from 'vitest'; import { cleanup, fireEvent } from '@testing-library/react'; import React from 'react'; -import { render, screen } from '~/test-utils'; +import { render, screen } from 'app/mocks'; import { useTitle } from '~/hooks'; const originalPageTitle = 'originalPageTitle'; diff --git a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx index c6c6ef8e1..f19daad21 100644 --- a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx +++ b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx @@ -4,11 +4,11 @@ import { useUserSiteIds } from '~/hooks'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler, createMockSite } from '~/test-utils/fixtures'; -import { createMockProfileResponse } from '~/test-utils/fixtures/mockUser'; -import { mockUserEndpoints, mockWasteEndpoints } from '~/test-utils/mock'; -import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; +import { renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler, createMockSite } from '~/mocks/fixtures'; +import { createMockProfileResponse } from '~/mocks/fixtures/mockUser'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; +import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; function TestComponent() { diff --git a/client/app/index.tsx b/client/app/index.tsx index b23501b6a..36c769823 100644 --- a/client/app/index.tsx +++ b/client/app/index.tsx @@ -11,7 +11,7 @@ const root = createRoot(container); // intercepts API calls and returns fake/test responses if (import.meta.env.VITE_HT_ENV && import.meta.env.VITE_HT_ENV.toUpperCase() === 'TEST') { // eslint-disable-next-line @typescript-eslint/no-var-requires - const { worker } = require('./test-utils/mock/browser'); + const { worker } = require('~/mocks/api/browser'); worker.start(); } diff --git a/client/app/mocks/api/index.ts b/client/app/mocks/api/index.ts new file mode 100644 index 000000000..f7efdeaaa --- /dev/null +++ b/client/app/mocks/api/index.ts @@ -0,0 +1,4 @@ +export { mockUserEndpoints } from '~/mocks/api/mockUserEndpoints'; +export { mockSiteEndpoints } from '~/mocks/api/mockSiteEndpoints'; +export { mockWasteEndpoints } from '~/mocks/api/mockWasteEndpoints'; +export { mockManifestEndpoints } from '~/mocks/api/mockManifestEndpoints'; diff --git a/client/app/test-utils/mock/mockManifestEndpoints.ts b/client/app/mocks/api/mockManifestEndpoints.ts similarity index 100% rename from client/app/test-utils/mock/mockManifestEndpoints.ts rename to client/app/mocks/api/mockManifestEndpoints.ts diff --git a/client/app/test-utils/mock/mockSiteEndpoints.ts b/client/app/mocks/api/mockSiteEndpoints.ts similarity index 100% rename from client/app/test-utils/mock/mockSiteEndpoints.ts rename to client/app/mocks/api/mockSiteEndpoints.ts diff --git a/client/app/test-utils/mock/mockUserEndpoints.ts b/client/app/mocks/api/mockUserEndpoints.ts similarity index 93% rename from client/app/test-utils/mock/mockUserEndpoints.ts rename to client/app/mocks/api/mockUserEndpoints.ts index 89a81df40..c4b49b444 100644 --- a/client/app/test-utils/mock/mockUserEndpoints.ts +++ b/client/app/mocks/api/mockUserEndpoints.ts @@ -1,11 +1,11 @@ import { http, HttpResponse } from 'msw'; import { HaztrakUser } from '~/store/authSlice/auth.slice'; import { LoginResponse } from '~/store/userSlice/user.slice'; -import { createMockHaztrakUser } from '~/test-utils/fixtures'; +import { createMockHaztrakUser } from '~/mocks/fixtures'; import { createMockProfileResponse, createMockRcrainfoProfileResponse, -} from '~/test-utils/fixtures/mockUser'; +} from '~/mocks/fixtures/mockUser'; /** mock Rest API*/ const API_BASE_URL = import.meta.env.VITE_HT_API_URL; diff --git a/client/app/test-utils/mock/mockWasteEndpoints.ts b/client/app/mocks/api/mockWasteEndpoints.ts similarity index 88% rename from client/app/test-utils/mock/mockWasteEndpoints.ts rename to client/app/mocks/api/mockWasteEndpoints.ts index 256fbcf5a..936f16c87 100644 --- a/client/app/test-utils/mock/mockWasteEndpoints.ts +++ b/client/app/mocks/api/mockWasteEndpoints.ts @@ -1,5 +1,5 @@ import { http, HttpResponse } from 'msw'; -import { mockDotIdNumbers, mockFederalWasteCodes } from '~/test-utils/fixtures/mockWaste'; +import { mockDotIdNumbers, mockFederalWasteCodes } from '~/mocks/fixtures/mockWaste'; /** mock Rest API*/ const API_BASE_URL = import.meta.env.VITE_HT_API_URL; diff --git a/client/app/test-utils/fixtures/index.ts b/client/app/mocks/fixtures/index.ts similarity index 100% rename from client/app/test-utils/fixtures/index.ts rename to client/app/mocks/fixtures/index.ts diff --git a/client/app/test-utils/fixtures/mockHandler.ts b/client/app/mocks/fixtures/mockHandler.ts similarity index 98% rename from client/app/test-utils/fixtures/mockHandler.ts rename to client/app/mocks/fixtures/mockHandler.ts index 5f2651a3c..e10e9dae5 100644 --- a/client/app/test-utils/fixtures/mockHandler.ts +++ b/client/app/mocks/fixtures/mockHandler.ts @@ -6,7 +6,7 @@ import { RcrainfoSitePermissions } from '~/store'; import { RcraContact } from '~/components/RcraSite/rcraSiteSchema'; /** - * A mock handler object for tests + * A api handler object for tests */ const DEFAULT_HANDLER: Handler = { epaSiteId: 'testSiteIdNumber', diff --git a/client/app/test-utils/fixtures/mockManifest.ts b/client/app/mocks/fixtures/mockManifest.ts similarity index 83% rename from client/app/test-utils/fixtures/mockManifest.ts rename to client/app/mocks/fixtures/mockManifest.ts index 32910a08c..638e1cea1 100644 --- a/client/app/test-utils/fixtures/mockManifest.ts +++ b/client/app/mocks/fixtures/mockManifest.ts @@ -1,6 +1,6 @@ import { Manifest } from '~/components/Manifest/manifestSchema'; -import { createMockMTNHandler, createMockTransporter } from '~/test-utils/fixtures/mockHandler'; -import { createMockWaste } from '~/test-utils/fixtures/mockWaste'; +import { createMockMTNHandler, createMockTransporter } from '~/mocks/fixtures/mockHandler'; +import { createMockWaste } from '~/mocks/fixtures/mockWaste'; const DEFAULT_MANIFEST: Manifest = { manifestTrackingNumber: '123456789ELC', diff --git a/client/app/test-utils/fixtures/mockUser.ts b/client/app/mocks/fixtures/mockUser.ts similarity index 95% rename from client/app/test-utils/fixtures/mockUser.ts rename to client/app/mocks/fixtures/mockUser.ts index 1c0027676..fb46c4e9e 100644 --- a/client/app/test-utils/fixtures/mockUser.ts +++ b/client/app/mocks/fixtures/mockUser.ts @@ -1,6 +1,6 @@ import { HaztrakProfileOrg, HaztrakUser, RcrainfoProfile, RcrainfoProfileSite } from '~/store'; import { HaztrakProfileResponse } from '~/store/userSlice/user.slice'; -import { createMockSite } from '~/test-utils/fixtures/mockHandler'; +import { createMockSite } from '~/mocks/fixtures/mockHandler'; export const DEFAULT_HAZTRAK_USER: HaztrakUser = { username: 'testuser1', diff --git a/client/app/test-utils/fixtures/mockWaste.ts b/client/app/mocks/fixtures/mockWaste.ts similarity index 100% rename from client/app/test-utils/fixtures/mockWaste.ts rename to client/app/mocks/fixtures/mockWaste.ts diff --git a/client/app/test-utils/index.ts b/client/app/mocks/index.ts similarity index 55% rename from client/app/test-utils/index.ts rename to client/app/mocks/index.ts index 5bb76fd8f..48367d804 100644 --- a/client/app/test-utils/index.ts +++ b/client/app/mocks/index.ts @@ -1,4 +1,4 @@ -import { renderWithProviders } from '~/test-utils/render'; +import { renderWithProviders } from '~/mocks/render'; export { renderWithProviders }; export * from '@testing-library/react'; diff --git a/client/app/test-utils/render.tsx b/client/app/mocks/render.tsx similarity index 100% rename from client/app/test-utils/render.tsx rename to client/app/mocks/render.tsx diff --git a/client/app/routes/Dashboard/Dashboard.spec.tsx b/client/app/routes/Dashboard/Dashboard.spec.tsx index efc033468..684ba6f08 100644 --- a/client/app/routes/Dashboard/Dashboard.spec.tsx +++ b/client/app/routes/Dashboard/Dashboard.spec.tsx @@ -2,9 +2,9 @@ import '@testing-library/jest-dom'; import { Dashboard } from '~/routes/Dashboard/Dashboard'; import { setupServer } from 'msw/node'; import React, { createElement } from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { mockUserEndpoints } from '~/test-utils/mock'; -import { mockSiteEndpoints } from '~/test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { mockUserEndpoints } from 'app/mocks/api'; +import { mockSiteEndpoints } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const USERNAME = 'testuser1'; diff --git a/client/app/routes/Login/login.spec.tsx b/client/app/routes/Login/login.spec.tsx index 69107e0b0..ff8c39ff6 100644 --- a/client/app/routes/Login/login.spec.tsx +++ b/client/app/routes/Login/login.spec.tsx @@ -1,6 +1,6 @@ import '@testing-library/jest-dom'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { Login } from '~/routes/Login'; import { describe, expect, test } from 'vitest'; diff --git a/client/app/routes/NewManifest/NewManifest.spec.tsx b/client/app/routes/NewManifest/NewManifest.spec.tsx index ceb9ad7b6..51332aadf 100644 --- a/client/app/routes/NewManifest/NewManifest.spec.tsx +++ b/client/app/routes/NewManifest/NewManifest.spec.tsx @@ -4,10 +4,10 @@ import { NewManifest } from '~/routes/NewManifest/NewManifest'; import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { createMockSite } from '~/test-utils/fixtures'; -import { mockSiteEndpoints, mockUserEndpoints } from '~/test-utils/mock'; -import { API_BASE_URL } from '~/test-utils/mock/mockSiteEndpoints'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { createMockSite } from '~/mocks/fixtures'; +import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/api'; +import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const mockSites = [createMockSite(), createMockSite()]; diff --git a/client/app/routes/SiteList/SiteList.spec.tsx b/client/app/routes/SiteList/SiteList.spec.tsx index 7bd943383..b98ee116b 100644 --- a/client/app/routes/SiteList/SiteList.spec.tsx +++ b/client/app/routes/SiteList/SiteList.spec.tsx @@ -1,9 +1,9 @@ import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; -import { renderWithProviders, screen } from '~/test-utils'; -import { createMockHandler, createMockSite } from '~/test-utils/fixtures/mockHandler'; -import { mockSiteEndpoints, mockUserEndpoints } from '~/test-utils/mock'; +import { renderWithProviders, screen } from 'app/mocks'; +import { createMockHandler, createMockSite } from '~/mocks/fixtures/mockHandler'; +import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/api'; import { afterAll, beforeAll, describe, expect, test } from 'vitest'; import { SiteList } from './SiteList'; diff --git a/client/app/services/manifest/manifest.spec.ts b/client/app/services/manifest/manifest.spec.ts index 931e3c52a..08c7b956e 100644 --- a/client/app/services/manifest/manifest.spec.ts +++ b/client/app/services/manifest/manifest.spec.ts @@ -4,7 +4,7 @@ import { createMockMTNHandler, createMockSite, createMockTransporter, -} from '~/test-utils/fixtures'; +} from '~/mocks/fixtures'; import { describe, expect, test } from 'vitest'; import { ProfileSlice } from '~/store'; import { ManifestStatus } from '~/components/Manifest/manifestSchema'; diff --git a/client/app/store/authSlice/auth.slice.spec.tsx b/client/app/store/authSlice/auth.slice.spec.tsx index 30b186351..e36c46f86 100644 --- a/client/app/store/authSlice/auth.slice.spec.tsx +++ b/client/app/store/authSlice/auth.slice.spec.tsx @@ -7,7 +7,7 @@ import { useAppDispatch, useAppSelector, } from '~/store'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { afterEach, describe, expect, test, vi } from 'vitest'; const getItemSpy = vi.spyOn(Storage.prototype, 'getItem'); diff --git a/client/app/store/manifestSlice/manifest.slice.spec.tsx b/client/app/store/manifestSlice/manifest.slice.spec.tsx index 4c4bc08ba..f1702f335 100644 --- a/client/app/store/manifestSlice/manifest.slice.spec.tsx +++ b/client/app/store/manifestSlice/manifest.slice.spec.tsx @@ -7,7 +7,7 @@ import reducer, { setManifestReadOnly, setManifestStatus, } from '~/store/manifestSlice/manifest.slice'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { describe, expect, test } from 'vitest'; const TestComponent = () => { diff --git a/client/app/store/notificationSlice/notification.slice.spec.tsx b/client/app/store/notificationSlice/notification.slice.spec.tsx index b34ff11e5..62f7d1f12 100644 --- a/client/app/store/notificationSlice/notification.slice.spec.tsx +++ b/client/app/store/notificationSlice/notification.slice.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { addAlert, HaztrakAlert, removeAlert, useAppSelector } from '~/store'; -import { renderWithProviders, screen } from '~/test-utils'; +import { renderWithProviders, screen } from 'app/mocks'; import { describe, expect, test } from 'vitest'; import reducer, { selectAllAlerts } from './notification.slice'; diff --git a/client/app/store/userSlice/user.slice.spec.tsx b/client/app/store/userSlice/user.slice.spec.tsx index 9e631cc42..d81cd87e9 100644 --- a/client/app/store/userSlice/user.slice.spec.tsx +++ b/client/app/store/userSlice/user.slice.spec.tsx @@ -3,8 +3,8 @@ import { waitFor } from '@testing-library/react'; import { setupServer } from 'msw/node'; import { useEffect, useState } from 'react'; import { useGetUserQuery, useUpdateUserMutation } from '~/store'; -import { cleanup, renderWithProviders, screen } from '~/test-utils'; -import { mockUserEndpoints } from '~/test-utils/mock'; +import { cleanup, renderWithProviders, screen } from 'app/mocks'; +import { mockUserEndpoints } from 'app/mocks/api'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/test-utils/mock/index.ts b/client/app/test-utils/mock/index.ts deleted file mode 100644 index dbe3fce6b..000000000 --- a/client/app/test-utils/mock/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { mockUserEndpoints } from '~/test-utils/mock/mockUserEndpoints'; -export { mockSiteEndpoints } from '~/test-utils/mock/mockSiteEndpoints'; -export { mockWasteEndpoints } from '~/test-utils/mock/mockWasteEndpoints'; -export { mockManifestEndpoints } from '~/test-utils/mock/mockManifestEndpoints'; From 912374ed721d5b9b2f5ad9edfe4d770b122547b2 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 20:54:43 -0400 Subject: [PATCH 06/12] modify mock service work import and conditional worker start up to follow current docks --- .../GeneralInfo/ManifestStatusSelect.spec.tsx | 4 +-- .../GeneralInfo/ManifestTypeField.spec.tsx | 2 +- .../Handler/Search/HandlerSearchForm.spec.tsx | 4 +-- .../components/Manifest/ManifestForm.spec.tsx | 2 +- .../QuickerSign/SignBtn/QuickSignBtn.spec.tsx | 2 +- .../Transporter/TransporterTable.spec.tsx | 2 +- .../Manifest/WasteLine/WasteLineForm.spec.tsx | 2 +- .../SyncManifestBtn/SyncManifestBtn.spec.tsx | 4 +-- .../app/components/User/UserInfoForm.spec.tsx | 2 +- .../useSaveManifest/useSaveManifest.spec.tsx | 2 +- .../useUserSiteIds/useUserSiteIds.spec.tsx | 4 +-- client/app/index.tsx | 33 ++++++++++--------- client/app/mocks/api/index.ts | 4 --- client/app/mocks/browser.js | 5 +++ client/app/mocks/handlers/index.ts | 19 +++++++++++ .../mockManifestEndpoints.ts | 0 .../{api => handlers}/mockSiteEndpoints.ts | 0 .../{api => handlers}/mockUserEndpoints.ts | 0 .../{api => handlers}/mockWasteEndpoints.ts | 0 .../app/routes/Dashboard/Dashboard.spec.tsx | 4 +-- .../routes/NewManifest/NewManifest.spec.tsx | 4 +-- client/app/routes/SiteList/SiteList.spec.tsx | 2 +- .../app/store/userSlice/user.slice.spec.tsx | 2 +- 23 files changed, 63 insertions(+), 40 deletions(-) delete mode 100644 client/app/mocks/api/index.ts create mode 100644 client/app/mocks/browser.js create mode 100644 client/app/mocks/handlers/index.ts rename client/app/mocks/{api => handlers}/mockManifestEndpoints.ts (100%) rename client/app/mocks/{api => handlers}/mockSiteEndpoints.ts (100%) rename client/app/mocks/{api => handlers}/mockUserEndpoints.ts (100%) rename client/app/mocks/{api => handlers}/mockWasteEndpoints.ts (100%) diff --git a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx index bf60d321c..0c94b7ced 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockHandler, createMockSite } from '~/mocks/fixtures'; import { createMockProfileResponse } from '~/mocks/fixtures/mockUser'; -import { mockUserEndpoints } from 'app/mocks/api'; -import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; +import { mockUserEndpoints } from 'app/mocks/handlers'; +import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx index 02fac7675..04a17a06c 100644 --- a/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx +++ b/client/app/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx @@ -5,7 +5,7 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockHandler } from '~/mocks/fixtures'; -import { mockUserEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx index 2d37108df..84b9716af 100644 --- a/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx +++ b/client/app/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx @@ -6,8 +6,8 @@ import '@testing-library/jest-dom'; import { HaztrakProfileResponse } from '~/store/userSlice/user.slice'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockRcrainfoSite } from '~/mocks/fixtures'; -import { mockUserEndpoints } from 'app/mocks/api'; -import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; +import { mockUserEndpoints } from 'app/mocks/handlers'; +import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { HandlerSearchForm } from './HandlerSearchForm'; diff --git a/client/app/components/Manifest/ManifestForm.spec.tsx b/client/app/components/Manifest/ManifestForm.spec.tsx index e15f6349b..841e54391 100644 --- a/client/app/components/Manifest/ManifestForm.spec.tsx +++ b/client/app/components/Manifest/ManifestForm.spec.tsx @@ -5,7 +5,7 @@ import { ManifestForm } from '~/components/Manifest'; import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders } from 'app/mocks'; -import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints); diff --git a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx index 81e88a9ab..36052b850 100644 --- a/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx +++ b/client/app/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx @@ -6,7 +6,7 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockMTNHandler } from '~/mocks/fixtures'; -import { mockUserEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; import { undefined } from 'zod'; diff --git a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx index d8c90f7e6..d519d8b18 100644 --- a/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx +++ b/client/app/components/Manifest/Transporter/TransporterTable.spec.tsx @@ -5,7 +5,7 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockTransporter } from '~/mocks/fixtures'; -import { mockUserEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { TransporterTable } from './index'; diff --git a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx index 447ec9c59..4eeb19a0f 100644 --- a/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx +++ b/client/app/components/Manifest/WasteLine/WasteLineForm.spec.tsx @@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event'; import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; -import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; import { WasteLineForm } from './WasteLineForm'; diff --git a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx index 2891e0d13..02c251a41 100644 --- a/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx +++ b/client/app/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx @@ -4,8 +4,8 @@ import { http, HttpResponse } from 'msw'; import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; -import { mockUserEndpoints } from 'app/mocks/api'; -import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; +import { mockUserEndpoints } from 'app/mocks/handlers'; +import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const testTaskID = 'testTaskId'; diff --git a/client/app/components/User/UserInfoForm.spec.tsx b/client/app/components/User/UserInfoForm.spec.tsx index 0451e47b9..c4c0a1e3d 100644 --- a/client/app/components/User/UserInfoForm.spec.tsx +++ b/client/app/components/User/UserInfoForm.spec.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { HaztrakUser, ProfileSlice } from '~/store'; import { renderWithProviders, screen } from 'app/mocks'; import { createMockHaztrakUser } from '~/mocks/fixtures'; -import { mockUserEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const server = setupServer(...mockUserEndpoints); diff --git a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx index 21ae82afc..774693114 100644 --- a/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx +++ b/client/app/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx @@ -6,7 +6,7 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { renderWithProviders, screen } from 'app/mocks'; import { createMockManifest } from '~/mocks/fixtures'; -import { mockManifestEndpoints } from 'app/mocks/api'; +import { mockManifestEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; import { useSaveManifest } from './useSaveManifest'; diff --git a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx index f19daad21..bc8a0c102 100644 --- a/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx +++ b/client/app/hooks/useUserSiteIds/useUserSiteIds.spec.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { renderWithProviders, screen } from 'app/mocks'; import { createMockHandler, createMockSite } from '~/mocks/fixtures'; import { createMockProfileResponse } from '~/mocks/fixtures/mockUser'; -import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/api'; -import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; +import { mockUserEndpoints, mockWasteEndpoints } from 'app/mocks/handlers'; +import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'; function TestComponent() { diff --git a/client/app/index.tsx b/client/app/index.tsx index 36c769823..c01fb3f8d 100644 --- a/client/app/index.tsx +++ b/client/app/index.tsx @@ -4,21 +4,24 @@ import { Provider } from 'react-redux'; import { rootStore } from '~/store'; import App from './App'; +// Start mock service worker in development mode +async function enableMocking() { + if (process.env.NODE_ENV !== 'development') { + return; + } + const { worker } = await import('./mocks/browser'); + return worker.start(); +} + const container = document.getElementById('root') as HTMLElement; const root = createRoot(container); -// initiate the mock service worker if deployed in TEST environment -// intercepts API calls and returns fake/test responses -if (import.meta.env.VITE_HT_ENV && import.meta.env.VITE_HT_ENV.toUpperCase() === 'TEST') { - // eslint-disable-next-line @typescript-eslint/no-var-requires - const { worker } = require('~/mocks/api/browser'); - worker.start(); -} - -root.render( - - - - - -); +enableMocking().then(() => { + root.render( + + + + + + ); +}); diff --git a/client/app/mocks/api/index.ts b/client/app/mocks/api/index.ts deleted file mode 100644 index f7efdeaaa..000000000 --- a/client/app/mocks/api/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { mockUserEndpoints } from '~/mocks/api/mockUserEndpoints'; -export { mockSiteEndpoints } from '~/mocks/api/mockSiteEndpoints'; -export { mockWasteEndpoints } from '~/mocks/api/mockWasteEndpoints'; -export { mockManifestEndpoints } from '~/mocks/api/mockManifestEndpoints'; diff --git a/client/app/mocks/browser.js b/client/app/mocks/browser.js new file mode 100644 index 000000000..957c19cd7 --- /dev/null +++ b/client/app/mocks/browser.js @@ -0,0 +1,5 @@ +// src/mocks/browser.js +import { setupWorker } from 'msw/browser'; +import { handlers } from './handlers'; + +export const worker = setupWorker(...handlers); diff --git a/client/app/mocks/handlers/index.ts b/client/app/mocks/handlers/index.ts new file mode 100644 index 000000000..f64e5c5b1 --- /dev/null +++ b/client/app/mocks/handlers/index.ts @@ -0,0 +1,19 @@ +import { mockUserEndpoints } from '~/mocks/handlers/mockUserEndpoints'; +import { mockSiteEndpoints } from '~/mocks/handlers/mockSiteEndpoints'; +import { mockWasteEndpoints } from '~/mocks/handlers/mockWasteEndpoints'; +import { mockManifestEndpoints } from '~/mocks/handlers/mockManifestEndpoints'; + +const handlers = { + ...mockManifestEndpoints, + ...mockUserEndpoints, + ...mockSiteEndpoints, + ...mockWasteEndpoints, +}; + +export { + mockWasteEndpoints, + mockManifestEndpoints, + mockSiteEndpoints, + mockUserEndpoints, + handlers, +}; diff --git a/client/app/mocks/api/mockManifestEndpoints.ts b/client/app/mocks/handlers/mockManifestEndpoints.ts similarity index 100% rename from client/app/mocks/api/mockManifestEndpoints.ts rename to client/app/mocks/handlers/mockManifestEndpoints.ts diff --git a/client/app/mocks/api/mockSiteEndpoints.ts b/client/app/mocks/handlers/mockSiteEndpoints.ts similarity index 100% rename from client/app/mocks/api/mockSiteEndpoints.ts rename to client/app/mocks/handlers/mockSiteEndpoints.ts diff --git a/client/app/mocks/api/mockUserEndpoints.ts b/client/app/mocks/handlers/mockUserEndpoints.ts similarity index 100% rename from client/app/mocks/api/mockUserEndpoints.ts rename to client/app/mocks/handlers/mockUserEndpoints.ts diff --git a/client/app/mocks/api/mockWasteEndpoints.ts b/client/app/mocks/handlers/mockWasteEndpoints.ts similarity index 100% rename from client/app/mocks/api/mockWasteEndpoints.ts rename to client/app/mocks/handlers/mockWasteEndpoints.ts diff --git a/client/app/routes/Dashboard/Dashboard.spec.tsx b/client/app/routes/Dashboard/Dashboard.spec.tsx index 684ba6f08..324574a16 100644 --- a/client/app/routes/Dashboard/Dashboard.spec.tsx +++ b/client/app/routes/Dashboard/Dashboard.spec.tsx @@ -3,8 +3,8 @@ import { Dashboard } from '~/routes/Dashboard/Dashboard'; import { setupServer } from 'msw/node'; import React, { createElement } from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; -import { mockUserEndpoints } from 'app/mocks/api'; -import { mockSiteEndpoints } from '~/mocks/api/mockSiteEndpoints'; +import { mockUserEndpoints } from 'app/mocks/handlers'; +import { mockSiteEndpoints } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'; const USERNAME = 'testuser1'; diff --git a/client/app/routes/NewManifest/NewManifest.spec.tsx b/client/app/routes/NewManifest/NewManifest.spec.tsx index 51332aadf..2043f816a 100644 --- a/client/app/routes/NewManifest/NewManifest.spec.tsx +++ b/client/app/routes/NewManifest/NewManifest.spec.tsx @@ -6,8 +6,8 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; import { createMockSite } from '~/mocks/fixtures'; -import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/api'; -import { API_BASE_URL } from '~/mocks/api/mockSiteEndpoints'; +import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/handlers'; +import { API_BASE_URL } from '~/mocks/handlers/mockSiteEndpoints'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const mockSites = [createMockSite(), createMockSite()]; diff --git a/client/app/routes/SiteList/SiteList.spec.tsx b/client/app/routes/SiteList/SiteList.spec.tsx index b98ee116b..81d61c69a 100644 --- a/client/app/routes/SiteList/SiteList.spec.tsx +++ b/client/app/routes/SiteList/SiteList.spec.tsx @@ -3,7 +3,7 @@ import { setupServer } from 'msw/node'; import React from 'react'; import { renderWithProviders, screen } from 'app/mocks'; import { createMockHandler, createMockSite } from '~/mocks/fixtures/mockHandler'; -import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/api'; +import { mockSiteEndpoints, mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, beforeAll, describe, expect, test } from 'vitest'; import { SiteList } from './SiteList'; diff --git a/client/app/store/userSlice/user.slice.spec.tsx b/client/app/store/userSlice/user.slice.spec.tsx index d81cd87e9..1f5f1d22b 100644 --- a/client/app/store/userSlice/user.slice.spec.tsx +++ b/client/app/store/userSlice/user.slice.spec.tsx @@ -4,7 +4,7 @@ import { setupServer } from 'msw/node'; import { useEffect, useState } from 'react'; import { useGetUserQuery, useUpdateUserMutation } from '~/store'; import { cleanup, renderWithProviders, screen } from 'app/mocks'; -import { mockUserEndpoints } from 'app/mocks/api'; +import { mockUserEndpoints } from 'app/mocks/handlers'; import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'; const server = setupServer(...mockUserEndpoints); From 61ae2774284b6b2d851c98aa2c653d40459f05d2 Mon Sep 17 00:00:00 2001 From: David Paul Graham Date: Wed, 31 Jul 2024 22:21:53 -0400 Subject: [PATCH 07/12] remove prettier configs from repo root modify when mock browser is enabled to NODE_ENV='test' move prettier configs to client directory to fox docker build --- .prettierignore => client/.prettierignore | 0 .prettierrc.json => client/.prettierrc.json | 0 client/Dockerfile | 10 +++++----- client/app/index.tsx | 2 +- client/app/mocks/handlers/index.ts | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename .prettierignore => client/.prettierignore (100%) rename .prettierrc.json => client/.prettierrc.json (100%) diff --git a/.prettierignore b/client/.prettierignore similarity index 100% rename from .prettierignore rename to client/.prettierignore diff --git a/.prettierrc.json b/client/.prettierrc.json similarity index 100% rename from .prettierrc.json rename to client/.prettierrc.json diff --git a/client/Dockerfile b/client/Dockerfile index cc4fc7978..04ae785fc 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -1,6 +1,6 @@ # Mutlistage dockerize dpgraham.com react.js front end # Build stage -FROM node:20-alpine as builder +FROM node:20-alpine AS builder LABEL maintainer="graham.david@epa.gov" WORKDIR /app COPY . . @@ -9,20 +9,20 @@ RUN npm run build # test -FROM builder as test +FROM builder AS test WORKDIR /app CMD ["npm", "run", "test"] # local development -FROM builder as dev +FROM builder AS dev WORKDIR /app EXPOSE 3000 CMD ["npm", "start"] # Production -FROM nginx:1.24.0-alpine as production +FROM nginx:1.24.0-alpine AS production WORKDIR /app -ENV NODE_ENV production +ENV NODE_ENV=production # copy build from builder stage COPY --from=builder /app/build /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf diff --git a/client/app/index.tsx b/client/app/index.tsx index c01fb3f8d..ff2930b25 100644 --- a/client/app/index.tsx +++ b/client/app/index.tsx @@ -6,7 +6,7 @@ import App from './App'; // Start mock service worker in development mode async function enableMocking() { - if (process.env.NODE_ENV !== 'development') { + if (process.env.NODE_ENV !== 'test') { return; } const { worker } = await import('./mocks/browser'); diff --git a/client/app/mocks/handlers/index.ts b/client/app/mocks/handlers/index.ts index f64e5c5b1..4bf292543 100644 --- a/client/app/mocks/handlers/index.ts +++ b/client/app/mocks/handlers/index.ts @@ -3,12 +3,12 @@ import { mockSiteEndpoints } from '~/mocks/handlers/mockSiteEndpoints'; import { mockWasteEndpoints } from '~/mocks/handlers/mockWasteEndpoints'; import { mockManifestEndpoints } from '~/mocks/handlers/mockManifestEndpoints'; -const handlers = { +const handlers = [ ...mockManifestEndpoints, ...mockUserEndpoints, ...mockSiteEndpoints, ...mockWasteEndpoints, -}; +]; export { mockWasteEndpoints, From 810da2465f67d964920e8b29f41af174df495abe Mon Sep 17 00:00:00 2001 From: David Graham Date: Thu, 1 Aug 2024 09:36:25 -0400 Subject: [PATCH 08/12] move setupTest.ts to the mocks directory --- client/app/{ => mocks}/setupTests.ts | 0 client/vite.config.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename client/app/{ => mocks}/setupTests.ts (100%) diff --git a/client/app/setupTests.ts b/client/app/mocks/setupTests.ts similarity index 100% rename from client/app/setupTests.ts rename to client/app/mocks/setupTests.ts diff --git a/client/vite.config.ts b/client/vite.config.ts index 9ea7b7ef7..d2482e3cf 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -63,6 +63,6 @@ export default defineConfig({ ], }, globals: true, - setupFiles: ['app/setupTests.ts'], + setupFiles: ['app/mocks/setupTests.ts'], }, }); From 3705c2f8167755bc86aca22974423a41aeac7926 Mon Sep 17 00:00:00 2001 From: David Graham Date: Thu, 1 Aug 2024 10:31:19 -0400 Subject: [PATCH 09/12] rename org and site object permission columns names to clarify that the content_object_id is the object ID of a site\/org object also add development fixtures so our test user has the appropriate permissions --- server/fixtures/dev_data.yaml | 448 +++++++++++++----- ...bjectpermission_content_object_and_more.py | 34 ++ server/org/models.py | 9 +- 3 files changed, 376 insertions(+), 115 deletions(-) create mode 100644 server/org/migrations/0002_alter_orggroupobjectpermission_content_object_and_more.py diff --git a/server/fixtures/dev_data.yaml b/server/fixtures/dev_data.yaml index 9d1fc3ea9..49b1c5ae4 100644 --- a/server/fixtures/dev_data.yaml +++ b/server/fixtures/dev_data.yaml @@ -1,107 +1,333 @@ - model: auth.group - pk: 1 fields: name: Org admin permissions: - - 161 - - 162 - - 163 - - 164 - - 157 - - 158 - - 159 - - 160 - - 165 - - 166 - - 167 - - 168 - - 126 - - 127 - - 128 - - 129 - - 130 - - 131 - - 132 - - 133 - - 134 - - 135 - - 136 - - 137 - - 138 - - 139 - - 140 - - 141 - - 142 - - 143 - - 144 - - 145 - - 146 - - 147 - - 148 - - 153 - - 154 - - 155 - - 156 - - 149 - - 150 - - 151 - - 152 - - 69 - - 70 - - 71 - - 72 - - 117 - - 118 - - 119 - - 120 - - 73 - - 74 - - 75 - - 76 - - 113 - - 114 - - 115 - - 116 - - 77 - - 78 - - 79 - - 80 - - 109 - - 110 - - 111 - - 112 - - 81 - - 82 - - 83 - - 84 - - 85 - - 86 - - 87 - - 88 - - 89 - - 90 - - 91 - - 92 - - 93 - - 94 - - 95 - - 96 - - 105 - - 106 - - 107 - - 108 - - 121 - - 122 - - 123 - - 124 - - 97 - - 98 - - 99 - - 100 - - 101 - - 102 - - 103 - - 104 + - - add_trakuser + - core + - trakuser + - - change_trakuser + - core + - trakuser + - - delete_trakuser + - core + - trakuser + - - view_trakuser + - core + - trakuser + - - add_clockedschedule + - django_celery_beat + - clockedschedule + - - change_clockedschedule + - django_celery_beat + - clockedschedule + - - delete_clockedschedule + - django_celery_beat + - clockedschedule + - - view_clockedschedule + - django_celery_beat + - clockedschedule + - - add_intervalschedule + - django_celery_beat + - intervalschedule + - - change_intervalschedule + - django_celery_beat + - intervalschedule + - - delete_intervalschedule + - django_celery_beat + - intervalschedule + - - view_intervalschedule + - django_celery_beat + - intervalschedule + - - add_periodictask + - django_celery_beat + - periodictask + - - change_periodictask + - django_celery_beat + - periodictask + - - delete_periodictask + - django_celery_beat + - periodictask + - - view_periodictask + - django_celery_beat + - periodictask + - - add_periodictasks + - django_celery_beat + - periodictasks + - - change_periodictasks + - django_celery_beat + - periodictasks + - - delete_periodictasks + - django_celery_beat + - periodictasks + - - view_periodictasks + - django_celery_beat + - periodictasks + - - add_solarschedule + - django_celery_beat + - solarschedule + - - change_solarschedule + - django_celery_beat + - solarschedule + - - delete_solarschedule + - django_celery_beat + - solarschedule + - - view_solarschedule + - django_celery_beat + - solarschedule + - - add_esignature + - handler + - esignature + - - change_esignature + - handler + - esignature + - - delete_esignature + - handler + - esignature + - - view_esignature + - handler + - esignature + - - add_handler + - handler + - handler + - - change_handler + - handler + - handler + - - delete_handler + - handler + - handler + - - view_handler + - handler + - handler + - - add_manifestphone + - handler + - manifestphone + - - change_manifestphone + - handler + - manifestphone + - - delete_manifestphone + - handler + - manifestphone + - - view_manifestphone + - handler + - manifestphone + - - add_papersignature + - handler + - papersignature + - - change_papersignature + - handler + - papersignature + - - delete_papersignature + - handler + - papersignature + - - view_papersignature + - handler + - papersignature + - - add_signer + - handler + - signer + - - change_signer + - handler + - signer + - - delete_signer + - handler + - signer + - - view_signer + - handler + - signer + - - add_transporter + - handler + - transporter + - - change_transporter + - handler + - transporter + - - delete_transporter + - handler + - transporter + - - view_transporter + - handler + - transporter + - - add_additionalinfo + - manifest + - additionalinfo + - - change_additionalinfo + - manifest + - additionalinfo + - - delete_additionalinfo + - manifest + - additionalinfo + - - view_additionalinfo + - manifest + - additionalinfo + - - add_manifest + - manifest + - manifest + - - change_manifest + - manifest + - manifest + - - delete_manifest + - manifest + - manifest + - - view_manifest + - manifest + - manifest + - - add_portofentry + - manifest + - portofentry + - - change_portofentry + - manifest + - portofentry + - - delete_portofentry + - manifest + - portofentry + - - view_portofentry + - manifest + - portofentry + - - add_org + - org + - org + - - change_org + - org + - org + - - delete_org + - org + - org + - - view_org + - org + - org + - - add_orggroupobjectpermission + - org + - orggroupobjectpermission + - - change_orggroupobjectpermission + - org + - orggroupobjectpermission + - - delete_orggroupobjectpermission + - org + - orggroupobjectpermission + - - view_orggroupobjectpermission + - org + - orggroupobjectpermission + - - add_site + - org + - site + - - change_site + - org + - site + - - delete_site + - org + - site + - - view_site + - org + - site + - - add_address + - rcrasite + - address + - - change_address + - rcrasite + - address + - - delete_address + - rcrasite + - address + - - view_address + - rcrasite + - address + - - add_contact + - rcrasite + - contact + - - change_contact + - rcrasite + - contact + - - delete_contact + - rcrasite + - contact + - - view_contact + - rcrasite + - contact + - - add_rcraphone + - rcrasite + - rcraphone + - - change_rcraphone + - rcrasite + - rcraphone + - - delete_rcraphone + - rcrasite + - rcraphone + - - view_rcraphone + - rcrasite + - rcraphone + - - change_rcrasite + - rcrasite + - rcrasite + - - delete_rcrasite + - rcrasite + - rcrasite + - - view_rcrasite + - rcrasite + - rcrasite + - - add_dotlookup + - wasteline + - dotlookup + - - change_dotlookup + - wasteline + - dotlookup + - - delete_dotlookup + - wasteline + - dotlookup + - - view_dotlookup + - wasteline + - dotlookup + - - add_wastecode + - wasteline + - wastecode + - - change_wastecode + - wasteline + - wastecode + - - delete_wastecode + - wasteline + - wastecode + - - view_wastecode + - wasteline + - wastecode + - - add_wasteline + - wasteline + - wasteline + - - change_wasteline + - wasteline + - wasteline + - - delete_wasteline + - wasteline + - wasteline + - - view_wasteline + - wasteline + - wasteline +- model: org.siteuserobjectpermission + pk: 1 + fields: + permission: + - view_site + - org + - site + user: + - testuser1 + content_object: 1 +- model: auth.group + fields: + name: Org viewer + permissions: + - - view_org + - org + - org + - - view_orguserobjectpermission + - org + - orguserobjectpermission + - - view_site + - org + - site + - - view_sitegroupobjectpermission + - org + - sitegroupobjectpermission + - - view_siteuserobjectpermission + - org + - siteuserobjectpermission - model: core.trakuser pk: 8062d496-15f1-485d-961c-a8e5fa118dde fields: @@ -109,13 +335,13 @@ last_login: 2023-03-19 00:29:46.249589+00:00 is_superuser: false username: orgadmin - first_name: 'org' - last_name: 'admin' + first_name: "org" + last_name: "admin" email: foo@generator.com is_staff: true is_active: true date_joined: 2022-12-17 19:14:17.239000+00:00 - groups: [1] + groups: [1, 2] user_permissions: [] - model: core.trakuser pk: a0ba4966-aa53-44c8-be1a-0a0d2d6b6acd @@ -124,8 +350,8 @@ last_login: 2023-03-19 00:29:46.249589+00:00 is_superuser: true username: admin - first_name: '' - last_name: '' + first_name: "" + last_name: "" email: balh@blah.com is_staff: true is_active: true @@ -139,13 +365,13 @@ last_login: null is_superuser: false username: testuser1 - first_name: 'David' - last_name: 'Graham' - email: 'myemail@proton.me' + first_name: "David" + last_name: "Graham" + email: "myemail@proton.me" is_staff: false is_active: true date_joined: 2022-12-17 19:17:58.260000+00:00 - groups: [] + groups: [2] user_permissions: [] - model: authtoken.token pk: d9609d7764af771ee0def1db08dc7f90dd5e2d6d @@ -161,7 +387,7 @@ city: ARLINGTON state: VA country: US - zip: '22202' + zip: "22202" - model: handler.manifestphone pk: 1 fields: @@ -254,7 +480,7 @@ - model: profile.rcrainfoprofile pk: 1fd27bec-8743-4eb3-a44c-fd063ea62021 fields: - rcra_username: '' + rcra_username: "" phone_number: null email: superadmin@gmail.com - model: profile.rcrainfoprofile diff --git a/server/org/migrations/0002_alter_orggroupobjectpermission_content_object_and_more.py b/server/org/migrations/0002_alter_orggroupobjectpermission_content_object_and_more.py new file mode 100644 index 000000000..48e69c9e1 --- /dev/null +++ b/server/org/migrations/0002_alter_orggroupobjectpermission_content_object_and_more.py @@ -0,0 +1,34 @@ +# Generated by Django 5.0.7 on 2024-08-01 14:06 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('org', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='orggroupobjectpermission', + name='content_object', + field=models.ForeignKey(db_column='org_object_id', on_delete=django.db.models.deletion.CASCADE, to='org.org'), + ), + migrations.AlterField( + model_name='orguserobjectpermission', + name='content_object', + field=models.ForeignKey(db_column='org_object_id', on_delete=django.db.models.deletion.CASCADE, to='org.org'), + ), + migrations.AlterField( + model_name='sitegroupobjectpermission', + name='content_object', + field=models.ForeignKey(db_column='site_object_id', on_delete=django.db.models.deletion.CASCADE, to='org.site'), + ), + migrations.AlterField( + model_name='siteuserobjectpermission', + name='content_object', + field=models.ForeignKey(db_column='site_object_id', on_delete=django.db.models.deletion.CASCADE, to='org.site'), + ), + ] diff --git a/server/org/models.py b/server/org/models.py index 87294d37d..476ad5a38 100644 --- a/server/org/models.py +++ b/server/org/models.py @@ -81,7 +81,8 @@ class Meta(UserObjectPermissionBase.Meta): verbose_name = "Org Permission" verbose_name_plural = "Org Permissions" - content_object = models.ForeignKey(Org, on_delete=models.CASCADE) + # Note: class attribute must be named content_object (see django-guardian docs) + content_object = models.ForeignKey(Org, on_delete=models.CASCADE, db_column="org_object_id") class OrgGroupObjectPermission(GroupObjectPermissionBase): @@ -91,7 +92,7 @@ class Meta(GroupObjectPermissionBase.Meta): verbose_name = "Org Role" verbose_name_plural = "Org Roles" - content_object = models.ForeignKey(Org, on_delete=models.CASCADE) + content_object = models.ForeignKey(Org, on_delete=models.CASCADE, db_column="org_object_id") class SiteManager(QuerySet): @@ -188,7 +189,7 @@ class Meta(UserObjectPermissionBase.Meta): verbose_name = "Site Permission" verbose_name_plural = "Site Permissions" - content_object = models.ForeignKey(Site, on_delete=models.CASCADE) + content_object = models.ForeignKey(Site, on_delete=models.CASCADE, db_column="site_object_id") class SiteGroupObjectPermission(GroupObjectPermissionBase): @@ -198,4 +199,4 @@ class Meta(GroupObjectPermissionBase.Meta): verbose_name = "Site Role" verbose_name_plural = "Site Roles" - content_object = models.ForeignKey(Site, on_delete=models.CASCADE) + content_object = models.ForeignKey(Site, on_delete=models.CASCADE, db_column="site_object_id") From aac7c28625f8347ec1c49e9b8c47465e81cc3a4b Mon Sep 17 00:00:00 2001 From: David Graham Date: Thu, 1 Aug 2024 10:38:53 -0400 Subject: [PATCH 10/12] modify pre-commit prettier files arg --- .pre-commit-config.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 47338b3da..77f211f19 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,15 +3,15 @@ ci: autofix_commit_msg: | [pre-commit.ci] auto fixes from pre-commit.com hooks - autoupdate_branch: 'pre-commit' - autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' + autoupdate_branch: "pre-commit" + autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate" autoupdate_schedule: quarterly skip: [] submodules: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 'v4.5.0' + rev: "v4.5.0" hooks: - id: trailing-whitespace - id: check-json @@ -24,7 +24,7 @@ repos: \.vscode\/.*| )$ - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.1.11' + rev: "v0.1.11" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] @@ -38,17 +38,18 @@ repos: - python pass_filenames: false - repo: https://github.com/pre-commit/mirrors-eslint - rev: 'v9.8.0' + rev: "v9.8.0" hooks: - id: eslint files: ^client/.*\.[jt]sx?$ args: [-c=client/eslint.config.js] types: [file] - repo: https://github.com/pre-commit/mirrors-prettier - rev: 'v3.1.0' + rev: "v3.1.0" hooks: - id: prettier exclude: infra/haztrak/ + files: ^(client/.*\.[jt]sx?|.*\.md|.*\.yaml)$ - repo: https://github.com/asottile/pyupgrade rev: v3.15.0 hooks: From 0fdf254d4a5709ebce87899bece112db163b34f7 Mon Sep 17 00:00:00 2001 From: David Graham Date: Thu, 1 Aug 2024 11:30:34 -0400 Subject: [PATCH 11/12] modify dev fixtures --- compose.yaml | 22 +- server/fixtures/dev_data.yaml | 340 +---------------------- server/org/fixtures/org_permissions.yaml | 38 +++ 3 files changed, 59 insertions(+), 341 deletions(-) create mode 100644 server/org/fixtures/org_permissions.yaml diff --git a/compose.yaml b/compose.yaml index f19547a8b..1250c71e1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,4 +1,4 @@ -version: '3.9' +version: "3.9" services: trak: container_name: trak @@ -7,12 +7,12 @@ services: build: context: ./server ports: - - '8000:8000' + - "8000:8000" volumes: - ./server:/app environment: - DJANGO_SETTINGS_MODULE: 'haztrak.settings.dev' - HT_HOST: 'localhost' + DJANGO_SETTINGS_MODULE: "haztrak.settings.dev" + HT_HOST: "localhost" HT_SECRET_KEY: ${HT_SECRET_KEY} HT_DEBUG: ${HT_DEBUG} HT_LOG_LEVEL: ${HT_LOG_LEVEL} @@ -32,7 +32,7 @@ services: sh -c " python manage.py makemigrations && python manage.py migrate && - python manage.py loaddata dev_data.yaml && + python manage.py loaddata dev_data.yaml org_permissions.yaml && python manage.py runserver 0.0.0.0:8000" depends_on: db: @@ -40,9 +40,9 @@ services: redis: container_name: redis - image: 'redis:alpine' + image: "redis:alpine" ports: - - '6379:6379' + - "6379:6379" volumes: - imdb:/data @@ -95,15 +95,15 @@ services: db: restart: unless-stopped container_name: db - image: 'postgres:16' + image: "postgres:16" environment: POSTGRES_DB: ${HT_DB_NAME} POSTGRES_USER: ${HT_DB_USER} POSTGRES_PASSWORD: ${HT_DB_PASSWORD} ports: - - '5432:5432' + - "5432:5432" healthcheck: - test: ['CMD-SHELL', 'pg_isready -U $HT_DB_USER -d $HT_DB_NAME'] + test: ["CMD-SHELL", "pg_isready -U $HT_DB_USER -d $HT_DB_NAME"] interval: 3s timeout: 3s retries: 5 @@ -116,7 +116,7 @@ services: context: ./client target: dev ports: - - '3000:3000' + - "3000:3000" volumes: - ./client:/app environment: diff --git a/server/fixtures/dev_data.yaml b/server/fixtures/dev_data.yaml index 49b1c5ae4..3688a1e9d 100644 --- a/server/fixtures/dev_data.yaml +++ b/server/fixtures/dev_data.yaml @@ -1,333 +1,3 @@ -- model: auth.group - fields: - name: Org admin - permissions: - - - add_trakuser - - core - - trakuser - - - change_trakuser - - core - - trakuser - - - delete_trakuser - - core - - trakuser - - - view_trakuser - - core - - trakuser - - - add_clockedschedule - - django_celery_beat - - clockedschedule - - - change_clockedschedule - - django_celery_beat - - clockedschedule - - - delete_clockedschedule - - django_celery_beat - - clockedschedule - - - view_clockedschedule - - django_celery_beat - - clockedschedule - - - add_intervalschedule - - django_celery_beat - - intervalschedule - - - change_intervalschedule - - django_celery_beat - - intervalschedule - - - delete_intervalschedule - - django_celery_beat - - intervalschedule - - - view_intervalschedule - - django_celery_beat - - intervalschedule - - - add_periodictask - - django_celery_beat - - periodictask - - - change_periodictask - - django_celery_beat - - periodictask - - - delete_periodictask - - django_celery_beat - - periodictask - - - view_periodictask - - django_celery_beat - - periodictask - - - add_periodictasks - - django_celery_beat - - periodictasks - - - change_periodictasks - - django_celery_beat - - periodictasks - - - delete_periodictasks - - django_celery_beat - - periodictasks - - - view_periodictasks - - django_celery_beat - - periodictasks - - - add_solarschedule - - django_celery_beat - - solarschedule - - - change_solarschedule - - django_celery_beat - - solarschedule - - - delete_solarschedule - - django_celery_beat - - solarschedule - - - view_solarschedule - - django_celery_beat - - solarschedule - - - add_esignature - - handler - - esignature - - - change_esignature - - handler - - esignature - - - delete_esignature - - handler - - esignature - - - view_esignature - - handler - - esignature - - - add_handler - - handler - - handler - - - change_handler - - handler - - handler - - - delete_handler - - handler - - handler - - - view_handler - - handler - - handler - - - add_manifestphone - - handler - - manifestphone - - - change_manifestphone - - handler - - manifestphone - - - delete_manifestphone - - handler - - manifestphone - - - view_manifestphone - - handler - - manifestphone - - - add_papersignature - - handler - - papersignature - - - change_papersignature - - handler - - papersignature - - - delete_papersignature - - handler - - papersignature - - - view_papersignature - - handler - - papersignature - - - add_signer - - handler - - signer - - - change_signer - - handler - - signer - - - delete_signer - - handler - - signer - - - view_signer - - handler - - signer - - - add_transporter - - handler - - transporter - - - change_transporter - - handler - - transporter - - - delete_transporter - - handler - - transporter - - - view_transporter - - handler - - transporter - - - add_additionalinfo - - manifest - - additionalinfo - - - change_additionalinfo - - manifest - - additionalinfo - - - delete_additionalinfo - - manifest - - additionalinfo - - - view_additionalinfo - - manifest - - additionalinfo - - - add_manifest - - manifest - - manifest - - - change_manifest - - manifest - - manifest - - - delete_manifest - - manifest - - manifest - - - view_manifest - - manifest - - manifest - - - add_portofentry - - manifest - - portofentry - - - change_portofentry - - manifest - - portofentry - - - delete_portofentry - - manifest - - portofentry - - - view_portofentry - - manifest - - portofentry - - - add_org - - org - - org - - - change_org - - org - - org - - - delete_org - - org - - org - - - view_org - - org - - org - - - add_orggroupobjectpermission - - org - - orggroupobjectpermission - - - change_orggroupobjectpermission - - org - - orggroupobjectpermission - - - delete_orggroupobjectpermission - - org - - orggroupobjectpermission - - - view_orggroupobjectpermission - - org - - orggroupobjectpermission - - - add_site - - org - - site - - - change_site - - org - - site - - - delete_site - - org - - site - - - view_site - - org - - site - - - add_address - - rcrasite - - address - - - change_address - - rcrasite - - address - - - delete_address - - rcrasite - - address - - - view_address - - rcrasite - - address - - - add_contact - - rcrasite - - contact - - - change_contact - - rcrasite - - contact - - - delete_contact - - rcrasite - - contact - - - view_contact - - rcrasite - - contact - - - add_rcraphone - - rcrasite - - rcraphone - - - change_rcraphone - - rcrasite - - rcraphone - - - delete_rcraphone - - rcrasite - - rcraphone - - - view_rcraphone - - rcrasite - - rcraphone - - - change_rcrasite - - rcrasite - - rcrasite - - - delete_rcrasite - - rcrasite - - rcrasite - - - view_rcrasite - - rcrasite - - rcrasite - - - add_dotlookup - - wasteline - - dotlookup - - - change_dotlookup - - wasteline - - dotlookup - - - delete_dotlookup - - wasteline - - dotlookup - - - view_dotlookup - - wasteline - - dotlookup - - - add_wastecode - - wasteline - - wastecode - - - change_wastecode - - wasteline - - wastecode - - - delete_wastecode - - wasteline - - wastecode - - - view_wastecode - - wasteline - - wastecode - - - add_wasteline - - wasteline - - wasteline - - - change_wasteline - - wasteline - - wasteline - - - delete_wasteline - - wasteline - - wasteline - - - view_wasteline - - wasteline - - wasteline -- model: org.siteuserobjectpermission - pk: 1 - fields: - permission: - - view_site - - org - - site - user: - - testuser1 - content_object: 1 -- model: auth.group - fields: - name: Org viewer - permissions: - - - view_org - - org - - org - - - view_orguserobjectpermission - - org - - orguserobjectpermission - - - view_site - - org - - site - - - view_sitegroupobjectpermission - - org - - sitegroupobjectpermission - - - view_siteuserobjectpermission - - org - - siteuserobjectpermission - model: core.trakuser pk: 8062d496-15f1-485d-961c-a8e5fa118dde fields: @@ -527,3 +197,13 @@ e_manifest: Certifier my_rcra_id: Certifier wiets: Certifier +- model: org.siteuserobjectpermission + pk: 1 + fields: + permission: + - view_site + - org + - site + user: + - testuser1 + content_object: 1 diff --git a/server/org/fixtures/org_permissions.yaml b/server/org/fixtures/org_permissions.yaml new file mode 100644 index 000000000..6eae933d1 --- /dev/null +++ b/server/org/fixtures/org_permissions.yaml @@ -0,0 +1,38 @@ +- model: auth.group + fields: + name: Org admin + permissions: + - - view_org + - org + - org + - - view_orguserobjectpermission + - org + - orguserobjectpermission + - - view_site + - org + - site + - - view_sitegroupobjectpermission + - org + - sitegroupobjectpermission + - - view_siteuserobjectpermission + - org + - siteuserobjectpermission +- model: auth.group + fields: + name: Org viewer + permissions: + - - view_org + - org + - org + - - view_orguserobjectpermission + - org + - orguserobjectpermission + - - view_site + - org + - site + - - view_sitegroupobjectpermission + - org + - sitegroupobjectpermission + - - view_siteuserobjectpermission + - org + - siteuserobjectpermission From 3c0c82a8d38c91bad7bc01c10a458e48051926fb Mon Sep 17 00:00:00 2001 From: David Graham Date: Thu, 1 Aug 2024 12:11:03 -0400 Subject: [PATCH 12/12] add health checks to our trak (RESTful API) service in our docker compse file --- compose.yaml | 17 +++++++++++------ server/Dockerfile | 2 +- server/haztrak/settings/base.py | 7 +++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/compose.yaml b/compose.yaml index 1250c71e1..f6f5e7f7d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -34,6 +34,13 @@ services: python manage.py migrate && python manage.py loaddata dev_data.yaml org_permissions.yaml && python manage.py runserver 0.0.0.0:8000" + healthcheck: + test: + ["CMD", "curl", "-f", "http://localhost:8000/api/health/startup-probe/"] + interval: 30s + timeout: 20s + retries: 5 + start_period: 10s depends_on: db: condition: service_healthy @@ -65,9 +72,8 @@ services: HT_DB_PORT: ${HT_DB_PORT} command: python manage.py celery_worker depends_on: - - redis - - trak - - db + trak: + condition: service_healthy celery-beat: restart: unless-stopped @@ -88,9 +94,8 @@ services: HT_DB_PORT: ${HT_DB_PORT} command: python manage.py celery_beat depends_on: - - redis - - trak - - db + trak: + condition: service_healthy db: restart: unless-stopped diff --git a/server/Dockerfile b/server/Dockerfile index 09762873c..412f21999 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="graham.david@epa.gov" ENV APP_DIRECTORY=/app/ ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 -RUN apk add libffi-dev gcc libc-dev +RUN apk add libffi-dev gcc libc-dev curl WORKDIR $APP_DIRECTORY COPY requirements.txt ./ RUN mkdir $APP_DIRECTORY/static diff --git a/server/haztrak/settings/base.py b/server/haztrak/settings/base.py index 473397835..9bee8f517 100644 --- a/server/haztrak/settings/base.py +++ b/server/haztrak/settings/base.py @@ -232,6 +232,13 @@ GUARDIAN_RAISE_403 = True GUARDIAN_MONKEY_PATCH = False +HEALTH_CHECK = { + "SUBSETS": { + "startup-probe": ["MigrationsHealthCheck", "DatabaseBackend"], + "liveness-probe": ["DatabaseBackend"], + }, +} + TRAK_ORG_MODEL = "org.Org" TRAK_RCRAINFO_SITE_MODEL = "rcrasite.RcraSite" TRAK_MANIFEST_MODEL = "manifest.Manifest"