Merge branch '1.0.x' into prod/1.0.x

config/install/eu_cookie_compliance.settings.yml

@@ -48,7 +48,6 @@ use_mobile_message: false
 method: default
 disagree_button_label: 'No, thanks'
 disabled_javascripts: ''
-whitelisted_cookies: ''
 consent_storage_method: do_not_store
 withdraw_message:
   value: "<h2>We use cookies on this site to enhance your user experience</h2>\r\n\r\n<p>You have given your consent for us to set cookies.</p>\r\n"
@@ -56,12 +55,17 @@ withdraw_message:
 withdraw_action_button_label: 'Withdraw consent'
 withdraw_tab_button_label: 'Privacy settings'
 withdraw_enabled: false
-cookie_categories: ''
 enable_save_preferences_button: true
 save_preferences_button_label: 'Save preferences'
 accept_all_categories_button_label: 'Accept all cookies'
-fix_first_cookie_category: true
-select_all_categories_by_default: false
 withdraw_button_on_info_popup: false
 domain_all_sites: true
 cookie_session: 0
+reload_options: 0
+reload_routes_list: ''
+containing_element: body
+settings_tab_enabled: false
+automatic_cookies_removal: true
+set_cookie_session_zero_on_disagree: 0
+cookie_policy_version: 1.0.0
+allowed_cookies: ''

config/install/node.settings.yml

-use_admin_theme: true

config/optional/features.bundle.default.yml

-langcode: en
-status: true
-dependencies: {  }
-name: Default
-machine_name: default
-description: ''
-assignments:
-  alter:
-    core: true
-    uuid: true
-    user_permissions: false
-    enabled: true
-    weight: 0
-  base:
-    types:
-      config:
-        comment_type: comment_type
-        node_type: node_type
-      content:
-        user: user
-    enabled: true
-    weight: -2
-  core:
-    types:
-      config:
-        date_format: date_format
-        field_storage_config: field_storage_config
-        entity_form_mode: entity_form_mode
-        image_style: image_style
-        menu: menu
-        responsive_image_style: responsive_image_style
-        user_role: user_role
-        entity_view_mode: entity_view_mode
-    enabled: true
-    weight: 5
-  dependency:
-    enabled: true
-    weight: 15
-  exclude:
-    types:
-      config:
-        features_bundle: features_bundle
-    curated: true
-    module:
-      installed: true
-      profile: true
-      namespace: true
-      namespace_any: false
-    enabled: true
-    weight: -5
-  existing:
-    enabled: true
-    weight: 12
-  forward_dependency:
-    enabled: true
-    weight: 4
-  namespace:
-    enabled: true
-    weight: 0
-  optional:
-    types:
-      config: {  }
-    enabled: true
-    weight: 0
-  packages:
-    enabled: true
-    weight: -20
-  profile:
-    curated: true
-    standard:
-      files: true
-      dependencies: true
-    types:
-      config:
-        block: block
-        language_content_settings: language_content_settings
-        configurable_language: configurable_language
-        migration: migration
-        shortcut_set: shortcut_set
-        tour: tour
-    enabled: true
-    weight: 10
-  site:
-    types:
-      config:
-        action: action
-        contact_form: contact_form
-        block_content_type: block_content_type
-        rdf_mapping: rdf_mapping
-        search_page: search_page
-        taxonomy_vocabulary: taxonomy_vocabulary
-        editor: editor
-        filter_format: filter_format
-    enabled: true
-    weight: 7
-profile_name: ''
-is_profile: false

config/optional/node.settings.yml

-use_admin_theme: true

uw_sites_all.info.yml

 name: 'UW Sites all'
 description: 'Site controller for all UW sites.'
 type: module
-core_version_requirement: ^8 || ^9
+core_version_requirement: '^8 || ^9'
 dependencies:
   - draggableviews:draggableviews
   - drupal:aggregator
@@ -17,15 +17,6 @@ dependencies:
   - drupal:comment
   - drupal:components
   - drupal:config
-  - drupal:config_distro
-  - drupal:config_filter
-  - drupal:config_merge
-  - drupal:config_normalizer
-  - drupal:config_provider
-  - drupal:config_snapshot
-  - drupal:config_sync
-  - drupal:config_translation
-  - drupal:config_update
   - drupal:contact
   - drupal:content_moderation
   - drupal:content_translation
@@ -100,6 +91,7 @@ dependencies:
   - drupal:pathauto
   - drupal:preprocess_event_dispatcher
   - drupal:quickedit
+  - quick_node_clone:quick_node_clone
   - drupal:rdf
   - drupal:realname
   - drupal:redirect

uw_sites_all.install

@@ -27,8 +27,7 @@ function uw_sites_all_install() {
   }
 
   // Make sure the theme is installed.
-  $theme_handler = \Drupal::service('theme_handler');
-  $theme_handler->install(['uw_theme_admin']);
+  \Drupal::service('theme_installer')->install(['uw_theme_admin']);
 
   // Set it as the admin theme.
   $config = \Drupal::service('config.factory')->getEditable('system.theme');
@@ -144,3 +143,36 @@ function uw_sites_all_update_8104() {
   $roles['uw_role_content_editor']->save();
   $roles['uw_role_content_author']->save();
 }
+
+/**
+ * Enables Quick Node Clone module.
+ */
+function uw_sites_all_update_8105(&$sandbox) {
+  \Drupal::service('module_installer')->install(['quick_node_clone']);
+}
+
+/**
+ * Uninstall all modules to do with config sync distro.
+ */
+function uw_sites_all_update_8106() {
+
+  // Delete all references of config_snapshot from database,
+  // so that features does not show as overridden.
+  $query = \Drupal::database()->delete('config');
+  $query->condition('name', '%config_snapshot%', 'LIKE');
+  $query->execute();
+
+  // Modules to uninstall.
+  $modules = [
+    'config_distro',
+    'config_filter',
+    'config_merge',
+    'config_normalizer',
+    'config_provider',
+    'config_snapshot',
+    'config_sync',
+    'config_translation',
+  ];
+
+  \Drupal::service('module_installer')->uninstall($modules);
+}