Merge pull request #7498 from opengovsg/release_v6.134.0

build: release v6.134.0
opengovsg · Jul 11, 2024 · 73c67ee · 73c67ee
2 parents c44a8cc + 8d77390
commit 73c67ee
Show file tree

Hide file tree

Showing 47 changed files with 1,053 additions and 515 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,27 @@ 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.134.0](https://github.com/opengovsg/FormSG/compare/v6.133.0...v6.134.0)
+
+- fix(deps): bump helmet from 6.0.1 to 7.1.0 [`#7242`](https://github.com/opengovsg/FormSG/pull/7242)
+- feat(errors): revamp business logic error codes [`#7443`](https://github.com/opengovsg/FormSG/pull/7443)
+- chore(deps-dev): bump lint-staged from 13.1.0 to 15.2.7 [`#7487`](https://github.com/opengovsg/FormSG/pull/7487)
+- chore(deps-dev): bump supertest-session from 4.1.0 to 5.0.1 [`#7493`](https://github.com/opengovsg/FormSG/pull/7493)
+- fix(deps): bump hot-shots from 9.3.0 to 10.0.0 [`#7490`](https://github.com/opengovsg/FormSG/pull/7490)
+- fix: fix issue where attachments would fail locally [`#7496`](https://github.com/opengovsg/FormSG/pull/7496)
+- feat(i18n): replace hardcoded string values for AdminFormNavbar [`#7456`](https://github.com/opengovsg/FormSG/pull/7456)
+- build: merge release v6.133.0 to develop [`#7494`](https://github.com/opengovsg/FormSG/pull/7494)
+- build: release v6.133.0 [`#7483`](https://github.com/opengovsg/FormSG/pull/7483)
+- chore(deps-dev): bump @types/ejs from 3.1.1 to 3.1.5 [`#7492`](https://github.com/opengovsg/FormSG/pull/7492)
+- chore(deps-dev): bump @types/sns-validator from 0.3.1 to 0.3.3 [`#7491`](https://github.com/opengovsg/FormSG/pull/7491)
+- fix(deps): bump html-entities from 2.3.3 to 2.5.2 [`#7489`](https://github.com/opengovsg/FormSG/pull/7489)
+- fix(deps): bump fp-ts from 2.13.1 to 2.16.8 [`#7485`](https://github.com/opengovsg/FormSG/pull/7485)
+- chore(deps-dev): bump eslint-plugin-jest from 28.5.0 to 28.6.0 [`#7484`](https://github.com/opengovsg/FormSG/pull/7484)
+
 #### [v6.133.0](https://github.com/opengovsg/FormSG/compare/v6.132.0...v6.133.0)
 
+> 7 July 2024
+
 - feat(btn): frm 1723 internal flow postman [`#7343`](https://github.com/opengovsg/FormSG/pull/7343)
 - chore(deps): bump next and react-email in /react-email-preview [`#7375`](https://github.com/opengovsg/FormSG/pull/7375)
 - feat: rename placeholder for logic and mrf components [`#7482`](https://github.com/opengovsg/FormSG/pull/7482)
@@ -24,6 +43,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: release v6.132.0 [`#7473`](https://github.com/opengovsg/FormSG/pull/7473)
 - add reddot to mrf workflow [`a044b80`](https://github.com/opengovsg/FormSG/commit/a044b805076b6ad14b44fd7baf7c2d73ba73bddc)
 - handle old last seen route [`d883952`](https://github.com/opengovsg/FormSG/commit/d883952df327928e92d007c46fae427851a5dc7a)
+- chore: bump version to v6.133.0 [`0c7086b`](https://github.com/opengovsg/FormSG/commit/0c7086b46cf7e162dff1f3815c2104b7d32925f4)
 
 #### [v6.132.0](https://github.com/opengovsg/FormSG/compare/v6.131.0...v6.132.0)
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - AWS_ACCESS_KEY_ID=fakeKey
       - AWS_SECRET_ACCESS_KEY=fakeSecret
       - SESSION_SECRET=thisisasecret
-      - AWS_ENDPOINT=http://localhost:4566
+      - AWS_ENDPOINT=http://127.0.0.1:4566
       - SECRET_ENV=development
       - SUBMISSIONS_RATE_LIMIT=200
       - SEND_AUTH_OTP_RATE_LIMIT=60

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.133.0",
+  "version": "6.134.0",
   "homepage": ".",
   "private": true,
   "dependencies": {

diff --git a/frontend/src/features/admin-form/common/components/AdminFormNavbar/AdminFormNavbar.tsx b/frontend/src/features/admin-form/common/components/AdminFormNavbar/AdminFormNavbar.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import {
   BiDotsHorizontalRounded,
   BiShareAlt,
@@ -72,6 +73,7 @@ export const AdminFormNavbar = ({
   handleShareButtonClick,
   previewFormLink,
 }: AdminFormNavbarProps): JSX.Element => {
+  const { t } = useTranslation()
   const { ref, onMouseDown } = useDraggable<HTMLDivElement>()
   const { isOpen, onClose, onOpen } = useDisclosure()
   const { pathname } = useLocation()
@@ -182,7 +184,7 @@ export const AdminFormNavbar = ({
           to={ADMINFORM_BUILD_SUBROUTE}
           isActive={checkTabActive(ADMINFORM_BUILD_SUBROUTE)}
         >
-          Create
+          {t('features.adminFormNavbar.tabs.create')}
         </NavigationTab>
         <NavigationTab
           hidden={viewOnly}
@@ -197,7 +199,7 @@ export const AdminFormNavbar = ({
             }
           }}
         >
-          Settings
+          {t('features.adminFormNavbar.tabs.settings')}
           {shouldShowSettingsReddot ? (
             <Icon
               as={GoPrimitiveDot}
@@ -212,7 +214,7 @@ export const AdminFormNavbar = ({
           to={ADMINFORM_RESULTS_SUBROUTE}
           isActive={checkTabActive(ADMINFORM_RESULTS_SUBROUTE)}
         >
-          Results
+          {t('features.adminFormNavbar.tabs.results')}
         </NavigationTab>
       </NavigationTabList>
       <Flex
@@ -226,7 +228,7 @@ export const AdminFormNavbar = ({
       >
         <IconButton
           display={{ base: 'flex', md: 'none' }}
-          aria-label="Form actions"
+          aria-label={t('features.adminFormNavbar.formActions')}
           onClick={onOpen}
           icon={<BiDotsHorizontalRounded />}
         />
@@ -235,26 +237,28 @@ export const AdminFormNavbar = ({
             {renderLastModified}
           </Flex>
           <ButtonGroup spacing="0.5rem" isDisabled={!formInfo}>
-            <Tooltip label="Manage collaborators">
+            <Tooltip label={t('features.adminFormNavbar.manageCollaborators')}>
               <IconButton
-                aria-label="Manage collaborators"
+                aria-label={t('features.adminFormNavbar.manageCollaborators')}
                 variant="outline"
                 onClick={handleAddCollabButtonClick}
                 icon={<BiUserPlus />}
               />
             </Tooltip>
-            <Tooltip label="Preview form">
+            <Tooltip label={t('features.adminFormNavbar.previewForm')}>
               <IconButton
                 as={ReactLink}
-                aria-label="Preview form"
+                aria-label={t('features.adminFormNavbar.previewForm')}
                 variant="outline"
                 to={previewFormLink}
                 target="_blank"
                 icon={<BiShow />}
               />
             </Tooltip>
-            <Tooltip label="Share your form link">
-              <Button onClick={handleShareButtonClick}>Share</Button>
+            <Tooltip label={t('features.adminFormNavbar.shareBtn.tooltip')}>
+              <Button onClick={handleShareButtonClick}>
+                {t('features.adminFormNavbar.shareBtn.text')}
+              </Button>
             </Tooltip>
           </ButtonGroup>
         </Box>
@@ -278,21 +282,21 @@ export const AdminFormNavbar = ({
                 {...mobileDrawerExtraButtonProps}
                 leftIcon={<BiShow fontSize="1.25rem" />}
               >
-                Preview form
+                {t('features.adminFormNavbar.previewForm')}
               </Button>
               <Button
                 {...mobileDrawerExtraButtonProps}
                 onClick={handleShareButtonClick}
                 leftIcon={<BiShareAlt fontSize="1.25rem" />}
               >
-                Share form link
+                {t('features.adminFormNavbar.shareBtn.textMobile')}
               </Button>
               <Button
                 {...mobileDrawerExtraButtonProps}
                 onClick={handleAddCollabButtonClick}
                 leftIcon={<BiUserPlus fontSize="1.25rem" />}
               >
-                Manage collaborators
+                {t('features.adminFormNavbar.manageCollaborators')}
               </Button>
             </ButtonGroup>
           </DrawerBody>

diff --git a/frontend/src/i18n/locales/en-sg.ts b/frontend/src/i18n/locales/en-sg.ts
@@ -1,3 +1,4 @@
+import { enSG as adminFormNavbar } from './features/admin-form-navbar'
 import { enSG as common } from './features/common'
 import { enSG as login } from './features/login'
 import { enSG as publicForm } from './features/public-form'
@@ -6,6 +7,7 @@ import { FallbackTranslation } from './types'
 export const enSG: FallbackTranslation = {
   translation: {
     features: {
+      adminFormNavbar,
       common,
       login,
       publicForm,

diff --git a/frontend/src/i18n/locales/features/admin-form-navbar/en-sg.ts b/frontend/src/i18n/locales/features/admin-form-navbar/en-sg.ts
@@ -0,0 +1,18 @@
+import { AdminFormNavbar } from '.'
+
+export const enSG: AdminFormNavbar = {
+  tabs: {
+    create: 'Create',
+    settings: 'Settings',
+    results: 'Results',
+    routing: 'Routing',
+  },
+  manageCollaborators: 'Manage collaborators',
+  previewForm: 'Preview form',
+  formActions: 'Form actions',
+  shareBtn: {
+    text: 'Share',
+    textMobile: 'Share form link',
+    tooltip: 'Share your form link',
+  },
+}
diff --git a/frontend/src/i18n/locales/features/admin-form-navbar/index.ts b/frontend/src/i18n/locales/features/admin-form-navbar/index.ts
@@ -0,0 +1,18 @@
+export * from './en-sg'
+
+export interface AdminFormNavbar {
+  tabs: {
+    create: string
+    settings: string
+    results: string
+    routing: string
+  }
+  manageCollaborators: string
+  previewForm: string
+  formActions: string
+  shareBtn: {
+    text: string
+    textMobile: string
+    tooltip: string
+  }
+}
diff --git a/frontend/src/i18n/locales/features/index.ts b/frontend/src/i18n/locales/features/index.ts
@@ -1,3 +1,4 @@
+export { type AdminFormNavbar } from './admin-form-navbar'
 export { type Common } from './common'
 export { type Login } from './login'
 export { type PublicForm } from './public-form'
diff --git a/frontend/src/i18n/locales/types.ts b/frontend/src/i18n/locales/types.ts
@@ -1,8 +1,9 @@
-import { Common, Login, PublicForm } from './features'
+import { AdminFormNavbar, Common, Login, PublicForm } from './features'
 
 interface Translation {
   translation: {
     features: {
+      adminFormNavbar?: AdminFormNavbar
       common?: Common
       publicForm?: PublicForm
       login?: Login