diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbffbcfcd..93964f993 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,7 +130,7 @@ drush-deploy-dev: stage: development-postdeploy needs: ["deploy-to-dev"] before_script: - - apk add socat + - tdnf -y install socat - az extension add --name containerapp - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID} - az account set --subscription "Essex County Council (Microsites)" @@ -209,7 +209,7 @@ drush-deploy-preprod: stage: preproduction-postdeploy needs: ["deploy-to-preprod"] before_script: - - apk add socat + - tdnf -y install socat - az extension add --name containerapp - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID} - az account set --subscription "Essex County Council (Microsites)" @@ -287,7 +287,7 @@ drush-deploy-prod: stage: production-postdeploy needs: ["deploy-to-prod"] before_script: - - apk add socat + - tdnf -y install socat - az extension add --name containerapp - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID} - az account set --subscription "Essex County Council (Microsites)" diff --git a/config/sync/core.entity_view_display.media.image.default.yml b/config/sync/core.entity_view_display.media.image.default.yml index bfd09953f..c5d5144c6 100644 --- a/config/sync/core.entity_view_display.media.image.default.yml +++ b/config/sync/core.entity_view_display.media.image.default.yml @@ -16,14 +16,6 @@ targetEntityType: media bundle: image mode: default content: - field_media_category: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 2 - region: content field_media_image: type: responsive_image label: visually_hidden @@ -33,10 +25,11 @@ content: image_loading: attribute: eager third_party_settings: { } - weight: 1 + weight: 0 region: content hidden: created: true + field_media_category: true name: true search_api_excerpt: true thumbnail: true diff --git a/config/sync/group.relationship_type.microsite-234e2130c3c050ade3add2.yml b/config/sync/group.relationship_type.microsite-234e2130c3c050ade3add2.yml new file mode 100644 index 000000000..30f94b942 --- /dev/null +++ b/config/sync/group.relationship_type.microsite-234e2130c3c050ade3add2.yml @@ -0,0 +1,17 @@ +uuid: b73e3f4a-3995-40f8-82a8-4b2c4c3b388a +langcode: en +status: true +dependencies: + config: + - group.type.microsite + - taxonomy.vocabulary.media_category + module: + - group_term + - taxonomy +id: microsite-234e2130c3c050ade3add2 +group_type: microsite +content_plugin: 'group_term:media_category' +plugin_config: + group_cardinality: 0 + entity_cardinality: 1 + use_creation_wizard: false diff --git a/config/sync/views.view.group_media.yml b/config/sync/views.view.group_media.yml index d78e5eead..19a0829dd 100644 --- a/config/sync/views.view.group_media.yml +++ b/config/sync/views.view.group_media.yml @@ -4,10 +4,12 @@ status: true dependencies: config: - image.style.crop_thumbnail + - taxonomy.vocabulary.media_category module: - group - image - media + - taxonomy enforced: module: - groupmedia @@ -906,6 +908,57 @@ display: default_group: All default_group_multiple: { } group_items: { } + field_media_category_target_id: + id: field_media_category_target_id + table: media__field_media_category + field: field_media_category_target_id + relationship: none + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_media_category_target_id_op + label: Category + description: '' + use_operator: false + operator: field_media_category_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_media_category_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + emergency_publisher: '0' + anonymous: '0' + microsites_controller: '0' + microsites_trusted_editor: '0' + localgov_news_editor: '0' + waste_admin: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: media_category + type: textfield + hierarchy: false + limit: true + error_message: true filter_groups: operator: AND groups: