Merge pull request #656 from webstackdev/feature/resume-and-my-data-style-fixes

Feature/resume and my data style fixes

Author: webstackdev

@types/mjml-template.d.ts

@@ -1,4 +1,4 @@
 declare module '*.mjml?raw' {
   const content: string
   export default content
-}
+}

@types/pagedjs.d.ts

@@ -19,4 +19,4 @@ declare module 'pagedjs' {
   }
 
   export const registeredHandlers: PagedJsHandlerConstructor[]
-}
+}

_TODO.md

@@ -30,9 +30,9 @@ https://aws.plainenglish.io/how-to-build-a-chatbot-using-aws-lex-and-lambda-in-2
 ## Contact Form
 
 - `0/2000` characters should show number of characters left instead
+- Workflow right now puts the "Success" toast under the submit button when the submit button returns to normal after a submission. It seems like the button should have some time out after a successful submission to make sure it's not hammered, like five seconds. And it just looks visually odd - maybe the button should be part of the layout of the success toast, or moved down under it.
 
 ## Newsletter / MJML Templates
 
-- We need to make sure the images point to the full production URL, not a relative import
 - Need to move the unsubscribe link into an Action and handle it entirely within our website instead of on Hubspot
 - Need to add a newsletter publishing workflow as an action, using the newsletter static segment imported from Hubspot

cover.jpg

@@ -12,7 +12,9 @@ type ContactSubmitOutput = {
   message: string
 }
 
-const getMockedHandler = <Input, Output>(action: unknown): ActionConfig<Input, Output>['handler'] => {
+const getMockedHandler = <Input, Output>(
+  action: unknown
+): ActionConfig<Input, Output>['handler'] => {
   return (action as ActionConfig<Input, Output>).handler
 }
 
@@ -106,7 +108,7 @@ vi.mock('@actions/utils/errors', async () => {
           ? messageOrError
           : messageOrError instanceof Error
             ? messageOrError.message
-            : options?.message ?? 'Internal server error'
+            : (options?.message ?? 'Internal server error')
       super(message)
       this.name = 'ActionsFunctionError'
       this.status = options?.status ?? 500
@@ -239,4 +241,4 @@ describe('contact.submit.handler', () => {
       })
     )
   })
-})
+})

public/pdf/resume.pdf

@@ -49,7 +49,9 @@ describe('contact domain validation', () => {
     if (result.success) {
       throw new Error('Expected schema validation to fail')
     }
-    expect(z.flattenError(result.error).fieldErrors['timeline']).toContain('Invalid project timeline')
+    expect(z.flattenError(result.error).fieldErrors['timeline']).toContain(
+      'Invalid project timeline'
+    )
   })
 
   it('rejects messages that appear to contain spam', () => {
@@ -65,6 +67,8 @@ describe('contact domain validation', () => {
     if (result.success) {
       throw new Error('Expected schema validation to fail')
     }
-    expect(z.flattenError(result.error).fieldErrors['message']).toContain('Message appears to contain spam')
+    expect(z.flattenError(result.error).fieldErrors['message']).toContain(
+      'Message appears to contain spam'
+    )
   })
 })

src/actions/contact/__tests__/action.spec.ts

@@ -107,9 +107,7 @@ describe('contact responder', () => {
         { label: 'Budget', value: '$5k-$10k' },
         { label: 'Timeline', value: '2-3-months' },
       ])
-      expect(templateData.attachments).toEqual([
-        { filename: 'brief.pdf', sizeLabel: '1.21 KB' },
-      ])
+      expect(templateData.attachments).toEqual([{ filename: 'brief.pdf', sizeLabel: '1.21 KB' }])
       expect(templateData.consentGiven).toBe('Yes')
       expect(templateData.messageHtml).toContain('<ASAP>')
       expect(templateData.messageHtml).toContain('&')

src/actions/contact/__tests__/domain.spec.ts

@@ -8,7 +8,11 @@ import {
   getResendApiKey,
   isProd,
 } from '@actions/utils/environment/environmentActions'
-import { ActionsFunctionError, handleActionsFunctionError, throwActionError } from '@actions/utils/errors'
+import {
+  ActionsFunctionError,
+  handleActionsFunctionError,
+  throwActionError,
+} from '@actions/utils/errors'
 import { contactFormSender, contactInbox, contactReplyTo } from '@actions/utils/email/resendSenders'
 import { createConsentRecord } from '@actions/gdpr/entities/consent'
 import { createOrUpdateContact, setMarketingOptIn } from '@actions/utils/hubspot'
@@ -121,7 +125,8 @@ export const contact = {
             userAgent,
             ipAddress: ip !== 'unknown' ? ip : null,
             privacyPolicyVersion: getPrivacyPolicyVersion(),
-            consentText: null,
+            consentText:
+              'I consent to Webstack Builders processing my personal data for responding to your inquiry. See our Privacy Policy and Cookie Policy.',
             verified: true,
           })
         }
@@ -189,9 +194,13 @@ export const contact = {
           throw error
         }
 
-        throwActionError(error, { route, operation: 'submit' }, {
-          fallbackMessage: 'Failed to send email. Please try again later.',
-        })
+        throwActionError(
+          error,
+          { route, operation: 'submit' },
+          {
+            fallbackMessage: 'Failed to send email. Please try again later.',
+          }
+        )
       }
     },
   }),

src/actions/contact/__tests__/responder.spec.ts

@@ -1,15 +1,11 @@
 import { z } from 'astro/zod'
-import type {
-  ContactTimeline,
-  RequiredStringOptions,
- } from '@actions/contact/@types'
+import type { ContactTimeline, RequiredStringOptions } from '@actions/contact/@types'
 import { isAllowedTimeline } from './responder'
 
-const requiredStringError = (
-  requiredMessage: string,
-  invalidTypeMessage: string
-) => (issue: { input?: unknown }): string =>
-  issue.input === undefined ? requiredMessage : invalidTypeMessage
+const requiredStringError =
+  (requiredMessage: string, invalidTypeMessage: string) =>
+  (issue: { input?: unknown }): string =>
+    issue.input === undefined ? requiredMessage : invalidTypeMessage
 
 export function escapeHtml(text: string): string {
   const map: Record<string, string> = {
@@ -39,7 +35,8 @@ export function readString(form: FormData, key: string): string {
   return typeof value === 'string' ? value : ''
 }
 
-export const trimString = (value: unknown): unknown => (typeof value === 'string' ? value.trim() : value)
+export const trimString = (value: unknown): unknown =>
+  typeof value === 'string' ? value.trim() : value
 
 export const emptyStringToUndefined = (value: unknown): unknown => {
   if (value === null) return undefined
@@ -66,8 +63,8 @@ export const requiredString = (options: RequiredStringOptions) => {
   )
 }
 
-export const isFile = (value: unknown): value is File => typeof File !== 'undefined' && value instanceof File
-
+export const isFile = (value: unknown): value is File =>
+  typeof File !== 'undefined' && value instanceof File
 
 export const optionalFile = () => z.custom<File>(isFile).optional()