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

build: merge release v6.127.1 to develop #7416

Merged
merged 5 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,32 @@ 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).

#### [v6.126.0](https://github.com/opengovsg/FormSG/compare/v6.126.0...v6.126.0)
#### [v6.127.1](https://github.com/opengovsg/FormSG/compare/v6.127.0...v6.127.1)

- revert: "chore(deps-dev): bump braces from 3.0.2 to 3.0.3 in /serverless/virus-scanner" [`#7398`](https://github.com/opengovsg/FormSG/pull/7398)
- build: release v6.127.0 [`#7413`](https://github.com/opengovsg/FormSG/pull/7413)
- fix: fix issue where duplicating forms fails [`a66cebf`](https://github.com/opengovsg/FormSG/commit/a66cebf8528675c5153ce9c57fe53bb3e0026fdd)

#### [v6.127.0](https://github.com/opengovsg/FormSG/compare/v6.126.0...v6.127.0)

> 19 June 2024

- feat: email <> storage mode parity [`#7350`](https://github.com/opengovsg/FormSG/pull/7350)
- chore: expose sgid temp route [`#7410`](https://github.com/opengovsg/FormSG/pull/7410)
- chore(myinfo): update date to 28 jun [`#7409`](https://github.com/opengovsg/FormSG/pull/7409)
- fix(payment): add joi validation on POST body for payment onboarding [`#7405`](https://github.com/opengovsg/FormSG/pull/7405)
- fix(deps): bump winston from 3.8.2 to 3.13.0 [`#7406`](https://github.com/opengovsg/FormSG/pull/7406)
- fix(deps): bump nodemailer and @types/nodemailer [`#7404`](https://github.com/opengovsg/FormSG/pull/7404)
- build: merge release v6.126.0 to develop [`#7403`](https://github.com/opengovsg/FormSG/pull/7403)
- build: release v6.126.0 [`#7397`](https://github.com/opengovsg/FormSG/pull/7397)
- chore(deps-dev): bump @types/jwk-to-pem from 2.0.1 to 2.0.3 [`#7400`](https://github.com/opengovsg/FormSG/pull/7400)
- feat: email <> storage mode parity (#7350) [`#2264`](https://github.com/opengovsg/FormSG/issues/2264)
- chore: bump version to v6.127.0 [`cba2477`](https://github.com/opengovsg/FormSG/commit/cba2477cd464a3a1899d26d1e1df2b7051701b51)

#### [v6.126.0](https://github.com/opengovsg/FormSG/compare/v6.125.0...v6.126.0)

> 18 June 2024

- revert: "chore(deps-dev): bump braces from 3.0.2 to 3.0.3 in /serverless/virus-scanner" [`#7398`](https://github.com/opengovsg/FormSG/pull/7398)
- build: merge release v6.125.0 to develop [`#7396`](https://github.com/opengovsg/FormSG/pull/7396)
- chore(deps-dev): bump stripe-event-types from 2.3.0 to 3.1.0 [`#7330`](https://github.com/opengovsg/FormSG/pull/7330)
- fix: fix 4xx submission after stripe disconnect [`#7391`](https://github.com/opengovsg/FormSG/pull/7391)
Expand All @@ -20,9 +38,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(deps): bump type-fest from 4.20.0 to 4.20.1 in /shared [`#7393`](https://github.com/opengovsg/FormSG/pull/7393)
- feat: conditionally render sex based on timezone [`#7376`](https://github.com/opengovsg/FormSG/pull/7376)
- build: release v6.125.0 [`#7389`](https://github.com/opengovsg/FormSG/pull/7389)
- chore: bump version to v6.126.0 [`3d1a2f8`](https://github.com/opengovsg/FormSG/commit/3d1a2f899cb441905b5264b05f36b9fd8e5cf27a)
- chore: bump version to v6.126.0 [`a8b0d5d`](https://github.com/opengovsg/FormSG/commit/a8b0d5d261d5a367962337183c007096c6524680)

#### [v6.125.0](https://github.com/opengovsg/FormSG/compare/v6.124.1...v6.125.0)
#### [v6.125.0](https://github.com/opengovsg/FormSG/compare/v6.124.0...v6.125.0)

> 13 June 2024

Expand All @@ -38,13 +56,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- build: merge release 6.124.1 into develop [`#7371`](https://github.com/opengovsg/FormSG/pull/7371)
- fix: check for truthiness of fieldname in receiver [`#7370`](https://github.com/opengovsg/FormSG/pull/7370)
- build: merge release v6.124.0 into develop [`#7369`](https://github.com/opengovsg/FormSG/pull/7369)
- chore: bump version to v6.125.0 [`756fb88`](https://github.com/opengovsg/FormSG/commit/756fb88671cf5ba22fb28475eea44a06f3c6f79d)

#### [v6.124.1](https://github.com/opengovsg/FormSG/compare/v6.124.0...v6.124.1)

> 7 June 2024

- build: release v6.124.0 [`#7368`](https://github.com/opengovsg/FormSG/pull/7368)
- chore: bump version to v6.125.0 [`756fb88`](https://github.com/opengovsg/FormSG/commit/756fb88671cf5ba22fb28475eea44a06f3c6f79d)
- chore: bump version to v6.124.1 [`08eba07`](https://github.com/opengovsg/FormSG/commit/08eba07169a64e1ba5f42589c05345d32ad91a98)
- check for truthiness of fieldname in receiver [`429e1e9`](https://github.com/opengovsg/FormSG/commit/429e1e9a073da23cc7f329fae11ac4e0f1b7c66c)

Expand Down Expand Up @@ -194,7 +207,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- chore: reverting package-lock changes [`040b962`](https://github.com/opengovsg/FormSG/commit/040b96284ea317de22d9de6cf872fd4116f24c51)
- chore: bump version to v6.117.0 [`6eb4aca`](https://github.com/opengovsg/FormSG/commit/6eb4aca28514e3286c23c0834f9962de291a7fbc)

#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.1...v6.116.0)
#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.116.0)

> 8 April 2024

Expand All @@ -205,17 +218,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(mrf): webhook be validation [`#7247`](https://github.com/opengovsg/FormSG/pull/7247)
- chore: move react-dev-inspector to frontend/package.json [`#7245`](https://github.com/opengovsg/FormSG/pull/7245)
- refactor: add exhaustive checks, use answerArray for arrays [`#7244`](https://github.com/opengovsg/FormSG/pull/7244)
- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
- fix(deps): bump type-fest from 4.14.0 to 4.15.0 in /shared [`#7243`](https://github.com/opengovsg/FormSG/pull/7243)
- chore: bump version to v6.116.0 [`31e1a33`](https://github.com/opengovsg/FormSG/commit/31e1a33c96d76b69c492f5212bc48a3dabe054af)

#### [v6.115.1](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.115.1)

> 5 April 2024

- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
- fix: add check to block webhooks updates on mrf [`71ab0c5`](https://github.com/opengovsg/FormSG/commit/71ab0c592c15de5fddbffc9970a424af7a31d4ab)
- chore: bump version to 6.115.1 [`7d127b2`](https://github.com/opengovsg/FormSG/commit/7d127b2e8353a8a282acabe1c309cefb1e750f9c)

#### [v6.115.0](https://github.com/opengovsg/FormSG/compare/v6.114.1...v6.115.0)

> 3 April 2024
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
"version": "6.126.0",
"version": "6.127.1",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export const useDupeFormWizardContext = (): CreateFormWizardContextReturn => {

const {
dupeEmailModeFormMutation,
dupeStorageModeOrMultirespondentFormMutation,
dupeStorageModeFormMutation,
dupeMultirespondentModeFormMutation,
} = useDuplicateFormMutations()

const { activeWorkspace, isDefaultWorkspace } = useWorkspaceContext()
Expand All @@ -72,23 +73,35 @@ export const useDupeFormWizardContext = (): CreateFormWizardContextReturn => {

const handleCreateStorageModeOrMultirespondentForm = handleSubmit(
({ title, responseMode }) => {
if (
!(
responseMode === FormResponseMode.Encrypt ||
responseMode === FormResponseMode.Multirespondent
) ||
!activeFormMeta?._id
) {
if (!activeFormMeta?._id) {
return
}

return dupeStorageModeOrMultirespondentFormMutation.mutate({
formIdToDuplicate: activeFormMeta._id,
title,
responseMode,
publicKey: keypair.publicKey,
workspaceId,
})
switch (responseMode) {
case FormResponseMode.Encrypt:
return dupeStorageModeFormMutation.mutate({
formIdToDuplicate: activeFormMeta._id,
title,
responseMode,
publicKey: keypair.publicKey,
workspaceId,
})
case FormResponseMode.Email:
return
case FormResponseMode.Multirespondent:
return dupeMultirespondentModeFormMutation.mutate({
formIdToDuplicate: activeFormMeta._id,
title,
responseMode,
publicKey: keypair.publicKey,
workspaceId,
})
default: {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const _: never = responseMode
throw new Error('Invalid response mode')
}
}
},
)

Expand All @@ -110,7 +123,8 @@ export const useDupeFormWizardContext = (): CreateFormWizardContextReturn => {
isFetching: isWorkspaceLoading || isPreviewFormLoading,
isLoading:
dupeEmailModeFormMutation.isLoading ||
dupeStorageModeOrMultirespondentFormMutation.isLoading,
dupeStorageModeFormMutation.isLoading ||
dupeMultirespondentModeFormMutation.isLoading,
keypair,
currentStep,
direction,
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "6.126.0",
"version": "6.127.1",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
Loading