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: release v6.106.0 #7055

Merged
merged 7 commits into from
Jan 31, 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
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,28 @@ 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.106.0](https://github.com/opengovsg/FormSG/compare/v6.105.0...v6.106.0)

- build: release v6.105.0 [`#7054`](https://github.com/opengovsg/FormSG/pull/7054)
- build: merge release v6.104.0 into develop [`#7051`](https://github.com/opengovsg/FormSG/pull/7051)
- build: merge release v6.103.0 into develop [`#7041`](https://github.com/opengovsg/FormSG/pull/7041)
- feat(scripts): save multi-language forms report to tsv files [`#7027`](https://github.com/opengovsg/FormSG/pull/7027)

#### [v6.105.0](https://github.com/opengovsg/FormSG/compare/v6.104.0...v6.105.0)

> 30 January 2024

- build: release v6.104.0 [`#7050`](https://github.com/opengovsg/FormSG/pull/7050)
- chore: update pp and tou [`a9c1ec5`](https://github.com/opengovsg/FormSG/commit/a9c1ec5321a18e42a14e7cccf7c7461d8ffd7325)
- chore: bump version to 6.105.0 [`71c15d0`](https://github.com/opengovsg/FormSG/commit/71c15d0edefa8654544464246c97469bb3595dae)

#### [v6.104.0](https://github.com/opengovsg/FormSG/compare/v6.103.0...v6.104.0)

> 30 January 2024

- chore: credits update [`#7042`](https://github.com/opengovsg/FormSG/pull/7042)
- build: release v6.103.0 [`#7040`](https://github.com/opengovsg/FormSG/pull/7040)
- chore: bump version to 6.104.0 [`54ce533`](https://github.com/opengovsg/FormSG/commit/54ce5336c0b2ad69d8c68766647a2455f9fc4316)
- chore: update banner for TOU [`9547227`](https://github.com/opengovsg/FormSG/commit/95472277ce76427dc64eac7977170643c0264762)

#### [v6.103.0](https://github.com/opengovsg/FormSG/compare/v6.102.0...v6.103.0)
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.101.0",
"version": "6.102.0",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
216 changes: 136 additions & 80 deletions frontend/src/pages/PrivacyPolicy/PrivacyPolicyPage.tsx

Large diffs are not rendered by default.

628 changes: 501 additions & 127 deletions frontend/src/pages/TermsOfUse/TermsOfUsePage.tsx

Large diffs are not rendered by default.

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.104.0",
"version": "6.106.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
42 changes: 24 additions & 18 deletions scripts/20220217_multi-language-stats/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const MongoClient = require('mongodb').MongoClient,
ObjectId = require('mongodb').ObjectId,
_ = require('lodash')
_ = require('lodash'),
fs = require('fs')

const categories = ['un', 'cn', 'ta', 'ms', 'en']

Expand Down Expand Up @@ -111,7 +112,7 @@ async function getStats(db) {
]),
)

const printFormTSVReport = async (header, filter) => {
const outputFormTSVReport = async (header, filename, filter) => {
console.log('========================================')
console.log(header)
const formIds = Object.keys(formsById).filter(filter)
Expand All @@ -126,29 +127,34 @@ async function getStats(db) {
form.agency = await getAgencyFromAdminId(form.admin)
}

console.log(
formIds
.map((id) =>
[
id,
formsById[id].title,
[...formsById[id].langs].sort().join('+'),
`${formsById[id].agency.shortName} (${formsById[id].agency.fullName})`,
formsById[id].status,
formsById[id].numSubmissions,
].join('\t'),
)
.join('\n'),
)
const reportContent = formIds
.map((id) =>
[
id,
formsById[id].title,
[...formsById[id].langs].sort().join('+'),
`${formsById[id].agency.shortName} (${formsById[id].agency.fullName})`,
formsById[id].status,
formsById[id].numSubmissions,
].join('\t'),
)
.join('\n')

// 1. print report to console
console.log(reportContent)
// 2. save report to file
fs.writeFileSync(filename, reportContent)
}

await printFormTSVReport(
await outputFormTSVReport(
'Getting agency and number of submissions for forms with multi-languages',
'forms_multi_languages.tsv',
(id) => formsById[id].langs.size > 1,
)

await printFormTSVReport(
await outputFormTSVReport(
'Getting agency and number of submissions for non-english forms',
'forms_non_english_single_language.tsv',
(id) =>
formsById[id].langs.size === 1 &&
!formsById[id].langs.has('en') &&
Expand Down
Loading