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.

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

Release v0.9.0 (Sprint 48) #2041

Merged
merged 83 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
8ad7f45
PXBF-1598-enhance-cypress-tests-custom-commands: Enhance Cypress Test…
nehemiah-abuga Dec 10, 2024
65227e9
PXBF-1598-enhance-cypress-tests-custom-commands: fix config file remo…
nehemiah-abuga Dec 10, 2024
e4d0535
Redo work after release
Dec 12, 2024
9a9c71e
Add another test user to see if it gets to end of script
Dec 12, 2024
b0eea74
Check all command make order changes
Dec 12, 2024
df1ca92
Make sure script ends in new line
Dec 12, 2024
d2b34f0
Add set x's to add verbosity
Dec 12, 2024
0fad897
Fix typo in remote command comment out
Dec 12, 2024
6181d66
Remove the set x
Dec 12, 2024
0f5e05f
Change up post deploy script
Dec 12, 2024
ea986ac
Mute the deploy script, rebuild the drush script with names from secrets
Dec 12, 2024
71e536e
Mute the deploy script, rebuild the drush script with names from secr…
Dec 12, 2024
faa6435
Mute the deploy script, rebuild the drush script with names from secr…
Dec 12, 2024
0e78c47
Mute the deploy script, rebuild the drush script with names from secr…
Dec 12, 2024
0ff749f
Mute the deploy script, rebuild the drush script with names from secr…
Dec 12, 2024
8b646f7
Combine step
Dec 12, 2024
159507b
Mute scripts again
Dec 12, 2024
efe7298
Remove cat and remove muting
Dec 12, 2024
b1d8f5b
Remove cat and remove muting 2
Dec 12, 2024
d7f41b6
Mute again
Dec 12, 2024
23443a0
Database Restore Pipe Add test user steps 1
Dec 13, 2024
677370f
PXBF-1983-spell-checker-updates: new cspell config
scottqueen-bixal Dec 13, 2024
6f0d472
PXBF-1983-spell-checker-updates: include cspell with dev packages
scottqueen-bixal Dec 13, 2024
1a7777e
PXBF-1983-spell-checker-updates: new dictionary for cspell words to i…
scottqueen-bixal Dec 13, 2024
8c6b7e3
PXBF-1983-spell-checker-updates: update with correct spelling
scottqueen-bixal Dec 13, 2024
91bd830
PXBF-1983-spell-checker-updates: update lint-stage to check for spell…
scottqueen-bixal Dec 13, 2024
ec6e8c3
Merge pull request #2004 from GSA/1598-enhance-cypress-tests-custom-c…
scottqueen-bixal Dec 13, 2024
c2ad030
PXBF-1983-spell-checker-updates: Merge branch 'dev' of github.com:GSA…
scottqueen-bixal Dec 13, 2024
9fa671d
Merge pull request #2007 from GSA/1983-spell-checker-updates
scottqueen-bixal Dec 13, 2024
1eac82e
PXBF-1996-bug-fix-button-group: lifting component to parent render pr…
scottqueen-bixal Dec 16, 2024
02c1529
Add login module uninstall
Dec 16, 2024
0bb7775
PXBF-1987-update-router-v7: opt into future browser route api features
scottqueen-bixal Dec 16, 2024
07be867
PXBF-1987-update-router-v7: update router to v7
scottqueen-bixal Dec 16, 2024
4176278
PXBF-1987-update-router-v7: remove console log from spec
scottqueen-bixal Dec 16, 2024
1d41090
PXBF-update-prettier-eslint: recommend prettier, set format on save w…
scottqueen-bixal Dec 16, 2024
99e4e9a
PXBF-update-prettier-eslint: include prettier eslint plugin
scottqueen-bixal Dec 16, 2024
fd98cba
PXBF-update-prettier-eslint: config eslint prettier recomended
scottqueen-bixal Dec 16, 2024
a693f1c
PXBF-update-prettier-eslint: format files
scottqueen-bixal Dec 16, 2024
978522e
Merge pull request #2011 from GSA/1987-update-router-v7
scottqueen-bixal Dec 16, 2024
5cea34f
PXBF-update-prettier-eslint: Merge branch 'dev' of github.com:GSA/px-…
scottqueen-bixal Dec 16, 2024
6868b1f
Merge pull request #2012 from GSA/update-prettier-eslint
scottqueen-bixal Dec 16, 2024
97b4794
Unmute scripts
Dec 18, 2024
435c61b
Merge pull request #2010 from GSA/1996-bug-fix-button-group
scottqueen-bixal Dec 18, 2024
7f73242
Simplify command script
Dec 18, 2024
060a80b
PXBF-2014-design-qa-tweaks: bold content on notices intro
scottqueen-bixal Dec 23, 2024
e374ab7
PXBF-2014-design-qa-tweaks: margin adjustment to cta-wrapper
scottqueen-bixal Dec 23, 2024
05a0d18
PXBF-2015-design-qa-tweaks: adjust container pading on verification view
scottqueen-bixal Dec 23, 2024
b4585b3
PXBF-2016-design-qa-tweaks: hide expand all button on mobile
scottqueen-bixal Dec 23, 2024
d67085b
PXBF-2016-design-qa-tweaks: update content for cta
scottqueen-bixal Dec 23, 2024
83ddf93
PXBF-2016-design-qa-tweaks: bold content and include createMarkup
scottqueen-bixal Dec 23, 2024
a580dc5
PXBF-2016-design-qa-tweaks: convert to manual control of interactive …
scottqueen-bixal Dec 23, 2024
19f6d96
PXBF-2016-design-qa-tweaks: add more specificity to mobile adjustment…
scottqueen-bixal Dec 23, 2024
e846838
PXBF-2016-design-qa-tweaks: update margin for heading and description…
scottqueen-bixal Dec 23, 2024
11697f1
PXBF-2016-design-qa-tweaks: adjust to first of type p in descendent
scottqueen-bixal Dec 23, 2024
0d27aa3
PXBF-2016-design-qa-tweaks: set default width to desktop
scottqueen-bixal Dec 23, 2024
4f3d992
Merge pull request #2020 from GSA/2014-design-qa-tweaks
scottqueen-bixal Dec 23, 2024
4ca9589
Merge pull request #2021 from GSA/2015-design-qa-tweaks
scottqueen-bixal Dec 23, 2024
faa7e9b
Merge pull request #2022 from GSA/2016-design-qa-tweaks
scottqueen-bixal Dec 23, 2024
8b014ec
Update drush-post-deploy.sh
scottqueen-bixal Dec 23, 2024
96812e7
Update drush-post-deploy.sh
scottqueen-bixal Dec 23, 2024
2264bd3
Update drush-post-deploy.sh
scottqueen-bixal Dec 23, 2024
ae86b2b
PXBF-2016-design-qa-tweaks: update font-size of eligiblity list
scottqueen-bixal Jan 6, 2025
7e17612
Merge pull request #2030 from GSA/2016-design-qa-tweaks
scottqueen-bixal Jan 6, 2025
654d555
Update hash pipe with submod init
Jan 6, 2025
9cf6741
PXBF-dev: Merge branch 'main' of github.com:GSA/px-benefit-finder int…
scottqueen-bixal Jan 6, 2025
d899257
git log on the hash pipe
Jan 6, 2025
3a27ad0
Make each step its own job in hash job
Jan 6, 2025
6ace0ca
Make each step its own job in hash job 2
Jan 6, 2025
bbf99fd
Make each step its own job in hash job 3
Jan 6, 2025
0faeb35
Make each step its own job in hash job 4
Jan 6, 2025
99a7f48
Make each step its own job in hash job 5
Jan 6, 2025
0a46f4c
Make each step its own job in hash job 6
Jan 6, 2025
b4fe60f
Merge branch 'main' of github.com:GSA/px-benefit-finder into dev
scottqueen-bixal Jan 6, 2025
50f50a7
Change folder path for sed in deploy
Jan 6, 2025
7dbdb05
PXBF-dev: Merge branch 'dev' of github.com:GSA/px-benefit-finder into…
scottqueen-bixal Jan 7, 2025
62dfdba
PXBF-2031-adjust-template-spacing-footer: move padding for global usa…
scottqueen-bixal Jan 7, 2025
e164122
Merge pull request #2033 from GSA/2031-adjust-template-spacing-footer
scottqueen-bixal Jan 7, 2025
b9abf2d
PXBF-2031-adjust-template-spacing-footer: more specificity
scottqueen-bixal Jan 7, 2025
254cee7
Merge pull request #2034 from GSA/2031-adjust-template-spacing-footer
scottqueen-bixal Jan 7, 2025
819f946
PXBF-2031-adjust-template-spacing-footer: more specificity
scottqueen-bixal Jan 7, 2025
c3f6edd
Merge pull request #2035 from GSA/2031-adjust-template-spacing-footer
scottqueen-bixal Jan 7, 2025
048d4e2
PXBF-2031-adjust-template-spacing-footer: update bottom padding
scottqueen-bixal Jan 7, 2025
988f094
Merge pull request #2036 from GSA/2031-adjust-template-spacing-footer
scottqueen-bixal Jan 7, 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
17 changes: 14 additions & 3 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
- name: Configure application
run: |
cd usagov-2021
sed -i "s/memory_limit = 1G/memory_limit = 500M/g" .docker/src-cms/etc/php81/php.ini
sed -i "s/memory_limit = 1G/memory_limit = 500M/g" .docker/src-cms/etc/php83/php.ini
mv .docker/Dockerfile-cms .
sed -i 's/80/8080/g' Dockerfile-cms
sed -i 's/ENTRYPOINT/CMD/' Dockerfile-cms
Expand Down Expand Up @@ -213,6 +213,7 @@ jobs:
CR_USERNAME: "${{ secrets.CR_USERNAME }}"
PROJECT: "${{ secrets.PROJECT }}"
TEST_USER_PASS: "${{ secrets.TEST_USER_PASS }}"
TEST_USER_NAMES: "${{ secrets.TEST_USER_NAMES }}"
run: |
source ./scripts/pipeline/cloud-gov-login.sh
cd usagov-2021
Expand All @@ -222,6 +223,16 @@ jobs:
cf add-network-policy ${PROJECT}-waf-${BRANCH} ${PROJECT}-cms-${BRANCH} -s ${PROJECT}-${BRANCH} -o ${CF_ORG} --protocol tcp --port 61443
cf map-route benefit-finder-cms-${BRANCH} apps.internal --hostname benefit-finder-cms-${BRANCH} --app-protocol http1
cd ..
## sed -i "s#TU_PASS#${TEST_USER_PASS}#g" ./scripts/drush-post-deploy.sh
## cat ./scripts/drush-post-deploy.sh
# Split the USERS_LIST into an array
IFS=',' read -ra users <<< "${TEST_USER_NAMES}"
# Generate the password reset commands
password_reset_commands=""
for user in "${users[@]}"; do
password_reset_commands+="drush user:password $user \"TU_PASS\"\n"
done
# Make replacement in the drush post deploy with user change password commands
sed -i "s|### USER_PASSWORD_RESET_PLACEHOLDER ###|$password_reset_commands|" ./scripts/drush-post-deploy.sh
# Set the test user's passwords to the value of the github secret value for TEST_USER_PASS.
sed -i "s#TU_PASS#${TEST_USER_PASS}#g" ./scripts/drush-post-deploy.sh
# Execute the drush command script
source ./scripts/pipeline/cloud-gov-post-deploy.sh
16 changes: 15 additions & 1 deletion .github/workflows/database-restore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,25 @@ jobs:
CF_ORG: "${{ secrets.CF_ORG }}"
PROJECT: "${{ secrets.PROJECT }}"
DATABASE_BACKUP_BASTION_NAME: "${{ secrets.DATABASE_BACKUP_BASTION_NAME }}"
TEST_USER_PASS: "{{ secrets.TEST_USER_PASS }}"
TEST_USER_PASS: "${{ secrets.TEST_USER_PASS }}"
TEST_USER_NAMES: "${{ secrets.TEST_USER_NAMES }}"
run: |
export S3_FILE_PATH=${{ github.event.inputs.database_file_override }}
source ./scripts/pipeline/s3-backup-download.sh
source ./scripts/pipeline/database-restore.sh
# Split the USERS_LIST into an array
IFS=',' read -ra users <<< "${TEST_USER_NAMES}"
# Generate the password reset commands
password_reset_commands=""
for user in "${users[@]}"; do
password_reset_commands+="drush user:password $user \"TU_PASS\"\n"
done
# Make replacement in the drush post deploy with user change password commands
sed -i "s|### USER_PASSWORD_RESET_PLACEHOLDER ###|$password_reset_commands|" ./scripts/drush-post-deploy.sh
# Set the test user's passwords to the value of the github secret value for TEST_USER_PASS.
sed -i "s#TU_PASS#${TEST_USER_PASS}#g" ./scripts/drush-post-deploy.sh
# Execute the drush command script
source ./scripts/pipeline/cloud-gov-post-deploy.sh
source ./scripts/pipeline/cloud-gov-post-deploy.sh
source ./scripts/pipeline/s3-backup-post-restore.sh
stopBastion:
Expand Down
107 changes: 73 additions & 34 deletions .github/workflows/increment_sub_hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,55 @@ on:
workflow_dispatch: # Allows manual trigger

jobs:
update-submodule:
# update-submodule-on-release:
# name: update-submodule-on-release
# runs-on: ubuntu-latest
#
# steps:
# - name: Checkout repository without submodules
# uses: actions/checkout@v4
# with:
# submodules: false # Do not checkout submodules initially
# fetch-depth: 0 # Fetch all history
#
# - name: Set up Git
# run: |
# git config --global user.name "Xavier Metichecchia"
# git config --global user.email "[email protected]"
# git config --global pull.rebase false # Ensure merge strategy
# git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git
#
# - name: Update submodules on release branch
# continue-on-error: true
# run: |
# # Checkout the release branch
# git checkout release
#
# # Update and initialize submodules
# git submodule update --init
# git submodule set-branch --branch prod usagov-2021
# git submodule update --remote || echo "Expected error: Failed to update all submodules."
#
# # Check Git Status
# git add .
# git commit --allow-empty -m "Updated submodule to the latest commit on release branch"
#
# # Commit the changes
# git status
# git --no-pager diff
#
# # Push changes to release branch
# git push origin release

update-submodule-on-main:
name: update-submodule-on-main
runs-on: ubuntu-latest

steps:
- name: Checkout repository without submodules
uses: actions/checkout@v4
with:
submodules: false # Do not checkout submodules initially
# submodules: false # Do not checkout submodules initially
fetch-depth: 0 # Fetch all history

- name: Set up Git
Expand All @@ -21,46 +62,44 @@ jobs:
git config --global pull.rebase false # Ensure merge strategy
git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git

- name: Update submodules on release branch
continue-on-error: true
run: |
# Checkout the release branch
git checkout release

# Update and initialize submodules
git submodule update --init
git submodule set-branch --branch prod usagov-2021
git submodule update --remote || echo "Expected error: Failed to update all submodules."

# Check Git Status
git add .
git commit --allow-empty -m "Updated submodule to the latest commit on release branch"

# Commit the changes
git status
git --no-pager diff

# Push changes to release branch
git push origin release

- name: Sync release to main
run: |
# Switch to the main branch
git checkout main

git submodule update --remote

# Pull changes from release into main
git pull origin release

# Push updated main branch
git push origin main

- name: Sync release to dev
run: |
# Switch to the dev branch
git checkout dev

# Pull changes from release into dev
git pull origin release

# Push updated dev branch
git push origin dev
# update-submodule-on-dev:
# name: update-submodule-on-dev
# runs-on: ubuntu-latest
#
# steps:
# - name: Checkout repository without submodules
# uses: actions/checkout@v4
# with:
# # submodules: false # Do not checkout submodules initially
# fetch-depth: 0 # Fetch all history
#
# - name: Set up Git
# run: |
# git config --global user.name "Xavier Metichecchia"
# git config --global user.email "[email protected]"
# git config --global pull.rebase false # Ensure merge strategy
# git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git
#
# - name: Sync release to dev
# run: |
# # Switch to the dev branch
# git checkout dev
#
# # Pull changes from release into dev
# git pull origin release
#
# # Push updated dev branch
# git push origin dev
4 changes: 1 addition & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"recommendations": [
"rvest.vs-code-prettier-eslint"
],
"recommendations": ["github.vscode-github-actions", "esbenp.prettier-vscode"]
}
15 changes: 7 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"debug.javascript.autoAttachFilter": "onlyWithFlag",
"editor.renderWhitespace": "none",
"diffEditor.ignoreTrimWhitespace": false,
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
"editor.formatOnType": false,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"vs-code-prettier-eslint.prettierLast": true,
"debug.javascript.autoAttachFilter": "onlyWithFlag",
"editor.renderWhitespace": "none",
"diffEditor.ignoreTrimWhitespace": false,
"editor.formatOnType": false,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
30 changes: 30 additions & 0 deletions benefit-finder/.cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
"version": "0.2",
"ignorePaths": [
"node_modules",
"themes",
"storybook-static",
"dist",
"coverage",
"build",
"src/shared/locales/es/es.json"
],
"language": "en",
"dictionaryDefinitions": [
{ "name": "content", "path": "./cspell-dictionary/content.txt" },
{ "name": "dev", "path": "./cspell-dictionary/dev.txt" },
{ "name": "es", "path": "./cspell-dictionary/es.txt" },
{ "name": "project", "path": "./cspell-dictionary/project.txt" }
],
"dictionaries": [
"html",
"bash",
"css",
"node",
"content",
"dev",
"es",
"project"
]
}
3 changes: 3 additions & 0 deletions benefit-finder/.lintstagedrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
],
"src/**/*.scss": [
"stylelint --fix"
],
"**": [
"cspell lint"
]
}
11 changes: 6 additions & 5 deletions benefit-finder/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ const config = {
viteFinal(config) {
return mergeConfig(config, {
build: {
chunkSizeWarningLimit: '1000',
rollupOptions: {
chunkSizeWarningLimit: '1000',
rollupOptions: {
output: {
manualChunks: (id) => id.includes('src/App/index.jsx') ? 'app-chunk' : false,
manualChunks: id =>
id.includes('src/App/index.jsx') ? 'app-chunk' : false,
},
},
},
});
})
},
};
}

export default config
2 changes: 1 addition & 1 deletion benefit-finder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ We take a utility first approach. We do not have full control over our styles si

1. we establish uswds components with `usa-<class>` classes.
2. this inherits global `uswds` `css` and `js`
3. IF we need to overide, we clone the uswds class `usa-` and prepend `bf-`.
3. IF we need to override, we clone the uswds class `usa-` and prepend `bf-`.

```css
.bf-usa-<class> .usa-<class>
Expand Down
4 changes: 4 additions & 0 deletions benefit-finder/cspell-dictionary/content.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DOLO
FEMA
FASS
CHAMPVA
40 changes: 40 additions & 0 deletions benefit-finder/cspell-dictionary/dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
autodocs
camelcase
esbenp
fieldgroup
fieldset
fieldsets
firstname
lastname
stylelint
backcta
spacebar
pageup
pagedown
icongallery
skipnav
Vitest
labelledby
tabindex
stylesheet
hreflang
evenodd
checkmark
inputmode
datetype
describedby
noreferrer
noopener
lede
nbsp
httpstat
prestart
pagesurvey
Pagesub
ALLOWALL
cflinuxfs
buildpack
buildpacks
webfonts
hkshshslhshjksh
kjgljjlhkhgljgjh
16 changes: 16 additions & 0 deletions benefit-finder/cspell-dictionary/es.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
inglés
enero
Aplicar
beneficio
beneficios
buscador
discapacidad
jubilacion
suma
muerte
elegible
resultados
selecciónes
revisar
casada
Hija
2 changes: 2 additions & 0 deletions benefit-finder/cspell-dictionary/project.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usagov
uswds
2 changes: 1 addition & 1 deletion benefit-finder/cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

const { defineConfig } = require('cypress')

module.exports = defineConfig({
Expand All @@ -7,6 +6,7 @@ module.exports = defineConfig({
runMode: 2,
openMode: 0,
},
viewportWidth: 1050,
e2e: {
baseUrl: 'http://localhost:6006',
excludeSpecPattern: 'cypress/e2e/usagov-public-site/*.cy.js',
Expand Down
Loading
Loading