Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync staging with develop #544

Merged
merged 29 commits into from
Jan 29, 2025
+2,660 −3,558
Merged

Sync staging with develop #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fa32133
Update verifyBapConnection() to re-establish BAP connection if error …
courtneymyers Jan 24, 2025
bff90e1
Merge pull request #539 from USEPA/feature/update-bap-connection-erro…
courtneymyers Jan 24, 2025
671b196
Update server app's config API endpoint to return formio base url and…
courtneymyers Jan 27, 2025
8505fac
Update UserDashboard component to set Formio base URL and project URL…
courtneymyers Jan 27, 2025
b1ac196
Remove client app env variables for Formio base URL and project name
courtneymyers Jan 27, 2025
6a80569
Update GitHub workflows to no longer use Formio base url and project …
courtneymyers Jan 27, 2025
4682dea
Merge pull request #540 from USEPA/feature/update-client-app-env-setup
courtneymyers Jan 27, 2025
4439a06
Update tailwindcss to v4 and update config to new CSS-first config (i…
courtneymyers Jan 28, 2025
3500536
Update tailwind css utility classes to new v4 names
courtneymyers Jan 28, 2025
8eb845a
Update tailwindcss preflight styles
courtneymyers Jan 28, 2025
3132b23
Update TextWithTooltip component to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
84618fa
Update Submissions component to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
0039415
Update Helpdesk component to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
21a726d
Move importing of scoped tailwindcss preflight styles into stylesheet…
courtneymyers Jan 28, 2025
a40d7b3
Fix change request form components' summary toggle display
courtneymyers Jan 28, 2025
66b22a7
Update Notifications component to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
f9fb712
Update change request components to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
a989160
Update ConfirmationDialog component to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
28dbda6
Update FRFNew component to use updated 'tw:' prefix, and only center …
courtneymyers Jan 28, 2025
86f112b
Fix notifications paragraph styles (as a result of tailwindcss now us…
courtneymyers Jan 28, 2025
c71cf5c
Update FRF components to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
91c8d86
Update PRF and CRF components to use updated 'tw:' prefix
courtneymyers Jan 28, 2025
c36f30f
Merge pull request #541 from USEPA/feature/update-tailwind
courtneymyers Jan 28, 2025
9bfbf90
Update orchestrating app's dependencies
courtneymyers Jan 28, 2025
c940cdb
Update server app's dependencies
courtneymyers Jan 28, 2025
93b0882
Update client app's dependencies
courtneymyers Jan 28, 2025
725b7db
Merge pull request #542 from USEPA/feature/apply-package-updates
courtneymyers Jan 28, 2025
6948d3d
Roll back client app's react types to v18
courtneymyers Jan 28, 2025
2b2aedb
Merge pull request #543 from USEPA/feature/roll-back-react-types
courtneymyers Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ jobs:
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
VITE_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
VITE_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
npm run build
rm ../server/app/public/index.html
cd build
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ jobs:
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
VITE_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
VITE_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
npm run build
rm ../server/app/public/index.html
cd build
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ jobs:
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
VITE_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
VITE_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
npm run build
rm ../server/app/public/index.html
cd build
Expand Down
6 changes: 0 additions & 6 deletions app/client/.env.example
View file
Open in desktop

This file was deleted.

4,172 changes: 1,611 additions & 2,561 deletions app/client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 15 additions & 17 deletions app/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,29 @@
"preview": "vite preview"
},
"devDependencies": {
"@eslint/js": "9.16.0",
"@tailwindcss/forms": "0.5.9",
"@types/lodash": "4.17.13",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@eslint/js": "9.19.0",
"@tailwindcss/forms": "0.5.10",
"@tailwindcss/vite": "4.0.0",
"@types/lodash": "4.17.15",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@vitejs/plugin-react-swc": "3.7.2",
"autoprefixer": "10.4.20",
"clsx": "2.1.1",
"eslint": "9.16.0",
"eslint-plugin-react-hooks": "5.1.0-rc.0",
"eslint-plugin-react-refresh": "0.4.16",
"globals": "15.13.0",
"postcss": "8.4.49",
"tailwindcss": "3.4.16",
"typescript": "5.7.2",
"typescript-eslint": "8.17.0",
"vite": "6.0.2"
"eslint": "9.19.0",
"eslint-plugin-react-hooks": "5.1.0",
"eslint-plugin-react-refresh": "0.4.18",
"globals": "15.14.0",
"typescript": "5.7.3",
"typescript-eslint": "8.22.0",
"vite": "6.0.11"
},
"dependencies": {
"@formio/premium": "1.18.4",
"@formio/react": "5.2.3",
"@formio/uswds": "2.4.8",
"@headlessui/react": "1.7.19",
"@heroicons/react": "2.1.5",
"@radix-ui/react-tooltip": "1.1.4",
"@heroicons/react": "2.2.0",
"@radix-ui/react-tooltip": "1.1.7",
"@tanstack/react-query": "4.35.0",
"@tanstack/react-query-devtools": "4.35.0",
"bootstrap": "5.3.3",
Expand Down
6 changes: 0 additions & 6 deletions app/client/postcss.config.cjs
View file
Open in desktop

This file was deleted.

74 changes: 37 additions & 37 deletions app/client/src/components/change2023New.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ export function ChangeRequest2023Button(props: { data: ChangeRequestData }) {
<>
<button
className={clsx(
"tw-cursor-pointer tw-border-0 tw-border-b-[1.5px] tw-border-transparent tw-bg-transparent tw-p-0 tw-text-sm tw-leading-tight",
"hover:tw-border-b-slate-800",
"focus:tw-border-b-slate-800",
"tw:cursor-pointer tw:border-0 tw:border-b-[1.5px] tw:border-transparent tw:bg-transparent tw:p-0 tw:text-sm tw:leading-tight",
"tw:hover:border-b-slate-800",
"tw:focus:border-b-slate-800",
)}
type="button"
onClick={(_ev) => setDialogShown(true)}
>
<span className={clsx("tw-flex tw-items-center")}>
<span className={clsx("tw-mr-1")}>Change</span>
<span className={clsx("tw:flex tw:items-center")}>
<span className={clsx("tw:mr-1")}>Change</span>
<svg
className="usa-icon"
aria-hidden="true"
Expand Down Expand Up @@ -118,73 +118,73 @@ function ChangeRequest2023Dialog(props: {
<Transition.Root show={dialogShown} as={Fragment}>
<Dialog
as="div"
className={clsx("tw-relative tw-z-10")}
className={clsx("tw:relative tw:z-10")}
open={dialogShown}
onClose={(_value) => closeDialog()}
>
<Transition.Child
as={Fragment}
enter={clsx("tw-duration-300 tw-ease-out")}
enterFrom={clsx("tw-opacity-0")}
enterTo={clsx("tw-opacity-100")}
leave={clsx("tw-duration-200 tw-ease-in")}
leaveFrom={clsx("tw-opacity-100")}
leaveTo={clsx("tw-opacity-0")}
enter={clsx("tw:duration-300 tw:ease-out")}
enterFrom={clsx("tw:opacity-0")}
enterTo={clsx("tw:opacity-100")}
leave={clsx("tw:duration-200 tw:ease-in")}
leaveFrom={clsx("tw:opacity-100")}
leaveTo={clsx("tw:opacity-0")}
>
<div
className={clsx(
"tw-fixed tw-inset-0 tw-bg-black/70 tw-transition-colors",
"tw:fixed tw:inset-0 tw:bg-black/70 tw:transition-colors",
)}
/>
</Transition.Child>

<div className={clsx("tw-fixed tw-inset-0 tw-z-10 tw-overflow-y-auto")}>
<div className={clsx("tw:fixed tw:inset-0 tw:z-10 tw:overflow-y-auto")}>
<div
className={clsx(
"tw-flex tw-min-h-full tw-items-center tw-justify-center tw-p-4",
"tw:flex tw:min-h-full tw:items-center tw:justify-center tw:p-4",
)}
>
<Transition.Child
as={Fragment}
enter={clsx("tw-duration-300 tw-ease-out")}
enterFrom={clsx("tw-translate-y-0 tw-opacity-0")}
enterTo={clsx("tw-translate-y-0 tw-opacity-100")}
leave={clsx("tw-duration-200 tw-ease-in")}
leaveFrom={clsx("tw-translate-y-0 tw-opacity-100")}
leaveTo={clsx("tw-translate-y-0 tw-opacity-0")}
enter={clsx("tw:duration-300 tw:ease-out")}
enterFrom={clsx("tw:translate-y-0 tw:opacity-0")}
enterTo={clsx("tw:translate-y-0 tw:opacity-100")}
leave={clsx("tw:duration-200 tw:ease-in")}
leaveFrom={clsx("tw:translate-y-0 tw:opacity-100")}
leaveTo={clsx("tw:translate-y-0 tw:opacity-0")}
>
{/* <Dialog.Panel> */}
<div
className={clsx(
"tw-relative tw-transform tw-overflow-hidden tw-rounded-lg tw-bg-white tw-p-4 tw-shadow-xl tw-transition-all",
"sm:tw-w-full sm:tw-max-w-7xl sm:tw-p-6",
"tw:relative tw:transform tw:overflow-hidden tw:rounded-lg tw:bg-white tw:p-4 tw:shadow-xl tw:transition-all",
"tw:sm:w-full tw:sm:max-w-7xl tw:sm:p-6",
)}
>
<div className="twpf">
<div
className={clsx(
"tw-absolute tw-right-0 tw-top-0 tw-pr-4 tw-pt-4",
"tw:absolute tw:right-0 tw:top-0 tw:pr-4 tw:pt-4",
)}
>
<button
className={clsx(
"tw-rounded-md tw-bg-white tw-text-gray-400 tw-transition-none",
"hover:tw-text-gray-700",
"focus:tw-text-gray-700",
"tw:rounded-md tw:bg-white tw:text-gray-400 tw:transition-none",
"tw:hover:text-gray-700",
"tw:focus:text-gray-700",
)}
type="button"
onClick={(_ev) => closeDialog()}
>
<span className={clsx("tw-sr-only")}>Close</span>
<span className={clsx("tw:sr-only")}>Close</span>
<XMarkIcon
className={clsx("tw-h-6 tw-w-6 tw-transition-none")}
className={clsx("tw:size-6 tw:transition-none")}
aria-hidden="true"
/>
</button>
</div>
</div>

<div className={clsx("tw-m-auto tw-max-w-6xl tw-p-4")}>
<div className={clsx("tw:m-auto tw:max-w-6xl tw:p-4")}>
<ChangeRequest2023Form
data={data}
closeDialog={closeDialog}
Expand Down Expand Up @@ -257,16 +257,16 @@ function ChangeRequest2023Form(props: {
{content && <MarkdownContent children={content.newChangeIntro} />}

<Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
<div className={clsx("tw-fixed tw-inset-0 tw-z-20 tw-bg-black/30")} />
<div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>
<div className={clsx("tw:fixed tw:inset-0 tw:z-20 tw:bg-black/30")} />
<div className={clsx("tw:fixed tw:inset-0 tw:z-20")}>
<div
className={clsx(
"tw-flex tw-min-h-full tw-items-center tw-justify-center",
"tw:flex tw:min-h-full tw:items-center tw:justify-center",
)}
>
<Dialog.Panel
className={clsx(
"tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl",
"tw:rounded-lg tw:bg-white tw:px-4 tw:pb-4 tw:shadow-xl",
)}
>
<Loading />
Expand Down Expand Up @@ -316,7 +316,7 @@ function ChangeRequest2023Form(props: {
body: (
<p
className={clsx(
"tw-text-sm tw-font-medium tw-text-gray-900",
"tw:text-sm tw:font-medium tw:text-gray-900",
)}
>
Change Request <em>{res._id}</em> submitted successfully.
Expand All @@ -337,7 +337,7 @@ function ChangeRequest2023Form(props: {
<>
<p
className={clsx(
"tw-text-sm tw-font-medium tw-text-gray-900",
"tw:text-sm tw:font-medium tw:text-gray-900",
)}
>
Error creating Change Request for{" "}
Expand All @@ -347,7 +347,7 @@ function ChangeRequest2023Form(props: {
.
</p>
<p
className={clsx("tw-mt-1 tw-text-sm tw-text-gray-500")}
className={clsx("tw:mt-1 tw:text-sm tw:text-gray-500")}
>
Please try again.
</p>
Expand Down
Loading