Skip to content

Commit

Permalink
unemployment income inline fixes (#4849)
Browse files Browse the repository at this point in the history
* Create main CSP branch.

* fix jquery with csp context

* rubocop fixes

* Move in cucumber driver version fix from trunk for now.

* 188588717 drop enrollment member (#4801)

remove admin onclick events from views

* move inline js to external script (#4811)

* Update continue buttons on individual flow. (#4818)

* remove inline js from family page add member forms (#4826)

* remove inline js from family page add member forms

* refactor new.js.erb

* add partials js init to my household render

* Keyboard navigation functions updates (#4832)

* Deprecate keyboard navigation functions and introduce data-keydown-id attribute for improved accessibility

* remove console log and update documentation

* update formatting

* update formatting

* rubocop fix

* 188658143 plan shopping compare plan (#4835)

* replace radiohandler with listener

* removal of onkeydown handlers

---------

Co-authored-by: Ryan Eddy <[email protected]>

* Refactor checkbox selection and clean up unused code in product index (#4828)

Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>

* sep admin detail onclick refactor (#4836)

* move submit and modal confirm handlers to helper js

* fix selectors, move functions to file

---------

Co-authored-by: Ann Caballero <[email protected]>

* build the image for the csp branch (#4846)

build images for epic_188588775_csp_enabled

* replace onclick with propagated listener in js

* refactor to have checkDate accept inputs

* self employed keydown removal (#4839)

* use data attr for handler

* refactor enter keydown listener to leverage event propagation to better handle AJAX elements

---------

Co-authored-by: Ann Caballero <[email protected]>

* removal of in line event in the help me sign up button (#4845)

* fix primary nav layout when bs4 disabled (#4840)

* remove onchange, refactor bs4 check in warning helper, store id on form

* use data keydown for job income partial

* replace kb handlers in index

* use keydown data attr

* replace keydown handler

* remove logs, updated selector to use new attr

* remove date warning handlers and submit handler from form

* remove kb handlers on income partial links

* replace landing page kb handlers

* Revert "replace landing page kb handlers"

This reverts commit 8afc4d2.

* remove onclick from self employed

* Refactor upload button attributes for improved accessibility and cons… (#4838)

* Refactor upload button attributes for improved accessibility and consistency

* Fix upload button text

* removal of in line event (#4842)

Co-authored-by: Brad Bodine <[email protected]>

* removal of in line event in the broker add office location button (#4844)

Co-authored-by: Brad Bodine <[email protected]>

* add event initializers to edit.js.erb (#4843)

Co-authored-by: Brad Bodine <[email protected]>

* removal of inline events (#4837)

Co-authored-by: Brad Bodine <[email protected]>

* remove safe selectors not supported

* Create main CSP branch.

* fix jquery with csp context

* rubocop fixes

* 188588717 drop enrollment member (#4801)

remove admin onclick events from views

* move inline js to external script (#4811)

* Update continue buttons on individual flow. (#4818)

* update text (#4823)

* ignore actionpack warning (#4824)

* ignore actionpack warning

* add comment

* add comment to security.md

* remove inline js from family page add member forms (#4826)

* remove inline js from family page add member forms

* refactor new.js.erb

* add partials js init to my household render

* do not store as hash data for a string value (#4822)

* do not store as hash data for a string value

* allow admin to add/edit reason when the broker application status is pending

* add spec

* rubocop fix

* add index on family to speed up sep eligible filter (#4827)

* add index to speed up sep eligible filter

* fix rubocop

* bootstrap 4 cucumber coverage for faa (#4812)

* fixed missing transaltions in the review and health cov pages

* added translation keys to the shared file

* incorrect translation key fix for eligibility status on review page

* added chip short name key variable serving as an allias to the fa helper method

* other questions foster care with bs4 enabled, added additional locators and refactored step def

* job income fixes

* added sleep and employer adress field condition

* fixed job income and other questions bs4 tests

* added wait for income frequency dropdown

* added wait of 2 seconds to allow the frequency dropdown to be enabled

* change frequency css locator to xpath for failing step

* moving frequency xpath locator

* changed locator to attempt to solve github actions failure

* made step update to the submit your app file

* added wait to fix github actions step failure

* update locator to attempt to fix github actions element not found failure

* updated translation to not include the year for when bs4 is enabled

* turning bs4 for the income deductions page

* fix of the job income flaky feature file

* moved bs4 condition of the health cov page and cleaned up locator

* added wait so element can be interactible in ga

* reverting to initial click link function

* removing feature file redundant line

* added me faa translation keys to dc

* added missing translations to the ic file

---------

Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>

* add indexes on payment transactions model (#4830)

* display enrolled plan at the top of the page for csr scenario (#4831)

* rearrange list to display enrolled plan at the top of the page for csr scenario

* add spec

* update spec

* Keyboard navigation functions updates (#4832)

* Deprecate keyboard navigation functions and introduce data-keydown-id attribute for improved accessibility

* remove console log and update documentation

* update formatting

* update formatting

* rubocop fix

* modifies monthly enrollment due on date (#4834)

* 188658143 plan shopping compare plan (#4835)

* replace radiohandler with listener

* removal of onkeydown handlers

---------

Co-authored-by: Ryan Eddy <[email protected]>

* Refactor checkbox selection and clean up unused code in product index (#4828)

Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>

* sep admin detail onclick refactor (#4836)

* move submit and modal confirm handlers to helper js

* fix selectors, move functions to file

---------

Co-authored-by: Ann Caballero <[email protected]>

* build the image for the csp branch (#4846)

build images for epic_188588775_csp_enabled

* self employed keydown removal (#4839)

* use data attr for handler

* refactor enter keydown listener to leverage event propagation to better handle AJAX elements

---------

Co-authored-by: Ann Caballero <[email protected]>

* removal of in line event in the help me sign up button (#4845)

* fix primary nav layout when bs4 disabled (#4840)

* Refactor upload button attributes for improved accessibility and cons… (#4838)

* Refactor upload button attributes for improved accessibility and consistency

* Fix upload button text

* removal of in line event (#4842)

Co-authored-by: Brad Bodine <[email protected]>

* removal of in line event in the broker add office location button (#4844)

Co-authored-by: Brad Bodine <[email protected]>

* add event initializers to edit.js.erb (#4843)

Co-authored-by: Brad Bodine <[email protected]>

* removal of inline events (#4837)

Co-authored-by: Brad Bodine <[email protected]>

* cucumber split config improvement (#4833)

* config improvements

* remove contrast_level_aa from split config

* update full suite

* remove contrast_level_aa from report

* removal of contrast_level_aa tests

* add in newer admin attestation

* less groupings

* update with new cuke

* admin verification display logic for american indian status self attestation (#4815)

* Admin AI/AN action dropdown

* add to split config

* add wait, create verif type for attested

* partial find

* make their own cuke split

* fix issue with dc/me

* replace reject with subtraction

* break up values

* rubocop issue

* fix issue

* remove safe selectors not supported

* move inline js to external file (#4810)

* remoavl of in line event (#4847)

Co-authored-by: Brad Bodine <[email protected]>

* refactor confirm button to use data attribute for keydown event handling (#4859)

* sep date inline fix (#4858)

* Create main CSP branch.

* fix jquery with csp context

* rubocop fixes

* Move in cucumber driver version fix from trunk for now.

* 188588717 drop enrollment member (#4801)

remove admin onclick events from views

* move inline js to external script (#4811)

* update text (#4823)

* Update continue buttons on individual flow. (#4818)

* ignore actionpack warning (#4824)

* ignore actionpack warning

* add comment

* add comment to security.md

* do not store as hash data for a string value (#4822)

* do not store as hash data for a string value

* allow admin to add/edit reason when the broker application status is pending

* add spec

* rubocop fix

* remove inline js from family page add member forms (#4826)

* remove inline js from family page add member forms

* refactor new.js.erb

* add partials js init to my household render

* add index on family to speed up sep eligible filter (#4827)

* add index to speed up sep eligible filter

* fix rubocop

* bootstrap 4 cucumber coverage for faa (#4812)

* fixed missing transaltions in the review and health cov pages

* added translation keys to the shared file

* incorrect translation key fix for eligibility status on review page

* added chip short name key variable serving as an allias to the fa helper method

* other questions foster care with bs4 enabled, added additional locators and refactored step def

* job income fixes

* added sleep and employer adress field condition

* fixed job income and other questions bs4 tests

* added wait for income frequency dropdown

* added wait of 2 seconds to allow the frequency dropdown to be enabled

* change frequency css locator to xpath for failing step

* moving frequency xpath locator

* changed locator to attempt to solve github actions failure

* made step update to the submit your app file

* added wait to fix github actions step failure

* update locator to attempt to fix github actions element not found failure

* updated translation to not include the year for when bs4 is enabled

* turning bs4 for the income deductions page

* fix of the job income flaky feature file

* moved bs4 condition of the health cov page and cleaned up locator

* added wait so element can be interactible in ga

* reverting to initial click link function

* removing feature file redundant line

* added me faa translation keys to dc

* added missing translations to the ic file

---------

Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>

* add indexes on payment transactions model (#4830)

* display enrolled plan at the top of the page for csr scenario (#4831)

* rearrange list to display enrolled plan at the top of the page for csr scenario

* add spec

* update spec

* Keyboard navigation functions updates (#4832)

* Deprecate keyboard navigation functions and introduce data-keydown-id attribute for improved accessibility

* remove console log and update documentation

* update formatting

* update formatting

* rubocop fix

* modifies monthly enrollment due on date (#4834)

* 188658143 plan shopping compare plan (#4835)

* replace radiohandler with listener

* removal of onkeydown handlers

---------

Co-authored-by: Ryan Eddy <[email protected]>

* Refactor checkbox selection and clean up unused code in product index (#4828)

Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>

* sep admin detail onclick refactor (#4836)

* move submit and modal confirm handlers to helper js

* fix selectors, move functions to file

---------

Co-authored-by: Ann Caballero <[email protected]>

* cucumber split config improvement (#4833)

* config improvements

* remove contrast_level_aa from split config

* update full suite

* remove contrast_level_aa from report

* removal of contrast_level_aa tests

* add in newer admin attestation

* less groupings

* update with new cuke

* admin verification display logic for american indian status self attestation (#4815)

* Admin AI/AN action dropdown

* add to split config

* add wait, create verif type for attested

* partial find

* make their own cuke split

* fix issue with dc/me

* replace reject with subtraction

* break up values

* rubocop issue

* fix issue

* build the image for the csp branch (#4846)

build images for epic_188588775_csp_enabled

* self employed keydown removal (#4839)

* use data attr for handler

* refactor enter keydown listener to leverage event propagation to better handle AJAX elements

---------

Co-authored-by: Ann Caballero <[email protected]>

* removal of in line event in the help me sign up button (#4845)

* fix primary nav layout when bs4 disabled (#4840)

* Refactor upload button attributes for improved accessibility and cons… (#4838)

* Refactor upload button attributes for improved accessibility and consistency

* Fix upload button text

* removal of in line event (#4842)

Co-authored-by: Brad Bodine <[email protected]>

* removal of in line event in the broker add office location button (#4844)

Co-authored-by: Brad Bodine <[email protected]>

* add event initializers to edit.js.erb (#4843)

Co-authored-by: Brad Bodine <[email protected]>

* removal of inline events (#4837)

Co-authored-by: Brad Bodine <[email protected]>

* remove safe selectors not supported

* add data attr to date field div, refactor listener to handle bubbled events

* comment fix

---------

Co-authored-by: Trey Evans <[email protected]>
Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: RyanEddyIC <[email protected]>
Co-authored-by: Jacob Kagon <[email protected]>
Co-authored-by: vishal kalletla <[email protected]>
Co-authored-by: Sai Praveen Gudimetla <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>
Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>
Co-authored-by: Brad Bodine <[email protected]>
Co-authored-by: Sai Kumar Kotagiri <[email protected]>
Co-authored-by: Alec Turnbull <[email protected]>

* job income inline fixes (#4848)

* replace onclick with propagated listener in js

* refactor to have checkDate accept inputs

* remove onchange, refactor bs4 check in warning helper, store id on form

* use data keydown for job income partial

* replace kb handlers in index

* replace keydown handler

* remove logs, updated selector to use new attr

* remove onclick from self employed

---------

Co-authored-by: Brad Bodine <[email protected]>

* revert merge change on hbx profiles

* removal of in line events (#4870)

* removal of in line events (#4869)

Co-authored-by: Brad Bodine <[email protected]>

* other income ai an inline fixes (#4851)

* Create main CSP branch.

* fix jquery with csp context

* rubocop fixes

* Move in cucumber driver version fix from trunk for now.

* 188588717 drop enrollment member (#4801)

remove admin onclick events from views

* move inline js to external script (#4811)

* update text (#4823)

* Update continue buttons on individual flow. (#4818)

* ignore actionpack warning (#4824)

* ignore actionpack warning

* add comment

* add comment to security.md

* do not store as hash data for a string value (#4822)

* do not store as hash data for a string value

* allow admin to add/edit reason when the broker application status is pending

* add spec

* rubocop fix

* remove inline js from family page add member forms (#4826)

* remove inline js from family page add member forms

* refactor new.js.erb

* add partials js init to my household render

* add index on family to speed up sep eligible filter (#4827)

* add index to speed up sep eligible filter

* fix rubocop

* bootstrap 4 cucumber coverage for faa (#4812)

* fixed missing transaltions in the review and health cov pages

* added translation keys to the shared file

* incorrect translation key fix for eligibility status on review page

* added chip short name key variable serving as an allias to the fa helper method

* other questions foster care with bs4 enabled, added additional locators and refactored step def

* job income fixes

* added sleep and employer adress field condition

* fixed job income and other questions bs4 tests

* added wait for income frequency dropdown

* added wait of 2 seconds to allow the frequency dropdown to be enabled

* change frequency css locator to xpath for failing step

* moving frequency xpath locator

* changed locator to attempt to solve github actions failure

* made step update to the submit your app file

* added wait to fix github actions step failure

* update locator to attempt to fix github actions element not found failure

* updated translation to not include the year for when bs4 is enabled

* turning bs4 for the income deductions page

* fix of the job income flaky feature file

* moved bs4 condition of the health cov page and cleaned up locator

* added wait so element can be interactible in ga

* reverting to initial click link function

* removing feature file redundant line

* added me faa translation keys to dc

* added missing translations to the ic file

---------

Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>

* add indexes on payment transactions model (#4830)

* display enrolled plan at the top of the page for csr scenario (#4831)

* rearrange list to display enrolled plan at the top of the page for csr scenario

* add spec

* update spec

* Keyboard navigation functions updates (#4832)

* Deprecate keyboard navigation functions and introduce data-keydown-id attribute for improved accessibility

* remove console log and update documentation

* update formatting

* update formatting

* rubocop fix

* modifies monthly enrollment due on date (#4834)

* 188658143 plan shopping compare plan (#4835)

* replace radiohandler with listener

* removal of onkeydown handlers

---------

Co-authored-by: Ryan Eddy <[email protected]>

* Refactor checkbox selection and clean up unused code in product index (#4828)

Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>

* sep admin detail onclick refactor (#4836)

* move submit and modal confirm handlers to helper js

* fix selectors, move functions to file

---------

Co-authored-by: Ann Caballero <[email protected]>

* cucumber split config improvement (#4833)

* config improvements

* remove contrast_level_aa from split config

* update full suite

* remove contrast_level_aa from report

* removal of contrast_level_aa tests

* add in newer admin attestation

* less groupings

* update with new cuke

* admin verification display logic for american indian status self attestation (#4815)

* Admin AI/AN action dropdown

* add to split config

* add wait, create verif type for attested

* partial find

* make their own cuke split

* fix issue with dc/me

* replace reject with subtraction

* break up values

* rubocop issue

* fix issue

* build the image for the csp branch (#4846)

build images for epic_188588775_csp_enabled

* replace onclick with propagated listener in js

* refactor to have checkDate accept inputs

* self employed keydown removal (#4839)

* use data attr for handler

* refactor enter keydown listener to leverage event propagation to better handle AJAX elements

---------

Co-authored-by: Ann Caballero <[email protected]>

* removal of in line event in the help me sign up button (#4845)

* fix primary nav layout when bs4 disabled (#4840)

* remove onchange, refactor bs4 check in warning helper, store id on form

* use data keydown for job income partial

* replace kb handlers in index

* replace keydown handler

* remove logs, updated selector to use new attr

* remove submit, date change, and kb nav helper inlines

* replace button handlers with data attr

* remove onclick from self employed

* Refactor upload button attributes for improved accessibility and cons… (#4838)

* Refactor upload button attributes for improved accessibility and consistency

* Fix upload button text

* removal of in line event (#4842)

Co-authored-by: Brad Bodine <[email protected]>

* removal of in line event in the broker add office location button (#4844)

Co-authored-by: Brad Bodine <[email protected]>

* add event initializers to edit.js.erb (#4843)

Co-authored-by: Brad Bodine <[email protected]>

* removal of inline events (#4837)

Co-authored-by: Brad Bodine <[email protected]>

* remove safe selectors not supported

---------

Co-authored-by: Trey Evans <[email protected]>
Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: RyanEddyIC <[email protected]>
Co-authored-by: Jacob Kagon <[email protected]>
Co-authored-by: vishal kalletla <[email protected]>
Co-authored-by: Sai Praveen Gudimetla <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>
Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>
Co-authored-by: Brad Bodine <[email protected]>
Co-authored-by: Sai Kumar Kotagiri <[email protected]>
Co-authored-by: Alec Turnbull <[email protected]>

* removal of in line JS (#4863)

Co-authored-by: Brad Bodine <[email protected]>

---------

Co-authored-by: Trey Evans <[email protected]>
Co-authored-by: Ryan Eddy <[email protected]>
Co-authored-by: RyanEddyIC <[email protected]>
Co-authored-by: Brad Bodine <[email protected]>
Co-authored-by: Ann Caballero <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>
Co-authored-by: Jacob Kagon <[email protected]>
Co-authored-by: vishal kalletla <[email protected]>
Co-authored-by: Sai Praveen Gudimetla <[email protected]>
Co-authored-by: haridhar yamjala <[email protected]>
Co-authored-by: Sai Kumar Kotagiri <[email protected]>
Co-authored-by: Alec Turnbull <[email protected]>
  • Loading branch information
13 people committed Jan 9, 2025
1 parent 23151e3 commit 2e42ded
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</div>
</div>
<div class="d-flex mb-2">
<a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-income-delete-<%= dom_id income %>')" id="unemployment-income-delete-<%= dom_id income %>" class="button outline error mr-2 unemployment-income-delete"><%= l10n("faa.edit.remove") %></a>
<a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-income-edit-<%= dom_id income %>')" id="unemployment-income-edit-<%= dom_id income %>" class="button outline unemployment-income-edit"><%=l10n("edit")%></a>
<a tabindex="0" data-keydown-id='unemployment-income-delete-<%= dom_id income %>' id="unemployment-income-delete-<%= dom_id income %>" class="button outline error mr-2 unemployment-income-delete"><%= l10n("faa.edit.remove") %></a>
<a tabindex="0" data-keydown-id='unemployment-income-edit-<%= dom_id income %>' id="unemployment-income-edit-<%= dom_id income %>" class="button outline unemployment-income-edit"><%=l10n("edit")%></a>
</div>
</div>
<div class="edit-unemployment-income-form hidden">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<% income_id = income.id %>
<% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %>
<% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %>
<% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}', true)") : "" %>
<%= f.hidden_field :kind, value: 'unemployment_income' %>
<% if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning) %>
Expand All @@ -23,16 +22,16 @@
</div>
<div class="mr-auto col-sm col-md-6 col-lg-3 p-0 pr-4">
<%= f.label :start_on, l10n("start_date"), class: "required", for: "start_on_#{dummy_income_id}" %>
<%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100" %>
<%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", class: "w-100" %>
</div>
<div class="col-sm col-md-6 col-lg-3 p-0 pr-4">
<%= f.label :end_on, l10n("end_date"), for: "end_on_#{dummy_income_id}" %>
<%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
<%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
</div>
</div>
<div class="d-flex mb-2">
<a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-cancel-<%= income_id %>')" id="unemployment-cancel-<%= income_id %>" class="button outline mr-2 unemployment-income-cancel"><%= l10n("cancel") %></a>
<%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save", :data => { :cuke => "unemployment-income-save-button" }, onclick: "checkDate('#{income_id}')" %>
<a tabindex="0" data-keydown-id='unemployment-cancel-<%= income_id %>' id="unemployment-cancel-<%= income_id %>" class="button outline mr-2 unemployment-income-cancel"><%= l10n("cancel") %></a>
<%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save", :data => { :cuke => "unemployment-income-save-button" } %>
</div>
</div>
Expand Down

0 comments on commit 2e42ded

Please sign in to comment.