From 5db98530673ce5843c8e168f91c94178a5f5e400 Mon Sep 17 00:00:00 2001 From: Brooks Johnson <2008881+bkjohnson@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:47:54 -0800 Subject: [PATCH 01/16] Add .circleci/config.yml --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..6f98693ad --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,13 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 +# Use a package of configuration called an orb. +orbs: + # Declare a dependency on the welcome-orb + welcome: circleci/welcome-orb@0.4.1 +# Orchestrate or schedule a set of jobs +workflows: + # Name the workflow "welcome" + welcome: + # Run the welcome/run job in its own container + jobs: + - welcome/run From 995d89cefce20cea114d9bab7e326b0fb39bd8be Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 10:07:04 -0800 Subject: [PATCH 02/16] Begin setting up a build-deploy job in CircleCI --- .circleci/config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f98693ad..86f602638 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,18 @@ version: 2.1 orbs: # Declare a dependency on the welcome-orb welcome: circleci/welcome-orb@0.4.1 + +jobs: + build-deploy: + docker: + - image: cimg/ruby-node + steps: + - checkout + - run: yarn install + - run: bundle install + - run: yarn build + - run: bundle exec jekyll build + # Orchestrate or schedule a set of jobs workflows: # Name the workflow "welcome" @@ -11,3 +23,6 @@ workflows: # Run the welcome/run job in its own container jobs: - welcome/run + deploy: + jobs: + - build-deploy From a1287c45e651a022e1d01a6dc6d76dfe00db4652 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 10:24:06 -0800 Subject: [PATCH 03/16] Specificy version number in docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86f602638..66380d606 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ orbs: jobs: build-deploy: docker: - - image: cimg/ruby-node + - image: cimg/ruby:2.7.2-node steps: - checkout - run: yarn install From 2fe289605cd359690e870c08510204a32a669b1d Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 10:33:57 -0800 Subject: [PATCH 04/16] Try to install bundler --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66380d606..61f4cc893 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,8 @@ jobs: steps: - checkout - run: yarn install + # If this works, think about adding it to the Gemfile + - run: gem install bundler:1.16.6 - run: bundle install - run: yarn build - run: bundle exec jekyll build From 4efdc1f7a7bc6434549648c66683b7b46be1cbb3 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 10:44:28 -0800 Subject: [PATCH 05/16] Do a simple aws check --- .circleci/config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61f4cc893..b393602d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,11 +4,15 @@ version: 2.1 orbs: # Declare a dependency on the welcome-orb welcome: circleci/welcome-orb@0.4.1 + aws-cli: circleci/aws-cli@1.3.1 jobs: build-deploy: docker: - image: cimg/ruby:2.7.2-node + environment: + AWS_DEFAULT_REGION: us-gov-west-1 + steps: - checkout - run: yarn install @@ -17,6 +21,7 @@ jobs: - run: bundle install - run: yarn build - run: bundle exec jekyll build + - run: aws s3 ls # Orchestrate or schedule a set of jobs workflows: @@ -27,4 +32,6 @@ workflows: - welcome/run deploy: jobs: - - build-deploy + - build-deploy: + context: + - Platform From bf0f0459e4b8e4c4c5d350039c3a5517700403fe Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 11:02:58 -0800 Subject: [PATCH 06/16] Setup aws before using it --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b393602d0..b242ccf24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,7 @@ jobs: steps: - checkout + - aws-cli/setup - run: yarn install # If this works, think about adding it to the Gemfile - run: gem install bundler:1.16.6 From 94d2c82a91860faa57bfbb02311baf3f95c8eacb Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 11:08:02 -0800 Subject: [PATCH 07/16] Remove the default welcome workflow --- .circleci/config.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b242ccf24..3b377b970 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,6 @@ version: 2.1 # Use a package of configuration called an orb. orbs: - # Declare a dependency on the welcome-orb - welcome: circleci/welcome-orb@0.4.1 aws-cli: circleci/aws-cli@1.3.1 jobs: @@ -26,12 +24,7 @@ jobs: # Orchestrate or schedule a set of jobs workflows: - # Name the workflow "welcome" - welcome: - # Run the welcome/run job in its own container - jobs: - - welcome/run - deploy: + deploy: jobs: - build-deploy: context: From b86d46b3c39fb4613f529d1718eeeb09312f2f2d Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 11:40:32 -0800 Subject: [PATCH 08/16] Try to sync the jekyll build to dev site --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b377b970..aed24d2d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - run: bundle install - run: yarn build - run: bundle exec jekyll build - - run: aws s3 ls + - run: aws s3 sync _site s3://dev-design.va.gov # Orchestrate or schedule a set of jobs workflows: From 9f00496dab8b10082a09e06a1056dd6a7692300a Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 12:06:29 -0800 Subject: [PATCH 09/16] Make the bucket a parameter & rename workflow --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aed24d2d4..bdccad1ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,9 @@ jobs: - image: cimg/ruby:2.7.2-node environment: AWS_DEFAULT_REGION: us-gov-west-1 + parameters: + bucket: + type: string steps: - checkout @@ -20,12 +23,13 @@ jobs: - run: bundle install - run: yarn build - run: bundle exec jekyll build - - run: aws s3 sync _site s3://dev-design.va.gov + - run: aws s3 sync _site s3://<< parameters.bucket >> # Orchestrate or schedule a set of jobs workflows: - deploy: + deploy-dev: jobs: - build-deploy: + bucket: "dev-design.va.gov" context: - Platform From 1e284e1427062b63e29130942475c536145ef246 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 13:00:16 -0800 Subject: [PATCH 10/16] Remove the dev & staging deploys from Jenkins --- Jenkinsfile | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21cab0e85..0234e35d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,25 +50,5 @@ pipeline { } } - stage('Deploy dev & staging') { - when { - expression { env.BRANCH_NAME == 'master' } - } - steps { - script { - commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim() - } - - build job: 'deploys/vets-design-system-documentation-vagov-dev', parameters: [ - booleanParam(name: 'notify_slack', value: true), - stringParam(name: 'ref', value: commit) - ], wait: false - - build job: 'deploys/vets-design-system-documentation-vagov-staging', parameters: [ - booleanParam(name: 'notify_slack', value: true), - stringParam(name: 'ref', value: commit) - ], wait: false - } - } } -} \ No newline at end of file +} From 2300814c6100e5dd0c34a150c72338571ddca673 Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 13:18:28 -0800 Subject: [PATCH 11/16] Give the deploy public-read permissions --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bdccad1ed..99a023789 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: - run: bundle install - run: yarn build - run: bundle exec jekyll build - - run: aws s3 sync _site s3://<< parameters.bucket >> + - run: aws s3 sync _site s3://<< parameters.bucket >> --acl public-read # Orchestrate or schedule a set of jobs workflows: From aa72519c915f043c914ea9a482651b212bbe98ea Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 13:37:02 -0800 Subject: [PATCH 12/16] Add a workflow for deploying staging as well --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99a023789..cf66a355b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,9 +27,15 @@ jobs: # Orchestrate or schedule a set of jobs workflows: - deploy-dev: + deploy-dev: jobs: - build-deploy: bucket: "dev-design.va.gov" context: - Platform + deploy-staging: + jobs: + - build-deploy: + bucket: "staging-design.va.gov" + context: + - Platform From 572911f7eb448a65cb08d401491a8bc9ae6b15ba Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 14:04:05 -0800 Subject: [PATCH 13/16] Only run the dev & staging deploy on master --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf66a355b..f5a40248f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,11 +31,17 @@ workflows: jobs: - build-deploy: bucket: "dev-design.va.gov" + filters: + branches: + only: master context: - Platform deploy-staging: jobs: - build-deploy: bucket: "staging-design.va.gov" + filters: + branches: + only: master context: - Platform From e3c914ba623b4cd3a1a4bcfc2e2e1e54716ae65e Mon Sep 17 00:00:00 2001 From: Brooks Johnson Date: Tue, 24 Nov 2020 14:52:28 -0800 Subject: [PATCH 14/16] Add some comments --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f5a40248f..04bb5ce8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,18 +30,22 @@ workflows: deploy-dev: jobs: - build-deploy: + # Set the bucket parameter to be the dev bucket bucket: "dev-design.va.gov" filters: branches: only: master context: + # The Platform context has the environment variables for setting up the aws cli - Platform deploy-staging: jobs: - build-deploy: + # Set the bucket parameter to be the staging bucket bucket: "staging-design.va.gov" filters: branches: only: master context: + # The Platform context has the environment variables for setting up the aws cli - Platform From e513dabdcee4e6d8f3bc0d0ed6fe5598bcea27e1 Mon Sep 17 00:00:00 2001 From: peggygannon Date: Tue, 1 Dec 2020 16:28:50 -0800 Subject: [PATCH 15/16] Update phone number, content tweaks --- src/_patterns/messaging-dictionary.md | 64 +++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/_patterns/messaging-dictionary.md b/src/_patterns/messaging-dictionary.md index a863dd3cb..874f3a949 100644 --- a/src/_patterns/messaging-dictionary.md +++ b/src/_patterns/messaging-dictionary.md @@ -21,13 +21,13 @@ Alerts the user of important system-related issues or status. It’s initiated b | Scenario | Message title | Message content | Component | State | Location | | ---------------------------------------- | ----- | ----------- | --------- | ------ | -------- | | **Sitewide** | | | | | | -| Advance notification | **Upcoming site maintenance** | We’ll be doing some work on VA.gov. The maintenance will last x hour. During that time, you won’t be able to sign in or use tools.
**Date:** Day, Date, Year
**Start/End time:** 0:00 a.m. to 0:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | N/A | -| Advance notification/24 hour | **Upcoming site maintenance** | We’ll be doing some work on VA.gov. The maintenance will last 24 hours. During that time, you won’t be able to sign in or use tools.
**Start:** Day, Date, Year, at 0:00 a.m. ET
**End:** Day, Date, Year, at 0:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | N/A | +| Advance notification | **Upcoming site maintenance** | We’ll be doing some work on VA.gov. The maintenance will last x hour. During that time, you won’t be able to sign in or use tools.
**Date:** Day, Date, Year
**Start/End time:** 0:00 a.m. to 0:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Warning](/components/alertboxes#warning/) | N/A | +| Advance notification/24 hour | **Upcoming site maintenance** | We’ll be doing some work on VA.gov. The maintenance will last 24 hours. During that time, you won’t be able to sign in or use tools.
**Start:** Day, Date, Year, at 0:00 a.m. ET
**End:** Day, Date, Year, at 0:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Warning](/components/alertboxes#warning/) | N/A | | During downtime | **Site maintenance** | We’re working on VA.gov right now. If you have trouble signing in or using tools, check back after we're finished. Thank you for your patience.
**Date:** Day, Date, Year
**Start/End time:** 0:00 a.m. to 00:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | N/A | | During downtime/24 hour | **Site maintenance** | We’re working on VA.gov right now. If you have trouble signing in or using tools, check back after we're finished. Thank you for your patience.
**Start:** Day, Date, Year at 0:00 a.m. ET
**End:** Day, Date, Year at 0:00 a.m. ET | [System maintenance banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | [Banner](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/maintenancebanner/) | N/A | | **In-app** | | | | | | | During downtime | **We're working on [APP name] right now** | If you have trouble using this tool, please check back after [Month, Date] at [00:00 a.m./p.m. ET]. | [React component](/components/modal) | [Warning](https://department-of-veterans-affairs.github.io/veteran-facing-services-tools/visual-design/components/alertbox/) | N/A | -| Partial downtime notification | **Some online tools or services aren't working right now** | You may have trouble accessing some features on VA.gov at this time. We’re working to fix this. Please check back soon. | [Alert box](/components/alertboxes) | [Warning](/components/alertboxes#warning-alert) | TK | +| Partial downtime notification | **Some online tools or services aren't working right now** | You may have trouble accessing some features on VA.gov at this time. We’re working to fix this. Please check back soon. | [Alert box](/components/alertboxes) | [Warning](/components/alertboxes#warning-alert) | N/A | | **Sign-in page** | | | | | | | During downtime | **You may have trouble signing in with [DS Logon, MyHealtheVet, ID.me]** | We’re sorry. We’re working to fix some problems with our [DS Logon, MyHealtheVet,ID.me] sign in process. If you’d like to sign in to VA.gov with this account, please check back later. | [Alert box](/components/alertboxes) | [Warning](/components/alertboxes#warning-alert) | N/A | @@ -52,8 +52,8 @@ Alerts the user of important system-related issues or status. It’s initiated b | ---------------------------------------- | ----- | ----------- | ------- | --------- | ------ | -------- | | Status update (e.g. claim closed) | **Your [CLAIM TYPE] claim update** | Our records show that your claim was closed on [DATE].| N/A | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Replace affected component | | Action required (e.g. claim evidence request) | **We need your help to finish reviewing your claim** | Please provide more evidence (supporting documents) so we can finish reviewing your claim.| See Details | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Above affected component | -| Form prefill notice | **We've started your form for you** | We've filled in some of this form based on information you've given us in the past. Please double-check the information and update it as needed. | N/A | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Above affected component | -| Change in application feature, neutral/positive impact (e.g. SiP now available) | **You can now save your in-progress applications** | Sign in to VA.gov to save your application so you can come back later to complete it. All you'll need to sign in is an email and password. | Sign in to VA.gov | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Above affected component | +| Form prefill notice | **We've started your form for you** | We've filled in some of this form based on information you gave us. Please check and update the information as needed. | N/A | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Above affected component | +| Change in application feature, neutral/positive impact (e.g. SiP now available) | **You can save your in-progress application** | Sign in to VA.gov to save your application so you can come back later to complete it. All you'll need to sign in is an email and password. | Sign in to VA.gov | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Above affected component | ## Engagement messaging @@ -65,7 +65,7 @@ Nudges the user to enter or update data in the system. It can be initiated by ei | Scenario | Message title | Message content | Actions | Component | State | Location | | ---------------------------------------- | ----- | ----------- | ------- | --------- | ------ | -------- | -| Continue a saved benefit application | **Still want to apply for [BENEFIT NAME]?** | The application you started for [BENEFIT NAME] will expire on [EXPIRATION DATE]. If you'd still like to apply, you'll need to submit the application by this date. Or you can start a new application any time. | [BUTTON 1] Continue your application [BUTTON 2] Start over | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Replace affected component | +| Continue a saved benefit application | **Still want to apply for [BENEFIT NAME]?** | Your application will expire on [EXPIRATION DATE]. If you'd still like to apply, you'll need to submit the application by this date. Or you can start a new application any time. | [BUTTON 1] Continue your application [BUTTON 2] Start over | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Replace affected component | | Set up 2-factor authentication | **Want to make your VA.gov account more secure?** | You can add an optional extra layer of security (called 2-factor authentication) to your account. This helps to make sure that no one but you can access your account—even if someone gets your password. | Secure your account | [Alert box](/components/alertboxes) | [Informational](/components/alertboxes#informational-alert) | Replace affected component | ## Access messaging @@ -90,8 +90,8 @@ Variations in messaging will be contingent on: | Application or tool is not accessible | **[APPLICATION NAME] is down for maintenance** | We're making some updates to [APPLICATION NAME]. We're sorry it's not working right now. Please check back soon. | N/A | [Plain text](/design/typography) | N/A | Replace page below title | | Application or page is accessible (general message; specific iterations to be added later) | **Some parts of this may not be working** | You can still use [APPLICATION/PAGE NAME], but some parts of it may not work for you. If you're having trouble, please try again later. | N/A | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Below page title | | Component is not accessible (general message; specific iterations to be added later) | **[COMPONENT NAME] isn't working right now** | We're sorry. Something went wrong on our end. Please refresh this page or try again later. | Go back to previous page | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Replace affected component | -| Component is accessible (general message; [see application/component specific messages](https://github.com/department-of-veterans-affairs/vets.gov-team/blob/master/Products/Platform/Design%20System/Guidelines/Error%20handling/Dictionary/Access%20Messaging.md))| **Some information may not be up to date** | We're sorry. Something's not working quite right. You can still use [COMPONTENT NAME], but you may not be able to see all your updated information. If you're having trouble, please try again later. | N/A | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Above affected component | -| Unable to complete an automated task (e.g. save application in progress) | **We couldn't save your form** | We're sorry. Something went wrong when we tried to save your form. If you're on a secure and private computer, you can leave this page open and try saving your form again in a few minutes. If you're on a public computer, you can continue to fill out your form, but it won't automatically save as you fill it out. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below affected component | +| Component is accessible (general message; [see application/component specific messages](https://github.com/department-of-veterans-affairs/vets.gov-team/blob/master/Products/Platform/Design%20System/Guidelines/Error%20handling/Dictionary/Access%20Messaging.md))| **Some information may not be up to date** | You can still use [COMPONENT NAME], but you may not be able to see all your updated information. If you're having trouble, please try again later. | N/A | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Above affected component | +| Unable to complete an automated task (e.g. save application in progress) | **We couldn't save your form** | We're sorry. Something went wrong when we tried to save your form. Try saving it again in a few minutes. If you're on a public computer, you can continue to fill out your form, but your information won't automatically be saved. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below affected component | | Unable to complete a user-initiated task, can't proceed | **We've run into a problem** | We're sorry. Something went wrong on our end. Please try again. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | | Unable to complete a user-initiated task, can still proceed | **We've run into a problem** | We're sorry. Something went wrong on our end. You can try again now, or move on to the next step and come back later to complete this. | N/A | [Alert box](/components/alertboxes) | [Warning alert](/components/alertboxes#warning-alert) | Above page title | @@ -99,7 +99,7 @@ Variations in messaging will be contingent on: | Scenario | Message title | Message content | Actions | Component | State | Location | | ---------------------------------------- | ----- | ----------- | ------- | --------- | ------ | -------- | -| Application/page/component is not accessible due to user connection loss | **We can't load [APPLICATION/PAGE/COMPONENT NAME]** | Please make sure you're connected to the Internet, and refresh this page to try again. | Try again | [Plain text](/design/typography) | N/A | Below page title | +| Application/page/component is not accessible due to user connection loss | **We can't load [APPLICATION/PAGE/COMPONENT NAME]** | Please refresh this page or try again later. | Try again | [Plain text](/design/typography) | N/A | Below page title | | Unable to complete an automated task (e.g. save application in progress) due to user connection loss | **We can't save your form right now** | Please make sure you're connected to the Internet, and then try saving your form again. | Try again | [Plain text](/design/typography) | N/A | Below affected component | | Unable to complete a user-initiated task due to user connection loss | **We've run into a problem** | Please check to make sure you're connected to the Internet, and try again. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | @@ -107,20 +107,20 @@ Variations in messaging will be contingent on: | Scenario | Message title | Message content | Actions | Component | State | Location | | ---------------------------------------- | ----- | ----------- | ------- | --------- | ------ | -------- | -| (Application) user's records are not found | **We don't seem to have your records** | We're sorry. We can't find your records in our system. If you think they should be here, please try again later or call the VA.gov help desk at 844-698-2311 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace content below page title | -| (Page) user's records are not found | **We don't seem to have your records** | We're sorry. We can't find your records in our system. If you think they should be here, please try again later or call the VA.gov help desk at 844-698-2311 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace content below page title | -| (Component) user's records are not found | **We don't seem to have your records** | We're sorry. We can't find your records in our system. If you think they should be here, please try again later or call the VA.gov help desk at 844-698-2311 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace affected component | +| (Application) user's records are not found | **We don't seem to have your records** | We're sorry. We can't match your information to our records. If you think your information should be here, please try again later or call us at 800-698-2411 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace content below page title | +| (Page) user's records are not found | **We don't seem to have your records** | We're sorry. We can't match your information to our records. If you think your information should be here, please try again later or call us at 800-698-2411 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace content below page title | +| (Component) user's records are not found | **We don't seem to have your records** | We're sorry. We can't match your information to our records. If you think your information should be here, please try again later or call us at 800-698-2411 (TTY: 711). We’re here Monday–Friday, 8:00 a.m.–8:00 p.m. ET. | N/A | [Plain text](/design/typography) | N/A | Replace affected component | | (Application) user is not eligible for a benefit because they aren't a Veteran/dependent/spouse | **You're not eligible for this benefit** | It looks like you're not eligible for this benefit based on the information you've given us. Please check your eligibility again. | Check your eligibility | N/A | [Plain text](/design/typography) | Replace content below page title | -| (Application) user is not currently enrolled in a benefit (e.g. not enrolled in Post-9/11 GI Bill benefits) | **You're not enrolled in this benefit right now** | It looks like you're not signed up for this benefit. If you think you're eligible, you can apply now.| (1) Check your eligibility (2) Apply now | [Plain text](/design/typography) | N/A | Replace content below page title | +| (Application) user is not currently enrolled in a benefit (e.g. not enrolled in Post-9/11 GI Bill benefits) | **You're not enrolled in this benefit right now** | Our records show that you're not signed up for this benefit. If you think you're eligible for this benefit, you can apply now.| (1) Check your eligibility (2) Apply now | [Plain text](/design/typography) | N/A | Replace content below page title | | (Application) user is not a VA patient | **We can't give you access to this tool right now** | We're sorry. Only patients who've received care at a VA facility can use VA.gov health tools. If you've received care at a VA medical center, clinic, or Vet center, please call that facility to find out if you're in their records. | Find your VA facility | [Plain text](/design/typography) | N/A | Replace content below page title | ### Empty state | Scenario | Message title | Message content | Component | Location | | ---------------------------------------- | ----- | ----------- | --------- | -------- | -| (Application) No data tied to the user or scenario | **No [DATA TYPE (ie, prescription refills or health records)] to show** | We don't have any [DATA TYPE] in our system to show here. | [Plain text](/design/typography) | Replace content below page title | -| (Page) no data tied to the user or scenario | **No [DATA TYPE] to show** | We don't have any [DATA TYPE] in our system to show here. | [Plain text](/design/typography) | Replace content below page title | -| (Component) no data tied to the user or scenario | **No [DATA TYPE] to show** | We don't have any [DATA TYPE] for you in our system. | [Plain text](/design/typography) | Replace affected component | +| (Application) No data tied to the user or scenario | **We don't have any [DATA TYPE (ie, prescription refills or health records)] for you in our system** | | [Plain text](/design/typography) | Replace content below page title | +| (Page) no data tied to the user or scenario | **We don't have any [DATA TYPE] for you in our system** | | [Plain text](/design/typography) | Replace content below page title | +| (Component) no data tied to the user or scenario | **We don't have any [DATA TYPE] for you in our system** | | [Plain text](/design/typography) | Replace affected component | ## Feedback messaging @@ -132,27 +132,27 @@ The application’s response when the user is interacting with it. The majority | Scenario | Message title | Message content | Actions | Component | State | Location | | ---------------------------------------- | ----- | ----------- | ------- | --------- | ------ | -------- | -| Form save in progress success (inline) | **Saved** | We saved the information you've entered so far. | N/A | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Below affected component | -| Form save in progress success (exit page) | **Saved** | We saved your in-progress form. Remember, you need to finish the form and click "Submit" to apply for this benefit. Continue applying now, or come back later to finish your application. | Continue your application | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Below page title | +| Form save in progress success (inline) | **We've saved the information you've entered so far** | | N/A | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Below affected component | +| Form save in progress success (exit page) | **We've saved your in-progress application** | You'll need to finish the application and click "Submit" to apply for this benefit. Continue applying now, or come back later to finish. | Continue your application | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Below page title | | Form save in progress success (inline) | **We’re saving your new mobile phone number** | We’ll show it here once it’s saved. | N/A | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Below affected component | -| Form save in progress failure (inline) | **Your form didn't save** | We're sorry. We couldn't save your form. Please try again. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below affected component | +| Form save in progress failure (inline) | **Your form didn't save** | Please try again. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below affected component | | Form general error | **We need you to start over with this application** | Something's not working quite right. We're sorry to make extra work for you, but please try applying again in a few minutes. | Start over | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Replace content below page title | -| Form submission success | **Submitted** | We received your form. Thank you. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below page title | +| Form submission success | **We've received your application** | | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Below page title | | Form submission failure, can save in progress | **Please save this application and try again** | We're sorry. Your application didn't go through. We're working to fix the problem, but it may take us a while. Please save your application, and try again tomorrow. | Save your application | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | | Form submission failure, unable to save in progress | **Please start over with this application** | We're sorry. Your application didn't go through, and you'll need to start over. We suggest you wait a day while we fix this problem. | N/A | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | | Required form field is empty | N/A | Please enter your [required information]. | N/A | Inline | [Error alert](/components/alertboxes#error-alert) | N/A | | Form field entry is not valid | N/A | Please enter a valid [address/email address/phone number/city/state]. | N/A | Inline | [Error alert](/components/alertboxes#error-alert) | N/A | -| File upload success | **Uploaded** | We uploaded your file. Thank you. | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | -| File upload failure | **We couldn't upload your file** | We're sorry. We weren't able to upload your file. Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | -| File download success | **Downloaded** | We downloaded your file. | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | -| File download failure | **We couldn't download your file** | We're sorry. We weren't able to download your file. Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | -| Message sent | **Message sent** | We sent your message. Thank you. | Dismissible | Alert | Success | Above page title | -| Message failed to send | **Your message didn't go through** | We're sorry. We couldn't send your message. Please try again.| Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | -| Creation success | **File created** | We created your file. Thank you. | Dismissible | Alert | Success | Above page title | -| Creation failure | **We couldn't create your file** | We're sorry. We couldn't create your file. Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | -| Deletion success | **File deleted** | We deleted your file. Thank you. | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | -| Deletion failure | **We couldn't delete your file** | We're sorry. We couldn't delete your file. Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | -| Update success | **File updated** | We updated your file. Thank you. | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | -| Update failure | **We couldn't update your file** | We're sorry. We couldn't update your file. Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| File upload success | **Your file has been uploaded** | | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | +| File upload failure | **We couldn't upload your file** | Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| File download success | **We downloaded your file** | | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | +| File download failure | **We couldn't download your file** | Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| Message sent | **We sent your message** | | Dismissible | Alert | Success | Above page title | +| Message failed to send | **Your message didn't go through** | Please try again.| Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| Creation success | **We created your file** | | Dismissible | Alert | Success | Above page title | +| Creation failure | **We couldn't create your file** | Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| Deletion success | **We've deleted your file** | | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | +| Deletion failure | **We couldn't delete your file** | Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | +| Update success | **We updated your file** | | Dismissible | [Alert box](/components/alertboxes) | [Success alert](/components/alertboxes#success-alert) | Above page title | +| Update failure | **We couldn't update your file** | Please try again. | Dismissible | [Alert box](/components/alertboxes) | [Error alert](/components/alertboxes#error-alert) | Above page title | _Categories adapted from [Salesforce Lightning Design System](https://www.lightningdesignsystem.com/guidelines/messaging/types)_ From ce183bea0567db41bf2e00e9188f1604c378e2b8 Mon Sep 17 00:00:00 2001 From: CrystabelReiter Date: Mon, 7 Dec 2020 10:41:38 -0500 Subject: [PATCH 16/16] Update buttons.md --- src/_components/buttons.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/_components/buttons.md b/src/_components/buttons.md index 18de65a74..1a3ff2966 100644 --- a/src/_components/buttons.md +++ b/src/_components/buttons.md @@ -70,11 +70,12 @@ Only ``