cds-snc · justinr86 · Oct 2, 2020 · Oct 6, 2020 · Oct 8, 2020 · Oct 8, 2020
diff --git a/f2/src/AnonymousPage.js b/f2/src/AnonymousPage.js
@@ -10,6 +10,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const AnonymousPage = () => {
@@ -36,6 +37,7 @@ export const AnonymousPage = () => {
               </Lead>
               <AnonymousInfoForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { anonymous: data },

diff --git a/f2/src/BusinessPage.js b/f2/src/BusinessPage.js
@@ -14,6 +14,7 @@ import {
   whatWasAffectedPages,
 } from './utils/nextWhatWasAffectedUrl'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const BusinessPage = () => {
@@ -45,6 +46,7 @@ export const BusinessPage = () => {
                   whatWasAffectedNavState.nextPage.nextPageTextInPreviousPage
                 }
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { businessInfo: data },

diff --git a/f2/src/ConfirmationPage.js b/f2/src/ConfirmationPage.js
@@ -15,6 +15,7 @@ import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
 import { formDefaults } from './forms/defaultValues'
+import { removeEditFlags } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 const { getLogger } = require('./utils/winstonLoggerClient')
@@ -49,6 +50,7 @@ async function postData(url = '', data = {}) {
 }
 
 const prepFormData = (formDataOrig, language) => {
+  removeEditFlags(formDataOrig)
   Object.keys(formDataOrig).forEach((form) => {
     if (formDefaults[form]) {
       formDataOrig[form] = {

diff --git a/f2/src/ContactInfoPage.js b/f2/src/ContactInfoPage.js
@@ -10,10 +10,12 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const ContactInfoPage = () => {
-  const [, dispatch] = useStateValue()
+  const [state, dispatch] = useStateValue()
+  const { doneForms } = state
   useLog('ContactInfoPage')
   return (
     <Route
@@ -31,6 +33,7 @@ export const ContactInfoPage = () => {
 
               <ContactInfoForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { contactInfo: data },

diff --git a/f2/src/DevicesPage.js b/f2/src/DevicesPage.js
@@ -13,6 +13,7 @@ import {
   whatWasAffectedPages,
 } from './utils/nextWhatWasAffectedUrl'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const DevicesPage = () => {
@@ -46,6 +47,7 @@ export const DevicesPage = () => {
                   whatWasAffectedNavState.nextPage.nextPageTextInPreviousPage
                 }
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { devicesInfo: data },

diff --git a/f2/src/EvidencePage.js b/f2/src/EvidencePage.js
@@ -12,6 +12,7 @@ import { BackButton } from './components/backbutton'
 import { Stack, Box } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const EvidencePage = () => {
@@ -56,6 +57,7 @@ export const EvidencePage = () => {
 
               <EvidenceInfoForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({ type: 'saveFormData', data: { evidence: data } })
                   history.push(doneForms ? '/confirmation' : '/location')
                 }}

diff --git a/f2/src/HowDidItStartPage.js b/f2/src/HowDidItStartPage.js
@@ -10,6 +10,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const HowDidItStartPage = () => {
@@ -34,8 +35,8 @@ export const HowDidItStartPage = () => {
               </Stack>
 
               <HowDidItStartForm
-                history={history}
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { howdiditstart: data },

diff --git a/f2/src/InformationPage.js b/f2/src/InformationPage.js
@@ -14,6 +14,7 @@ import {
   whatWasAffectedPages,
 } from './utils/nextWhatWasAffectedUrl'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const InformationPage = () => {
@@ -47,6 +48,7 @@ export const InformationPage = () => {
                   whatWasAffectedNavState.nextPage.nextPageTextInPreviousPage
                 }
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { personalInformation: data },

diff --git a/f2/src/LocationAnonymousPage.js b/f2/src/LocationAnonymousPage.js
@@ -9,6 +9,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const LocationAnonymousPage = () => {
@@ -32,6 +33,7 @@ export const LocationAnonymousPage = () => {
 
               <LocationAnonymousInfoForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({ type: 'saveFormData', data: { location: data } })
                   history.push(doneForms ? '/confirmation' : '/confirmation')
                 }}

diff --git a/f2/src/LocationPage.js b/f2/src/LocationPage.js
@@ -12,6 +12,7 @@ import { useStateValue } from './utils/state'
 import { formatPostalCode } from './utils/formatPostalCode'
 import { Page } from './components/Page'
 import { formDefaults } from './forms/defaultValues'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const LocationPage = () => {
@@ -48,6 +49,7 @@ export const LocationPage = () => {
               ) : (
                 <LocationInfoForm
                   onSubmit={(data) => {
+                    editCheck(data, doneForms)
                     data.postalCode = formatPostalCode(data.postalCode)
                     dispatch({ type: 'saveFormData', data: { location: data } })
                     let isFromAnonymous = history.location.state

diff --git a/f2/src/MoneyLostPage.js b/f2/src/MoneyLostPage.js
@@ -13,6 +13,7 @@ import {
   whatWasAffectedPages,
 } from './utils/nextWhatWasAffectedUrl'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const MoneyLostPage = () => {
@@ -45,6 +46,7 @@ export const MoneyLostPage = () => {
                   whatWasAffectedNavState.nextPage.nextPageTextInPreviousPage
                 }
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { moneyLost: data },

diff --git a/f2/src/SuspectCluesPage.js b/f2/src/SuspectCluesPage.js
@@ -10,6 +10,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const SuspectCluesPage = () => {
@@ -35,6 +36,7 @@ export const SuspectCluesPage = () => {
 
               <SuspectCluesForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { suspectClues: data },

diff --git a/f2/src/WhatHappenedPage.js b/f2/src/WhatHappenedPage.js
@@ -14,6 +14,7 @@ import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
 import { Li } from './components/list-item'
 import { formDefaults } from './forms/defaultValues'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const WhatHappenedPage = () => {
@@ -95,6 +96,7 @@ export const WhatHappenedPage = () => {
               )}
               <WhatHappenedForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { whatHappened: data },

diff --git a/f2/src/WhatWasAffected.js b/f2/src/WhatWasAffected.js
@@ -14,6 +14,7 @@ import {
   orderSelection,
 } from './utils/nextWhatWasAffectedUrl'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 import { useLog } from './useLog'
 
 export const WhatWasAffectedPage = () => {
@@ -78,7 +79,7 @@ export const WhatWasAffectedPage = () => {
               <WhatWasAffectedForm
                 onSubmit={(data) => {
                   updateSelection(data.affectedOptions)
-
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { whatWasAffected: data },

diff --git a/f2/src/WhenDidItHappenPage.js b/f2/src/WhenDidItHappenPage.js
@@ -10,6 +10,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 
 export const WhenDidItHappenPage = () => {
   const [data, dispatch] = useStateValue()
@@ -33,6 +34,7 @@ export const WhenDidItHappenPage = () => {
 
               <WhenDidItHappenForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { whenDidItHappen: data },

diff --git a/f2/src/WhoAreYouReportForPage.js b/f2/src/WhoAreYouReportForPage.js
@@ -9,6 +9,7 @@ import { BackButton } from './components/backbutton'
 import { Stack } from '@chakra-ui/core'
 import { useStateValue } from './utils/state'
 import { Page } from './components/Page'
+import { editCheck } from './utils/flagFieldEdited'
 
 export const WhoAreYouReportForPage = () => {
   const [data, dispatch] = useStateValue()
@@ -27,6 +28,7 @@ export const WhoAreYouReportForPage = () => {
 
               <WhoAreYouReportForForm
                 onSubmit={(data) => {
+                  editCheck(data, doneForms)
                   dispatch({
                     type: 'saveFormData',
                     data: { whoAreYouReportFor: data },

diff --git a/f2/src/components/EditButton/index.js b/f2/src/components/EditButton/index.js
@@ -5,18 +5,19 @@ import { useLingui } from '@lingui/react'
 import { Link } from '../link'
 import { useStateValue } from '../../utils/state'
 
-export const EditButton = ({ path, label }) => {
+export const EditButton = (props) => {
   const { i18n } = useLingui()
   const [{ submitted }] = useStateValue()
+  const color = props.edited ? '#7834bc' : null
 
   return submitted ? null : (
-    <Link to={path} aria-label={i18n._(label)} ml={4}>
+    <Link to={props.path} aria-label={i18n._(props.label)} ml={4} color={color}>
       <Trans id="button.edit" />
     </Link>
   )
 }
 
 EditButton.propTypes = {
-  path: PropTypes.string.isRequired,
+  path: PropTypes.isRequired,
   label: PropTypes.string.isRequired,
 }
diff --git a/f2/src/components/formik/alert/index.js b/f2/src/components/formik/alert/index.js
@@ -124,6 +124,7 @@ export const ErrorSummary = (props) => {
                         href={`#${key}`}
                         marginBottom="0.5rem"
                         color="initial"
+                        visitedColor="initial"
                         onClick={(e) => {
                           e.preventDefault()
                           focusElement(key)

diff --git a/f2/src/components/formik/link/index.js b/f2/src/components/formik/link/index.js
@@ -9,5 +9,9 @@ export const A = styled.a`
     outline: 0px;
     box-shadow: 0 0 0 4px rgba(99, 179, 237, 0.6);
   }
+  &:visited {
+    color: ${(props) =>
+      props.visitedColor ? props.visitedColor : '#7834bc'} !important;
+  }
   ${fontSize};
 `
diff --git a/f2/src/components/link/index.js b/f2/src/components/link/index.js
@@ -6,7 +6,7 @@ import { Button } from '../button'
 import { Link as ChakraLink } from '@chakra-ui/core'
 
 //A link using react-router-dom. Useful for internal links. Takes a "to" attribute
-export const Link = props => (
+export const Link = (props) => (
   <ChakraLink
     as={ReactRouterLink}
     color="blue.700"
@@ -27,7 +27,7 @@ Link.propTypes = {
 }
 
 // Looks like a button, acts as a link
-export const ButtonLink = props => (
+export const ButtonLink = (props) => (
   <Button {...props} as={ReactRouterLink} role="button">
     {props.children}
   </Button>
@@ -39,7 +39,7 @@ ButtonLink.propTypes = {
 }
 
 // Looks like a link, acts as a button
-export const LinkButton = props => (
+export const LinkButton = (props) => (
   <ChakraLink
     color="blue.700"
     textDecoration="underline"
@@ -52,6 +52,9 @@ export const LinkButton = props => (
     _active={{
       boxShadow: 'outline',
     }}
+    _visited={{
+      color: '#7834bc',
+    }}
   >
     {props.children}
   </ChakraLink>
@@ -63,14 +66,17 @@ LinkButton.propTypes = {
 }
 
 // An anchor link. needs to contain an HREF. Useful for links outside the app
-export const A = props => (
+export const A = (props) => (
   <ChakraLink
     color="blue.700"
     textDecoration="underline"
     _hover={{
       color: 'blue.hover',
     }}
     {...props}
+    _visited={{
+      color: '#7834bc',
+    }}
   >
     {props.children}
   </ChakraLink>

diff --git a/f2/src/forms/LocationInfoForm.js b/f2/src/forms/LocationInfoForm.js
@@ -18,6 +18,7 @@ import { WarningModal } from '../components/formik/warningModal'
 export const LocationInfoForm = (props) => {
   const [, dispatch] = useStateValue()
   const [data] = useStateValue()
+  const { doneForms } = data
   const locationInfo = {
     ...formDefaults.location,
     ...data.formData.location,
@@ -89,7 +90,7 @@ export const LocationInfoForm = (props) => {
                   onClick={() => {
                     RemoveData()
                   }}
-                  to="/contactinfo"
+                  to={doneForms ? '/confirmation' : '/contactinfo'}
                 />
               </FormRow>
               <FormRow>

diff --git a/f2/src/locales/en.json b/f2/src/locales/en.json
@@ -92,6 +92,7 @@
   "confirmationPage.devices.nag": "No information provided.",
   "confirmationPage.devicesTitle": "Devices or accounts",
   "confirmationPage.devicesTitle.edit": "Edit How might your devices or accounts be affected?",
+  "confirmationPage.editedTag": "(Edited)",
   "confirmationPage.evidence.nag": "No information provided.",
   "confirmationPage.evidence.title": "Supporting evidence",
   "confirmationPage.evidence.title.edit": "Edit supporting evidence",

diff --git a/f2/src/locales/fr.json b/f2/src/locales/fr.json
@@ -92,6 +92,7 @@
   "confirmationPage.devices.nag": "Aucune information fournie.",
   "confirmationPage.devicesTitle": "Appareils ou comptes",
   "confirmationPage.devicesTitle.edit": "Modifier les répercussions sur les appareils ou comptes",
+  "confirmationPage.editedTag": "(Modifié)",
   "confirmationPage.evidence.nag": "Aucune information fournie.",
   "confirmationPage.evidence.title": "Preuves à l’appui",
   "confirmationPage.evidence.title.edit": "Modifier les preuves à l’appui",