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

chore: merge v5.1.0 into master #1389

Merged
merged 70 commits into from
Mar 17, 2021
Merged

chore: merge v5.1.0 into master #1389

merged 70 commits into from
Mar 17, 2021

Conversation

mantariksh
Copy link
Contributor

No description provided.

liangyuanruo and others added 30 commits February 25, 2021 15:43
chore: merge Release v5.0.3 back to develop branch
chore: merge v5.0.4 into develop
* feat: Add submission limits for storage mode form submissions

* made changes to refactor out hasSubmissionLimit, and added support for email mode forms

* Fix types in form.service.ts

* change check order, and change logger.warn to logger.info

* use null instead of -1 as default value for submissionLimit

* remove 'submissionLimits' type

* Update src/app/modules/form/public-form/public-form.middlewares.ts

Co-authored-by: Yuan Ruo <yuanruo@data.gov.sg>

* add check for public form before deactivating, and fix lint issues

* check not necessary

Co-authored-by: Yuan Ruo <yuanruo@data.gov.sg>
* feat: add timestamp to form submission end page

* fix: adjust date formatting and CSS selection and styling for end-page
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.15.1 to 4.15.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.15.2/packages/eslint-plugin)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kar Rui Lau <karrui.lau@gmail.com>
Bumps [neverthrow](https://github.com/supermacro/neverthrow) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/supermacro/neverthrow/releases)
- [Commits](supermacro/neverthrow@v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [stylelint-prettier](https://github.com/prettier/stylelint-prettier) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/prettier/stylelint-prettier/releases)
- [Changelog](https://github.com/prettier/stylelint-prettier/blob/master/CHANGELOG.md)
- [Commits](prettier/stylelint-prettier@v1.1.2...v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ontend test framework and lint (#1243)

* feat(FileHandlerSvc): add initial file

* ref(EditFieldsModal): use FileHandlerService instead of old client

* ref(EditStartPage): use FileHandlerService instead of old client

* ref(FieldAttachments): use shared utils instead of FileHandler

* feat: remove file-handler.client.service

* test: update frontend test runner to allow for typescript

* feat: allow cancellation when fetching presigned data

* feat: export uploadFile for testing

* chore: update eslint rules for testing

* chore: add jest-mock-axios package

* test(FileHandlerService): add unit tests

* chore: remove crypto-js package

* fix(FileHandlerSvc): update JSDoc

* test: manually instantiate mock axios instead of using a manual mock

* fix(FileHandlerSvc): base64 encode md5 before returning

also make the code more performant on larger files

* ref(FileHandlerSvc): mark uploadImage/Logo functions as async

* chore(eslint): fix projected path of tsconfig.json
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 26.5.1 to 26.5.2.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md)
- [Commits](kulshekhar/ts-jest@v26.5.1...v26.5.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@sentry/browser](https://github.com/getsentry/sentry-javascript) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-javascript@6.2.0...6.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.12.17 to 7.13.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.9/packages/babel-plugin-transform-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.17 to 7.13.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.9/packages/babel-preset-env)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump husky from 4.3.8 to 5.0.9

Bumps [husky](https://github.com/typicode/husky) from 4.3.8 to 5.0.9.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v4.3.8...v5.0.9)

Signed-off-by: dependabot[bot] <support@github.com>

* feat: migrate to husky v5

* feat: upgrade to latest husky

* feat: change postinstall to prepare

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Antariksh <antarikshmahajan@gmail.com>
Bumps [@opengovsg/mockpass](https://github.com/opengovsg/mockpass) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/opengovsg/mockpass/releases)
- [Commits](opengovsg/mockpass@v2.6.3...v2.6.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(deps): bump connect-mongo from 3.2.0 to 4.2.0

Bumps [connect-mongo](https://github.com/jdesboeufs/connect-mongo) from 3.2.0 to 4.2.0.
- [Release notes](https://github.com/jdesboeufs/connect-mongo/releases)
- [Changelog](https://github.com/jdesboeufs/connect-mongo/blob/master/CHANGELOG.md)
- [Commits](jdesboeufs/connect-mongo@v3.2.0...v4.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

* fix: correctly instantiate connect-mongo store due to package upgrade

* fix(sessionLoader): use session memorystore if in test environment

* test: use test specific session memory store

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kar Rui Lau <karrui.lau@gmail.com>
Bumps [whatwg-fetch](https://github.com/github/fetch) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](JakeChampion/fetch@v3.6.1...v3.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.9.1/packages/core-js)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [bcrypt](https://github.com/kelektiv/node.bcrypt.js) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/kelektiv/node.bcrypt.js/releases)
- [Changelog](https://github.com/kelektiv/node.bcrypt.js/blob/master/CHANGELOG.md)
- [Commits](kelektiv/node.bcrypt.js@v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [twilio](https://github.com/twilio/twilio-node) from 3.56.0 to 3.57.0.
- [Release notes](https://github.com/twilio/twilio-node/releases)
- [Changelog](https://github.com/twilio/twilio-node/blob/main/CHANGES.md)
- [Commits](twilio/twilio-node@3.56.0...3.57.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.12.18 to 7.13.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.9/packages/babel-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.848.0 to 2.856.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-js@v2.848.0...v2.856.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ts-node-dev](https://github.com/whitecolor/ts-node-dev) from 1.1.1 to 1.1.6.
- [Release notes](https://github.com/whitecolor/ts-node-dev/releases)
- [Changelog](https://github.com/wclr/ts-node-dev/blob/master/CHANGELOG.md)
- [Commits](wclr/ts-node-dev@v1.1.1...v1.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 23 commits March 8, 2021 09:38
Bumps [@types/mongodb](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mongodb) from 3.6.8 to 3.6.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mongodb)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [stylelint](https://github.com/stylelint/stylelint) from 13.11.0 to 13.12.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
- [Commits](stylelint/stylelint@13.11.0...13.12.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/convict](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/convict) from 5.2.2 to 6.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/convict)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.1.5 to 24.1.8.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](jest-community/eslint-plugin-jest@v24.1.5...v24.1.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* refactor: migrate checkboxValidator to ts

* refactor: update references

* chore: fix typos

* chore: add null as type for CheckboxValidationOptions customMax/customMin

* chore: add jest tests for checkbox validation

* refactor: split up nested ternary operator

* test: add test case for non-selected others checkbox

* test: add test case for multiple others, use helper to generate checkbox field and response

* fix: rework checkboxValidator to address edge case

* chore: add model validation to prevent duplicate checkbox fieldOptions

* chore: add validation message for checkbox field

* chore: rename answerValidatorFactory

* chore: fix indent for test

* refactor: use helper function directly in tests

* test: shift test category

* refactor: use helper function validateResponseWithValidator

* docs: checkboxValidator logic
* refactor: define EmailDataObj class

* refactor: use lodash compact

* docs: improve comments

* chore: shift business logic of returning masked autoreplydata to class

* chore: update tests

* chore: update types for response emails

* chore: rename jsonData to dataCollationData

* refactor: unnest compact

* refactor: convert maskField to generic maskStringHead function

* refactor: separate checks in tests

* chore: add defensive check that charsToReveal is nonnegative

* refactor: simplify use of state and run maskUidOnLastField only if necessary

Co-authored-by: Yuan Ruo <yuanruo@data.gov.sg>

* style: lint

* refactor: use type instead of interface, constraint generic T on createFormattedDataForOneField

* refactor: avoid state

* build: resolve merge conflicts

* doc: remove comment

* docs: createFormattedDataForOneField

* chore: rename Submission Email Object, add unit tests

Co-authored-by: Yuan Ruo <yuanruo@data.gov.sg>
* refactor: call new SubmissionEmailObj directly instead of createEmailData
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.1.8 to 24.1.9.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](jest-community/eslint-plugin-jest@v24.1.8...v24.1.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#1321)

Bumps [stylelint-config-standard](https://github.com/stylelint/stylelint-config-standard) from 20.0.0 to 21.0.0.
- [Release notes](https://github.com/stylelint/stylelint-config-standard/releases)
- [Changelog](https://github.com/stylelint/stylelint-config-standard/blob/master/CHANGELOG.md)
- [Commits](stylelint/stylelint-config-standard@20.0.0...21.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yuanruo Liang <yuanruo@open.gov.sg>
* feat: upgrade to latest mockpass

* feat: remove error_description support
* ref: stop replacing spaces in SAML artifact

* ref: stop returning SAMLart from parse function
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.858.0 to 2.859.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-js@v2.858.0...v2.859.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat(FieldVfnSvc): rewrite frontend service in TypeScript

* feat: replace usage of Verification module in verifiable-field

with new FieldVerificationService

* feat: replace usage of Verification module in submit-form directive

* fix: make getErrorMessage backwards compatible

axios returns errors as AxiosErrors, will need to extract out the error response text to make it behave the same way as the previous implementation

* feat: remove verification.client.factory file

* ref: convert ITransaction from interface to type and extend empty obj

* feat(VfnCtl): return empty obj if no transaction needs to be created

* fix: frontend to check if transaction data is an empty obj or not

* test: add unit tests for FieldVerificationService

* feat: correct JSDoc for FetchNewTransactionResponse type

* test: fix vfn ctl tests for no transactions needed

* ref(verifiableField): import entire service instead of destructuring

* test: update test description for resetVerifiedField success case

Co-authored-by: Antariksh Mahajan <antarikshmahajan@gmail.com>

* feat: wrap promises with angularjs $q

* ref(FieldVfnSvc): add spacing between jest tests

Co-authored-by: Antariksh Mahajan <antarikshmahajan@gmail.com>
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.13.9 to 7.13.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.10/packages/babel-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.32 to 14.14.33.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mantariksh mantariksh requested review from karrui and tshuli and removed request for karrui March 17, 2021 01:59
@liangyuanruo liangyuanruo merged commit bb2f4bd into master Mar 17, 2021
@karrui karrui deleted the release-5.1.0 branch April 21, 2021 02:16
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.

None yet

7 participants