From 8649e1dc5467180fb80e52595eb8bfed1f7933e7 Mon Sep 17 00:00:00 2001 From: shuli-ogp Date: Wed, 10 Feb 2021 09:18:50 +0800 Subject: [PATCH 1/2] chore: bump version to 4.57.0 --- CHANGELOG.md | 56 ++++++++++++++++++++++++++++++++++++++++++++--- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d83e2dfdd..fb739f1a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,62 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v4.57.0](https://github.com/opengovsg/FormSG/compare/v4.56.0...v4.57.0) + +- feat: mask cp uid in autoreply to respondent [`#1109`](https://github.com/opengovsg/FormSG/pull/1109) +- fix: interrupt submission if field is blank [`#1096`](https://github.com/opengovsg/FormSG/pull/1096) +- fix(deps): bump @babel/runtime from 7.12.5 to 7.12.13 [`#1098`](https://github.com/opengovsg/FormSG/pull/1098) +- chore(deps-dev): bump ts-jest from 26.4.4 to 26.5.0 [`#1099`](https://github.com/opengovsg/FormSG/pull/1099) +- fix(deps): bump ejs from 3.1.5 to 3.1.6 [`#1100`](https://github.com/opengovsg/FormSG/pull/1100) +- chore(deps-dev): bump @opengovsg/mockpass from 2.6.1 to 2.6.2 [`#1101`](https://github.com/opengovsg/FormSG/pull/1101) +- fix(deps): bump @opengovsg/formsg-sdk from 0.8.2 to 0.8.3 [`#1095`](https://github.com/opengovsg/FormSG/pull/1095) +- fix(deps): bump @sentry/browser from 5.30.0 to 6.1.0 [`#1094`](https://github.com/opengovsg/FormSG/pull/1094) +- chore(deps-dev): bump @types/mongodb from 3.6.3 to 3.6.5 [`#1093`](https://github.com/opengovsg/FormSG/pull/1093) +- fix(deps): bump aws-sdk from 2.834.0 to 2.838.0 [`#1092`](https://github.com/opengovsg/FormSG/pull/1092) +- chore(deps-dev): bump @babel/preset-env from 7.12.11 to 7.12.13 [`#1091`](https://github.com/opengovsg/FormSG/pull/1091) +- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1090`](https://github.com/opengovsg/FormSG/pull/1090) +- fix(deps): bump opossum from 5.1.2 to 5.1.3 [`#1069`](https://github.com/opengovsg/FormSG/pull/1069) +- chore: merge 4.56.0 into develop [`#1088`](https://github.com/opengovsg/FormSG/pull/1088) +- fix: upgrade angular-translate from 2.18.3 to 2.18.4 [`#1086`](https://github.com/opengovsg/FormSG/pull/1086) +- chore(deps-dev): bump @babel/plugin-transform-runtime [`#1089`](https://github.com/opengovsg/FormSG/pull/1089) +- fix: upgrade sortablejs from 1.12.0 to 1.13.0 [`#1054`](https://github.com/opengovsg/FormSG/pull/1054) +- chore(deps-dev): bump eslint-config-prettier from 7.1.0 to 7.2.0 [`#1081`](https://github.com/opengovsg/FormSG/pull/1081) +- chore(deps-dev): bump @babel/core from 7.12.10 to 7.12.13 [`#1080`](https://github.com/opengovsg/FormSG/pull/1080) +- feat: allow .oa attachments [`#1084`](https://github.com/opengovsg/FormSG/pull/1084) +- test: mock DNS in webhooks tests [`#1056`](https://github.com/opengovsg/FormSG/pull/1056) +- fix: apply dropdown padding on whole table [`#1078`](https://github.com/opengovsg/FormSG/pull/1078) +- feat: add db migration scripts [`#1072`](https://github.com/opengovsg/FormSG/pull/1072) +- feat: filter deprecated fields from admin panel [`#1071`](https://github.com/opengovsg/FormSG/pull/1071) +- refactor: migrate dropdown validator to ts [`#861`](https://github.com/opengovsg/FormSG/pull/861) +- fix(deps): bump fp-ts from 2.9.3 to 2.9.4 [`#1075`](https://github.com/opengovsg/FormSG/pull/1075) +- chore(deps-dev): bump core-js from 3.8.2 to 3.8.3 [`#1076`](https://github.com/opengovsg/FormSG/pull/1076) +- chore(deps-dev): bump supertest from 6.0.1 to 6.1.3 [`#1062`](https://github.com/opengovsg/FormSG/pull/1062) +- chore(deps-dev): bump mongodb-memory-server-core from 6.9.2 to 6.9.3 [`#1063`](https://github.com/opengovsg/FormSG/pull/1063) +- chore(deps-dev): bump csv-parse from 4.15.0 to 4.15.1 [`#1064`](https://github.com/opengovsg/FormSG/pull/1064) +- chore(deps-dev): bump jasmine from 3.6.3 to 3.6.4 [`#1065`](https://github.com/opengovsg/FormSG/pull/1065) +- refactor: combine email submission middleware into controller [`#935`](https://github.com/opengovsg/FormSG/pull/935) +- fix/travis: wean off Travis workspaces [`#1067`](https://github.com/opengovsg/FormSG/pull/1067) +- fix/updates: bugs and refactors after building payments demo [`#1061`](https://github.com/opengovsg/FormSG/pull/1061) +- chore(deps-dev): bump sinon from 9.2.3 to 9.2.4 [`#1057`](https://github.com/opengovsg/FormSG/pull/1057) +- chore(deps-dev): bump @types/express from 4.17.9 to 4.17.11 [`#1058`](https://github.com/opengovsg/FormSG/pull/1058) +- fix(deps): bump aws-sdk from 2.828.0 to 2.834.0 [`#1059`](https://github.com/opengovsg/FormSG/pull/1059) +- chore(deps-dev): bump eslint-plugin-typesafe from 0.4.0 to 0.5.2 [`#1060`](https://github.com/opengovsg/FormSG/pull/1060) +- test: mock DNS in webhooks tests [`#1056`](https://github.com/opengovsg/FormSG/pull/1056) +- fix(deps): bump helmet from 4.3.1 to 4.4.1 [`#1042`](https://github.com/opengovsg/FormSG/pull/1042) +- fix(deps): bump neverthrow from 3.2.0 to 4.0.1 [`#1041`](https://github.com/opengovsg/FormSG/pull/1041) +- chore(deps-dev): bump @types/node from 14.14.20 to 14.14.22 [`#1043`](https://github.com/opengovsg/FormSG/pull/1043) +- chore(deps-dev): bump husky from 4.3.7 to 4.3.8 [`#1033`](https://github.com/opengovsg/FormSG/pull/1033) +- chore: merge 4.55.0 into develop [`#1051`](https://github.com/opengovsg/FormSG/pull/1051) + #### [v4.56.0](https://github.com/opengovsg/FormSG/compare/v4.55.0...v4.56.0) +> 4 February 2021 + - fix: apply dropdown padding on whole table [`#1078`](https://github.com/opengovsg/FormSG/pull/1078) - feat: add db migration scripts [`#1072`](https://github.com/opengovsg/FormSG/pull/1072) - feat: filter deprecated fields from admin panel [`#1071`](https://github.com/opengovsg/FormSG/pull/1071) - chore: log encrypt sub ID with request meta [`#1049`](https://github.com/opengovsg/FormSG/pull/1049) +- chore: bump version to 4.56.0 [`1d750d3`](https://github.com/opengovsg/FormSG/commit/1d750d354783cc59fade7463c50010260d257c05) - build: empty commit to trigger build [`089fa17`](https://github.com/opengovsg/FormSG/commit/089fa17ff5135bd18357a58303cd70dc9244cf3a) #### [v4.55.0](https://github.com/opengovsg/FormSG/compare/v4.54.0...v4.55.0) @@ -216,16 +266,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - build: Release 4.30.1 - Fix field creation on old clients [`#74`](https://github.com/opengovsg/FormSG/pull/74) - Release 4.30.0 - acknowledgement for secret key backup, TypeScript migrations [`#67`](https://github.com/opengovsg/FormSG/pull/67) - build: empty commit to trigger PR build [`d0c6583`](https://github.com/opengovsg/FormSG/commit/d0c65838efa6731a0f10e89ff954c132b9f8b854) +- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea) - fix: return 401 for missing JWT [`e6c1947`](https://github.com/opengovsg/FormSG/commit/e6c19477b05fc4aed90b2db42916220aea2a263c) -- test: add tests for extractJwt [`16191a9`](https://github.com/opengovsg/FormSG/commit/16191a957be0dc7f63dc4221569fac2794b7d063) #### [v4.50.2](https://github.com/opengovsg/FormSG/compare/v4.50.1...v4.50.2) > 16 December 2020 -- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea) +- feat: update table field styling to not rely on multiple divs [`e857aed`](https://github.com/opengovsg/FormSG/commit/e857aed667145441758f09f311c2b9f16f57645b) - fix: email format validation should allow 126/163.com, align frontend and backend validation [`be35522`](https://github.com/opengovsg/FormSG/commit/be35522e15d20521f58fada7ed3164e6c0c0894d) -- chore: bump version to v4.50.2 [`1ac7be6`](https://github.com/opengovsg/FormSG/commit/1ac7be6cb69553d186ec194682ae25bd98318a8b) +- chore: bump version to v4.50.2 [`fad62ec`](https://github.com/opengovsg/FormSG/commit/fad62ec5730412201e208332a91286fd53e2b36a) #### [v4.50.1](https://github.com/opengovsg/FormSG/compare/v4.50.0...v4.50.1) diff --git a/package-lock.json b/package-lock.json index bda944cbcc..6d79a1a633 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "FormSG", - "version": "4.56.0", + "version": "4.57.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 056f7f9ae2..5becdce9dd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "4.56.0", + "version": "4.57.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG " From 3c4b0d605ce9b483765967dc8c7a6d0dfd277775 Mon Sep 17 00:00:00 2001 From: Antariksh Mahajan Date: Wed, 10 Feb 2021 13:16:00 +0800 Subject: [PATCH 2/2] fix: revert merge to extend (#1115) --- src/app/controllers/admin-forms.server.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/controllers/admin-forms.server.controller.js b/src/app/controllers/admin-forms.server.controller.js index 1938b09265..e16ec80d60 100644 --- a/src/app/controllers/admin-forms.server.controller.js +++ b/src/app/controllers/admin-forms.server.controller.js @@ -233,7 +233,7 @@ function makeModule(connection) { } } - _.merge(form, updatedForm) + _.extend(form, updatedForm) // Can't just do updatedForm.save() because updatedForm has some String values form.save(function (err, savedForm) {