diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 32b5c1779..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,102 +0,0 @@ -version: 2 -aliases: - - &ssh_key_fingerprint "36:03:e3:ca:b3:0b:82:18:e2:e9:ae:5d:81:17:86:b1" - # Fingerprint of the SSH deploy key of the project used to pull code. - # The value can be found in CircleCI UI -> SSH Permissions. - - - &step_configure_git - run: - name: Configure git - command: | - git config --global user.email "$DEPLOY_USER_EMAIL" && git config --global user.name "$DEPLOY_USER_NAME" - - # Re-usable job to run different types of builds. - - &job-build - working_directory: &working-directory /app - docker: - - image: &builder-image singledigital/bay-ci-builder:5.x - environment: - INSTALL_NEW_SITE: 1 - LAGOON_ENVIRONMENT_TYPE: ci - steps: - - attach_workspace: - at: /workspace - - checkout - # Init environment for development. - - run: if [ -f "./dev-tools.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-tools.sh; fi - - setup_remote_docker: - docker_layer_caching: true - - run: .circleci/build.sh - - run: .circleci/test.sh - - run: - name: Copy artifacts - command: .circleci/test-artifacts.sh - when: always - - store_artifacts: - path: /tmp/artifacts - - # Job to perform merge to reference branch after a merge to develop. - - &merge-to-reference - working_directory: *working-directory - docker: - - image: *builder-image - auth: - username: $DOCKERHUB_USERNAME - password: $DOCKERHUB_PASSWORD - environment: - LAGOON_ENVIRONMENT_TYPE: ci - SSH_KEY_FINGERPRINT: *ssh_key_fingerprint - DEPLOY_USER_EMAIL: sdp.devs@dpc.vic.gov.au - DEPLOY_USER_NAME: sdpdeploy - steps: - - attach_workspace: - at: /workspace - - checkout - - *step_configure_git - - setup_remote_docker: - docker_layer_caching: true - - add_ssh_keys: - fingerprints: - - *ssh_key_fingerprint - - run: - name: Merge to reference branch - command: .circleci/merge-to-reference.sh - no_output_timeout: 30m - - -jobs: - build: - <<: *job-build - - build_suggest: - <<: *job-build - docker: - - image: *builder-image - environment: - INSTALL_NEW_SITE: 1 - LAGOON_ENVIRONMENT_TYPE: ci - INSTALL_SUGGEST: 1 - BEHAT_PROFILE: "--profile=suggest" - - merge_to_reference: - <<: *merge-to-reference - - -workflows: - version: 2 - main: - jobs: - - build - - build_suggest: - filters: - branches: - ignore: - - reference - - mergetoreference: - jobs: - - merge_to_reference: - filters: - branches: - only: - - develop diff --git a/.circleci/merge-to-reference.sh b/.circleci/merge-to-reference.sh deleted file mode 100755 index db8b679ef..000000000 --- a/.circleci/merge-to-reference.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -## -# Merge develop to reference branch in CI. -# - -echo "==> Checking out reference branch" -git checkout reference -echo "==> Merging develop to reference branch" -git merge develop -git checkout develop -- composer.json -git add . -echo "==> Replacing composer require entries starting with dpc-sdp with value dev-reference" -cat composer.json | gojq '.require |= with_entries( - if (.key | test("dpc-sdp/tide")) - then .value = "dev-reference" end)' > composer.json.backup -mv -f composer.json.backup composer.json -echo "==> Add all changes" -git add . -git commit -m "Merge changes from develop." -echo "==> Push the changes to remote reference branch" -git push origin --force reference diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1caf8d6d..9eb80315a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,16 +5,6 @@ on: workflow_dispatch: jobs: - set_status_in_progress: - name: set_status_in_progress - if: always() - uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0 - secrets: inherit - with: - context: 'tide_build' - description: 'Tide Build running...' - state: 'pending' - target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} tide_build: name: tide_build secrets: inherit @@ -22,17 +12,3 @@ jobs: with: module_build: true runner: biggy-tide - export_config: - name: export_config - secrets: inherit - uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@v1.2.0 - set_status: - name: set_status - needs: [tide_build] - if: always() - uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0 - secrets: inherit - with: - context: 'tide_build' - description: 'Tide Build' - target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} diff --git a/.github/workflows/pull-request-reviewer-reminder.yml b/.github/workflows/pull-request-reviewer-reminder.yml new file mode 100644 index 000000000..47188d8a2 --- /dev/null +++ b/.github/workflows/pull-request-reviewer-reminder.yml @@ -0,0 +1,21 @@ +name: 'Close stale issues and PRs' +on: + workflow_dispatch: + schedule: + - cron: '30 1 * * *' + +permissions: + contents: write # only for delete-branch option + issues: write + pull-requests: write + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v9 + with: + exempt-pr-labels: "DO NOT MERGE" + stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.' + days-before-stale: 28 + days-before-close: 14 diff --git a/composer.json b/composer.json index 5976ffb16..75d430f8a 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "drupal/maxlength": "^2.1", "drupal/entity_hierarchy": "4.x", "drupal/elasticsearch_connector": "^7.0", - "drupal/search_api": "^1.11", + "drupal/search_api": "^1.36", "drupal/data_pipelines": "1.0.0-alpha22", "drupal/data_pipelines_elasticsearch": "^1.0@alpha", "drupal/key": "^1.17", @@ -69,7 +69,7 @@ "drupal/viewsreference": "^2.0@beta", "drupal/workbench": "^1.4", "drupal/dynamic_entity_reference": "^3.0", - "drupal/scheduled_transitions": "^2.3", + "drupal/scheduled_transitions": "2.5", "drupal/link_field_autocomplete_filter": "^2.0", "drupal/queue_mail": "^1.5", "drupal/token": "^1.15", @@ -406,7 +406,7 @@ "[UX] Add the ability to hide or disable the import CSV option - https://www.drupal.org/project/tablefield/issues/2337743": "https://www.drupal.org/files/issues/2020-11-11/tablefield-allowed_data_sources-2337743-16.patch" }, "drupal/search_api": { - "Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2020-02-08/search_api-index-specific-items-3016809-09.patch" + "Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2024-11-25/search_api-index-specific-items-3016809-10.patch" }, "drupal/key": { "KeyProviderInterface::getKeyValue() doesn't always return a string - https://www.drupal.org/project/key/issues/3356052#comment-15030602": "https://git.drupalcode.org/project/key/-/merge_requests/11/diffs.patch", @@ -464,7 +464,8 @@ }, "config": { "allow-plugins": { - "composer/installers": true + "composer/installers": true, + "oomphinc/composer-installers-extender": true } } } diff --git a/config/install/core.entity_form_display.taxonomy_term.sites.default.yml b/config/install/core.entity_form_display.taxonomy_term.sites.default.yml index 8af48aab9..32358292a 100644 --- a/config/install/core.entity_form_display.taxonomy_term.sites.default.yml +++ b/config/install/core.entity_form_display.taxonomy_term.sites.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.taxonomy_term.sites.field_bottom_corner_graphic - field.field.taxonomy_term.sites.field_print_friendly_logo - field.field.taxonomy_term.sites.field_prominence_ack_to_country + - field.field.taxonomy_term.sites.field_show_exit_site_specific - field.field.taxonomy_term.sites.field_show_table_of_contents - field.field.taxonomy_term.sites.field_site_domains - field.field.taxonomy_term.sites.field_site_favicon @@ -47,7 +48,7 @@ third_party_settings: label: 'Table of contents' region: content parent_name: '' - weight: 18 + weight: 19 format_type: details format_settings: classes: '' @@ -62,7 +63,7 @@ third_party_settings: label: 'Site theme values' region: content parent_name: '' - weight: 19 + weight: 20 format_type: details format_settings: classes: '' @@ -77,7 +78,7 @@ third_party_settings: label: 'Site feature flag values' region: content parent_name: '' - weight: 20 + weight: 21 format_type: details format_settings: classes: '' @@ -92,7 +93,7 @@ third_party_settings: label: 'Site favicon value' region: content parent_name: '' - weight: 21 + weight: 22 format_type: details format_settings: classes: '' @@ -108,7 +109,7 @@ third_party_settings: label: 'Site header corner graphics' region: content parent_name: '' - weight: 22 + weight: 23 format_type: details format_settings: classes: '' @@ -124,7 +125,7 @@ mode: default content: field_acknowledgement_to_country: type: string_textarea - weight: 12 + weight: 13 region: content settings: rows: 5 @@ -155,12 +156,18 @@ content: third_party_settings: { } field_prominence_ack_to_country: type: string_textarea - weight: 13 + weight: 14 region: content settings: rows: 5 placeholder: '' third_party_settings: { } + field_show_exit_site_specific: + type: options_select + weight: 12 + region: content + settings: { } + third_party_settings: { } field_show_table_of_contents: type: boolean_checkbox weight: 17 @@ -266,7 +273,7 @@ content: third_party_settings: { } field_site_og_image: type: entity_browser_entity_reference - weight: 14 + weight: 15 region: content settings: entity_browser: tide_image_browser @@ -296,7 +303,7 @@ content: third_party_settings: { } field_site_social_links: type: link_default - weight: 16 + weight: 17 region: content settings: placeholder_url: 'https://example.com/Social' @@ -323,7 +330,7 @@ content: third_party_settings: { } field_site_twitter_image: type: entity_browser_entity_reference - weight: 15 + weight: 16 region: content settings: entity_browser: tide_image_browser @@ -362,7 +369,7 @@ content: third_party_settings: { } status: type: boolean_checkbox - weight: 17 + weight: 18 region: content settings: display_label: true diff --git a/config/install/core.entity_view_display.taxonomy_term.sites.default.yml b/config/install/core.entity_view_display.taxonomy_term.sites.default.yml index 98416ecb7..33cfa2881 100644 --- a/config/install/core.entity_view_display.taxonomy_term.sites.default.yml +++ b/config/install/core.entity_view_display.taxonomy_term.sites.default.yml @@ -6,6 +6,7 @@ dependencies: - field.field.taxonomy_term.sites.field_additional_comment - field.field.taxonomy_term.sites.field_print_friendly_logo - field.field.taxonomy_term.sites.field_prominence_ack_to_country + - field.field.taxonomy_term.sites.field_show_exit_site_specific - field.field.taxonomy_term.sites.field_show_table_of_contents - field.field.taxonomy_term.sites.field_site_domains - field.field.taxonomy_term.sites.field_site_footer_logos @@ -53,6 +54,13 @@ content: third_party_settings: { } weight: 12 region: content + field_show_exit_site_specific: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 11 + region: content field_show_table_of_contents: type: boolean label: above diff --git a/config/install/field.field.taxonomy_term.sites.field_show_exit_site_specific.yml b/config/install/field.field.taxonomy_term.sites.field_show_exit_site_specific.yml new file mode 100644 index 000000000..f8b802151 --- /dev/null +++ b/config/install/field.field.taxonomy_term.sites.field_show_exit_site_specific.yml @@ -0,0 +1,20 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.taxonomy_term.field_show_exit_site_specific + - taxonomy.vocabulary.sites + module: + - options +id: taxonomy_term.sites.field_show_exit_site_specific +field_name: field_show_exit_site_specific +entity_type: taxonomy_term +bundle: sites +label: 'Show Quick exit button on pages in this site section?' +description: 'You can turn the Quick exit button on or off for a site section only, separate from the setting for the whole site.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/install/field.field.taxonomy_term.sites.field_site_show_exit_site.yml b/config/install/field.field.taxonomy_term.sites.field_site_show_exit_site.yml index c8af94a3f..2996b6ac4 100644 --- a/config/install/field.field.taxonomy_term.sites.field_site_show_exit_site.yml +++ b/config/install/field.field.taxonomy_term.sites.field_site_show_exit_site.yml @@ -4,11 +4,13 @@ dependencies: config: - field.storage.taxonomy_term.field_site_show_exit_site - taxonomy.vocabulary.sites +_core: + default_config_hash: H4XsO_lcSpmN8fpKEaZh7KoUvvK8Ajfg5hOdosU4VKs id: taxonomy_term.sites.field_site_show_exit_site field_name: field_site_show_exit_site entity_type: taxonomy_term bundle: sites -label: 'Show Exit Site?' +label: 'Show Quick exit button sitewide?' description: '' required: false translatable: false diff --git a/config/install/field.storage.taxonomy_term.field_show_exit_site_specific.yml b/config/install/field.storage.taxonomy_term.field_show_exit_site_specific.yml new file mode 100644 index 000000000..83eacccf4 --- /dev/null +++ b/config/install/field.storage.taxonomy_term.field_show_exit_site_specific.yml @@ -0,0 +1,26 @@ +langcode: en +status: true +dependencies: + module: + - options + - taxonomy +id: taxonomy_term.field_show_exit_site_specific +field_name: field_show_exit_site_specific +entity_type: taxonomy_term +type: list_string +settings: + allowed_values: + - + value: 'yes' + label: 'Yes' + - + value: 'no' + label: 'No' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/install/filter.format.rich_text.yml b/config/install/filter.format.rich_text.yml index cd834cdfb..479f5a7b9 100644 --- a/config/install/filter.format.rich_text.yml +++ b/config/install/filter.format.rich_text.yml @@ -47,7 +47,7 @@ filters: status: true weight: -49 settings: - allowed_html: '