finalize v2

Co-authored-by: Copilot <copilot@github.com>

Author: icepcp

.github/workflows/build.yml

@@ -55,20 +55,16 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      - name: Set up Buildx (docker-container)
+      - name: Set up buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
         with:
           driver: docker-container
           use: true
 
-      - name: Debug buildx
-        run: |
-          docker buildx version
-          docker buildx ls
-
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
+        id: push
         with:
           context: ./formsg
           file: ./formsg/Dockerfile.production
@@ -86,3 +82,26 @@ jobs:
           subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Login to azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Deploy new app
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az extension add --name containerapp --upgrade
+            az containerapp update -n app -g formsg \
+              --image ghcr.io/buildingblocs/formbbcs@sha-${GITHUB_SHA::7}

README.md

@@ -10,4 +10,21 @@ The backend could run with 1x cpu and 512mb
 
 ## v2
 
-v2 has both frontend and backend hosted on Azure, and therefore may require more compute to run. Having frontend on Azure allows for the meta information to work when links are pasted in whatsapp, discord, etc
+v2 has both frontend and backend hosted on Azure, and therefore may require more compute to run. Having frontend on Azure allows for the meta information to work when links are pasted in whatsapp, discord, etc. We are using 2C 4G, and have it to scale to 2 instances when needed, but it may be a bit overkill
+
+### How to run
+
+1. Create azure environment
+ - email, app container
+2. create an image by running the action
+ - make sure you modify some values to your own, like image name and whatnot
+3. try to run the app container with the docker image
+
+### Files changed and why
+
+**Backend**
+- Removed "attached pdf" text as pdf is no longer generated on server side, and instead on lamda. We dont use aws
+
+**Frontend**
+- All mostly just name changes so it is more branded for buildingblocs
+- features/admin-form: this is to enable charts feature to try it out

v1/backend/src/app/models/field/imageField.ts

@@ -1,3 +1,4 @@
+// myat: v2 azre migration: cant remember why this was added
 import { Schema } from 'mongoose'
 
 import { IImageFieldSchema } from '../../../types'

v1/backend/src/app/modules/auth/sso/auth-sso.controller.ts

@@ -1,3 +1,5 @@
+// myat v2migration: also cant understand why this was commented out
+
 // import { AuthedSessionData } from 'express-session'
 // import { StatusCodes } from 'http-status-codes'
 // import { errAsync } from 'neverthrow'

v1/backend/src/app/modules/auth/sso/auth-sso.service.ts

@@ -1,3 +1,5 @@
+// myat v2migration: also cant understand why this was commented out
+
 // import { okAsync, ResultAsync } from 'neverthrow'
 // import { getValidatedIdTokenClaims } from 'oauth4webapi'
 // import * as oidcClient from 'openid-client'

v1/frontend/frontend/src/features/admin-form/responses/ResponsesPage/storage/StorageResponsesService.ts

@@ -27,7 +27,7 @@ const generateDownloadUrl = (
 
   // Stringify all values in params.
   const uriEncodedParams = new URLSearchParams(mapValues(params, String))
-  return `${API_BASE_URL}/${ADMIN_FORM_ENDPOINT}/${formId}/submissions/download?${uriEncodedParams}`
+  return `${API_BASE_URL}${ADMIN_FORM_ENDPOINT}/${formId}/submissions/download?${uriEncodedParams}`
 }
 
 export const getEncryptedResponsesStream = async (
@@ -37,7 +37,6 @@ export const getEncryptedResponsesStream = async (
 ) => {
   // Unable to use axios for streams, and thus using native fetch instead.
   return fetch(generateDownloadUrl(formId, params), {
-    credentials: 'include',
     signal: abortController?.signal,
   })
     .then((res) => res.body)

v2/apps/backend/src/app/views/templates/submit-form-autoreply.server.view.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style type="text/css">
+      hr {
+        margin-top: 20px;
+        margin-bottom: 20px;
+      }
+    </style>
+  </head>
+  <body>
+    Response ID: <%= submissionId %>
+    <hr />
+    <% autoReplyBody.forEach(function(line) { %> <%= line %><br />
+    <% }) %> <% if (locals.refNo) { %>
+    <br />
+    <br />
+    ---
+    <br />
+    <br />
+    A summary of your response is shown below. A PDF summary is also attached
+    for your convenience.
+    <br />
+    <br />
+    <%- include('./submit-form-summary-pdf.server.view.html', { refNo: refNo,
+    formTitle: formTitle, submissionTime: submissionTime, formData: formData,
+    formUrl: formUrl, tableOnly: true}) %> <% } %>
+  </body>
+</html>

v2/apps/frontend/src/components/Footer/Footer.stories.tsx

@@ -0,0 +1,70 @@
+import { Meta, StoryFn } from '@storybook/react'
+
+import { viewports } from '~utils/storybook'
+
+import { FooterProps } from './common/types'
+import { Footer } from './Footer'
+
+const DEFAULT_ARGS: FooterProps = {
+  appName: 'Form',
+  appLink: 'https://form.gov.sg',
+  footerLinks: [
+    {
+      label: 'User guide',
+      href: '',
+    },
+    {
+      label: 'Privacy',
+      href: '',
+    },
+    {
+      label: 'Terms of use',
+      href: '',
+    },
+    {
+      label: 'Report vulnerability',
+      href: '',
+    },
+  ],
+}
+
+export default {
+  title: 'Components/Footer',
+  component: Footer,
+  decorators: [],
+  parameters: {
+    layout: 'fullscreen',
+  },
+  args: DEFAULT_ARGS,
+} as Meta<FooterProps>
+
+const Template: StoryFn<FooterProps> = (args) => <Footer {...args} />
+export const Default = Template.bind({})
+
+export const CompactVariant = Template.bind({})
+CompactVariant.args = {
+  ...DEFAULT_ARGS,
+  variant: 'compact',
+}
+
+export const WithTagline = Template.bind({})
+WithTagline.args = {
+  ...DEFAULT_ARGS,
+  tagline: 'Build secure BuildingBloCS forms in minutes',
+}
+
+export const Mobile = Template.bind({})
+Mobile.parameters = {
+  viewport: {
+    defaultViewport: 'mobile1',
+  },
+  chromatic: { viewports: [viewports.xs] },
+}
+
+export const Tablet = Template.bind({})
+Tablet.parameters = {
+  viewport: {
+    defaultViewport: 'tablet',
+  },
+  chromatic: { viewports: [viewports.md] },
+}