Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into 04-23-feat_add_ini…
Browse files Browse the repository at this point in the history
…tial_vite_config_and_new_eslint_rules

# Conflicts:
#	frontend/.storybook/main.js
#	frontend/package-lock.json
#	frontend/package.json
#	frontend/src/components/Field/Attachment/Attachment.tsx
#	frontend/src/components/Searchbar/Searchbar.stories.tsx
#	frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/field-panels/MyInfoPanel.tsx
#	frontend/src/features/admin-form/share/ShareFormModal.tsx
#	frontend/src/features/public-form/PublicFormContext.tsx
#	frontend/src/hooks/useMdComponents.tsx
#	playwright.config.ts
#	shared/constants/form.ts
  • Loading branch information
KenLSM committed Sep 13, 2024
2 parents 10cf995 + 7284af0 commit 0ceb51d
Show file tree
Hide file tree
Showing 197 changed files with 8,228 additions and 2,367 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
NODE_OPTIONS: '--max-old-space-size=4096 --openssl-legacy-provider'
AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE: 1
- name: Upload build files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: always()
with:
name: build-output
Expand Down Expand Up @@ -144,17 +144,6 @@ jobs:
# if: ${{ needs.changes.outputs.backend == 'true' }}
runs-on: ubuntu-latest
steps:
# prevent CI from failing when worker runs out of memory
# https://github.com/actions/runner-images/discussions/7188#discussioncomment-6750749
- name: Increase swapfile
run: |
df -h
sudo swapoff -a
sudo fallocate -l 15G /swapfile
sudo chmod 600 /swapfile
sudo mkswap /swapfile
sudo swapon /swapfile
sudo swapon --show
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
build-mode: ${{ matrix.build-mode }}
config-file: opengovsg/codeql-config/codeql-config.yml@develop

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
Expand All @@ -68,4 +66,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
2 changes: 0 additions & 2 deletions .sentryignore

This file was deleted.

4 changes: 2 additions & 2 deletions .template-env
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ FORMSG_SDK_MODE=
# AWS_REGION=

## Google Services
## If the below variable exists, the [google-analytics] feature will be enabled.
# GA_TRACKING_ID=
## If the below variables exists, the [captcha] feature will be enabled.
# GOOGLE_CAPTCHA=
# GOOGLE_CAPTCHA_PUBLIC=
Expand Down Expand Up @@ -110,6 +108,8 @@ FORMSG_SDK_MODE=
## Per-minute, per-IP request limits applied to specific endpoints
# SUBMISSIONS_RATE_LIMIT=
# SEND_AUTH_OTP_RATE_LIMIT=
# DOWNLOAD_FORM_WHITELIST_RATE_LIMIT=
# UPLOAD_FORM_WHITELIST_RATE_LIMIT=

# Used to check if BE Server is currently running on local development environment
# One of boolean: "true" | "false"
Expand Down
141 changes: 138 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,147 @@ 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.146.1](https://github.com/opengovsg/FormSG/compare/v6.146.0...v6.146.1)

- fix(MRF): disable hasBeenScanned [`#7652`](https://github.com/opengovsg/FormSG/pull/7652)
- build: release v6.146.0 [`#7644`](https://github.com/opengovsg/FormSG/pull/7644)

#### [v6.146.0](https://github.com/opengovsg/FormSG/compare/v6.145.0...v6.146.0)

> 4 September 2024

- build: merge release to develop [`#7643`](https://github.com/opengovsg/FormSG/pull/7643)
- feat: email notifications for mrf completed workflows [`#7597`](https://github.com/opengovsg/FormSG/pull/7597)
- build: release v6.145.0 [`#7637`](https://github.com/opengovsg/FormSG/pull/7637)
- chore: bump version to v6.146.0 [`7cc7d92`](https://github.com/opengovsg/FormSG/commit/7cc7d9235636d7a6b55f32d6e7214ced74078ee2)

#### [v6.145.0](https://github.com/opengovsg/FormSG/compare/v6.144.0...v6.145.0)

> 2 September 2024

- feat(form-issue): add rate-limit [`#7633`](https://github.com/opengovsg/FormSG/pull/7633)
- fix: set disable props on field [`#7634`](https://github.com/opengovsg/FormSG/pull/7634)
- fix(deps): bump type-fest from 4.25.0 to 4.26.0 in /shared [`#7632`](https://github.com/opengovsg/FormSG/pull/7632)
- chore(deps-dev): bump @types/http-errors from 2.0.1 to 2.0.4 [`#7627`](https://github.com/opengovsg/FormSG/pull/7627)
- build: merge release v6.144.0 to develop [`#7624`](https://github.com/opengovsg/FormSG/pull/7624)
- docs: remove angular from CREDITS.md [`#7577`](https://github.com/opengovsg/FormSG/pull/7577)
- build: release v6.144.0 [`#7623`](https://github.com/opengovsg/FormSG/pull/7623)
- chore: bump version to v6.145.0 [`a498d4b`](https://github.com/opengovsg/FormSG/commit/a498d4bcf8003cc4eaffc1c6969b1cd3a596b1cf)

#### [v6.144.0](https://github.com/opengovsg/FormSG/compare/v6.143.1...v6.144.0)

> 26 August 2024

- feat(nric): remove override flag [`#7620`](https://github.com/opengovsg/FormSG/pull/7620)
- chore(nric): remove nric collection description [`#7621`](https://github.com/opengovsg/FormSG/pull/7621)
- feat(nric): set default to false [`#7619`](https://github.com/opengovsg/FormSG/pull/7619)
- build: merge release v6.143.1 to develop [`#7622`](https://github.com/opengovsg/FormSG/pull/7622)
- build: release v6.143.1 [`#7618`](https://github.com/opengovsg/FormSG/pull/7618)
- build: release v6.143.0 to develop [`#7616`](https://github.com/opengovsg/FormSG/pull/7616)
- chore(scripts): set isSubmitterIdCollectionEnabled to true [`#7615`](https://github.com/opengovsg/FormSG/pull/7615)
- chore(deps-dev): bump core-js from 3.28.0 to 3.38.1 [`#7613`](https://github.com/opengovsg/FormSG/pull/7613)
- fix(deps): bump jwk-to-pem from 2.0.5 to 2.0.6 [`#7612`](https://github.com/opengovsg/FormSG/pull/7612)
- chore(deps-dev): bump @types/bluebird from 3.5.38 to 3.5.42 [`#7611`](https://github.com/opengovsg/FormSG/pull/7611)
- chore: bump version to v6.144.0 [`65b1b25`](https://github.com/opengovsg/FormSG/commit/65b1b25e197bcea55c034c103bd1096b01d7a625)

#### [v6.143.1](https://github.com/opengovsg/FormSG/compare/v6.143.0...v6.143.1)

> 22 August 2024

- fix(mrf): ensure number of non-editable fields are still present [`#7617`](https://github.com/opengovsg/FormSG/pull/7617)
- build: release v6.143.0 [`#7610`](https://github.com/opengovsg/FormSG/pull/7610)
- chore: bump version to v6.143.0 [`9db06d4`](https://github.com/opengovsg/FormSG/commit/9db06d4f164b9d1848b5f871812ed1fec50416c0)

#### [v6.143.0](https://github.com/opengovsg/FormSG/compare/v6.142.0...v6.143.0)

> 20 August 2024

- feat: change nric mask toggle to nric collection toggle [`#7566`](https://github.com/opengovsg/FormSG/pull/7566)
- fix(deps): bump type-fest from 4.24.0 to 4.25.0 in /shared [`#7606`](https://github.com/opengovsg/FormSG/pull/7606)
- chore(deps-dev): bump elliptic from 6.5.4 to 6.5.7 in /frontend [`#7605`](https://github.com/opengovsg/FormSG/pull/7605)
- fix(deps): bump elliptic from 6.5.4 to 6.5.7 [`#7604`](https://github.com/opengovsg/FormSG/pull/7604)
- fix(deps): bump libphonenumber-js from 1.11.5 to 1.11.7 in /shared [`#7603`](https://github.com/opengovsg/FormSG/pull/7603)
- build: merge release v6.142.0 to develop [`#7602`](https://github.com/opengovsg/FormSG/pull/7602)
- build: release v6.142.0 [`#7601`](https://github.com/opengovsg/FormSG/pull/7601)
- chore: bump version to v6.143.0 [`377e808`](https://github.com/opengovsg/FormSG/commit/377e808ba4c62f687f798bcf1fe7831e45768512)

#### [v6.142.0](https://github.com/opengovsg/FormSG/compare/v6.141.0...v6.142.0)

> 15 August 2024

- chore(myinfo): update myinfo nationalities list 15 aug 2024 [`#7600`](https://github.com/opengovsg/FormSG/pull/7600)
- build: merge release v6.141.0 to develop [`#7599`](https://github.com/opengovsg/FormSG/pull/7599)
- chore(myinfo): update myinfo race list 15-aug-2024 [`#7598`](https://github.com/opengovsg/FormSG/pull/7598)
- build: release v6.141.0 [`#7592`](https://github.com/opengovsg/FormSG/pull/7592)
- fix(deps): bump axios from 1.6.5 to 1.7.4 [`#7596`](https://github.com/opengovsg/FormSG/pull/7596)
- chore: bump version to v6.142.0 [`1789ce0`](https://github.com/opengovsg/FormSG/commit/1789ce02f32735f1aafa68808a463e3503fabb0a)

#### [v6.141.0](https://github.com/opengovsg/FormSG/compare/v6.140.0...v6.141.0)

> 13 August 2024

- build: merge release v6.140.0 to develop [`#7591`](https://github.com/opengovsg/FormSG/pull/7591)
- feat: support nric whitelisting [`#7534`](https://github.com/opengovsg/FormSG/pull/7534)
- fix: add nonce to script-src directive [`#7578`](https://github.com/opengovsg/FormSG/pull/7578)
- chore(deps-dev): bump @babel/preset-env from 7.22.5 to 7.25.3 [`#7586`](https://github.com/opengovsg/FormSG/pull/7586)
- chore: remove unused props [`#7585`](https://github.com/opengovsg/FormSG/pull/7585)
- feat(admin-form): implement drag and drop functionality [`#7372`](https://github.com/opengovsg/FormSG/pull/7372)
- fix: settings page resets position glitch [`#7582`](https://github.com/opengovsg/FormSG/pull/7582)
- fix(deps): bump type-fest from 4.23.0 to 4.24.0 in /shared [`#7583`](https://github.com/opengovsg/FormSG/pull/7583)
- chore: move label to tab [`#7581`](https://github.com/opengovsg/FormSG/pull/7581)
- build: release v6.140.0 [`#7580`](https://github.com/opengovsg/FormSG/pull/7580)
- chore: bump version to v6.141.0 [`e9b60f7`](https://github.com/opengovsg/FormSG/commit/e9b60f7983dcd7e3a10a41268309930a7fecd12b)

#### [v6.140.0](https://github.com/opengovsg/FormSG/compare/v6.139.0...v6.140.0)

> 8 August 2024

- refactor: worker pool [`#7553`](https://github.com/opengovsg/FormSG/pull/7553)
- chore(admin): mrf v1.1 content [`#7579`](https://github.com/opengovsg/FormSG/pull/7579)
- build: merge release v6.139.0 to develop [`#7575`](https://github.com/opengovsg/FormSG/pull/7575)
- docs: remove Sentry references and .sentryignore file [`#7573`](https://github.com/opengovsg/FormSG/pull/7573)
- build: release v6.139.0 [`#7564`](https://github.com/opengovsg/FormSG/pull/7564)
- chore: bump version to v6.140.0 [`5ff8367`](https://github.com/opengovsg/FormSG/commit/5ff83673930cd9f63e967953b58bc22824e96cb1)

#### [v6.139.0](https://github.com/opengovsg/FormSG/compare/v6.138.0...v6.139.0)

> 6 August 2024

- fix: forbid stripe acc connection with pdf summary enabled [`#7570`](https://github.com/opengovsg/FormSG/pull/7570)
- fix: failing gh actions due to runner out of disk space [`#7565`](https://github.com/opengovsg/FormSG/pull/7565)
- fix: enable pdf attachment for encrypt mode forms [`#7523`](https://github.com/opengovsg/FormSG/pull/7523)
- build: merge release v6.138.0 to develop [`#7559`](https://github.com/opengovsg/FormSG/pull/7559)
- chore: remove unused sgid toggle [`#7563`](https://github.com/opengovsg/FormSG/pull/7563)
- build: release v6.138.0 [`#7558`](https://github.com/opengovsg/FormSG/pull/7558)
- chore: bump version to v6.139.0 [`90ff12e`](https://github.com/opengovsg/FormSG/commit/90ff12e2178e29bc351fe6ef7c4b054a647b4258)

#### [v6.138.0](https://github.com/opengovsg/FormSG/compare/v6.137.0...v6.138.0)

> 1 August 2024

- fix: statsD default route not found [`#7551`](https://github.com/opengovsg/FormSG/pull/7551)
- feat(fe-quality): updating outdated links and copy content [`#7552`](https://github.com/opengovsg/FormSG/pull/7552)
- fix: mock statsD client during dev/test env [`#7550`](https://github.com/opengovsg/FormSG/pull/7550)
- fix(deps): bump libphonenumber-js from 1.11.4 to 1.11.5 in /shared [`#7547`](https://github.com/opengovsg/FormSG/pull/7547)
- chore(deps-dev): bump eslint-plugin-simple-import-sort from 12.1.0 to 12.1.1 [`#7544`](https://github.com/opengovsg/FormSG/pull/7544)
- chore(ci): pipe test coverage results to datadog [`#7542`](https://github.com/opengovsg/FormSG/pull/7542)
- fix(deps): bump type-fest from 4.22.1 to 4.23.0 in /shared [`#7541`](https://github.com/opengovsg/FormSG/pull/7541)
- fix(deps): bump type-fest from 4.22.0 to 4.22.1 in /shared [`#7540`](https://github.com/opengovsg/FormSG/pull/7540)
- chore: add simple fix to date format for sample form submission api [`#7539`](https://github.com/opengovsg/FormSG/pull/7539)
- fix(deps): bump type-fest from 4.21.0 to 4.22.0 in /shared [`#7536`](https://github.com/opengovsg/FormSG/pull/7536)
- chore(deps-dev): bump eslint-plugin-prettier from 5.1.3 to 5.2.1 in /shared [`#7535`](https://github.com/opengovsg/FormSG/pull/7535)
- build: merge release v6.137.0 to develop [`#7533`](https://github.com/opengovsg/FormSG/pull/7533)
- build: release v6.137.0 [`#7532`](https://github.com/opengovsg/FormSG/pull/7532)
- chore: bump version to v6.138.0 [`c7fcadc`](https://github.com/opengovsg/FormSG/commit/c7fcadc8c6f29a379d57b54c9d795282837bcc99)

#### [v6.137.0](https://github.com/opengovsg/FormSG/compare/v6.136.0...v6.137.0)

> 17 July 2024

- chore(frontend): remove isSingleSubmission toggle for email mode form… [`#7530`](https://github.com/opengovsg/FormSG/pull/7530)
- build: merge release v6.136.0 to develop [`#7531`](https://github.com/opengovsg/FormSG/pull/7531)
- build: release v6.136.0 [`#7528`](https://github.com/opengovsg/FormSG/pull/7528)
- chore: bump version to v6.137.0 [`fd05950`](https://github.com/opengovsg/FormSG/commit/fd05950516c2324bf2fdaa65b2a8a2349d707d41)
- chore(Frontend): remove isSingleSubmission toggle for email mode form that have not yet enabled it [`de48cc0`](https://github.com/opengovsg/FormSG/commit/de48cc018e9d15d1109a7d09845fcaf6734b35c1)

#### [v6.136.0](https://github.com/opengovsg/FormSG/compare/v6.135.0...v6.136.0)
Expand Down Expand Up @@ -161,20 +297,19 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix: add default values for postman env variables to docker compose [`#7424`](https://github.com/opengovsg/FormSG/pull/7424)
- fix: email notifications with wrong submission id [`#7418`](https://github.com/opengovsg/FormSG/pull/7418)
- build: release v6.128.0 [`#7419`](https://github.com/opengovsg/FormSG/pull/7419)
- fix(btn): form admin not fully resolved when retrieved from FormService [`#7420`](https://github.com/opengovsg/FormSG/pull/7420)
- fix: fix issue where email notifs for storage forms have wrong submission id [`66b27ab`](https://github.com/opengovsg/FormSG/commit/66b27abcc08e7b71a10c80989e9626f963d4601c)
- chore: bump version to v6.128.0 [`8f91bf0`](https://github.com/opengovsg/FormSG/commit/8f91bf0cbe541487bc9cd2775dd4c3c135b13f70)
- chore: bump version to v6.129.0 [`061dc4f`](https://github.com/opengovsg/FormSG/commit/061dc4fa0b106300764268f1b5f0671de75a7213)

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

> 20 June 2024

- fix(btn): form admin not fully resolved when retrieved from FormService [`#7420`](https://github.com/opengovsg/FormSG/pull/7420)
- feat(btn): frm 1717 mop flow to postman [`#7342`](https://github.com/opengovsg/FormSG/pull/7342)
- build: merge release v6.127.1 to develop [`#7416`](https://github.com/opengovsg/FormSG/pull/7416)
- fix(deps): bump libphonenumber-js from 1.11.3 to 1.11.4 in /shared [`#7415`](https://github.com/opengovsg/FormSG/pull/7415)
- hotfix: dupe form fail [`#7414`](https://github.com/opengovsg/FormSG/pull/7414)
- chore: bump version to v6.128.0 [`4b8cea2`](https://github.com/opengovsg/FormSG/commit/4b8cea2a46a258b96dc9b7be31b480481b8e30e8)
- chore: bump version to v6.128.0 [`8f91bf0`](https://github.com/opengovsg/FormSG/commit/8f91bf0cbe541487bc9cd2775dd4c3c135b13f70)

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

Expand Down
95 changes: 0 additions & 95 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -645,70 +645,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


-------------------------------------------------------------------------------

## Project
@sentry/browser

### Source
https://github.com/getsentry/sentry-javascript

### License
MIT License

Copyright (c) 2022 Functional Software, Inc. dba Sentry

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


-------------------------------------------------------------------------------

## Project
@sentry/integrations

### Source
https://github.com/getsentry/sentry-javascript

### License
MIT License

Copyright (c) 2022 Functional Software, Inc. dba Sentry

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


-------------------------------------------------------------------------------

## Project
Expand Down Expand Up @@ -5446,37 +5382,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


-------------------------------------------------------------------------------

## Project
ui-select

### Source
https://github.com/angular-ui/ui-select

### License
The MIT License (MIT)

Copyright (c) 2013-2014 AngularUI

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


-------------------------------------------------------------------------------

## Project
Expand Down
Loading

0 comments on commit 0ceb51d

Please sign in to comment.