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.13.1 into master #2175

Merged
merged 40 commits into from
Jun 15, 2021
Merged

chore: merge v5.13.1 into master #2175

merged 40 commits into from
Jun 15, 2021

Conversation

mantariksh
Copy link
Contributor

No description provided.

mantariksh and others added 30 commits June 1, 2021 21:21
chore: merge v5.12.0 into develop
)

* docs(scripts): add scripts to set student logos to selected forms

* doc(script): update script for completeness

* fix: script comments
Bumps [@opengovsg/mockpass](https://github.com/opengovsg/mockpass) from 2.7.2 to 2.7.3.
- [Release notes](https://github.com/opengovsg/mockpass/releases)
- [Commits](opengovsg/mockpass@v2.7.2...v2.7.3)

---
updated-dependencies:
- dependency-name: "@opengovsg/mockpass"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: merge v5.12.1 into develop
* chore(deps-dev): bump type-fest from 0.20.2 to 1.2.0

Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 0.20.2 to 1.2.0.
- [Release notes](https://github.com/sindresorhus/type-fest/releases)
- [Commits](sindresorhus/type-fest@v0.20.2...v1.2.0)

---
updated-dependencies:
- dependency-name: type-fest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: remove circular reference from PublicForm type

seems to be introduced by the new Merge implementation in type-fest, go back to using Omit

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kar Rui Lau <[email protected]>
* fix(deps): update mongoose to 5.12.12

* fix: correct types of IEmail/EncryptedSubmissionSchema

* refactor: remove explicit `this` in mongoose models
In preparation to porting betas.client.factory to TypeScript, write a
suite of unit tests to ensure functionality does not change during the
migration. Restructure the AngularJS factory a bit to make code paths
easy to reach.

- Restructure `betas.client.factory` so that its functions are
  accessible both via module import and `angular.module().factory()`
- Allow the functions to take in other beta feature fields for test
  purposes, defaulting to `BETA_FEATURES_FIELD`
- Provide test coverage via jest, crowbar-ing a mock into the angular
  global at runtime, to minimise changes to the module under test
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.17.1 to 14.17.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.918.0 to 2.919.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.918.0...v2.919.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

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

* refactor: replace set hook with validator hook in emailField model

* refactor: edit error message and remove repeated pre-validate hook

* fix: allow update if includeFormSummary is false

* refactor: eedit validator and add comments
refactor(beta): migrate to TypeScript
* refactor: shift EditFormFieldParams to types/api

* refactor: shift IPossiblyPrefilledField to types

* refactor: add DuplicateFormBody, FormUpdateParmas and PublicFormViewDto to types/api

* refactor: rreimport dependencies based on previous changes

* fix: remove CreateFormService left over from rebase
Bumps [@sentry/browser](https://github.com/getsentry/sentry-javascript) from 6.5.0 to 6.5.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.5.0...6.5.1)

---
updated-dependencies:
- dependency-name: "@sentry/browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.919.0 to 2.920.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.919.0...v2.920.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [twilio](https://github.com/twilio/twilio-node) from 3.63.0 to 3.63.1.
- [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.63.0...3.63.1)

---
updated-dependencies:
- dependency-name: twilio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@sentry/integrations](https://github.com/getsentry/sentry-javascript) from 6.5.0 to 6.5.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.5.0...6.5.1)

---
updated-dependencies:
- dependency-name: "@sentry/integrations"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [nocache](https://github.com/helmetjs/nocache) from 2.1.0 to 3.0.0.
- [Release notes](https://github.com/helmetjs/nocache/releases)
- [Changelog](https://github.com/helmetjs/nocache/blob/main/CHANGELOG.md)
- [Commits](helmetjs/nocache@v2.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: nocache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

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.13.1 to 3.14.0.
- [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.14.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](eslint/eslint@v7.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.920.0 to 2.922.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.920.0...v2.922.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

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

Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.2.1...2.3.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* ref: run npm lint

* ref: run npm run lint-html

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kar Rui Lau <[email protected]>
)

* refactor(misc): removed unused parameter in submission factory; added typings to count submissions

* refactor(adminformservice): added method (and typing) for countFormSubmissions

* refactor(public): removed old Submission.count calls and replaced with countFormSubmissions

* test(adminformservice): adds test for countFormSubmissions

* feat(adminformservice): add new method (and typings) for retrieving form metadata

* test(adminformservice/test): adds tests for new method

* refactor(public): removed getMetadata and changed calls to getFormsMetadata

* feat(adminformservice): add new method (and type) for retrieval of single response

* test(adminformservice/test): adds test for getEncryptedResponse

* refactor(public): replaced Submission.getEncryptedResponse with new version

* chore(adminformservice): shifts submission related stuff to AdminSubmissionsService

* chore(public): updated prev callsites for submissions related methods

* fix(view-feedback.client.directive): removed duplicate services

* refactor(types/api/submission): changed typing of submission count query and associated methods

* refactor(getformsmetadata): split into 2 smaller methods and updated callsites

* test(adminsubmissionsservice): removed MockAxios import and uses jest.mock with mocked

using mockAxios impacted readability and understanding so it was changed to use jest.mock (which
mocks the whole module) together with mocked from ts-jest to mock return values

* refactor(adminsubmissionservice): renamed methods for greater clarity

* test(adminsubmissionsservice): changed test structure for increased clarity
…#2094)

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.26.0 to 4.26.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.26.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.4 to 4.3.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.2.4...v4.3.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.26.0 to 4.26.1.
- [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.26.1/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mantariksh and others added 10 commits June 8, 2021 09:46
* chore: add script to delete endPage.buttons

* chore: remove endpage buttons from covid templates

* refactor: edit count statement and remove check for number of forms
* feat: log form updates

* chore: log formId, remove unknown typing for ControllerHandler

* chore: log req.query

* chore: remove end slash for route

Co-authored-by: Antariksh Mahajan <[email protected]>

Co-authored-by: Antariksh Mahajan <[email protected]>
* build(webhook-retries): create SQS queue in dev mode (1) (#1938)

* feat(webhook-retries): add isRetryEnabled to model (2) (#1939)

* feat(webhook-retries): produce and consume retries (3) (#1940)

* test(webhook-retries): add unit tests for retrieveWebhookInfoById (5) (#1942)

* test(webhook-retries): add unit tests for webhook service (6) (#1943)

* test(webhook-retries): add unit tests for message, producer, consumer (7) (#1988)

* test: add tests for WebhookQueueMessage

* test: add tests for webhook consumer

* test: add tests for WebhookProducer

* test: add tests for important utils

* feat: increase jitter with increasing base interval

* fix: calculate next attempt from time of initial attempt

* feat(webhook-retries): enable toggling retries on frontend (4) (#1941)

* test: make Date.now consistent in producer tests
@mantariksh mantariksh merged commit eccc0fc into master Jun 15, 2021
@karrui karrui deleted the release-v5.13.1 branch August 17, 2021 02:44
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.

6 participants