Skip to content

Commit

Permalink
Merge branch 'main' into integration-operating-statuses
Browse files Browse the repository at this point in the history
  • Loading branch information
omahane authored Dec 18, 2024
2 parents 5edfefe + b52da25 commit 3a60ee0
Show file tree
Hide file tree
Showing 162 changed files with 5,441 additions and 1,330 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
/docroot/modules/custom/va_gov_login # @department-of-veterans-affairs/platform-cms-drupal-engineers
/docroot/modules/custom/va_gov_lovell @department-of-veterans-affairs/facilities-cms
/docroot/modules/custom/va_gov_magichead @department-of-veterans-affairs/public-websites-cms
/docroot/modules/custom/va_gov_manila @department-of-veterans-affairs/facilities-cms
/docroot/modules/custom/va_gov_media # @department-of-veterans-affairs/platform-cms-drupal-engineers
/docroot/modules/custom/va_gov_menu_access # @department-of-veterans-affairs/platform-cms-drupal-engineers
/docroot/modules/custom/va_gov_menus # @department-of-veterans-affairs/platform-cms-drupal-engineers
Expand Down
25 changes: 18 additions & 7 deletions .github/ISSUE_TEMPLATE/taxonomy-add-term.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body:
label: Rationale for adding this term
description: Write a short explanation of why this term is needed. Include links to any relevant issues, research findings, etc.
validations:
required: true
required: true
- type: dropdown
id: products
attributes:
Expand All @@ -58,6 +58,8 @@ body:
- Vet Centers
- VBA Regional Office
- Benefit hubs
- Facility Locator
- Lighthouse VA Facilities API
- Other
validations:
required: false
Expand All @@ -80,19 +82,28 @@ body:
- 'Yes'
- 'No'
validations:
required: true
required: true
- type: textarea
id: acceptance-critera
attributes:
label: Acceptance Criteria
description: Customize the Acceptance Critera or use the default
label: Tasks
description: Customize the Tasks or use the default
value: |
**Content Review and Entry**
- [ ] Term is reviewed by relevant taxonomy governance body
- [ ] Term is either approved for addition, or denied with an explanation
- [ ] If approved, a Drupal admin from Product team may add the term to the taxonomy
- [ ] If approved, a Drupal admin from Product team may add the term to the taxonomy and save as Draft
- [ ] Content for subfields is updated in Drupal by Product team
- [ ] (List any necessary review and approval steps here)
- [ ] Term is published
- [ ] (List any other necessary review and approval steps here)
**Technical Coordination**
- [ ] Work with Lighthouse to update the Facilities API to accept new value
- This step can begin as soon as the API ID has been finalized and saved as Draft in Drupal
**Launch & Change Management**
- [ ] Once Content Review and Technical Coordination are complete, term can be published in Drupal
- [ ] Updates to KB articles and other editor training materials
- [ ] Announcement to editors
validations:
required: true

6 changes: 3 additions & 3 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: ./.github/actions/post-checkout
- name: ReviewDog
# See also `composer va:test:eslint` in composer.json
uses: reviewdog/action-eslint@9a6606695f1ef9709cce821919ca3b2a6d5e6bb5 # v1.32.0
uses: reviewdog/action-eslint@9b5b0150e399e1f007ee3c27bc156549810a64e3 # v1.33.0
with:
reporter: github-pr-review
eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Stylelint modules
# See also `composer va:test:stylelint-modules` in composer.json
uses: reviewdog/action-stylelint@c1da6e75d890eba79f82a4294e867cbd720b52d9 # v1.29.0
uses: reviewdog/action-stylelint@3957468a0ecd893d96e59774122c860fa98b0f82 # v1.30.0
with:
fail_on_error: true
github_token: ${{ secrets.github_token }}
Expand All @@ -149,7 +149,7 @@ jobs:
stylelint_input: 'docroot/modules/custom/**/*.css'
- name: Stylelint themes
# See also `composer va:test:stylelint-themes` in composer.json
uses: reviewdog/action-stylelint@c1da6e75d890eba79f82a4294e867cbd720b52d9 # v1.29.0
uses: reviewdog/action-stylelint@3957468a0ecd893d96e59774122c860fa98b0f82 # v1.30.0
with:
fail_on_error: true
github_token: ${{ secrets.github_token }}
Expand Down
59 changes: 59 additions & 0 deletions READMES/ga4-glossary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Google Analytics 4 - Glossary Terms

The goal of this document is to provide a guide for VA users to navigate the Google Analytics 4 (GA4) dashboard. While this file will go through the most pertinent items in our dashboard, an exhaustive list of terms can be found here: https://www.lovesdata.com/blog/google-analytics-glossary

## Landing Page - Home Landing Page

![Home landing page](images/ga4-home.png)

This is the initial landing page for when you come to the analytics url. It provides a snapshot of what google considers to be key items for your attention. Per the advice of the sitewide analytics team, this page is typically not all that useful to your interests. It gives the past week's data as reference.

## Landing Page - Reports Snapshot

![Reports snapshot](images/ga4-reports.png)

This landing page for your reports is a bit more useful, providing longer trends and updates on any of your created metrics at a glance. A more in-depth description can be found here: https://support.google.com/analytics/answer/10659091?hl=en&utm_id=ad

## Landing Page - Library

![Library](images/ga4-library.png)

The Library landing page (seen on the bottom left of your screen once you are inside the reports section) is where you can manage your collections and custom reports. GA4 supplies you with stock options for both collections and reports, but it is important for you to create one that makes sense for your use case.

## Collection - Life cycle - Engagement overview

![Engagement overview collection](images/ga4-collection.png)

Each collection you create will populate the sidebar navigation and provide the pages associated with the directories and reports you include. For example, we are taking a look at the engagement overview page within the "Life cycle" collection. We have provided GA4 with some parameters and metrics we would like to track for this collection (like average engagement time and engaged sessions per active user), and GA4 gives us an interactive graph to visualize those metrics over a time period we can specify.

## Terms

### Active Users

Active users is the primary metric used in GA4 to show you how many people have visited our site. To be considered active, a user needs to have an engaged session (a user on the site longer than 10 seconds) or be reported as a new user (note: being listed as new would also include people who have cleared their cookies or on a different device).

### Views

Views collect the total number of times events have been collected. For example, a user who navigates to the ‘about us’ page, then the ‘contact us’ page, and then back to the ‘about us’ page will result in two views of the ‘about us’ page and one view of the ‘contact us’ page.

### Events

GA4 treats all data as "events". If you interact with a webpage at all, that is an event. There are automatic events that google collects for you (like page_view, scroll, click, and more), and there are also ways to create custom events and add recommended events for tracking purposes. Here's a helpful guide on creating custom events: https://www.lovesdata.com/blog/google-analytics-4-events#custom-events

### Session

A session is when a user visits a page and logs an event (this is done as soon as a user views the page and is tracked by the session_start event by GA4). A session will include any and all events a user does until either they have stayed on the same page for over 30 minutes (in which time a new session will be created) OR they navigate away from the page.

### Bounce Rate

A bounce rate is the percentage of sessions that last less than 10 seconds, have no key event (previously called a conversion), and/or only include one page view (the initial page view upon landing on the page). Think of this as the percentage of users who are not really engaged on the site.

### Key Event

Key events are used to report actions that you have chosen that align with your business objectives. After choosing one or several key events, you can then see this number surfaced in your reports. This will give you an idea of if your users are interacting with the site in your predicted ways.

### Filter

You can add filters to reports to further refine your results. For example, I can add a filter to exactly match the prod.cms.va hostname to make sure I have excluded metrics from lower or unwanted environments as seen in the image below. NOTE: Filters are not exported to reports and will only persist on a user basis. If I create a filter, I cannot share that with you directly in the dashboard (I can, however, export the filtered report or guide you how to create that filter for yourself).

![Filtering reports](images/ga4-filter.png)
Binary file added READMES/images/ga4-collection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added READMES/images/ga4-filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added READMES/images/ga4-home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added READMES/images/ga4-library.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added READMES/images/ga4-reports.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 20 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"drupal/crop": "^2.0",
"drupal/csv_serialization": "^4.0",
"drupal/ctools_block": "^4.0",
"drupal/danse": "^2.2",
"drupal/danse": "^2.3",
"drupal/danse_content_moderation": "^2.0@beta",
"drupal/default_content_deploy": "^2.0",
"drupal/default_content_deploy": "^2.1",
"drupal/devel_entity_updates": "^4.1",
"drupal/diff": "^1.0",
"drupal/dropzonejs": "^2.0",
Expand Down Expand Up @@ -107,7 +107,7 @@
"drupal/ief_table_view_mode": "^3.0",
"drupal/image_style_warmer": "^1.2@RC",
"drupal/image_widget_crop": "^2.2",
"drupal/jsonapi_extras": "3.24",
"drupal/jsonapi_extras": "3.26",
"drupal/jsonapi_hypermedia": "^1.9",
"drupal/jsonapi_image_styles": "^3.0",
"drupal/jsonapi_menu_items": "^1.2",
Expand All @@ -133,7 +133,7 @@
"drupal/message_notify": "^1.2",
"drupal/message_subscribe": "^2.0",
"drupal/message_ui": "^1.0@beta",
"drupal/metatag": "^2.0",
"drupal/metatag": "^2.1",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_source_csv": "^3.4",
"drupal/migrate_source_ui": "^1.0",
Expand All @@ -144,7 +144,7 @@
"drupal/next": "^1.1",
"drupal/no_table_drag": "^2.0@alpha",
"drupal/node_link_report": "^1.14",
"drupal/node_revision_delete": "^1.0",
"drupal/node_revision_delete": "^2.0",
"drupal/node_title_help_text": "^1.0",
"drupal/office_hours": "^1.9",
"drupal/openapi": "^2.0@RC",
Expand All @@ -164,29 +164,29 @@
"drupal/pfm": "^2.0",
"drupal/post_api": "^2.0.3",
"drupal/prometheus_exporter": "^2.0@beta",
"drupal/raven": "^5.0",
"drupal/raven": "^6.0",
"drupal/rdf": "^2.1",
"drupal/redirect": "^1.3",
"drupal/redirect_options": "^2.1",
"drupal/restui": "^1.16",
"drupal/role_delegation": "1.3.0",
"drupal/s3fs": "^3.6",
"drupal/samlauth": "^3.9",
"drupal/schemata": "^1.0@beta",
"drupal/schemata": "^1.0",
"drupal/search_api": "^1.29.0",
"drupal/seckit": "^2.0",
"drupal/simplesamlphp_auth": "^4.0@RC",
"drupal/sitewide_alert": "^2.0",
"drupal/slack": "^1.3",
"drupal/smart_date": "^4.1.2",
"drupal/social_media_links": "^2.8",
"drupal/smart_date": "^4.2.0",
"drupal/social_media_links": "^2.10",
"drupal/string_field_formatter": "^2.0",
"drupal/styleguide": "^2.0@beta",
"drupal/tablefield": "^2.4",
"drupal/taxonomy_entity_index": "^1.1",
"drupal/taxonomy_menu": "^3.6",
"drupal/textfield_counter": "^2.3",
"drupal/tmgmt": "^1.14",
"drupal/tmgmt": "^1.17",
"drupal/toolbar_menu": "^3.0",
"drupal/twig_tweak": "^3.4",
"drupal/tzfield": "^1.7",
Expand All @@ -195,12 +195,12 @@
"drupal/video_embed_media": "^2.2",
"drupal/viewfield": "^3.0@beta",
"drupal/views_bulk_edit": "^3.0",
"drupal/views_bulk_operations": "^4.2",
"drupal/views_bulk_operations": "^4.3",
"drupal/views_conditional": "^1.4",
"drupal/views_data_export": "^1.4",
"drupal/views_local_tasks": "^1.0",
"drupal/workbench_access": "^2.0",
"drupal/workbench_menu_access": "^2.0",
"drupal/workbench_menu_access": "^2.1",
"drush/drush": "12.5.3",
"easyrdf/easyrdf": "1.1.1 as 0.9.1",
"geocoder-php/mapbox-provider": "^1.3",
Expand Down Expand Up @@ -228,10 +228,10 @@
"squizlabs/php_codesniffer": "^3.5",
"symfony/browser-kit": "^6.3",
"symfony/console": "^6.2",
"symfony/phpunit-bridge": "^5.1",
"symfony/phpunit-bridge": "^7.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3634",
"va-gov/content-build": "^0.0.3651",
"vlucas/phpdotenv": "^5.6",
"webflo/drupal-finder": "1.3.1",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -298,7 +298,7 @@
"sort-packages": true,
"optimize-autoloader": true,
"platform": {
"php": "8.1"
"php": "8.1.30"
},
"preferred-install": {
"va-gov/content-build": "source",
Expand Down Expand Up @@ -377,9 +377,6 @@
"drupal/clientside_validation": {
"2949540 - Allow specific form ids for clientside validation": "patches/2949540-allow-specific-form-ids-for-clientside-validation.patch"
},
"drupal/consumer_image_styles": {
"3301224 - Follow-up: Very slow JSON:API responses when images are stored on AWS bucket": "patches/3301224-very-slow-json-api-responses-when-images-are-stored-on-aws-bucket.patch"
},
"drupal/content_lock": {
"2951652 - Content lock causes redirect response preventing migration rollback.": "patches/2951652-content-lock-causes-redirect-response-preventing-migration-rollback.patch"
},
Expand Down Expand Up @@ -417,12 +414,12 @@
"2834253 - Missing column headings in Revisions list": "patches/2834253-missing-column-headers.patch"
},
"drupal/eca": {
"3465031 - Multiple cron events not firing consistently": "patches/3465031-eca-fix-cron-consistency.patch",
"3472437 - Drupal\\eca\\Service\\ExportRecipe::__construct(): Argument #2 ($fileSystem) must be of type Drupal\\Core\\File\\FileSystem": "patches/3472437-instatiate-against-file-system-interface.patch"
},
"drupal/entity_browser": {
"2856138 - Entity browser cardinality validation": "patches/2856138-entity-browser-cardinality-validation.patch",
"3191302 - Make modal iframe tab accessible": "patches/3191302-make-modal-iframe-tab-accessible.patch"
"3191302 - Make modal iframe tab accessible": "patches/3191302-make-modal-iframe-tab-accessible.patch",
"3483265 - Make it possible to show latest revision in form widget": "patches/3483265-make-it-possible-to-show-latest-revision-in-fomr-widget.patch"
},
"drupal/entity_browser_table": {
"3194622 - Custom field validation should not be applied to remove button": "patches/3794622-limit-remove-button-validators.patch",
Expand Down Expand Up @@ -507,8 +504,9 @@
"drupal/redirect_options": {
"3335893 - form_alter hook check on classes fails in some cases": "patches/3335893-redirect-options-form-alter-array-check.patch"
},
"drupal/schemata": {
"3190131 - Possibly unnecessary logging in SchemaFactory::create().": "patches/3190131-schemata-remove-logging-statement.patch"
"drupal/simplesamlphp_auth": {
"VAMCS-19923: add PIV card logging": "patches/VACMS-19923-simplesaml-attributes-error-logging.patch",
"3127628 - Successful login with IDP but the user is still considered as anonymous": "patches/3127628-simplesamlphp-auth-fix-redirection-issue.patch"
},
"drupal/social_media_links": {
"3044002 - Platform Name and Aria Label issue": "patches/3044002-platform-name-and-aria-label-issue.patch"
Expand Down
Loading

0 comments on commit 3a60ee0

Please sign in to comment.