Merge pull request #6866 from opengovsg/release_v6.86.0

build: release v6.86.0

CHANGELOG.md

@@ -4,9 +4,29 @@ 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.86.0](https://github.com/opengovsg/FormSG/compare/v6.86.0...v6.86.0)
+
+- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867)
+
+#### [v6.86.0](https://github.com/opengovsg/FormSG/compare/v6.85.1...v6.86.0)
+
+> 6 November 2023
+
+- chore: update credits and terms of use [`#6865`](https://github.com/opengovsg/FormSG/pull/6865)
+- fix: add cloudflareinsights as allowable csp [`#6864`](https://github.com/opengovsg/FormSG/pull/6864)
+- feat: optimise submission query [`#6863`](https://github.com/opengovsg/FormSG/pull/6863)
+- chore(dockerfile): update mocktwilio to start asap [`#6862`](https://github.com/opengovsg/FormSG/pull/6862)
+- fix: only render delete button if owner [`#6837`](https://github.com/opengovsg/FormSG/pull/6837)
+- build: merge release v6.85.1 into develop [`#6861`](https://github.com/opengovsg/FormSG/pull/6861)
+- fix: hotfix v6.85.1 to prevent creation of SGID_MyInfo storage mode forms [`#6860`](https://github.com/opengovsg/FormSG/pull/6860)
+- chore: bump version to v6.86.0 [`1c827cd`](https://github.com/opengovsg/FormSG/commit/1c827cd11844649ca303bb5dc9987db5367637c9)
+
 #### [v6.85.1](https://github.com/opengovsg/FormSG/compare/v6.85.0...v6.85.1)
 
+> 31 October 2023
+
 - build: release v6.85.0 [`#6857`](https://github.com/opengovsg/FormSG/pull/6857)
+- chore: bump version to 6.85.1 [`6b0fbeb`](https://github.com/opengovsg/FormSG/commit/6b0fbeb241a1bafd097d1d38905369c744b6b6b1)
 - fix: add validation check for SGID_MyInfo [`c5e6a70`](https://github.com/opengovsg/FormSG/commit/c5e6a70764d5229a36985b363cc4695e49dfad6d)
 
 #### [v6.85.0](https://github.com/opengovsg/FormSG/compare/v6.84.0...v6.85.0)

Dockerfile.production

@@ -95,7 +95,8 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
 # This package is needed to render Chinese characters in autoreply PDFs
-RUN echo @edge http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && apk add font-wqy-zenhei@edge
+RUN apk add font-wqy-zenhei --repository https://dl-cdn.alpinelinux.org/alpine/edge/community
+
 ENV CHROMIUM_BIN=/usr/bin/chromium-browser
 
 # Run as non-privileged user

docker-compose.yml

@@ -187,8 +187,6 @@ services:
   mocktwilio:
     image: stoplight/prism:4
     container_name: formsg-mocktwilio
-    depends_on:
-      - backend
     network_mode: 'service:backend' # reuse backend service's network stack so that it can resolve localhost:4010 to prismtwilio:4010
     command: mock https://raw.githubusercontent.com/twilio/twilio-oai/main/spec/json/twilio_api_v2010.json
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.85.0",
+  "version": "6.86.0",
   "homepage": ".",
   "private": true,
   "dependencies": {

frontend/src/constants/links.ts

@@ -3,8 +3,7 @@ import { PRIVACY_POLICY_ROUTE, TOU_ROUTE } from './routes'
 export const CONTACT_US = 'https://go.gov.sg/formsg-support'
 export const FEATURE_REQUEST = 'https://go.gov.sg/form-featurerequest'
 export const REPORT_VULNERABILITY = 'https://go.gov.sg/report-vulnerability'
-export const OSS_README =
-  'https://s3-ap-southeast-1.amazonaws.com/misc.form.gov.sg/OSS-Legal.pdf'
+export const OSS_README = 'https://go.gov.sg/formsg-thirdparty'
 
 export const SINGPASS_FAQ = 'https://www.singpass.gov.sg/main/html/faq.html'
 

frontend/src/features/workspace/components/WorkspaceFormRow/RowActions/RowActionsDrawer.tsx

@@ -53,6 +53,7 @@ export const RowActionsDrawer = ({
     previewFormLink,
     handleDeleteForm,
     handleDuplicateForm,
+    isFormAdmin,
     handleCollaborators,
     handleShareForm,
   } = useRowAction(formMeta)
@@ -156,15 +157,19 @@ export const RowActionsDrawer = ({
                       <BiChevronRight fontSize="1.25rem" />
                     </Flex>
                   </Button>
-                  <Divider />
-                  <Button
-                    {...buttonProps}
-                    onClick={handleDeleteForm}
-                    color="danger.500"
-                    leftIcon={<BiTrash fontSize="1.25rem" />}
-                  >
-                    Delete
-                  </Button>
+                  {isFormAdmin && (
+                    <>
+                      <Divider />
+                      <Button
+                        {...buttonProps}
+                        onClick={handleDeleteForm}
+                        color="danger.500"
+                        leftIcon={<BiTrash fontSize="1.25rem" />}
+                      >
+                        Delete
+                      </Button>
+                    </>
+                  )}
                 </>
               )}
             </ButtonGroup>