Skip to content

build: release v6.66.0#6544

Closed
LinHuiqing wants to merge 11 commits into
release-al2from
release_v6.66.0
Closed

build: release v6.66.0#6544
LinHuiqing wants to merge 11 commits into
release-al2from
release_v6.66.0

Conversation

@LinHuiqing

@LinHuiqing LinHuiqing commented Jul 18, 2023

Copy link
Copy Markdown
Contributor

New

  • feat: indicate if GST has been applied to a payment transaction #6538
  • chore: reduce max payment limit #6543
  • fix: updating csp to fix bypass #6535
  • feat: add description to form issue modal #6536
  • fix: presub remove additional underscore #6533
  • feat: presub-change-icon-to-help #6532
  • build: merge v6.65.0 into develop #6531
  • build: release v6.65.0 #6528
  • fix: add FE validation rule that email domains must be non empty #6529

Dependencies

  • fix(deps): [Snyk] Security upgrade mongoose from 5.13.15 to 5.13.20 #6541
  • build(deps): bump winston-cloudwatch version to "6.2.0" #6542

Dev-Dependencies

Tests

feat: indicate if GST has been applied to a payment transaction #6538

  1. Enable GST
  • Create a new form with payments enabled. In the payment settings page, the GST toggle should already be set to true by default.
  • Submit a form and complete the payment
  • In the BE:
    • Forms collection: check that the form has payments_fields.gst_enabled = true
    • Payments collection: check that the payment has gstEnabled = true
  • For the generated invoice, check that it contains
    • the GST Reg No
    • (includes GST) beside 'Amount Charged'
  1. Disable GST
  • Go to a form with payments enabled. In the payment settings page, set the GST toggle to false.
  • Submit a form and complete the payment
  • In the BE:
    • Forms collection: check that the form has payments_fields.gst_enabled = false
    • Payments collection: check that the payment has gstEnabled = false
  • For the generated invoice, check that it does not contain
    • the GST Reg No
    • (includes GST) beside 'Amount Charged'

Deploy Notes

New scripts:

  • scripts/20230718_set-gst-enabled-flag/set-gst-enabled-flag.js : This script adds the gstEnabled flag to the payments collection and sets the flag for all existing documents to true. It also adds the gst_enabled flag to the payments_field in the form collection, and sets the flag for all existing documents with a payments_field to true.

chore: reduce max payment limit #6543

@foochifa
Regression Form payments settings

  • form admins should be able to update their payment amount
  • form admins with previously higher form payment values should be able to update their payment amount (change on db if you don't have any existing forms with high payments)

Feature test

  • form admins cannot set any value above 200000 (try 222333)

fix: updating csp to fix bypass #6535

  • Check that scripts from reCAPTCHA can load successfully in form submission page (network tab).
  • Check that reCAPTCHA can trigger successfully. Ensure that feature flags for turnstile is set to false and use VPN to trigger reCAPTCHA.
  • Check that there are no script failures related to GTM/GA when you navigate the home page and log in. No errors are expected as we are not using GA4 yet.
    https://analytics.google.com/analytics/web/#/report-home/a130216930w207559009p200196046

feat: add description to form issue modal #6536

@wanlingt

  • Open a form as public user, and click on the question mark icon at the bottom right corner.
  • Ensure that the form issue modal is describing what this issue is for. Specifically, it should say `Fill this in only if you are experiencing issues and are unable to submit this form. If you would like to provide feedback, you can do so after submitting the form.

fix: presub remove additional underscore #6533

@wanlingt

  • Report an issue in any public form (make sure this is the first issue reported for the day), notice the underscore is only for the word Login to forms

build(deps): bump winston-cloudwatch version to "6.2.0" #6542

@foochifa

Regression tests

  • Log in to FormSG.
  • Create and submit a form with email and mobile OTP verification.
  • Duplicate the form using the template function, using another mode.
  • Submit the new form.
  • Log out of FormSG.

foochifa and others added 10 commits July 12, 2023 11:40
build: merge v6.65.0 into develop
feat/presub-change-icon-to-help
* feat: add description to form issue modal

* update based on figma change

* Remove fullstop as requested
* removed gtm and gstatic from csp headers

* removed gtm and gstatic from csp headers

* loading specific files for recaptcha

* corrected path

* corrected path

* test defer

* add tags

* reverted hardcoded tracking id

* reverted changes to gtm

* added gtm

* updated csp

* added comments

* updated comments
* chore: lower max payment amount cents to 200k

* fix: variable amounts to draw max payment amount from env
* feat: add gst_enabled flag to form definition

* feat: add gst_enabled flag to payment model

* feat: add validation check for gst_enabled flag when updating payment

* feat: add gstEnabled field when a new payment is created

* feat: modify invoice according to whether GST is enabled

* fix: edit invoice format

* test: add gstEnabled to payments tests

* test: fix more tests

* feat: add datafix script

* docs: refine description of script

* feat: add GST toggle to payment settings page

* fix: remove GST Reg No and Business Address descriptions

* fix: UI changes

* fix: set gst_enabled default in form model to true

* fix: update test

* fix: update db script
…6541)

* fix: package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MONGOOSE-5777721

* build: update package-lock.json

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Justyn Oh <justynoh@gmail.com>
@LinHuiqing

LinHuiqing commented Jul 18, 2023

Copy link
Copy Markdown
Contributor Author

Strange, it missed out the regression tests I added for one of the dep upgrade PRs. Added to PR description manually!

@LinHuiqing
LinHuiqing temporarily deployed to staging July 18, 2023 09:07 — with GitHub Actions Inactive
@LinHuiqing

Copy link
Copy Markdown
Contributor Author

Closing PR to recut release 6.66.0 due to missing ip module bug (and another payments copy change)!

@LinHuiqing LinHuiqing closed this Jul 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants