From 19030a12aae671f1497988f40e88a7ac864fb3fb Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 31 Dec 2024 12:06:57 -0500 Subject: [PATCH 1/9] - Updated error message to match UX research and added link to KC --- .../src/components/FileUpload/FileUpload.jsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx index d8a21476b..2121d07dd 100644 --- a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx +++ b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx @@ -18,8 +18,20 @@ import { handlePreview, getTargetClassName } from './utils' const INVALID_FILE_ERROR = 'We can’t process that file format. Please provide a plain text file.' -const INVALID_EXT_ERROR = - 'Invalid extension. Accepted file types are: .txt, .ms##, .ts##, or .ts###.' +const INVALID_EXT_ERROR = ( + <> + Invalid extension, please upload a .txt file.  + + Need help? + + +) function FileUpload({ section, setLocalAlertState }) { // e.g. 'Aggregate Case Data' => 'aggregate-case-data' From dc90779cc69c3dc632449e3ab911ebec7ecae70a Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 31 Dec 2024 12:52:47 -0500 Subject: [PATCH 2/9] - update to only accept text files --- tdrs-frontend/src/components/FileUpload/FileUpload.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx index 2121d07dd..8db48c91a 100644 --- a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx +++ b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx @@ -112,7 +112,7 @@ function FileUpload({ section, setLocalAlertState }) { /* istanbul ignore next */ if (!evt.target.error) { // Validate file extension before proceeding - const re = /(\.txt|\.ms\d{2}|\.ts\d{2,3})$/i + const re = /(\.txt)$/i if (!re.exec(file.name)) { dispatch({ type: FILE_EXT_ERROR, From eaf8dc0b60349586c2b3295a4fa88cc63c2f4136 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 31 Dec 2024 16:09:47 -0500 Subject: [PATCH 3/9] - disable tests - disable apply migrations --- .circleci/build-and-test/workflows.yml | 112 ++++++++++++------------- .circleci/deployment/commands.yml | 8 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml index 99d7c4fff..1081c40e7 100644 --- a/.circleci/build-and-test/workflows.yml +++ b/.circleci/build-and-test/workflows.yml @@ -3,15 +3,15 @@ when: << pipeline.parameters.build_and_test_all >> jobs: - secrets-check - - test-backend: - requires: - - secrets-check - - test-frontend: - requires: - - secrets-check - - test-e2e: - requires: - - secrets-check + # - test-backend: + # requires: + # - secrets-check + # - test-frontend: + # requires: + # - secrets-check + # - test-e2e: + # requires: + # - secrets-check ci-build-and-test-all: jobs: @@ -22,52 +22,52 @@ - main - master - /^release.*/ - - test-backend: - filters: - branches: - only: - - main - - master - - /^release.*/ - requires: - - secrets-check - - test-frontend: - filters: - branches: - only: - - main - - master - - /^release.*/ - requires: - - secrets-check - - test-e2e: - filters: - branches: - only: - - main - - master - - /^release.*/ - requires: - - secrets-check - - make_erd: # from ../util folder - filters: - branches: - only: - - develop - - master + # - test-backend: + # filters: + # branches: + # only: + # - main + # - master + # - /^release.*/ + # requires: + # - secrets-check + # - test-frontend: + # filters: + # branches: + # only: + # - main + # - master + # - /^release.*/ + # requires: + # - secrets-check + # - test-e2e: + # filters: + # branches: + # only: + # - main + # - master + # - /^release.*/ + # requires: + # - secrets-check + # - make_erd: # from ../util folder + # filters: + # branches: + # only: + # - develop + # - master - build-and-test-backend: - when: << pipeline.parameters.build_and_test_backend >> - jobs: - - secrets-check - - test-backend: - requires: - - secrets-check + # build-and-test-backend: + # when: << pipeline.parameters.build_and_test_backend >> + # jobs: + # - secrets-check + # - test-backend: + # requires: + # - secrets-check - build-and-test-frontend: - when: << pipeline.parameters.build_and_test_frontend >> - jobs: - - secrets-check - - test-frontend: - requires: - - secrets-check + # build-and-test-frontend: + # when: << pipeline.parameters.build_and_test_frontend >> + # jobs: + # - secrets-check + # - test-frontend: + # requires: + # - secrets-check diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml index 992f6440d..de585f75e 100644 --- a/.circleci/deployment/commands.yml +++ b/.circleci/deployment/commands.yml @@ -123,10 +123,10 @@ sudo apt update sudo apt-get install -y wget sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.42.1/yq_linux_amd64 && chmod +x /usr/local/bin/yq - - run: - name: Apply database migrations - command: | - bash ./scripts/apply-remote-migrations.sh <> + # - run: + # name: Apply database migrations + # command: | + # bash ./scripts/apply-remote-migrations.sh <> - run: name: Deploy backend application command: | From e0b23fb438a0c0d6139c3f9992f1f98d611dfdfe Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 31 Dec 2024 16:31:50 -0500 Subject: [PATCH 4/9] Revert "- disable tests" This reverts commit eaf8dc0b60349586c2b3295a4fa88cc63c2f4136. --- .circleci/build-and-test/workflows.yml | 112 ++++++++++++------------- .circleci/deployment/commands.yml | 8 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml index 1081c40e7..99d7c4fff 100644 --- a/.circleci/build-and-test/workflows.yml +++ b/.circleci/build-and-test/workflows.yml @@ -3,15 +3,15 @@ when: << pipeline.parameters.build_and_test_all >> jobs: - secrets-check - # - test-backend: - # requires: - # - secrets-check - # - test-frontend: - # requires: - # - secrets-check - # - test-e2e: - # requires: - # - secrets-check + - test-backend: + requires: + - secrets-check + - test-frontend: + requires: + - secrets-check + - test-e2e: + requires: + - secrets-check ci-build-and-test-all: jobs: @@ -22,52 +22,52 @@ - main - master - /^release.*/ - # - test-backend: - # filters: - # branches: - # only: - # - main - # - master - # - /^release.*/ - # requires: - # - secrets-check - # - test-frontend: - # filters: - # branches: - # only: - # - main - # - master - # - /^release.*/ - # requires: - # - secrets-check - # - test-e2e: - # filters: - # branches: - # only: - # - main - # - master - # - /^release.*/ - # requires: - # - secrets-check - # - make_erd: # from ../util folder - # filters: - # branches: - # only: - # - develop - # - master + - test-backend: + filters: + branches: + only: + - main + - master + - /^release.*/ + requires: + - secrets-check + - test-frontend: + filters: + branches: + only: + - main + - master + - /^release.*/ + requires: + - secrets-check + - test-e2e: + filters: + branches: + only: + - main + - master + - /^release.*/ + requires: + - secrets-check + - make_erd: # from ../util folder + filters: + branches: + only: + - develop + - master - # build-and-test-backend: - # when: << pipeline.parameters.build_and_test_backend >> - # jobs: - # - secrets-check - # - test-backend: - # requires: - # - secrets-check + build-and-test-backend: + when: << pipeline.parameters.build_and_test_backend >> + jobs: + - secrets-check + - test-backend: + requires: + - secrets-check - # build-and-test-frontend: - # when: << pipeline.parameters.build_and_test_frontend >> - # jobs: - # - secrets-check - # - test-frontend: - # requires: - # - secrets-check + build-and-test-frontend: + when: << pipeline.parameters.build_and_test_frontend >> + jobs: + - secrets-check + - test-frontend: + requires: + - secrets-check diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml index de585f75e..992f6440d 100644 --- a/.circleci/deployment/commands.yml +++ b/.circleci/deployment/commands.yml @@ -123,10 +123,10 @@ sudo apt update sudo apt-get install -y wget sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.42.1/yq_linux_amd64 && chmod +x /usr/local/bin/yq - # - run: - # name: Apply database migrations - # command: | - # bash ./scripts/apply-remote-migrations.sh <> + - run: + name: Apply database migrations + command: | + bash ./scripts/apply-remote-migrations.sh <> - run: name: Deploy backend application command: | From 86b70dd541c9e7b29b223420ecb3796841dbd75e Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 3 Jan 2025 07:54:18 -0500 Subject: [PATCH 5/9] - update aria label --- tdrs-frontend/src/components/FileUpload/FileUpload.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx index 8db48c91a..c6be31d1c 100644 --- a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx +++ b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx @@ -25,7 +25,7 @@ const INVALID_EXT_ERROR = ( className="usa-link" href="https://tdp-project-updates.app.cloud.gov/knowledge-center/file-extension-guide.html" target="_blank" - aria-label="Knowledge Center file extension guidance" + aria-label="Need help? Read file extension guidance" rel="noreferrer" > Need help? From 45464abcdc54f23a8ce9d6f2bae01f52f29cbb43 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 3 Jan 2025 11:06:02 -0500 Subject: [PATCH 6/9] - update year --- .../tdpservice/parsers/validators/test/test_category3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/validators/test/test_category3.py b/tdrs-backend/tdpservice/parsers/validators/test/test_category3.py index 40090e8e6..6ce06e457 100644 --- a/tdrs-backend/tdpservice/parsers/validators/test/test_category3.py +++ b/tdrs-backend/tdpservice/parsers/validators/test/test_category3.py @@ -223,11 +223,11 @@ def test_isNotZero(val, number_of_zeros, kwargs, exp_result, exp_message): ('199510', 18, {}, True, None), ( f'{datetime.date.today().year - 18}01', 18, {}, False, - '2006 must be less than or equal to 2006 to meet the minimum age requirement.' + '2007 must be less than or equal to 2007 to meet the minimum age requirement.' ), ( '202010', 18, {}, False, - '2020 must be less than or equal to 2006 to meet the minimum age requirement.' + '2020 must be less than or equal to 2007 to meet the minimum age requirement.' ), ]) def test_isOlderThan(val, min_age, kwargs, exp_result, exp_message): From bd236aea76aa56ef330a10865cad7ca781d4dd6c Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Wed, 8 Jan 2025 08:18:24 -0700 Subject: [PATCH 7/9] - Re-add removed file types --- tdrs-frontend/src/components/FileUpload/FileUpload.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx index f18755bfe..8c1b5b57f 100644 --- a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx +++ b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx @@ -110,7 +110,7 @@ function FileUpload({ section, setLocalAlertState }) { const types = ['png', 'gif', 'jpeg'] filereader.onload = () => { - const re = /(\.txt)$/i + const re = /(\.txt|\.ms\d{2}|\.ts\d{2,3})$/i if (!re.exec(file.name)) { dispatch({ type: FILE_EXT_ERROR, From fb4ebecf75a6b1526c868addb49f0b00e1da8856 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 14 Jan 2025 15:26:16 -0700 Subject: [PATCH 8/9] - Updating error message --- tdrs-frontend/src/components/FileUpload/FileUpload.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx index 8c1b5b57f..cd910f24a 100644 --- a/tdrs-frontend/src/components/FileUpload/FileUpload.jsx +++ b/tdrs-frontend/src/components/FileUpload/FileUpload.jsx @@ -20,7 +20,8 @@ const INVALID_FILE_ERROR = const INVALID_EXT_ERROR = ( <> - Invalid extension, please upload a .txt file.  + Invalid extension. Accepted file types are: .txt, .ms##, .ts##, or + .ts###.  Date: Wed, 15 Jan 2025 15:41:07 -0500 Subject: [PATCH 9/9] Update product manager for TDP (#3403) Adding Lauren Hux as product manager. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce86a895b..e397f2ecf 100644 --- a/README.md +++ b/README.md @@ -81,4 +81,4 @@ TDP is developed to be (at minimum) compliant with Section 508 of the Rehabilita |--|--|--|--| | Product Owner |Lauren Frohlich |@lfrohlich |Lauren.Frohlich@acf.hhs.gov| | Government Technical Monitor |Alex Pennington |@adpennington |Alexandra.Pennington@acf.hhs.gov| -| Vendor Product Manager |Rob Gendron |@robgendron |rgendron@teamraft.com | +| Vendor Product Manager |Lauren Hux |@lhuxraft |lhux@teamraft.com |