Skip to content

Commit

Permalink
Merge branch 'develop' into feature/9733-VAIconWithTextMigration
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparowhawk authored Oct 22, 2024
2 parents 96fa32e + 022b468 commit ae9528c
Show file tree
Hide file tree
Showing 160 changed files with 2,105 additions and 927 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/External Bug Submission Template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: External Bug Report Template
about: This bug template should be used by external parties (non-VA / non-mobile) when submitting concerns
title: BUG - [iOS/Android/All] - [Short description]
labels: bug,qa, external-submission
assignees: DJUltraTom
assignees: TKDickson
---
## Summary of the bug
General overview of what happened and where it happened.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Post_RC_Code_Change.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Post RC Code Change
about: Template for Adding Code After RC is Cut requiring a new RC build
title: Post RC Code Change Template
labels: release
assignees: djultratom, bischoffa
assignees: TKDickson, bischoffa
---
<!-- Please fill out all of the relevant sections of this template. Please do not delete any areas of this template. The tickets can be updated as the sections are finished and any section that doesn't need to have info should be labeled as NA -->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/QA_feature_signoff.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _'Relevant for this epic?' column to include Y or N, and explanation if a N_
| -- | -- | -- |
| Standards | Test plan was peer reviewed | |
| Standards | All tickets found during testing have been prioritized | |
| Standards | Feature testing summary written and reviewed with feature team ([example](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/products/va-mobile-app/features/design-personalization/qa/findings.md)) | |
| Standards | [Feature testing summary](https://department-of-veterans-affairs.github.io/va-mobile-app/docs/QA/QualityAssuranceProcess/Testing%20Summary) written and reviewed with feature team | |
| Testing | ACs met on all implementation tickets | |
| Testing | Accessibility testing per accessibility design annotations | |
| Testing | [API errors](https://dsvavsp.testrail.io/index.php?/suites/view/92&group_by=cases:section_id&group_order=desc&display_deleted_cases=0&group_id=8943) handled well | |
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/detox_nightly_build_failure.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Detox Nightly Build Failure Template
about: Template for reporting a detox nightly build failure
title: "Bug - Detox - Fix Overnight Failures"
labels: bug, QA and Release
assignees: rbontrager
assignees: rbontrager, TKDickson

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: VAHB Mobile App Change Request Form
description: Use this template to formally request a new feature, enhancement to a feature, discovery, research, analytics request or other ask/change for the VA Mobile App team to evaluate.
title: "Change Request: [name of change]"
labels: [ "Epic", "Leads team" ]
labels: [ "Epic", "Leads team", "needs-review" ]
projects: ["department-of-veterans-affairs/823"]
assignees: [ DonMcCaugheyUSDS, rtwell, Hallm13, kellylein ]
body:
Expand Down
13 changes: 1 addition & 12 deletions .github/ISSUE_TEMPLATE/release_ticket.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Review Template
about: Template for requesting a production release for VA mobile app
title: "{{ env.releaseDate }} Release Sign-Off: {{ env.versionNumber }}"
labels: release
assignees: timwright12, DJUltraTom, chrisj-usds, drjecker, dumathane, rachelhanster, kellylein, DonMcCaugheyUSDS
assignees: timwright12, chrisj-usds, dumathane, rachelhanster, kellylein, DonMcCaugheyUSDS, TKDickson

---

Expand Down Expand Up @@ -51,15 +51,4 @@ Indicate NA if no changes.

## Regression Testing
[QA Testrail Regression Test Run Here](^^^Testrail-url^^^)

```mermaid
%%{init: {'theme': 'base', 'themeVariables': { 'pie1': '#00ff00', 'pie2': '#212121', 'pie3': '#FFE000', 'pie4': '#ff0000', 'pie5': '#cccccc', 'pieLegendTextSize': '20px', 'pieLegendTextColor':'#777777', 'pieSectionTextSize': '24px', 'pieTitleTextColor': '#777777'}}}%%
pie showData
title Regression pass for v2.1.0 Tuesday Apr 25, 2023 release
"Passed": 0
"Blocked": 0
"Retest": 0
"Failed": 0
"Untested": 1
```

1 change: 1 addition & 0 deletions .github/workflows/e2e_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ jobs:
dateOfIssue: ${{ env.DATE_OF_ISSUE }}
OS: "Android"
issues: ${{steps.failing_tests.outputs.FAILING_TEST}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
id: create-issue

matrix-send_test_results_to_testrail:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/e2e_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ jobs:
id: run_e2e_tests
run: |
if [[ "${{needs.output_detox_tests_to_run.outputs.output2}}" == "" ]]; then
yarn e2e:ios-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot
yarn e2e:ios-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot --debug-synchronization 15000
echo "NAV_AF_TEST_RUN=" >> "$GITHUB_OUTPUT"
else
echo "NAV_AF_TEST_RUN=true" >> "$GITHUB_OUTPUT"
yarn e2e:ios-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot
yarn e2e:ios-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot --debug-synchronization 15000
fi
continue-on-error: true

Expand All @@ -206,9 +206,9 @@ jobs:
run: |
yarn jest:clear;
if [[ "${{ steps.run_e2e_tests.outputs.NAV_AF_TEST_RUN}}" != "" ]]; then
yarn e2e:ios-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot
yarn e2e:ios-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot --debug-synchronization 15000
else
yarn e2e:ios-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot
yarn e2e:ios-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot --debug-synchronization 15000
fi
- name: Upload e2e-junit
Expand Down Expand Up @@ -318,6 +318,7 @@ jobs:
dateOfIssue: ${{ env.DATE_OF_ISSUE }}
OS: "iOS"
issues: ${{steps.failing_tests.outputs.FAILING_TEST}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
id: create-issue

matrix-send_test_results_to_testrail:
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/label_pull_request_onCreate.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/label_pull_request_onReview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: Remove old labels and add FE-Changes Requested
run: |
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-Needs Review,FE-With QA" --add-label "FE-Changes Requested"
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-With QA" --add-label "FE-Changes Requested"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -29,9 +29,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Remove old labels and add FE-Needs Review
- name: Remove old labels
run: |
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-Changes Requested" --add-label "FE-Needs Review"
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-Changes Requested"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -59,10 +59,10 @@ jobs:
if [[ $(jq '[.[] | select(. | IN("timwright12", "rbontrager", "DJUltraTom", "TKDickson"))] | length' <<< "$approvals") -gt 0 ]]
then
echo 'This PR has QA approval and one other'
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-Needs Review,FE-With QA" --add-label "FE-Ready to Merge"
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-With QA" --add-label "FE-Ready to Merge"
else
echo 'This PR requires QA approval'
gh pr edit ${{ github.event.pull_request.number }} --remove-label "FE-Needs Review" --add-label "FE-With QA"
gh pr edit ${{ github.event.pull_request.number }} --add-label "FE-With QA"
fi
else
echo 'This PR requires 2 approvals, including one QA approval'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/new_release_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ jobs:
- name: Cut release branch
env:
GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PAT }}
run: ./release_branch.sh
run: |
if [[ "${{ needs.get-workflow-environment.outputs.environment_name }}" == "manual-release" ]]; then
./release_branch.sh --bypass-date-check
else
./release_branch.sh
fi
8 changes: 4 additions & 4 deletions .github/workflows/release_branch_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
id: map_slack_ids
run: |
declare -A GITHUB_TO_SLACK_MAP
GITHUB_TO_SLACK_MAP["DJUltraTom"]="U02BBL9L0CU"
GITHUB_TO_SLACK_MAP["TKDickson"]="U02PJLJ0H6H"
GITHUB_TO_SLACK_MAP["kellylein"]="UJHA49K6X"
GITHUB_TO_SLACK_MAP["dumathane"]="U02RC1BRZBP"
GITHUB_TO_SLACK_MAP["timwright12"]="U01DBDAJZ18"
Expand All @@ -110,7 +110,7 @@ jobs:
- name: Notify Slack for release coordination
env:
SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }}
SLACK_DJUltraTom: $DJUltraTom
SLACK_TKDickson: $TKDickson
SLACK_kellylein: $kellylein
SLACK_dumathane: $dumathane
SLACK_timwright12: $timwright12
Expand All @@ -132,7 +132,7 @@ jobs:
- *Release Manager Approval Due:* ${{ needs.release_ticket.outputs.vaDueDate }}\n\
- *Tickets Tagged Appropriately:* ${{ needs.release_ticket.outputs.qaDueDate }}\n\n\
*Contacts:*\n\
- *Release Testing:* <@${SLACK_DJUltraTom}>\n\
- *Release Testing:* <@${SLACK_TKDickson}>\n\
- *Release Manager:* <@${SLACK_kellylein}>\n\
- *Release Ticket Validation:* <@${SLACK_dumathane}>\n\
- *Engineering:* <@${SLACK_dumathane}>, <@${SLACK_timwright12}>\n\
Expand All @@ -148,4 +148,4 @@ jobs:
-H 'Authorization: Bearer '"$SLACK_API_TOKEN" \
-H 'Content-type: application/json' \
-d @- \
https://slack.com/api/chat.postMessage
https://slack.com/api/chat.postMessage
18 changes: 9 additions & 9 deletions VAMobile/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.982.0)
aws-partitions (1.991.0)
aws-sdk-core (3.209.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
Expand All @@ -19,7 +19,7 @@ GEM
aws-sdk-kms (1.94.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.166.0)
aws-sdk-s3 (1.167.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -113,7 +113,7 @@ GEM
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
fastlane-plugin-slack_bot (1.4.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.72.0)
google-apis-androidpublisher_v3 (0.73.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.15.1)
addressable (~> 2.5, >= 2.5.1)
Expand All @@ -131,12 +131,12 @@ GEM
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.16.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.46.0)
google-apis-storage_v1 (0.47.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.2.0)
google-cloud-env (2.2.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.4.0)
google-cloud-storage (1.52.0)
Expand All @@ -148,7 +148,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
mini_mime (~> 1.0)
googleauth (1.11.0)
googleauth (1.11.1)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
Expand All @@ -161,7 +161,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.2)
jwt (2.9.1)
jwt (2.9.3)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
Expand Down Expand Up @@ -205,13 +205,13 @@ GEM
uber (0.1.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.25.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.2, < 4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class CustomTabsIntentModule(private val context: ReactApplicationContext) :
appendQueryParameter("code_challenge", codeChallenge)
appendQueryParameter("application", "vamobile")
appendQueryParameter("oauth", "true")
appendQueryParameter("scope", "device_sso")
}
}
.build()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
title: Checkbox
---

Allows users to select one or more items from a list. Checkboxes are an easily understandable way to indicate that users can select one or more answers to a question or items from a list.

## Examples

### Checkbox

#### Default
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox--default) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-384&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="250" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox--default&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

#### Tile
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox--tile) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-384&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="250" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox--tile&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

#### Error
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox--error) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-384&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="250" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox--error&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

### Checkbox Group

#### Default
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox-group--default) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-441&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="500" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox-group--default&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

#### Tile
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox-group--tile) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-441&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="500" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox-group--tile&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

#### Error
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox-group--error) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=1415-441&t=iHMS9U3pTWPZb8Qb-4)
<iframe width="620" height="500" alt="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/checkbox-group--error&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

## Usage
[Refer to the VA Design System for usage guidance](https://design.va.gov/components/form/checkbox)

## Code usage
**Open Storybook**: [Checkbox](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox--docs) | [Checkbox Group](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/checkbox-group--docs)

## Content considerations
* Refer to the [VA Design System for content considerations](https://design.va.gov/components/form/checkbox#usage)

## Accessibility considerations
* Refer to the [VA Design System for accessibility considerations](https://design.va.gov/components/form/checkbox#accessibility-considerations)
* Screenreaders should announce the name, role, and state of each checkbox.

### Related
* [Checkbox - VA Design System](https://design.va.gov/components/form/checkbox)
* [Checkbox - USWDS](https://designsystem.digital.gov/components/checkbox/)
* [Checkbox - Material Design](https://m3.material.io/components/checkbox/overview)
3 changes: 3 additions & 0 deletions VAMobile/documentation/design/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ A system to help you write, design, and build digital services on the VA Mobile
### Navigation
- [Segmented control](/va-mobile-app/design/Components/Navigation/Secondary/SegmentedControl)

### Selection and input
- [Checkbox](/va-mobile-app/design/Components/Selection%20and%20input/Checkbox)

-----

## Design system team
Expand Down
2 changes: 1 addition & 1 deletion VAMobile/documentation/docs/About our team/_category_.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"label": "About our team",
"position": 7
"position": 9
}
4 changes: 4 additions & 0 deletions VAMobile/documentation/docs/App Features/_category_.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"label": "App Features",
"position": 10
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ title: Endpoint Creation Checklist
$ref: '#/components/responses/504'
```

Regenerated HTML file by running `generate_static_docs.sh` command (`modules/mobile/docs/generate_static_docs.sh`)
Regenerated [OpenAPI documentation](./OpenAPIDocumentation.md) HTML file by running `modules/mobile/docs/generate_static_docs.sh`

### Monitoring

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The vets-api mobile endpoints generally follow the following pattern:
- the controller then uses [service objects](#outbound-request-service-objects) to communicate with other servers in the vets-api ecosystem. those service objects may perform their own validations. These will generally be the same as the ones performed in the controller but may occasionally differ.
- the external service processes that request and responds or times out
- the service object processes the response.
- when the request fails (status is >= 400), the service objects will raise corresponding errors. These errors are rescued by [ExceptionHandling](#exception-handling) and responds with error details to the client.
- when the request fails (status is >= 400), the service objects will raise corresponding errors. These errors are rescued by [ExceptionHandling](#exception-handling) and responds with error details to the client. (Note: this is only true if the service configuration uses the Faraday plug `faraday.use Faraday::Response::RaiseError`. Most services that make requests for data do use this plug.)
- when the request is successful (status is < 400), any additional business logic will be applied by the service object. This often includes parsing and converting the data to models.
- the data is then returned to the controller.
- the controller then performs any additional modifications that are necessary, serializes the data, and returns it to the client with an appropriate status code.
Expand Down
Loading

0 comments on commit ae9528c

Please sign in to comment.