From a704a9ba40f09443553e53b2d42ef16f00eaff81 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 19 Aug 2024 16:58:16 +0300 Subject: [PATCH 01/19] UHF-10469: Change news archive fallback and rss views to use drupal database instead of elastic index to make the rss filtering work correctly --- ..._index.yml => views.view.news_archive.yml} | 1172 ++++++++++++----- .../custom/hdbt_subtheme/hdbt_subtheme.theme | 2 +- 2 files changed, 812 insertions(+), 362 deletions(-) rename conf/cmi/{views.view.news_archive_index.yml => views.view.news_archive.yml} (52%) diff --git a/conf/cmi/views.view.news_archive_index.yml b/conf/cmi/views.view.news_archive.yml similarity index 52% rename from conf/cmi/views.view.news_archive_index.yml rename to conf/cmi/views.view.news_archive.yml index f8c91db90..1ec39216b 100644 --- a/conf/cmi/views.view.news_archive_index.yml +++ b/conf/cmi/views.view.news_archive.yml @@ -1,23 +1,28 @@ -uuid: 9498ef19-6bd8-407c-a996-992f67738d63 +uuid: 82f7949d-e966-4e8d-9fa0-19e5f82659b6 langcode: en status: true dependencies: config: + - core.entity_view_mode.node.teaser - field.storage.node.field_lead_in - field.storage.node.field_main_image - - search_api.index.news + - node.type.news_item + - taxonomy.vocabulary.news_group + - taxonomy.vocabulary.news_neighbourhoods + - taxonomy.vocabulary.news_tags module: - helfi_etusivu - - search_api + - node + - taxonomy - user - views_rss -id: news_archive_index +id: news_archive label: 'News archive' module: views description: '' tag: '' -base_table: search_api_index_news -base_field: search_api_id +base_table: node_field_data +base_field: nid display: default: id: default @@ -25,50 +30,34 @@ display: display_plugin: default position: 0 display_options: - title: 'All news' + title: News fields: - search_api_rendered_item: - id: search_api_rendered_item - table: search_api_index_news - field: search_api_rendered_item + title: + id: title + table: node_field_data + field: title relationship: none group_type: group admin_label: '' - plugin_id: search_api_rendered_item + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: alter_text: false - text: '' make_link: false - path: '' absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' + word_boundary: false + ellipsis: false strip_tags: false trim: false - preserve_tags: '' html: false element_type: '' element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: false + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -76,22 +65,52 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - view_modes: - 'entity:node': - news_article: teaser - news_item: teaser - 'entity:taxonomy_term': - annif_keywords: '' - linked_events_keywords: '' - news_group: '' - news_neighbourhoods: '' - news_tags: '' + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_lead_in: + id: field_lead_in + table: node__field_lead_in + field: field_lead_in + plugin_id: field + view_node: + id: view_node + table: node + field: view_node + entity_type: node + plugin_id: entity_link + output_url_as_text: false + absolute: false + title_1: + id: title_1 + table: node_field_data + field: title + entity_type: node + entity_field: title + plugin_id: field + name: + id: name + table: users_field_data + field: name + entity_type: user + entity_field: name + plugin_id: field pager: type: full options: offset: 0 - pagination_heading_level: h4 - items_per_page: 15 + items_per_page: 10 total_pages: null id: 0 tags: @@ -111,9 +130,9 @@ display: exposed_form: type: basic options: - submit_button: Apply - reset_button: false - reset_button_label: Reset + submit_button: Filter + reset_button: true + reset_button_label: 'Clear selections' exposed_sorts_label: 'Sort by' expose_sort_order: true sort_asc_label: Asc @@ -122,78 +141,50 @@ display: type: none options: { } cache: - type: search_api_none + type: tag options: { } empty: { } - sorts: - published_at: - id: published_at - table: search_api_index_news - field: published_at - relationship: none - group_type: group - admin_label: '' - plugin_id: search_api - order: DESC - expose: - label: '' - field_identifier: '' - exposed: false + sorts: { } arguments: { } filters: - search_api_language: - id: search_api_language - table: search_api_index_news - field: search_api_language - relationship: none - group_type: group - admin_label: '' - plugin_id: search_api_language - operator: in - value: - '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' group: 1 - exposed: false expose: - operator_id: '' - label: '' - description: '' - use_operator: false operator: '' operator_limit_selection: false operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - 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: { } - entity_type: - id: entity_type - table: search_api_index_news - field: entity_type + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + news_item: news_item + expose: + operator_limit_selection: false + operator_list: { } + langcode: + id: langcode + table: node_field_data + field: langcode relationship: none group_type: group admin_label: '' - plugin_id: search_api_string - operator: '=' + entity_type: node + entity_field: langcode + plugin_id: language + operator: in value: - min: '' - max: '' - value: node + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' group: 1 exposed: false expose: @@ -210,9 +201,7 @@ display: multiple: false remember_roles: authenticated: authenticated - min_placeholder: '' - max_placeholder: '' - placeholder: '' + reduce: false is_grouped: false group_info: label: '' @@ -225,33 +214,30 @@ display: default_group: All default_group_multiple: { } group_items: { } - field_news_groups: - id: field_news_groups - table: search_api_index_news - field: field_news_groups + field_news_groups_target_id: + id: field_news_groups_target_id + table: node__field_news_groups + field: field_news_groups_target_id relationship: none group_type: group admin_label: '' - plugin_id: search_api_string - operator: '=' - value: - min: '' - max: '' - value: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } group: 1 exposed: true expose: - operator_id: field_news_groups_op - label: 'News groups ' + operator_id: field_news_groups_target_id_op + label: 'Target groups' description: '' use_operator: false - operator: field_news_groups_op + operator: field_news_groups_target_id_op operator_limit_selection: false operator_list: { } identifier: groups required: false remember: false - multiple: false + multiple: true remember_roles: authenticated: authenticated anonymous: '0' @@ -259,12 +245,7 @@ display: content_producer: '0' editor: '0' admin: '0' - menu_api: '0' - news_producer: '0' - super_administrator: '0' - min_placeholder: '' - max_placeholder: '' - placeholder: '' + reduce: false is_grouped: false group_info: label: '' @@ -277,33 +258,36 @@ display: default_group: All default_group_multiple: { } group_items: { } - field_news_item_tags: - id: field_news_item_tags - table: search_api_index_news - field: field_news_item_tags + reduce_duplicates: false + vid: news_group + type: select + hierarchy: false + limit: true + error_message: true + field_news_item_tags_target_id: + id: field_news_item_tags_target_id + table: node__field_news_item_tags + field: field_news_item_tags_target_id relationship: none group_type: group admin_label: '' - plugin_id: search_api_string - operator: '=' - value: - min: '' - max: '' - value: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } group: 1 exposed: true expose: - operator_id: field_news_item_tags_op - label: 'News tags' + operator_id: field_news_item_tags_target_id_op + label: Topics description: '' use_operator: false - operator: field_news_item_tags_op + operator: field_news_item_tags_target_id_op operator_limit_selection: false operator_list: { } - identifier: topic + identifier: tags required: false remember: false - multiple: false + multiple: true remember_roles: authenticated: authenticated anonymous: '0' @@ -311,12 +295,7 @@ display: content_producer: '0' editor: '0' admin: '0' - menu_api: '0' - news_producer: '0' - super_administrator: '0' - min_placeholder: '' - max_placeholder: '' - placeholder: '' + reduce: false is_grouped: false group_info: label: '' @@ -329,33 +308,36 @@ display: default_group: All default_group_multiple: { } group_items: { } - field_news_neighbourhoods: - id: field_news_neighbourhoods - table: search_api_index_news - field: field_news_neighbourhoods + reduce_duplicates: false + vid: news_tags + type: select + hierarchy: false + limit: true + error_message: true + field_news_neighbourhoods_target_id: + id: field_news_neighbourhoods_target_id + table: node__field_news_neighbourhoods + field: field_news_neighbourhoods_target_id relationship: none group_type: group admin_label: '' - plugin_id: search_api_string - operator: '=' - value: - min: '' - max: '' - value: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } group: 1 exposed: true expose: - operator_id: field_news_neighbourhoods_op - label: 'News neighbourhoods' + operator_id: field_news_neighbourhoods_target_id_op + label: 'City districts' description: '' use_operator: false - operator: field_news_neighbourhoods_op + operator: field_news_neighbourhoods_target_id_op operator_limit_selection: false operator_list: { } identifier: neighbourhoods required: false remember: false - multiple: false + multiple: true remember_roles: authenticated: authenticated anonymous: '0' @@ -363,12 +345,7 @@ display: content_producer: '0' editor: '0' admin: '0' - menu_api: '0' - news_producer: '0' - super_administrator: '0' - min_placeholder: '' - max_placeholder: '' - placeholder: '' + reduce: false is_grouped: false group_info: label: '' @@ -381,51 +358,59 @@ display: default_group: All default_group_multiple: { } group_items: { } - filter_groups: - operator: AND - groups: - 1: AND + reduce_duplicates: false + vid: news_neighbourhoods + type: select + hierarchy: false + limit: true + error_message: true style: type: default row: - type: fields + type: 'entity:node' + options: + view_mode: teaser query: - type: search_api_query + type: views_query options: - bypass_access: false - skip_access: false - preserve_facet_query_args: false + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false query_tags: { } relationships: { } + link_display: feed_1 + link_url: '' header: { } footer: { } display_extenders: { } cache_metadata: max-age: -1 contexts: + - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' tags: - - 'config:search_api.index.news' - - 'search_api_list:news' - news_archive_feed_index: - id: news_archive_feed_index + - 'config:field.storage.node.field_lead_in' + feed_1: + id: feed_1 display_title: Feed display_plugin: feed position: 2 display_options: - title: News fields: title: id: title - table: search_api_index_news + table: node_field_data field: title relationship: none group_type: group admin_label: '' - plugin_id: search_api_field + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -446,8 +431,8 @@ display: target: '' nl2br: false max_length: 0 - word_boundary: true - ellipsis: true + word_boundary: false + ellipsis: false more_link: false more_link_text: '' more_link_path: '' @@ -481,21 +466,14 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - url: - id: url - table: search_api_index_news - field: url + field_lead_in: + id: field_lead_in + table: node__field_lead_in + field: field_lead_in relationship: none group_type: group admin_label: '' - plugin_id: search_api + plugin_id: field label: '' exclude: false alter: @@ -532,24 +510,33 @@ display: element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' - element_default_classes: true + element_default_classes: false empty: '' hide_empty: false empty_zero: false hide_alter_empty: true - link_to_item: false - use_highlighting: false + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false multi_type: separator - multi_separator: ', ' - field_lead_in: - id: field_lead_in - table: search_api_datasource_news_entity_node - field: field_lead_in + separator: ', ' + field_api_classes: false + view_node: + id: view_node + table: node + field: view_node relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: search_api_field + plugin_id: entity_link label: '' exclude: false alter: @@ -591,35 +578,19 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - click_sort_column: value - type: basic_string - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' + text: view + output_url_as_text: true + absolute: false name: id: name - table: search_api_entity_user + table: users_field_data field: name relationship: uid group_type: group admin_label: '' entity_type: user - plugin_id: search_api_field + entity_field: name + plugin_id: field label: '' exclude: false alter: @@ -662,7 +633,7 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string + type: user_name settings: link_to_entity: false group_column: value @@ -675,22 +646,16 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - field_main_image: - id: field_main_image - table: search_api_datasource_news_entity_node - field: field_main_image + created: + id: created + table: node_field_data + field: created relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: search_api_field + entity_field: created + plugin_id: field label: '' exclude: false alter: @@ -732,10 +697,22 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - click_sort_column: target_id - type: rss_enclosure_formatter - settings: { } - group_column: target_id + click_sort_column: value + type: timestamp + settings: + date_format: custom + custom_date_format: r + timezone: '' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + group_column: value group_columns: { } group_rows: true delta_limit: 0 @@ -745,38 +722,16 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: true - fallback_handler: search_api_entity - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - display_methods: - file: - display_method: label - view_mode: default - hel_map: - display_method: label - view_mode: default - helfi_chart: - display_method: label - view_mode: default - image: - display_method: label - view_mode: default - remote_video: - display_method: label - view_mode: default - uuid: - id: uuid - table: search_api_datasource_news_entity_node - field: uuid + published_at: + id: published_at + table: node_field_data + field: published_at relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: search_api_field + entity_field: published_at + plugin_id: field label: '' exclude: false alter: @@ -819,9 +774,20 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string + type: timestamp settings: - link_to_entity: false + date_format: custom + custom_date_format: r + timezone: UTC + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 group_column: value group_columns: { } group_rows: true @@ -832,22 +798,14 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - published_at: - id: published_at - table: search_api_datasource_news_entity_node - field: published_at + field_main_image: + id: field_main_image + table: node__field_main_image + field: field_main_image relationship: none group_type: group admin_label: '' - entity_type: node - plugin_id: search_api_field + plugin_id: field label: '' exclude: false alter: @@ -889,23 +847,10 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - click_sort_column: value - type: timestamp - settings: - date_format: custom - custom_date_format: r - timezone: UTC - tooltip: - date_format: '' - custom_date_format: '' - time_diff: - enabled: false - future_format: '@interval hence' - past_format: '@interval ago' - granularity: 2 - refresh: 60 - description: '' - group_column: value + click_sort_column: target_id + type: rss_enclosure_formatter + settings: { } + group_column: target_id group_columns: { } group_rows: true delta_limit: 0 @@ -915,64 +860,439 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - pager: - type: some - options: - offset: 0 - items_per_page: 20 - style: - type: rss - options: - grouping: { } - description: feed - row: - type: views_rss_fields - options: - item: - core: - views_rss_core: - title: title - link: url - description: field_lead_in - author: name - category: '' - comments: '' - enclosure: field_main_image - guid: uuid - pubDate: published_at - content: + uuid: + id: uuid + table: node + field: uuid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: uuid + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 20 + sorts: + published_at: + id: published_at + table: node_field_data + field: published_at + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: published_at + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false + granularity: minute + filters: + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + news_item: news_item + group: 1 + expose: + operator_limit_selection: false + operator_list: { } + langcode: + id: langcode + table: node_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + 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: { } + field_news_groups_target_id: + id: field_news_groups_target_id + table: node__field_news_groups + field: field_news_groups_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_news_groups_target_id_op + label: 'News groups (field_news_groups)' + description: '' + use_operator: false + operator: field_news_groups_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: groups + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + news_producer: '0' + debug_api: '0' + reduce: false + is_grouped: false + group_info: + label: 'News groups (field_news_groups)' + description: null + identifier: field_news_groups_target_id + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: { } + 2: { } + 3: { } + reduce_duplicates: false + vid: news_group + type: select + hierarchy: false + limit: true + error_message: true + field_news_item_tags_target_id: + id: field_news_item_tags_target_id + table: node__field_news_item_tags + field: field_news_item_tags_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_news_item_tags_target_id_op + label: Topics + description: '' + use_operator: false + operator: field_news_item_tags_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: topic + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + news_producer: '0' + debug_api: '0' + reduce: false + is_grouped: false + group_info: + label: 'News tags (field_news_item_tags)' + description: null + identifier: field_news_item_tags_target_id + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: { } + 2: { } + 3: { } + reduce_duplicates: false + vid: news_tags + type: select + hierarchy: false + limit: true + error_message: true + field_news_neighbourhoods_target_id: + id: field_news_neighbourhoods_target_id + table: node__field_news_neighbourhoods + field: field_news_neighbourhoods_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_news_neighbourhoods_target_id_op + label: 'City districts' + description: '' + use_operator: false + operator: field_news_neighbourhoods_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: neighbourhoods + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + news_producer: '0' + debug_api: '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: news_neighbourhoods + type: select + hierarchy: false + limit: true + error_message: true + field_news_item_tags_target_id_2: + id: field_news_item_tags_target_id_2 + table: node__field_news_item_tags + field: field_news_item_tags_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_news_item_tags_target_id_2_op + label: 'News tags fallback (field_news_item_tags)' + description: '' + use_operator: false + operator: field_news_item_tags_target_id_2_op + operator_limit_selection: false + operator_list: { } + identifier: tags + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + menu_api: '0' + news_producer: '0' + debug_api: '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: news_tags + type: select + hierarchy: false + limit: true + error_message: true + filter_groups: + operator: AND + groups: + 1: AND + style: + type: rss + options: + grouping: { } + description: feed + row: + type: views_rss_fields + options: + item: + core: + views_rss_core: + title: title + link: view_node + description: field_lead_in + author: name + category: '' + comments: '' + enclosure: field_main_image + guid: uuid + pubDate: published_at + content: views_rss_core: encoded: '' + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: true + replica: false + query_tags: { } defaults: - title: false + access: true + query: false + css_class: false relationships: false fields: false - sitename_title: false + sorts: false + filters: false + filter_groups: false relationships: uid: id: uid - table: search_api_datasource_news_entity_node + table: node_field_data field: uid relationship: none group_type: group - admin_label: 'Authored by: User' + admin_label: author entity_type: node - plugin_id: search_api + entity_field: uid + plugin_id: standard required: false - skip_access: true + css_class: '' display_extenders: { } path: news/rss - sitename_title: false - displays: - news_archive_index_block: news_archive_index_block - default: '0' cache_metadata: max-age: -1 contexts: @@ -983,23 +1303,153 @@ display: tags: - 'config:field.storage.node.field_lead_in' - 'config:field.storage.node.field_main_image' - - 'config:search_api.index.news' - - 'search_api_list:news' - news_archive_index_block: - id: news_archive_index_block - display_title: 'News archive' - display_plugin: block + page_1: + id: page_1 + display_title: Page + display_plugin: page position: 1 display_options: - display_description: '' + sorts: + published_at: + id: published_at + table: node_field_data + field: published_at + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: published_at + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false + granularity: minute + arguments: + field_news_item_tags_target_id: + id: field_news_item_tags_target_id + table: node__field_news_item_tags + field: field_news_item_tags_target_id + relationship: none + group_type: group + admin_label: '' + plugin_id: numeric + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: query_parameter + default_argument_options: + query_param: topic + fallback: all + multiple: and + summary_options: + base_path: '' + count: true + override: false + items_per_page: 25 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: false + validate: + type: none + fail: 'not found' + validate_options: { } + break_phrase: false + not: false + filters: + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + news_item: news_item + group: 1 + expose: + operator_limit_selection: false + operator_list: { } + langcode: + id: langcode + table: node_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + 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: { } + filter_groups: + operator: AND + groups: + 1: AND + defaults: + sorts: false + arguments: false + filters: false + filter_groups: false display_extenders: { } + path: news cache_metadata: max-age: -1 contexts: + - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' tags: - - 'config:search_api.index.news' - - 'search_api_list:news' + - 'config:field.storage.node.field_lead_in' diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme index 09a8f3fb3..0f015e7a8 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme @@ -142,7 +142,7 @@ function hdbt_subtheme_preprocess_paragraph(array &$variables) { $variables['#attached']['drupalSettings']['helfi_react_search']['sentry_dsn_react'] = $sentry_dsn_react; } - $feed_base_url = Url::fromRoute('view.news_archive_index.news_archive_feed_index')->toString(); + $feed_base_url = Url::fromRoute('view.news_archive.news_archive_feed')->toString(); if ($feed_base_url) { $feed_link = [ From a6c6cca314ff0afb257992f1e7ea5a259b181f40 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 19 Aug 2024 17:35:26 +0300 Subject: [PATCH 02/19] UHF-10469: Add correct machine names and configuration to news archive view --- conf/cmi/views.view.news_archive.yml | 276 ++++++++++++--------------- 1 file changed, 122 insertions(+), 154 deletions(-) diff --git a/conf/cmi/views.view.news_archive.yml b/conf/cmi/views.view.news_archive.yml index 1ec39216b..dd8d4ce49 100644 --- a/conf/cmi/views.view.news_archive.yml +++ b/conf/cmi/views.view.news_archive.yml @@ -30,7 +30,7 @@ display: display_plugin: default position: 0 display_options: - title: News + title: 'All news' fields: title: id: title @@ -110,7 +110,8 @@ display: type: full options: offset: 0 - items_per_page: 10 + pagination_heading_level: h4 + items_per_page: 15 total_pages: null id: 0 tags: @@ -394,12 +395,126 @@ display: - 'user.node_grants:view' tags: - 'config:field.storage.node.field_lead_in' - feed_1: - id: feed_1 + news_archive_block: + id: news_archive_block + display_title: 'All news' + display_plugin: block + position: 1 + display_options: + sorts: + published_at: + id: published_at + table: node_field_data + field: published_at + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: published_at + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false + granularity: minute + arguments: { } + filters: + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + news_item: news_item + group: 1 + expose: + operator_limit_selection: false + operator_list: { } + langcode: + id: langcode + table: node_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + 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: { } + filter_groups: + operator: AND + groups: + 1: AND + defaults: + sorts: false + arguments: false + filters: false + filter_groups: false + display_description: '' + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + tags: + - 'config:field.storage.node.field_lead_in' + news_archive_feed: + id: news_archive_feed display_title: Feed display_plugin: feed position: 2 display_options: + title: News fields: title: id: title @@ -1272,12 +1387,14 @@ display: defaults: access: true query: false + title: false css_class: false relationships: false fields: false sorts: false filters: false filter_groups: false + sitename_title: false relationships: uid: id: uid @@ -1293,6 +1410,7 @@ display: css_class: '' display_extenders: { } path: news/rss + sitename_title: false cache_metadata: max-age: -1 contexts: @@ -1303,153 +1421,3 @@ display: tags: - 'config:field.storage.node.field_lead_in' - 'config:field.storage.node.field_main_image' - page_1: - id: page_1 - display_title: Page - display_plugin: page - position: 1 - display_options: - sorts: - published_at: - id: published_at - table: node_field_data - field: published_at - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: published_at - plugin_id: date - order: DESC - expose: - label: '' - field_identifier: '' - exposed: false - granularity: minute - arguments: - field_news_item_tags_target_id: - id: field_news_item_tags_target_id - table: node__field_news_item_tags - field: field_news_item_tags_target_id - relationship: none - group_type: group - admin_label: '' - plugin_id: numeric - default_action: default - exception: - value: all - title_enable: false - title: All - title_enable: false - title: '' - default_argument_type: query_parameter - default_argument_options: - query_param: topic - fallback: all - multiple: and - summary_options: - base_path: '' - count: true - override: false - items_per_page: 25 - summary: - sort_order: asc - number_of_records: 0 - format: default_summary - specify_validation: false - validate: - type: none - fail: 'not found' - validate_options: { } - break_phrase: false - not: false - filters: - status: - id: status - table: node_field_data - field: status - entity_type: node - entity_field: status - plugin_id: boolean - value: '1' - group: 1 - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - type: - id: type - table: node_field_data - field: type - entity_type: node - entity_field: type - plugin_id: bundle - value: - news_item: news_item - group: 1 - expose: - operator_limit_selection: false - operator_list: { } - langcode: - id: langcode - table: node_field_data - field: langcode - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: langcode - plugin_id: language - operator: in - value: - '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - 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: { } - filter_groups: - operator: AND - groups: - 1: AND - defaults: - sorts: false - arguments: false - filters: false - filter_groups: false - display_extenders: { } - path: news - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - 'user.node_grants:view' - tags: - - 'config:field.storage.node.field_lead_in' From eebd1d061196ca18229080a1ff6169bf72697a02 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 19 Aug 2024 17:41:32 +0300 Subject: [PATCH 03/19] UHF-10469: Add translations for news archive view --- ...w.news_archive_index.yml => views.view.news_archive.yml} | 6 +++--- ...w.news_archive_index.yml => views.view.news_archive.yml} | 4 ++-- conf/cmi/views.view.news_archive.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename conf/cmi/language/fi/{views.view.news_archive_index.yml => views.view.news_archive.yml} (92%) rename conf/cmi/language/sv/{views.view.news_archive_index.yml => views.view.news_archive.yml} (85%) diff --git a/conf/cmi/language/fi/views.view.news_archive_index.yml b/conf/cmi/language/fi/views.view.news_archive.yml similarity index 92% rename from conf/cmi/language/fi/views.view.news_archive_index.yml rename to conf/cmi/language/fi/views.view.news_archive.yml index 49c8f707b..1307f3213 100644 --- a/conf/cmi/language/fi/views.view.news_archive_index.yml +++ b/conf/cmi/language/fi/views.view.news_archive.yml @@ -20,8 +20,8 @@ display: exposed_sorts_label: Järjestä sort_asc_label: Nouseva sort_desc_label: Laskeva - news_archive_feed_index: + news_archive_block: + display_title: Uutisarkisto + news_archive_feed: display_options: title: Uutiset - news_archive_index_block: - display_title: Uutisarkisto diff --git a/conf/cmi/language/sv/views.view.news_archive_index.yml b/conf/cmi/language/sv/views.view.news_archive.yml similarity index 85% rename from conf/cmi/language/sv/views.view.news_archive_index.yml rename to conf/cmi/language/sv/views.view.news_archive.yml index 9a6319b06..01d0eac75 100644 --- a/conf/cmi/language/sv/views.view.news_archive_index.yml +++ b/conf/cmi/language/sv/views.view.news_archive.yml @@ -10,8 +10,8 @@ display: first: Första last: Sista title: 'Alla nyheter' - news_archive_index_block: + news_archive_block: display_title: Nyhetsarkiv - news_archive_feed_index: + news_archive_feed: display_options: title: Nyheter diff --git a/conf/cmi/views.view.news_archive.yml b/conf/cmi/views.view.news_archive.yml index dd8d4ce49..61f53862a 100644 --- a/conf/cmi/views.view.news_archive.yml +++ b/conf/cmi/views.view.news_archive.yml @@ -397,7 +397,7 @@ display: - 'config:field.storage.node.field_lead_in' news_archive_block: id: news_archive_block - display_title: 'All news' + display_title: 'News archive' display_plugin: block position: 1 display_options: From a3b1da8e07e3accc98426991a602d8668558235d Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 19 Aug 2024 17:57:05 +0300 Subject: [PATCH 04/19] UHF-10469: Update documentation to reflect the changes made to news archive --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99144d127..d80126d02 100644 --- a/README.md +++ b/README.md @@ -96,13 +96,17 @@ selection of what to show is determined by the `field_listing_type`, and the par #### News archive (news_archive) The _news_archive_ paragraph provides the news archive search that can be added to landing pages. The news archive is -a React search that uses views listing (`news_archive_index`) as a fallback when JavaScript is not enabled. All React +a React search that uses views listing (`news_archive`) as a fallback when JavaScript is not enabled. All React searches are in the `hdbt` theme, so most of the related logic is also found there. The _news_archive_ paragraph has an editable title and description. - React search code can be found under the `hdbt` theme [here](https://github.com/City-of-Helsinki/drupal-hdbt/tree/main/src/js/react/apps/news-archive). - Additional configuration for the React app is under the `hdbt_subtheme` theme function `hdbt_subtheme_preprocess_paragraph` [here](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/blob/dev/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme) -- Fallback view when JavaScript is not enabled can be found in the `/conf/cim` folder [here](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/blob/dev/conf/cmi/views.view.news_archive_index.yml). +- Fallback view when JavaScript is not enabled can be found in the `/conf/cim` folder [here](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/blob/dev/conf/cmi/views.view.news_archive.yml). +- **NOTICE:** The fallback view and RSS view retrieve data from the regular database, while the React application queries +the Elasticsearch index. This is because switching the view to use the Elasticsearch index as the data source limits +its ability to filter using URL queries, compared to the regular view. For example, queries in the format +`?tags%5b%5d=375` would no longer work out of the box, and the contextual filters would need to be added separately. ### Custom roles From 43ba97171b14399af6cb2a122a782e3e82776823 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 19 Aug 2024 18:05:10 +0300 Subject: [PATCH 05/19] UHF-10469: Attach the feed icon to the news archive --- conf/cmi/views.view.news_archive.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/cmi/views.view.news_archive.yml b/conf/cmi/views.view.news_archive.yml index 61f53862a..3e48f64de 100644 --- a/conf/cmi/views.view.news_archive.yml +++ b/conf/cmi/views.view.news_archive.yml @@ -1411,6 +1411,9 @@ display: display_extenders: { } path: news/rss sitename_title: false + displays: + news_archive_block: news_archive_block + default: '0' cache_metadata: max-age: -1 contexts: From e1b26a80434039709361d21e6a5ebd7c407dbd8e Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:08:26 +0000 Subject: [PATCH 06/19] Update configuration --- composer.lock | 62 +++++++++++++-------------- conf/cmi/language/de/tfa.settings.yml | 6 +-- public/sites/default/settings.php | 1 + 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index b3ec18cd2..543c5e01a 100644 --- a/composer.lock +++ b/composer.lock @@ -4241,16 +4241,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.4", + "version": "6.6.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4" + "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8e011aa97b4449d3c7eaca723fff9d2111c6db4", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", + "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", "shasum": "" }, "require": { @@ -4268,10 +4268,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-15T08:46:48+00:00" + "time": "2024-08-20T08:03:47+00:00" }, { "name": "drupal/hdbt_admin", @@ -5644,26 +5644,26 @@ }, { "name": "drupal/menu_link_attributes", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_link_attributes.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "431c7954cc614a1b9677173f0209f1df15592503" + "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "a679a5c53c94e3c992483ce3ea782950f4f7e5b3" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1671026425", + "version": "8.x-1.4", + "datestamp": "1724060900", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5680,7 +5680,7 @@ "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -5902,26 +5902,26 @@ }, { "name": "drupal/oembed_providers", - "version": "2.1.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/oembed_providers.git", - "reference": "2.1.2" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.2.zip", - "reference": "2.1.2", - "shasum": "ad125c7e55555499f001755c365f96edce1d6343" + "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.2.0.zip", + "reference": "2.2.0", + "shasum": "318bafadd5e9b74a593f08e252dc5ea6dec98cd2" }, "require": { - "drupal/core": "^9.0|^10.0" + "drupal/core": "^10|^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1692724351", + "version": "2.2.0", + "datestamp": "1723853165", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7423,27 +7423,27 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.9", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.9" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", - "reference": "4.1.9", - "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.1.zip", + "reference": "4.2.1", + "shasum": "d96b481571ca2fecdb305e87d2557f9338116864" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "ext-xmlwriter": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.9", - "datestamp": "1712441608", + "version": "4.2.1", + "datestamp": "1723802052", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/language/de/tfa.settings.yml b/conf/cmi/language/de/tfa.settings.yml index 67899d557..231524441 100644 --- a/conf/cmi/language/de/tfa.settings.yml +++ b/conf/cmi/language/de/tfa.settings.yml @@ -1,8 +1,8 @@ -help_text: 'Contact support to reset your access' +help_text: 'Wenden Sie sich an den Support, um Ihren Zugriff zurückzusetzen.' mail: tfa_enabled_configuration: - subject: 'Your [site:name] account now has two-factor authentication' + subject: 'Ihr [site:name]-Konto verfügt jetzt über eine Zwei-Faktor-Authentifizierung' body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" tfa_disabled_configuration: - subject: 'Your [site:name] account no longer has two-factor authentication' + subject: 'Ihr [site:name]-Konto hat keine Zwei-Faktor-Authentifizierung mehr' body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9e6f7a6b2..9813b60af 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -350,6 +350,7 @@ function drupal_get_env(string|array $variables) : mixed { 'DRUPAL_DB_NAME', 'DRUPAL_DB_PASS', 'DRUPAL_DB_HOST', + 'TFA_ENCRYPTION_KEY', ], 'additionalFiles' => [], ]; From 055e16f9586694e1506c1bbf14203487ee889417 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 21 Aug 2024 16:07:03 +0300 Subject: [PATCH 07/19] UHF-10469: Add news articles to rss feed and fallback listing of news archive --- conf/cmi/views.view.news_archive.yml | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/conf/cmi/views.view.news_archive.yml b/conf/cmi/views.view.news_archive.yml index 3e48f64de..e106db58e 100644 --- a/conf/cmi/views.view.news_archive.yml +++ b/conf/cmi/views.view.news_archive.yml @@ -6,6 +6,7 @@ dependencies: - core.entity_view_mode.node.teaser - field.storage.node.field_lead_in - field.storage.node.field_main_image + - node.type.news_article - node.type.news_item - taxonomy.vocabulary.news_group - taxonomy.vocabulary.news_neighbourhoods @@ -437,15 +438,45 @@ display: id: type table: node_field_data field: type + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: type plugin_id: bundle + operator: in value: + news_article: news_article news_item: news_item group: 1 + exposed: false expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' operator_limit_selection: false operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + 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: { } langcode: id: langcode table: node_field_data @@ -1080,15 +1111,45 @@ display: id: type table: node_field_data field: type + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: type plugin_id: bundle + operator: in value: + news_article: news_article news_item: news_item group: 1 + exposed: false expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' operator_limit_selection: false operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + 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: { } langcode: id: langcode table: node_field_data From 0f9bce3f13208ee9de74fd368d5d5cb5dba3d204 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Thu, 22 Aug 2024 13:36:09 +0300 Subject: [PATCH 08/19] UHF-10296: disable old recommendations block, enable new --- conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml | 2 +- ...ck.hdbt_subtheme_views_block__frontpage_news_of_interest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml b/conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml index 26340cc38..273849a14 100644 --- a/conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml +++ b/conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml @@ -1,6 +1,6 @@ uuid: 6ab1786a-6f04-44a4-afe2-b7c9829fd000 langcode: en -status: false +status: true dependencies: module: - helfi_annif diff --git a/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml b/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml index 6c292f2b4..790aa89b5 100644 --- a/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml +++ b/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml @@ -1,6 +1,6 @@ uuid: 2780cd50-1615-40f6-a1eb-7a193bad7c9a langcode: en -status: true +status: false dependencies: config: - views.view.frontpage_news From 0ec7a5e00df2de82919d7e6bc5c53dde318282e0 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Thu, 22 Aug 2024 14:08:14 +0300 Subject: [PATCH 09/19] UHF-10296: leave the old block enabled for other than main languages --- ...iews_block__frontpage_news_of_interest.yml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml b/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml index 790aa89b5..b02c467c4 100644 --- a/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml +++ b/conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml @@ -1,10 +1,11 @@ uuid: 2780cd50-1615-40f6-a1eb-7a193bad7c9a langcode: en -status: false +status: true dependencies: config: - views.view.frontpage_news module: + - language - node - views theme: @@ -32,3 +33,20 @@ visibility: bundles: news_article: news_article news_item: news_item + language: + id: language + negate: false + context_mapping: + language: '@language.current_language_context:language_interface' + langcodes: + de: de + fr: fr + ru: ru + uk: uk + ar: ar + et: et + fa: fa + es: es + so: so + se: se + zh-hans: zh-hans From 4a5aeec04988fbb44b264b6cf9081812695cf23f Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 23 Aug 2024 08:43:11 +0300 Subject: [PATCH 10/19] UHF-10296: annif keyword entity reference is not translatable any more --- public/modules/custom/helfi_annif/src/RecommendationManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_annif/src/RecommendationManager.php b/public/modules/custom/helfi_annif/src/RecommendationManager.php index 16675a1ac..c958accb8 100644 --- a/public/modules/custom/helfi_annif/src/RecommendationManager.php +++ b/public/modules/custom/helfi_annif/src/RecommendationManager.php @@ -110,7 +110,7 @@ private function executeQuery(EntityInterface $entity, string $target_langcode, where restriction.in_recommendations_value = 0) and nfd.status = 1 and n.langcode = :target_langcode - and annif.langcode = :destination_langcode + and annif.langcode = :target_langcode and nfd.langcode = :target_langcode and n.nid != :nid and nfd.created > :timestamp From 739ed42f7aaafc2a51f5d0ae851062e8177dbbf6 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 23 Aug 2024 08:55:44 +0300 Subject: [PATCH 11/19] UHF-10296: fix the en and sv translation recommendations --- public/modules/custom/helfi_annif/src/RecommendationManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_annif/src/RecommendationManager.php b/public/modules/custom/helfi_annif/src/RecommendationManager.php index c958accb8..f23accded 100644 --- a/public/modules/custom/helfi_annif/src/RecommendationManager.php +++ b/public/modules/custom/helfi_annif/src/RecommendationManager.php @@ -111,7 +111,7 @@ private function executeQuery(EntityInterface $entity, string $target_langcode, and nfd.status = 1 and n.langcode = :target_langcode and annif.langcode = :target_langcode - and nfd.langcode = :target_langcode + and nfd.langcode = :destination_langcode and n.nid != :nid and nfd.created > :timestamp group by n.nid From ec9fe922eaaf287482c8e9ef6c59a6e1e7225184 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 23 Aug 2024 10:39:43 +0300 Subject: [PATCH 12/19] UHF-10485: alter didn't trigger for articles because of wrong view id --- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 401123b88..9e04deb66 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -62,7 +62,7 @@ function helfi_etusivu_form_node_form_alter(&$form, FormStateInterface $form_sta function helfi_etusivu_views_query_alter(ViewExecutable $view, QueryPluginBase $query) : void { $draggable_views = [ 'frontpage_news', - 'ordered_news_articles', + 'ordered_news_articles_list', 'ordered_news_list', ]; if (in_array($view->id(), $draggable_views)) { From 77a69d80ca21562aa63304b61701b9e567850d9e Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 23 Aug 2024 12:11:25 +0300 Subject: [PATCH 13/19] UHF-10485: mentioned orderable news feeds in site specific documentation --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index d80126d02..c83485951 100644 --- a/README.md +++ b/README.md @@ -150,3 +150,15 @@ each paragraph that support the alternative languages. For example `paragraphs.p Regarding this alternative language support there is a custom module called `helfi_alt_lang_fallback` that provides menu and block fallbacks for the alternative languages. See more from the module itself [here](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/tree/dev/public/modules/custom/helfi_alt_lang_fallback). + +### News and article feed reordering with drupal/draggableviews + +Drupal/draggableviews -module is used to allow content creators to reorder the ´main news feed´ and ´main articles feed´ +located in the front page. Adding content to the front page news feed can be done from node edit page by enabling +`Näytä artikkeli pääartikkelivirrassa` selection. + +Draggableviews-module doesn't support translations out of the box and some patching has been done to get it working. +The initial feed ordering view was done in [this PR](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/pull/103/files#diff-eac9bb841152af0a402bf0d14621ac75c98ff734db71f6a34a7156b9812346df) +- langcode -column added to draggableviews -database table. +- Query alter for views utilizing draggableviews to filter out content by language. +- Page preprocess to add custom styles to the ordering views. From f82a5dfaeb0feb33e1610069d39f95b93eb6a86e Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 23 Aug 2024 12:53:42 +0300 Subject: [PATCH 14/19] UHF-10485: Updated the documentation a bit --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c83485951..843dae109 100644 --- a/README.md +++ b/README.md @@ -153,12 +153,12 @@ menu and block fallbacks for the alternative languages. See more from the module ### News and article feed reordering with drupal/draggableviews -Drupal/draggableviews -module is used to allow content creators to reorder the ´main news feed´ and ´main articles feed´ +Drupal/draggableviews -module is used to allow content creators to reorder the `main news feed` and `main articles feed` located in the front page. Adding content to the front page news feed can be done from node edit page by enabling -`Näytä artikkeli pääartikkelivirrassa` selection. +`Publish the news article in the top news articles flow` selection. Draggableviews-module doesn't support translations out of the box and some patching has been done to get it working. The initial feed ordering view was done in [this PR](https://github.com/City-of-Helsinki/drupal-helfi-etusivu/pull/103/files#diff-eac9bb841152af0a402bf0d14621ac75c98ff734db71f6a34a7156b9812346df) -- langcode -column added to draggableviews -database table. -- Query alter for views utilizing draggableviews to filter out content by language. -- Page preprocess to add custom styles to the ordering views. +- `langcode` column was added to draggableviews -database table. +- Query alter was created for views utilizing draggableviews to filter out content by language. +- Page preprocess was included to add custom styling to the admin interface of the view used to organize the items. From 2c19301c41fca579e100bed0344eccedad2584a1 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 23 Aug 2024 19:15:58 +0300 Subject: [PATCH 15/19] UHF-10452: Change the front page latest news blocks news archive base url --- conf/cmi/language/fi/views.view.frontpage_news.yml | 4 ++-- conf/cmi/language/sv/views.view.frontpage_news.yml | 4 ++-- conf/cmi/views.view.frontpage_news.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/cmi/language/fi/views.view.frontpage_news.yml b/conf/cmi/language/fi/views.view.frontpage_news.yml index cc2d74a0e..af8442f06 100644 --- a/conf/cmi/language/fi/views.view.frontpage_news.yml +++ b/conf/cmi/language/fi/views.view.frontpage_news.yml @@ -9,11 +9,11 @@ display: display_options: title: 'Uusimmat uutiset' use_more_text: 'Katso kaikki uutiset' - link_url: /uutiset + link_url: /uutiset/arkisto display_title: 'Uusimmat uutiset' latest_news_minimal: display_options: title: 'Uusimmat uutiset' use_more_text: 'Katso kaikki uutiset' - link_url: /uutiset + link_url: /uutiset/arkisto display_title: 'Uusimmat uutiset' diff --git a/conf/cmi/language/sv/views.view.frontpage_news.yml b/conf/cmi/language/sv/views.view.frontpage_news.yml index 298853527..476b30abe 100644 --- a/conf/cmi/language/sv/views.view.frontpage_news.yml +++ b/conf/cmi/language/sv/views.view.frontpage_news.yml @@ -9,9 +9,9 @@ display: display_options: title: 'Senaste nyheter' use_more_text: 'Se alla nyheter' - link_url: /nyheter + link_url: /nyheter/arkiv latest_news_minimal: display_options: title: 'Senaste nyheter' use_more_text: 'Se alla nyheter' - link_url: /nyheter + link_url: /nyheter/arkiv diff --git a/conf/cmi/views.view.frontpage_news.yml b/conf/cmi/views.view.frontpage_news.yml index 6303b5a22..bd6c3edb5 100644 --- a/conf/cmi/views.view.frontpage_news.yml +++ b/conf/cmi/views.view.frontpage_news.yml @@ -631,7 +631,7 @@ display: use_more_always: true use_more_text: 'See all news' link_display: custom_url - link_url: /news + link_url: /news/archive display_extenders: { } cache_metadata: max-age: -1 @@ -797,7 +797,7 @@ display: use_more_always: true use_more_text: 'See all news' link_display: custom_url - link_url: /news + link_url: /news/archive display_extenders: { } cache_metadata: max-age: -1 From ff8de16d5f14a1802b629179bc59c50d6bc453e4 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 25 Aug 2024 12:06:14 +0000 Subject: [PATCH 16/19] Updated node modules based on npm audit fix --- .../custom/hdbt_subtheme/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 8cd455b0b..57673a742 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -6716,11 +6716,11 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -15576,11 +15576,11 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From 9d28c4bfd92deb8a0f77b4daf664416828a25163 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 08:36:37 +0000 Subject: [PATCH 17/19] Update configuration --- composer.lock | 121 ++++++++++++++++++------------------ conf/cmi/core.extension.yml | 1 + 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/composer.lock b/composer.lock index 543c5e01a..cb693937a 100644 --- a/composer.lock +++ b/composer.lock @@ -2778,7 +2778,7 @@ "homepage": "https://www.drupal.org/user/1852732" }, { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -2794,7 +2794,7 @@ "homepage": "https://www.drupal.org/user/395439" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" } ], @@ -3038,7 +3038,7 @@ "homepage": "https://www.drupal.org/user/430714" }, { - "name": "Greg Boggs", + "name": "greg boggs", "homepage": "https://www.drupal.org/user/153069" }, { @@ -3050,11 +3050,11 @@ "homepage": "https://www.drupal.org/user/717290" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { - "name": "NickDickinsonWilde", + "name": "nickdickinsonwilde", "homepage": "https://www.drupal.org/user/3094661" }, { @@ -3524,20 +3524,20 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta13", + "version": "2.0.0-beta14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta13" + "reference": "8.x-2.0-beta14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta13.zip", - "reference": "8.x-2.0-beta13", - "shasum": "3b07a629ed6c94ee23656556b0d1a1c7ba58a77f" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta14.zip", + "reference": "8.x-2.0-beta14", + "shasum": "68124ea440273a8f4e40bc7d07421c8a230c287b" }, "require": { - "drupal/core": "^10.1 || ^11" + "drupal/core": "^10.2 || ^11" }, "require-dev": { "drupal/block_field": "~1.0", @@ -3554,8 +3554,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta13", - "datestamp": "1721834455", + "version": "8.x-2.0-beta14", + "datestamp": "1724498300", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4241,16 +4241,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.6", + "version": "6.6.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa" + "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", - "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c02b0b7e8898424df6d7a63556b69d0be5d9aef5", + "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5", "shasum": "" }, "require": { @@ -4268,10 +4268,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.7", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-20T08:03:47+00:00" + "time": "2024-08-21T13:30:33+00:00" }, { "name": "drupal/hdbt_admin", @@ -4569,16 +4569,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.10", + "version": "4.4.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" + "reference": "e09d1522bdb5f800ddf72a82fa64efa5631bf162" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e09d1522bdb5f800ddf72a82fa64efa5631bf162", + "reference": "e09d1522bdb5f800ddf72a82fa64efa5631bf162", "shasum": "" }, "require": { @@ -4649,6 +4649,7 @@ "drupal/core": "<10.3", "drupal/core-composer-scaffold": "<10.3", "drupal/ctools": "<3.11 || ^4.0.1", + "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/stage_file_proxy": "<2.1.5", @@ -4695,10 +4696,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.11", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-16T08:50:18+00:00" + "time": "2024-08-27T08:30:52+00:00" }, { "name": "drupal/helfi_proxy", @@ -5543,26 +5544,26 @@ }, { "name": "drupal/media_entity_file_replace", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/media_entity_file_replace.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "e5e1aa2519c3e3f65e8a8291c324bc527f649147" + "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "cfc0d500aba8b6ade547c9a17173f9a89fde02d0" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1701092779", + "version": "8.x-1.3", + "datestamp": "1724336085", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8234,20 +8235,20 @@ }, { "name": "drupal/view_unpublished", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/view_unpublished.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "14374dd56d841270207e21974c7b7cf8aa1804f7" + "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "7dd4411c53866585ac6319d147ab11d214d55877" }, "require": { - "drupal/core": "^9.4 || ^10" + "drupal/core": "^9.4 || ^10 || ^11" }, "require-dev": { "drupal/coder": "^8.3.18", @@ -8256,8 +8257,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1709383642", + "version": "8.x-1.3", + "datestamp": "1724503131", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8333,7 +8334,7 @@ "homepage": "https://www.drupal.org/u/graber" }, { - "name": "Graber", + "name": "graber", "homepage": "https://www.drupal.org/user/1599440" }, { @@ -8416,26 +8417,26 @@ }, { "name": "drupal/views_infinite_scroll", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_infinite_scroll.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.2.zip", - "reference": "2.0.2", - "shasum": "8b2b935d1e5d94d7ad068d099512d3b915efb41f" + "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.3.zip", + "reference": "2.0.3", + "shasum": "3c56969f71256300226118a0f35bad66ab41306c" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^10.1 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1689001933", + "version": "2.0.3", + "datestamp": "1724335951", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8448,11 +8449,11 @@ ], "authors": [ { - "name": "Anybody", + "name": "anybody", "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -8460,7 +8461,7 @@ "homepage": "https://www.drupal.org/user/123612" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { @@ -8468,7 +8469,7 @@ "homepage": "https://www.drupal.org/user/143827" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" }, { @@ -11895,16 +11896,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -11939,9 +11940,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "psy/psysh", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index f56bdf7a7..638ebc210 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -92,6 +92,7 @@ module: helfi_toc: 0 helfi_tunnistamo: 0 helfi_user_roles: 0 + helfi_users: 0 help: 0 image: 0 image_style_quality: 0 From 46f95cec7604df5a3baa1031682947372dfe492e Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:33:48 +0000 Subject: [PATCH 18/19] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index cb693937a..d276b9b9a 100644 --- a/composer.lock +++ b/composer.lock @@ -4569,16 +4569,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.11", + "version": "4.4.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "e09d1522bdb5f800ddf72a82fa64efa5631bf162" + "reference": "ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e09d1522bdb5f800ddf72a82fa64efa5631bf162", - "reference": "e09d1522bdb5f800ddf72a82fa64efa5631bf162", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00", + "reference": "ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00", "shasum": "" }, "require": { @@ -4696,10 +4696,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.11", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.12", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-27T08:30:52+00:00" + "time": "2024-08-27T09:29:23+00:00" }, { "name": "drupal/helfi_proxy", From ba6148a845d7758f950df0b6b7b3c45c226fcec7 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:14:38 +0000 Subject: [PATCH 19/19] Update configuration --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index d276b9b9a..d4b7ec042 100644 --- a/composer.lock +++ b/composer.lock @@ -4241,16 +4241,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.7", + "version": "6.6.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5" + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c02b0b7e8898424df6d7a63556b69d0be5d9aef5", - "reference": "c02b0b7e8898424df6d7a63556b69d0be5d9aef5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/aae8641b58d16cf0b396f8a34b8be40403e495a6", + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6", "shasum": "" }, "require": { @@ -4268,10 +4268,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-21T13:30:33+00:00" + "time": "2024-08-27T11:08:04+00:00" }, { "name": "drupal/hdbt_admin", @@ -4569,16 +4569,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.12", + "version": "4.4.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00" + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00", - "reference": "ad390d79c13d0dcc5cb0254bfd2067d3e2df1a00", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c609a3f7abd306e1ae11c6ddb422f34e421f0748", + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748", "shasum": "" }, "require": { @@ -4696,10 +4696,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.12", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-27T09:29:23+00:00" + "time": "2024-08-27T10:45:17+00:00" }, { "name": "drupal/helfi_proxy",