Skip to content

Commit

Permalink
Merge branch 'develop' into feature/9452-ClaimFileUploadEmbeddedScreens
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandec committed Nov 12, 2024
2 parents 274eb42 + 8da7b5f commit b477397
Show file tree
Hide file tree
Showing 54 changed files with 1,652 additions and 421 deletions.
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: TKDickson, bischoffa
assignees: TKDickson, SarahHuber_AdHoc
---
<!-- 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/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, chrisj-usds, dumathane, rachelhanster, kellylein, DonMcCaugheyUSDS, TKDickson
assignees: timwright12, chrisj-usds, dumathane, rachelhanster, SarahHuber_AdHoc, DonMcCaugheyUSDS, TKDickson

---

Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/e2e_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ jobs:
message: 'Starting E2E Android tests. Please see :thread: for results. This process may take a while.'

find_detox_tests_to_run:
if: github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/e2e_detox_mapping.yml

output_detox_tests_to_run:
Expand All @@ -99,8 +98,8 @@ jobs:
- name: 'Get Matrix Value'
id: matrix_value
run: |
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
echo "individual_matrix=" >> "$GITHUB_OUTPUT"
Expand All @@ -116,7 +115,7 @@ jobs:
if [[ "${{ needs.find_detox_tests_to_run.outputs.test_run }}" != "" ]]; then
echo "${{needs.find_detox_tests_to_run.outputs.test_matrix}}"
if [[ "${{needs.find_detox_tests_to_run.outputs.test_matrix}}" == "[]" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
echo "individual_matrix=" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -242,7 +241,7 @@ jobs:
if: failure() || success()
uses: actions/upload-artifact@v4
with:
name: ${{matrix.testsuite}}-e2e-junit
name: e2e-junit-${{matrix.testsuite}}
path: VAMobile/e2e/test_reports/e2e-junit.xml

- name: Upload artifacts on failure
Expand Down Expand Up @@ -349,16 +348,10 @@ jobs:

matrix_send_test_results_to_testrail:
if: (!cancelled()) && github.event.inputs.run_testRail == 'true'
needs: [matrix-e2e-android, output_detox_tests_to_run]
strategy:
fail-fast: false
max-parallel: 1
matrix:
testsuite: ${{ fromJSON(needs.output_detox_tests_to_run.outputs.output1) }}
needs: [matrix-e2e-android, output_detox_tests_to_run]
name: Update testRail Results
uses: ./.github/workflows/update_testrail_results.yml
with:
test_names: "${{matrix.testsuite}}"
testRail_name: ${{ inputs.testRail_name }}
test_OS_name: "Android"
secrets: inherit
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/e2e_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
message: 'Starting E2E iOS tests. Please see :thread: for results. This process may take a while.'

find_detox_tests_to_run:
if: github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/e2e_detox_mapping.yml

output_detox_tests_to_run:
Expand All @@ -90,8 +89,8 @@ jobs:
- name: 'Get Matrix Value'
id: matrix_value
run: |
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ inputs.tests_to_run}}" != "" ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
echo "individual_matrix=" >> "$GITHUB_OUTPUT"
Expand All @@ -107,7 +106,7 @@ jobs:
if [[ "${{ needs.find_detox_tests_to_run.outputs.test_run }}" != "" ]]; then
echo "${{needs.find_detox_tests_to_run.outputs.test_matrix}}"
if [[ "${{needs.find_detox_tests_to_run.outputs.test_matrix}}" == "[]" ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]]; then
if [[ "${{ inputs.run_full_test }}" == "true" ]] || [[ ${{ github.event_name }} == 'schedule' ]] || [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
e2eNames=$(gh api repos/department-of-veterans-affairs/va-mobile-app/contents/VAMobile/e2e/tests | jq --compact-output 'del(.[] | select(.name == "utils.ts")) | [.[].name]')
echo "matrix=$e2eNames" >> "$GITHUB_OUTPUT"
echo "individual_matrix=" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -139,7 +138,6 @@ jobs:
IOS_PROJ_FILE: 'VAMobile.xcodeproj'
# Xcode scheme to build
IOS_SCHEME: 'VAMobileRelease'

strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -220,8 +218,8 @@ jobs:
if: failure() || success()
uses: actions/upload-artifact@v4
with:
name: ${{matrix.testsuite}}-e2e-junit
path: VAMobile/e2e/test_reports/e2e-junit.xml
name: e2e-junit-${{matrix.testsuite}}
path: VAMobile/e2e/test_reports/e2e-junit.xml

- name: Upload artifacts on failure
if: failure() || steps.run_e2e_tests.outcome == 'failure'
Expand Down Expand Up @@ -328,16 +326,10 @@ jobs:

matrix_send_test_results_to_testrail:
if: (!cancelled()) && github.event.inputs.run_testRail == 'true'
needs: [matrix-e2e-ios, output_detox_tests_to_run]
strategy:
fail-fast: false
max-parallel: 1
matrix:
testsuite: ${{ fromJSON(needs.output_detox_tests_to_run.outputs.output1) }}
needs: [matrix-e2e-ios, output_detox_tests_to_run]
name: Update testRail Results
uses: ./.github/workflows/update_testrail_results.yml
with:
test_names: "${{matrix.testsuite}}"
testRail_name: ${{ inputs.testRail_name }}
test_OS_name: "iOS"
secrets: inherit
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_branch_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
declare -A GITHUB_TO_SLACK_MAP
GITHUB_TO_SLACK_MAP["TKDickson"]="U02PJLJ0H6H"
GITHUB_TO_SLACK_MAP["kellylein"]="UJHA49K6X"
GITHUB_TO_SLACK_MAP["SarahHuber_AdHoc"]="U07U9EDGAFP"
GITHUB_TO_SLACK_MAP["dumathane"]="U02RC1BRZBP"
GITHUB_TO_SLACK_MAP["timwright12"]="U01DBDAJZ18"
GITHUB_TO_SLACK_MAP["ala_yna"]="UQC180926"
Expand All @@ -111,7 +111,7 @@ jobs:
env:
SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }}
SLACK_TKDickson: $TKDickson
SLACK_kellylein: $kellylein
SLACK_SarahHuberAdHoc: $SarahHuber_AdHoc
SLACK_dumathane: $dumathane
SLACK_timwright12: $timwright12
SLACK_alayna: $ala_yna
Expand All @@ -133,7 +133,7 @@ jobs:
- *Tickets Tagged Appropriately:* ${{ needs.release_ticket.outputs.qaDueDate }}\n\n\
*Contacts:*\n\
- *Release Testing:* <@${SLACK_TKDickson}>\n\
- *Release Manager:* <@${SLACK_kellylein}>\n\
- *Release Manager:* <@${SLACK_SarahHuberAdHoc}>\n\
- *Release Ticket Validation:* <@${SLACK_dumathane}>\n\
- *Engineering:* <@${SLACK_dumathane}>, <@${SLACK_timwright12}>\n\
- *Mobile Product Approvers:* H&B and Global - <@${SLACK_alayna}> Global - <@${SLACK_ajsarkar28}>\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
31 changes: 16 additions & 15 deletions .github/workflows/update_testrail_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ on:
description: "TestRail api key"
required: true
inputs:
test_names:
type: string
default: ''
testRail_name:
type: string
default: ''
Expand All @@ -39,7 +36,7 @@ jobs:
- name: Download junit file
uses: actions/download-artifact@v4
with:
name: ${{inputs.test_names}}-e2e-junit
pattern: e2e-junit-*
- name: 'Find run ID in testRail'
id: run-id-selection
run: |
Expand Down Expand Up @@ -86,15 +83,19 @@ jobs:
python-version: '3.x'
- name: TestRail CLI upload results
if: always()
run: |
run: |
pip install trcli
trcli -y \
-h https://dsvavsp.testrail.io/ \
--project "VA Mobile App" \
--project-id 29 \
-u ${{secrets.TEST_RAIL_USER}} \
-k ${{secrets.TEST_RAIL_KEY}} \
parse_junit \
--run-id ${{steps.run-id-selection.outputs.TEST_RUN_ID}} \
--section-id ${{steps.section-id-selection.outputs.SECTION_RUN_ID}} \
-f "/home/runner/work/va-mobile-app/va-mobile-app/e2e-junit.xml"
for dir in /home/runner/work/va-mobile-app/va-mobile-app/e2e-junit-*/; do
echo "$dir"
trcli -y \
-h https://dsvavsp.testrail.io/ \
--project "VA Mobile App" \
--project-id 29 \
-u ${{secrets.TEST_RAIL_USER}} \
-k ${{secrets.TEST_RAIL_KEY}} \
parse_junit \
--run-id ${{steps.run-id-selection.outputs.TEST_RUN_ID}} \
--section-id ${{steps.section-id-selection.outputs.SECTION_RUN_ID}} \
-f "${dir}e2e-junit.xml"
done
8 changes: 4 additions & 4 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.998.0)
aws-partitions (1.1001.0)
aws-sdk-core (3.211.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
Expand Down Expand Up @@ -127,7 +127,7 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-firebaseappdistribution_v1alpha (0.2.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-iamcredentials_v1 (0.21.0)
google-apis-iamcredentials_v1 (0.22.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.16.0)
google-apis-core (>= 0.15.0, < 2.a)
Expand Down Expand Up @@ -160,7 +160,7 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.4)
json (2.7.6)
jwt (2.9.3)
base64
mini_magick (4.13.2)
Expand Down Expand Up @@ -205,7 +205,7 @@ GEM
uber (0.1.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.26.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
17 changes: 14 additions & 3 deletions VAMobile/documentation/design/About/designers.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ Once you’ve loaded the library, you should be able to access everything in it

## Figma

VA mobile design teams at Ad Hoc use Figma to view, share, and collaborate on our work. Only designers actively working on products at VA can be added to Figma. Once you have been added, you may access the libraries in the cloud.
VA mobile app design teams use Figma to view, share, and collaborate on our work. Currently, only designers at Ad Hoc can be added as Editors to the Mobile App team's Figma account. If you're working on an external Experience Team and need access to our files, you can follow the steps below to be added as a Viewer.

### Get added to Figma

1. Go to [figma.com](https://www.figma.com/) and [create a Figma account](https://help.figma.com/hc/en-us/articles/360039811114-Create-a-Figma-account)
2. In the [#va-mobile-app-shared-systems](https://dsva.slack.com/archives/C05HF9ULKJ4) channel in Slack, ping a Figma admin (currently Jen Ecker and Jessica Woodin) requesting to be added.
2. In the [#va-mobile-app-shared-systems](https://dsva.slack.com/archives/C05HF9ULKJ4) channel in Slack, ping a Figma admin (currently Kelly Lein, Jessica Woodin, and Holly Collier) requesting to be added.
3. Receive the invite via email and accept the invitation.
4. Boom, you’re in!

Expand All @@ -65,4 +65,15 @@ Figma contains a few important features that help teams work together:
* You receive library updates automatically (a big advantage of using Figma)
* You can see what everyone else is working on in the VA workspace
* Developers can inspect any element on a page
* You can [create a branch](https://department-of-veterans-affairs.github.io/va-mobile-app/docs/UX/How-We-Work/figma-branching) of your file at any time
* You can [create a branch](https://department-of-veterans-affairs.github.io/va-mobile-app/docs/UX/How-We-Work/figma-branching) of your file at any time

### Designers on Experience Teams
Currently, designers on Experience Teams can only be added as Viewers in the **VA Mobile App's Figma account**. In order to use the Mobile App libraries in the **VA.gov Platform team's Figma account**, designers should follow the steps below.

1. In the [VA Mobile App team's Figma account](https://www.figma.com/files/827597988283174959/team/1114266503868297401), open the [Component Library](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?m=auto&t=h1T1ozCx1hqbFSDa-7) and/or [Flagship Library](https://www.figma.com/design/QVLPB3eOunmKrgQOuOt0SU/Flagship-Library---%F0%9F%93%90-Resource---VA-Mobile?m=auto&t=h1T1ozCx1hqbFSDa-7).
2. Find the component you need.
3. Copy the component.
4. In the [VA.gov Platform team's Figma account](https://www.figma.com/files/team/1278375444205744118/all-projects), open your working file.
5. Paste the component into your working file.

If you have questions or need assistance, reach out in the [#va-mobile-app-shared-systems](https://dsva.slack.com/archives/C05HF9ULKJ4) channel.
Loading

0 comments on commit b477397

Please sign in to comment.