From a055e2213be94e1506d0e36a3d61ac29ea9b0e07 Mon Sep 17 00:00:00 2001 From: justinr86 Date: Fri, 2 Oct 2020 14:13:50 -0400 Subject: [PATCH 1/4] Update package-lock.json --- f2/package-lock.json | 87 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/f2/package-lock.json b/f2/package-lock.json index c4fbdd898..13c170391 100644 --- a/f2/package-lock.json +++ b/f2/package-lock.json @@ -582,7 +582,6 @@ "version": "7.9.2", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", - "dev": true, "requires": { "@babel/template": "^7.8.3", "@babel/traverse": "^7.9.0", @@ -8277,6 +8276,7 @@ "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz", "integrity": "sha512-k58RtQOKH21NyKtzptoAvtAODuAJJs3ZhqBMl456/GnXEQ/0La92pNmwgWoMn5pBTrsvk3YYXdY7zpY4e3UIxA==", "requires": { + "@babel/core": "7.9.0", "@babel/plugin-proposal-class-properties": "7.8.3", "@babel/plugin-proposal-decorators": "7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3", @@ -8293,6 +8293,29 @@ "babel-plugin-transform-react-remove-prop-types": "0.4.24" }, "dependencies": { + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, "@babel/preset-react": { "version": "7.9.1", "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.1.tgz", @@ -8313,6 +8336,19 @@ "requires": { "regenerator-runtime": "^0.13.4" } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -22572,6 +22608,7 @@ "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.3.tgz", "integrity": "sha512-oSnoWmii/iKdeQiwaO6map1lUaZLmG0xIUyb/HwCVFLT7gNbj8JZ9RmpvMCZ4fB98ZUMRfNmp/ft8uy/xD1RLA==", "requires": { + "@babel/core": "7.9.0", "@svgr/webpack": "4.3.3", "@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/parser": "^2.10.0", @@ -22626,6 +22663,41 @@ "workbox-webpack-plugin": "4.3.1" }, "dependencies": { + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, "ajv": { "version": "6.12.3", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", @@ -22637,6 +22709,14 @@ "uri-js": "^4.2.2" } }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "requires": { + "ms": "2.1.2" + } + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -22692,6 +22772,11 @@ "semver": "^6.0.0" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", From 0f2b10e6ebaceed6c2cc4c93bc99552071c8b821 Mon Sep 17 00:00:00 2001 From: justinr86 Date: Thu, 29 Oct 2020 15:42:08 -0400 Subject: [PATCH 2/4] Indicate field has been modified in confirmation summary --- f2/src/AnonymousPage.js | 2 ++ f2/src/BusinessPage.js | 3 ++- f2/src/ConfirmationPage.js | 2 ++ f2/src/ContactInfoPage.js | 2 ++ f2/src/DevicesPage.js | 3 ++- f2/src/EvidencePage.js | 2 ++ f2/src/HowDidItStartPage.js | 3 ++- f2/src/InformationPage.js | 3 ++- f2/src/LocationAnonymousPage.js | 2 ++ f2/src/LocationPage.js | 2 ++ f2/src/MoneyLostPage.js | 3 ++- f2/src/SuspectCluesPage.js | 4 +++- f2/src/WhatHappenedPage.js | 2 ++ f2/src/WhatWasAffected.js | 3 ++- f2/src/WhenDidItHappenPage.js | 2 ++ f2/src/WhoAreYouReportForPage.js | 2 ++ f2/src/components/EditButton/index.js | 7 ++++--- f2/src/components/formik/alert/index.js | 1 + f2/src/components/formik/link/index.js | 4 ++++ f2/src/components/link/index.js | 14 ++++++++++---- f2/src/forms/LocationInfoForm.js | 3 ++- f2/src/i18n.config.js | 2 +- f2/src/locales/en.json | 1 + f2/src/locales/fr.json | 1 + f2/src/summary/AnonymousSummary.js | 10 ++++++++-- f2/src/summary/BusinessInfoSummary.js | 11 ++++++++--- f2/src/summary/ContactInfoSummary.js | 10 ++++++++-- f2/src/summary/DevicesSummary.js | 10 ++++++++-- f2/src/summary/EvidenceInfoSummary.js | 10 ++++++++-- f2/src/summary/HowDidItStartSummary.js | 12 +++++++++--- f2/src/summary/InformationSummary.js | 10 ++++++++-- f2/src/summary/LocationInfoSummary.js | 12 +++++++++--- f2/src/summary/MoneyLostInfoSummary.js | 10 ++++++++-- f2/src/summary/SuspectCluesSummary.js | 14 +++++++++++--- f2/src/summary/WhatHappenedSummary.js | 12 +++++++++--- f2/src/summary/WhatWasAffectedSummary.js | 10 ++++++++-- f2/src/summary/WhenDidItHappenSummary.js | 14 ++++++++++---- f2/src/summary/WhoAreYouReportForSummary.js | 10 ++++++++-- f2/src/utils/flagFieldEdited.js | 11 +++++++++++ 39 files changed, 188 insertions(+), 51 deletions(-) create mode 100644 f2/src/utils/flagFieldEdited.js diff --git a/f2/src/AnonymousPage.js b/f2/src/AnonymousPage.js index 0e2acb160..cfe91e2fb 100644 --- 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' export const AnonymousPage = () => { const [state, dispatch] = useStateValue() @@ -34,6 +35,7 @@ export const AnonymousPage = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { anonymous: data }, diff --git a/f2/src/BusinessPage.js b/f2/src/BusinessPage.js index 966976792..de259eddb 100644 --- a/f2/src/BusinessPage.js +++ b/f2/src/BusinessPage.js @@ -11,6 +11,7 @@ import { Stack } from '@chakra-ui/core' import { useStateValue } from './utils/state' import { navigate, whatWasAffectedPages } from './utils/nextWhatWasAffectedUrl' import { Page } from './components/Page' +import { editCheck } from './utils/flagFieldEdited' export const BusinessPage = () => { const [state, dispatch] = useStateValue() @@ -37,7 +38,7 @@ export const BusinessPage = () => { { navigate(doneForms, whatWasAffectedNavState) - + editCheck(data, history) dispatch({ type: 'saveFormData', data: { businessInfo: data }, diff --git a/f2/src/ConfirmationPage.js b/f2/src/ConfirmationPage.js index 942b3656b..eae31754e 100644 --- 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' async function postData(url = '', data = {}) { // Building a multi-part form for file upload! @@ -45,6 +46,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 index 71abc3868..868e2a309 100644 --- a/f2/src/ContactInfoPage.js +++ b/f2/src/ContactInfoPage.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 ContactInfoPage = () => { const [, dispatch] = useStateValue() @@ -29,6 +30,7 @@ export const ContactInfoPage = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { contactInfo: data }, diff --git a/f2/src/DevicesPage.js b/f2/src/DevicesPage.js index 9b15deb22..2935ddef9 100644 --- a/f2/src/DevicesPage.js +++ b/f2/src/DevicesPage.js @@ -10,6 +10,7 @@ import { Stack } from '@chakra-ui/core' import { useStateValue } from './utils/state' import { navigate, whatWasAffectedPages } from './utils/nextWhatWasAffectedUrl' import { Page } from './components/Page' +import { editCheck } from './utils/flagFieldEdited' export const DevicesPage = () => { const [state, dispatch] = useStateValue() @@ -37,7 +38,7 @@ export const DevicesPage = () => { { navigate(doneForms, whatWasAffectedNavState) - + editCheck(data, history) dispatch({ type: 'saveFormData', data: { devicesInfo: data }, diff --git a/f2/src/EvidencePage.js b/f2/src/EvidencePage.js index db97c4eba..5aa66ab03 100644 --- 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' export const EvidencePage = () => { const [data, dispatch] = useStateValue() @@ -54,6 +55,7 @@ export const EvidencePage = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { evidence: data } }) history.push(doneForms ? '/confirmation' : '/location') }} diff --git a/f2/src/HowDidItStartPage.js b/f2/src/HowDidItStartPage.js index 7995a8f62..dc3210708 100644 --- 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' export const HowDidItStartPage = () => { const [data, dispatch] = useStateValue() @@ -32,8 +33,8 @@ export const HowDidItStartPage = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { howdiditstart: data }, diff --git a/f2/src/InformationPage.js b/f2/src/InformationPage.js index e6ab50355..86c5be6f1 100644 --- a/f2/src/InformationPage.js +++ b/f2/src/InformationPage.js @@ -11,6 +11,7 @@ import { Stack } from '@chakra-ui/core' import { useStateValue } from './utils/state' import { navigate, whatWasAffectedPages } from './utils/nextWhatWasAffectedUrl' import { Page } from './components/Page' +import { editCheck } from './utils/flagFieldEdited' export const InformationPage = () => { const [state, dispatch] = useStateValue() @@ -38,7 +39,7 @@ export const InformationPage = () => { { navigate(doneForms, whatWasAffectedNavState) - + editCheck(data, history) dispatch({ type: 'saveFormData', data: { personalInformation: data }, diff --git a/f2/src/LocationAnonymousPage.js b/f2/src/LocationAnonymousPage.js index b0c61d4f0..b1da36293 100644 --- 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' export const LocationAnonymousPage = () => { const [data, dispatch] = useStateValue() @@ -30,6 +31,7 @@ export const LocationAnonymousPage = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { location: data } }) history.push(doneForms ? '/confirmation' : '/confirmation') }} diff --git a/f2/src/LocationPage.js b/f2/src/LocationPage.js index dd15f37dc..8352e9d1a 100644 --- 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' export const LocationPage = () => { const [data, dispatch] = useStateValue() @@ -46,6 +47,7 @@ export const LocationPage = () => { ) : ( { + editCheck(data, history) 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 index 2a08df0a7..ad6cc7753 100644 --- a/f2/src/MoneyLostPage.js +++ b/f2/src/MoneyLostPage.js @@ -10,6 +10,7 @@ import { Stack } from '@chakra-ui/core' import { useStateValue } from './utils/state' import { navigate, whatWasAffectedPages } from './utils/nextWhatWasAffectedUrl' import { Page } from './components/Page' +import { editCheck } from './utils/flagFieldEdited' export const MoneyLostPage = () => { const [state, dispatch] = useStateValue() @@ -36,7 +37,7 @@ export const MoneyLostPage = () => { { navigate(doneForms, whatWasAffectedNavState) - + editCheck(data, history) dispatch({ type: 'saveFormData', data: { moneyLost: data }, diff --git a/f2/src/SuspectCluesPage.js b/f2/src/SuspectCluesPage.js index b2b7a68ce..69eca73cd 100644 --- 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' export const SuspectCluesPage = () => { const [data, dispatch] = useStateValue() @@ -32,7 +33,8 @@ export const SuspectCluesPage = () => { { + onSubmit={(data) => { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { suspectClues: data }, diff --git a/f2/src/WhatHappenedPage.js b/f2/src/WhatHappenedPage.js index 33ecbdde2..1d79f4dfc 100644 --- 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' export const WhatHappenedPage = () => { const [data, dispatch] = useStateValue() @@ -93,6 +94,7 @@ export const WhatHappenedPage = () => { )} { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { whatHappened: data }, diff --git a/f2/src/WhatWasAffected.js b/f2/src/WhatWasAffected.js index 6da771a7e..7c1d67a25 100644 --- 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' export const WhatWasAffectedPage = () => { const [data, dispatch] = useStateValue() @@ -76,7 +77,7 @@ export const WhatWasAffectedPage = () => { { updateSelection(data.affectedOptions) - + editCheck(data, history) dispatch({ type: 'saveFormData', data: { whatWasAffected: data }, diff --git a/f2/src/WhenDidItHappenPage.js b/f2/src/WhenDidItHappenPage.js index 3ff3c54fa..410ed1535 100644 --- 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 = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { whenDidItHappen: data }, diff --git a/f2/src/WhoAreYouReportForPage.js b/f2/src/WhoAreYouReportForPage.js index 7823e780d..0a7837d27 100644 --- 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 = () => { { + editCheck(data, history) dispatch({ type: 'saveFormData', data: { whoAreYouReportFor: data }, diff --git a/f2/src/components/EditButton/index.js b/f2/src/components/EditButton/index.js index d26674978..9b5c8f8ce 100644 --- 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 : ( - + ) } 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 index 0c2d17885..217b0ab12 100644 --- 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 index e2259cbe9..de5201530 100644 --- 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 index 8c4583df7..64f259d87 100644 --- 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) => ( ( +export const ButtonLink = (props) => ( @@ -39,7 +39,7 @@ ButtonLink.propTypes = { } // Looks like a link, acts as a button -export const LinkButton = props => ( +export const LinkButton = (props) => ( ( _active={{ boxShadow: 'outline', }} + _visited={{ + color: '#7834bc', + }} > {props.children} @@ -63,7 +66,7 @@ LinkButton.propTypes = { } // An anchor link. needs to contain an HREF. Useful for links outside the app -export const A = props => ( +export const A = (props) => ( ( color: 'blue.hover', }} {...props} + _visited={{ + color: '#7834bc', + }} > {props.children} diff --git a/f2/src/forms/LocationInfoForm.js b/f2/src/forms/LocationInfoForm.js index 2fc3ebdb5..83215c363 100644 --- 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'} /> diff --git a/f2/src/i18n.config.js b/f2/src/i18n.config.js index a84da21b7..29d23750f 100644 --- a/f2/src/i18n.config.js +++ b/f2/src/i18n.config.js @@ -11,7 +11,7 @@ export async function activate(locale) { try { catalog = await import( - /* webpackChunkName: "i18n-[index]" */ `@lingui/loader!./locales/${locale}.json` + /* webpackChunkName: "i18n-[index]" */ `./locales/${locale}.js` ) } catch (e) { // this fails only during tests due to webpack errors. diff --git a/f2/src/locales/en.json b/f2/src/locales/en.json index da7b75dda..cd63db288 100644 --- a/f2/src/locales/en.json +++ b/f2/src/locales/en.json @@ -93,6 +93,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 index 85d133056..9769609ea 100644 --- a/f2/src/locales/fr.json +++ b/f2/src/locales/fr.json @@ -93,6 +93,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", diff --git a/f2/src/summary/AnonymousSummary.js b/f2/src/summary/AnonymousSummary.js index 4c3a8a0cd..bd1d33d75 100644 --- a/f2/src/summary/AnonymousSummary.js +++ b/f2/src/summary/AnonymousSummary.js @@ -6,7 +6,7 @@ import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { Text } from '../components/text' export const AnonymousSummary = (props) => { @@ -30,9 +30,15 @@ export const AnonymousSummary = (props) => {

+ {anonymous.edited && ( +

+ +

+ )} diff --git a/f2/src/summary/BusinessInfoSummary.js b/f2/src/summary/BusinessInfoSummary.js index af5810193..d0fe1cbda 100644 --- a/f2/src/summary/BusinessInfoSummary.js +++ b/f2/src/summary/BusinessInfoSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -43,10 +43,15 @@ export const BusinessInfoSummary = (props) => {

- + {businessInfo.edited && ( +

+ +

+ )} diff --git a/f2/src/summary/ContactInfoSummary.js b/f2/src/summary/ContactInfoSummary.js index 2995f2ce2..f663320c9 100644 --- a/f2/src/summary/ContactInfoSummary.js +++ b/f2/src/summary/ContactInfoSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -42,9 +42,15 @@ export const ContactInfoSummary = (props) => {

+ {contactInfo.edited && ( +

+ +

+ )} {containsData(contactInfo) ? ( diff --git a/f2/src/summary/DevicesSummary.js b/f2/src/summary/DevicesSummary.js index 7968924a2..33e1e0915 100644 --- a/f2/src/summary/DevicesSummary.js +++ b/f2/src/summary/DevicesSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -41,9 +41,15 @@ export const DevicesSummary = (props) => {

+ {devices.edited && ( +

+ +

+ )} diff --git a/f2/src/summary/EvidenceInfoSummary.js b/f2/src/summary/EvidenceInfoSummary.js index ea62ce9a8..b88dbd334 100644 --- a/f2/src/summary/EvidenceInfoSummary.js +++ b/f2/src/summary/EvidenceInfoSummary.js @@ -6,7 +6,7 @@ import { Stack, Flex, Box } from '@chakra-ui/core' import { useStateValue } from '../utils/state' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { Text } from '../components/text' export const EvidenceInfoSummary = (props) => { @@ -39,9 +39,15 @@ export const EvidenceInfoSummary = (props) => {

+ {evidence.edited && ( +

+ +

+ )} {evidence.files && evidence.files.length > 0 ? ( diff --git a/f2/src/summary/HowDidItStartSummary.js b/f2/src/summary/HowDidItStartSummary.js index fd3583203..a18b4d09b 100644 --- a/f2/src/summary/HowDidItStartSummary.js +++ b/f2/src/summary/HowDidItStartSummary.js @@ -8,7 +8,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' import { formatList } from '../utils/formatList' @@ -70,13 +70,19 @@ export const HowDidItStartSummary = (props) => {

+ {howdiditstart.edited && ( +

+ +

+ )} - {containsData(howdiditstart) ? ( + {howdiditstart.howDidTheyReachYou.length ? ( {overviewLine} diff --git a/f2/src/summary/InformationSummary.js b/f2/src/summary/InformationSummary.js index fa858d749..b6b972237 100644 --- a/f2/src/summary/InformationSummary.js +++ b/f2/src/summary/InformationSummary.js @@ -6,7 +6,7 @@ import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { useLingui } from '@lingui/react' import { Text } from '../components/text' @@ -75,9 +75,15 @@ export const InformationSummary = (props) => {

+ {personalInformation.edited && ( +

+ +

+ )} diff --git a/f2/src/summary/LocationInfoSummary.js b/f2/src/summary/LocationInfoSummary.js index 3252657de..bd1b90425 100644 --- a/f2/src/summary/LocationInfoSummary.js +++ b/f2/src/summary/LocationInfoSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -41,12 +41,18 @@ export const LocationInfoSummary = (props) => {

+ {location.edited && ( +

+ +

+ )} - {containsData(location) ? ( + {location.city || location.province || location.postalCode ? ( {

+ {moneyLost.edited && ( +

+ +

+ )} diff --git a/f2/src/summary/SuspectCluesSummary.js b/f2/src/summary/SuspectCluesSummary.js index e44e2640f..e353809f0 100644 --- a/f2/src/summary/SuspectCluesSummary.js +++ b/f2/src/summary/SuspectCluesSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -41,12 +41,20 @@ export const SuspectCluesSummary = (props) => {

+ {suspectClues.edited && ( +

+ +

+ )} - {containsData(suspectClues) ? ( + {suspectClues.suspectClues1 || + suspectClues.suspectClues2 || + suspectClues.suspectClues3 ? ( { @@ -39,13 +39,19 @@ export const WhatHappenedSummary = (props) => {

+ {whatHappened.edited && ( +

+ +

+ )} - {containsData(whatHappened) ? ( + {whatHappened.whatHappened ? ( {whatHappened.whatHappened} ) : ( diff --git a/f2/src/summary/WhatWasAffectedSummary.js b/f2/src/summary/WhatWasAffectedSummary.js index cb0274b83..f0c10692d 100644 --- a/f2/src/summary/WhatWasAffectedSummary.js +++ b/f2/src/summary/WhatWasAffectedSummary.js @@ -7,7 +7,7 @@ import { useStateValue } from '../utils/state' import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { useLingui } from '@lingui/react' import { Text } from '../components/text' import { formatList } from '../utils/formatList' @@ -50,9 +50,15 @@ export const WhatWasAffectedSummary = (props) => {

+ {impact.edited && ( +

+ +

+ )} {containsData(impact) ? ( diff --git a/f2/src/summary/WhenDidItHappenSummary.js b/f2/src/summary/WhenDidItHappenSummary.js index de3223e8a..302b022e0 100644 --- a/f2/src/summary/WhenDidItHappenSummary.js +++ b/f2/src/summary/WhenDidItHappenSummary.js @@ -8,7 +8,7 @@ import { containsData } from '../utils/containsData' import { formatDate } from '../utils/formatDate' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' -import { H2 } from '../components/header' +import { H2, H3 } from '../components/header' import { DescriptionListItem } from '../components/DescriptionListItem' import { Text } from '../components/text' @@ -56,13 +56,19 @@ export const WhenDidItHappenSummary = (props) => {

+ {whenDidItHappen.edited && ( +

+ +

+ )} - {containsData(whenDidItHappen) ? ( + {whenDidItHappen.incidentFrequency ? ( { whenDidItHappen.endYear, )} /> - {containsData(whenDidItHappen.description) ? ( + {whenDidItHappen.description ? ( {

+ {whoAreYouReportFor.edited && ( +

+ +

+ )} diff --git a/f2/src/utils/flagFieldEdited.js b/f2/src/utils/flagFieldEdited.js new file mode 100644 index 000000000..d9e20bc96 --- /dev/null +++ b/f2/src/utils/flagFieldEdited.js @@ -0,0 +1,11 @@ +export const editCheck = (data, history) => { + if (history.location.state && history.location.state.edit) { + data.edited = true + } +} + +export const removeEditFlags = (data) => { + Object.keys(data).forEach((key) => { + delete data[key].edited + }) +} From 11b55b328290e61d3d4a8757cba006496fff4eb5 Mon Sep 17 00:00:00 2001 From: justinr86 Date: Thu, 29 Oct 2020 15:43:22 -0400 Subject: [PATCH 3/4] Indicate field has been modified in confirmation summary --- f2/src/i18n.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f2/src/i18n.config.js b/f2/src/i18n.config.js index 29d23750f..a84da21b7 100644 --- a/f2/src/i18n.config.js +++ b/f2/src/i18n.config.js @@ -11,7 +11,7 @@ export async function activate(locale) { try { catalog = await import( - /* webpackChunkName: "i18n-[index]" */ `./locales/${locale}.js` + /* webpackChunkName: "i18n-[index]" */ `@lingui/loader!./locales/${locale}.json` ) } catch (e) { // this fails only during tests due to webpack errors. From ed116ea16a57fd70c0eb99027d254a29e76ddcf2 Mon Sep 17 00:00:00 2001 From: justinr86 Date: Fri, 30 Oct 2020 07:21:48 -0400 Subject: [PATCH 4/4] Remove unused import --- f2/src/AnonymousPage.js | 2 +- f2/src/BusinessPage.js | 2 +- f2/src/ContactInfoPage.js | 6 ++++-- f2/src/DevicesPage.js | 2 +- f2/src/EvidencePage.js | 2 +- f2/src/HowDidItStartPage.js | 2 +- f2/src/InformationPage.js | 2 +- f2/src/LocationAnonymousPage.js | 2 +- f2/src/LocationPage.js | 2 +- f2/src/MoneyLostPage.js | 2 +- f2/src/SuspectCluesPage.js | 2 +- f2/src/WhatHappenedPage.js | 2 +- f2/src/WhatWasAffected.js | 2 +- f2/src/WhenDidItHappenPage.js | 2 +- f2/src/WhoAreYouReportForPage.js | 2 +- f2/src/summary/AnonymousSummary.js | 2 +- f2/src/summary/BusinessInfoSummary.js | 2 +- f2/src/summary/ContactInfoSummary.js | 2 +- f2/src/summary/DevicesSummary.js | 2 +- f2/src/summary/EvidenceInfoSummary.js | 2 +- f2/src/summary/HowDidItStartSummary.js | 3 +-- f2/src/summary/InformationSummary.js | 2 +- f2/src/summary/LocationInfoSummary.js | 3 +-- f2/src/summary/MoneyLostInfoSummary.js | 2 +- f2/src/summary/SuspectCluesSummary.js | 3 +-- f2/src/summary/WhatHappenedSummary.js | 3 +-- f2/src/summary/WhatWasAffectedSummary.js | 2 +- f2/src/summary/WhenDidItHappenSummary.js | 3 +-- f2/src/summary/WhoAreYouReportForSummary.js | 2 +- f2/src/utils/flagFieldEdited.js | 4 ++-- 30 files changed, 34 insertions(+), 37 deletions(-) diff --git a/f2/src/AnonymousPage.js b/f2/src/AnonymousPage.js index cfe91e2fb..4fa4925f6 100644 --- a/f2/src/AnonymousPage.js +++ b/f2/src/AnonymousPage.js @@ -35,7 +35,7 @@ export const AnonymousPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { anonymous: data }, diff --git a/f2/src/BusinessPage.js b/f2/src/BusinessPage.js index de259eddb..4864b97bf 100644 --- a/f2/src/BusinessPage.js +++ b/f2/src/BusinessPage.js @@ -38,7 +38,7 @@ export const BusinessPage = () => { { navigate(doneForms, whatWasAffectedNavState) - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { businessInfo: data }, diff --git a/f2/src/ContactInfoPage.js b/f2/src/ContactInfoPage.js index 868e2a309..98cf99f06 100644 --- a/f2/src/ContactInfoPage.js +++ b/f2/src/ContactInfoPage.js @@ -13,7 +13,9 @@ import { Page } from './components/Page' import { editCheck } from './utils/flagFieldEdited' export const ContactInfoPage = () => { - const [, dispatch] = useStateValue() + const [state, dispatch] = useStateValue() + const { doneForms } = state + return ( ( @@ -30,7 +32,7 @@ export const ContactInfoPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { contactInfo: data }, diff --git a/f2/src/DevicesPage.js b/f2/src/DevicesPage.js index 2935ddef9..eaab4ce20 100644 --- a/f2/src/DevicesPage.js +++ b/f2/src/DevicesPage.js @@ -38,7 +38,7 @@ export const DevicesPage = () => { { navigate(doneForms, whatWasAffectedNavState) - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { devicesInfo: data }, diff --git a/f2/src/EvidencePage.js b/f2/src/EvidencePage.js index 5aa66ab03..d365eee4d 100644 --- a/f2/src/EvidencePage.js +++ b/f2/src/EvidencePage.js @@ -55,7 +55,7 @@ export const EvidencePage = () => { { - editCheck(data, history) + 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 index dc3210708..6519ae394 100644 --- a/f2/src/HowDidItStartPage.js +++ b/f2/src/HowDidItStartPage.js @@ -34,7 +34,7 @@ export const HowDidItStartPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { howdiditstart: data }, diff --git a/f2/src/InformationPage.js b/f2/src/InformationPage.js index 86c5be6f1..02c6634d1 100644 --- a/f2/src/InformationPage.js +++ b/f2/src/InformationPage.js @@ -39,7 +39,7 @@ export const InformationPage = () => { { navigate(doneForms, whatWasAffectedNavState) - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { personalInformation: data }, diff --git a/f2/src/LocationAnonymousPage.js b/f2/src/LocationAnonymousPage.js index b1da36293..7c1875324 100644 --- a/f2/src/LocationAnonymousPage.js +++ b/f2/src/LocationAnonymousPage.js @@ -31,7 +31,7 @@ export const LocationAnonymousPage = () => { { - editCheck(data, history) + 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 index 8352e9d1a..35381b3ec 100644 --- a/f2/src/LocationPage.js +++ b/f2/src/LocationPage.js @@ -47,7 +47,7 @@ export const LocationPage = () => { ) : ( { - editCheck(data, history) + 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 index ad6cc7753..36aacb13e 100644 --- a/f2/src/MoneyLostPage.js +++ b/f2/src/MoneyLostPage.js @@ -37,7 +37,7 @@ export const MoneyLostPage = () => { { navigate(doneForms, whatWasAffectedNavState) - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { moneyLost: data }, diff --git a/f2/src/SuspectCluesPage.js b/f2/src/SuspectCluesPage.js index 69eca73cd..d52b6af5d 100644 --- a/f2/src/SuspectCluesPage.js +++ b/f2/src/SuspectCluesPage.js @@ -34,7 +34,7 @@ export const SuspectCluesPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { suspectClues: data }, diff --git a/f2/src/WhatHappenedPage.js b/f2/src/WhatHappenedPage.js index 1d79f4dfc..7b7cfd271 100644 --- a/f2/src/WhatHappenedPage.js +++ b/f2/src/WhatHappenedPage.js @@ -94,7 +94,7 @@ export const WhatHappenedPage = () => { )} { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { whatHappened: data }, diff --git a/f2/src/WhatWasAffected.js b/f2/src/WhatWasAffected.js index 7c1d67a25..9569fd718 100644 --- a/f2/src/WhatWasAffected.js +++ b/f2/src/WhatWasAffected.js @@ -77,7 +77,7 @@ export const WhatWasAffectedPage = () => { { updateSelection(data.affectedOptions) - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { whatWasAffected: data }, diff --git a/f2/src/WhenDidItHappenPage.js b/f2/src/WhenDidItHappenPage.js index 410ed1535..69297baba 100644 --- a/f2/src/WhenDidItHappenPage.js +++ b/f2/src/WhenDidItHappenPage.js @@ -34,7 +34,7 @@ export const WhenDidItHappenPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { whenDidItHappen: data }, diff --git a/f2/src/WhoAreYouReportForPage.js b/f2/src/WhoAreYouReportForPage.js index 0a7837d27..9ce6deaec 100644 --- a/f2/src/WhoAreYouReportForPage.js +++ b/f2/src/WhoAreYouReportForPage.js @@ -28,7 +28,7 @@ export const WhoAreYouReportForPage = () => { { - editCheck(data, history) + editCheck(data, doneForms) dispatch({ type: 'saveFormData', data: { whoAreYouReportFor: data }, diff --git a/f2/src/summary/AnonymousSummary.js b/f2/src/summary/AnonymousSummary.js index bd1d33d75..880ed2b49 100644 --- a/f2/src/summary/AnonymousSummary.js +++ b/f2/src/summary/AnonymousSummary.js @@ -37,7 +37,7 @@ export const AnonymousSummary = (props) => { )} diff --git a/f2/src/summary/BusinessInfoSummary.js b/f2/src/summary/BusinessInfoSummary.js index d0fe1cbda..e42dbf36d 100644 --- a/f2/src/summary/BusinessInfoSummary.js +++ b/f2/src/summary/BusinessInfoSummary.js @@ -50,7 +50,7 @@ export const BusinessInfoSummary = (props) => { )} diff --git a/f2/src/summary/ContactInfoSummary.js b/f2/src/summary/ContactInfoSummary.js index f663320c9..c43086da9 100644 --- a/f2/src/summary/ContactInfoSummary.js +++ b/f2/src/summary/ContactInfoSummary.js @@ -49,7 +49,7 @@ export const ContactInfoSummary = (props) => { )} diff --git a/f2/src/summary/DevicesSummary.js b/f2/src/summary/DevicesSummary.js index 33e1e0915..287c539cf 100644 --- a/f2/src/summary/DevicesSummary.js +++ b/f2/src/summary/DevicesSummary.js @@ -48,7 +48,7 @@ export const DevicesSummary = (props) => { )} diff --git a/f2/src/summary/EvidenceInfoSummary.js b/f2/src/summary/EvidenceInfoSummary.js index b88dbd334..683e8d194 100644 --- a/f2/src/summary/EvidenceInfoSummary.js +++ b/f2/src/summary/EvidenceInfoSummary.js @@ -46,7 +46,7 @@ export const EvidenceInfoSummary = (props) => { )} diff --git a/f2/src/summary/HowDidItStartSummary.js b/f2/src/summary/HowDidItStartSummary.js index a18b4d09b..b3b4a7884 100644 --- a/f2/src/summary/HowDidItStartSummary.js +++ b/f2/src/summary/HowDidItStartSummary.js @@ -5,7 +5,6 @@ import { useLingui } from '@lingui/react' import { Trans } from '@lingui/macro' import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' -import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' import { H2, H3 } from '../components/header' @@ -77,7 +76,7 @@ export const HowDidItStartSummary = (props) => { )} diff --git a/f2/src/summary/InformationSummary.js b/f2/src/summary/InformationSummary.js index b6b972237..05a8be2c0 100644 --- a/f2/src/summary/InformationSummary.js +++ b/f2/src/summary/InformationSummary.js @@ -82,7 +82,7 @@ export const InformationSummary = (props) => { )} diff --git a/f2/src/summary/LocationInfoSummary.js b/f2/src/summary/LocationInfoSummary.js index bd1b90425..57037cf17 100644 --- a/f2/src/summary/LocationInfoSummary.js +++ b/f2/src/summary/LocationInfoSummary.js @@ -4,7 +4,6 @@ import { jsx } from '@emotion/core' import { Trans } from '@lingui/macro' import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' -import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' import { H2, H3 } from '../components/header' @@ -48,7 +47,7 @@ export const LocationInfoSummary = (props) => { )} diff --git a/f2/src/summary/MoneyLostInfoSummary.js b/f2/src/summary/MoneyLostInfoSummary.js index 8c8f594bf..54b525da9 100644 --- a/f2/src/summary/MoneyLostInfoSummary.js +++ b/f2/src/summary/MoneyLostInfoSummary.js @@ -72,7 +72,7 @@ export const MoneyLostInfoSummary = (props) => { )} diff --git a/f2/src/summary/SuspectCluesSummary.js b/f2/src/summary/SuspectCluesSummary.js index e353809f0..69ccc3a7d 100644 --- a/f2/src/summary/SuspectCluesSummary.js +++ b/f2/src/summary/SuspectCluesSummary.js @@ -4,7 +4,6 @@ import { jsx } from '@emotion/core' import { Trans } from '@lingui/macro' import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' -import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' import { H2, H3 } from '../components/header' @@ -48,7 +47,7 @@ export const SuspectCluesSummary = (props) => { )} diff --git a/f2/src/summary/WhatHappenedSummary.js b/f2/src/summary/WhatHappenedSummary.js index 624a661cd..be1d93fc7 100644 --- a/f2/src/summary/WhatHappenedSummary.js +++ b/f2/src/summary/WhatHappenedSummary.js @@ -4,7 +4,6 @@ import { jsx } from '@emotion/core' import { Trans } from '@lingui/macro' import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' -import { containsData } from '../utils/containsData' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' import { H2, H3 } from '../components/header' @@ -46,7 +45,7 @@ export const WhatHappenedSummary = (props) => { )} diff --git a/f2/src/summary/WhatWasAffectedSummary.js b/f2/src/summary/WhatWasAffectedSummary.js index f0c10692d..e2c95143a 100644 --- a/f2/src/summary/WhatWasAffectedSummary.js +++ b/f2/src/summary/WhatWasAffectedSummary.js @@ -57,7 +57,7 @@ export const WhatWasAffectedSummary = (props) => { )} diff --git a/f2/src/summary/WhenDidItHappenSummary.js b/f2/src/summary/WhenDidItHappenSummary.js index 302b022e0..3f6d1d46d 100644 --- a/f2/src/summary/WhenDidItHappenSummary.js +++ b/f2/src/summary/WhenDidItHappenSummary.js @@ -4,7 +4,6 @@ import { jsx } from '@emotion/core' import { Trans } from '@lingui/macro' import { Stack, Flex } from '@chakra-ui/core' import { useStateValue } from '../utils/state' -import { containsData } from '../utils/containsData' import { formatDate } from '../utils/formatDate' import { testdata } from '../ConfirmationSummary' import { EditButton } from '../components/EditButton' @@ -63,7 +62,7 @@ export const WhenDidItHappenSummary = (props) => { )} diff --git a/f2/src/summary/WhoAreYouReportForSummary.js b/f2/src/summary/WhoAreYouReportForSummary.js index 1e2b22d03..e74a523b1 100644 --- a/f2/src/summary/WhoAreYouReportForSummary.js +++ b/f2/src/summary/WhoAreYouReportForSummary.js @@ -67,7 +67,7 @@ export const WhoAreYouReportForSummary = (props) => { )} diff --git a/f2/src/utils/flagFieldEdited.js b/f2/src/utils/flagFieldEdited.js index d9e20bc96..cb3e9ad4a 100644 --- a/f2/src/utils/flagFieldEdited.js +++ b/f2/src/utils/flagFieldEdited.js @@ -1,5 +1,5 @@ -export const editCheck = (data, history) => { - if (history.location.state && history.location.state.edit) { +export const editCheck = (data, doneForms) => { + if (doneForms) { data.edited = true } }