From a12096516def308ae9cec440428385f367e47241 Mon Sep 17 00:00:00 2001 From: Vincent Gao Date: Thu, 2 Feb 2023 15:56:34 +1100 Subject: [PATCH 1/7] D10 CKE5 reference site --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d9f9b90f..c9cbad54 100644 --- a/composer.json +++ b/composer.json @@ -9,9 +9,6 @@ "patches": { "drupal/core": { "Add a token for publication status - https://www.drupal.org/project/drupal/issues/3073554": "https://www.drupal.org/files/issues/2019-08-09/3073554_10.patch" - }, - "drupal/linkit": { - "Unpublished nodes not included even when option is selected - https://www.drupal.org/project/linkit/issues/3049946": "https://www.drupal.org/files/issues/2021-05-27/linkit-unpublished-nodes-not-included-3049946-28.patch" } } }, @@ -32,4 +29,4 @@ "dpc-sdp/tide_api:^3.0.0": "Allows to use Drupal in headless mode" }, "type": "drupal-module" -} +} \ No newline at end of file From 4c1e3c64be22846b0d6bd71571e4feafe4162ec8 Mon Sep 17 00:00:00 2001 From: Edward Yuen Date: Thu, 23 Mar 2023 11:39:04 +1100 Subject: [PATCH 2/7] [SRM-763] Missing tide_site_preview. --- .../optional/block.block.seven_tide_site_preview_links.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml b/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml index 97ac74c2..7769d47f 100644 --- a/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml +++ b/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml @@ -4,9 +4,9 @@ dependencies: module: - tide_site_preview theme: - - seven + - claro id: seven_tide_site_preview_links -theme: seven +theme: claro region: highlighted weight: -3 provider: null From 8e1dbf02d913f8874c90b14ce5a75c5b7ace3371 Mon Sep 17 00:00:00 2001 From: Edward Yuen Date: Thu, 23 Mar 2023 12:03:37 +1100 Subject: [PATCH 3/7] Revert "[SRM-763] Missing tide_site_preview." This reverts commit 4c1e3c64be22846b0d6bd71571e4feafe4162ec8. --- .../optional/block.block.seven_tide_site_preview_links.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml b/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml index 7769d47f..97ac74c2 100644 --- a/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml +++ b/modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml @@ -4,9 +4,9 @@ dependencies: module: - tide_site_preview theme: - - claro + - seven id: seven_tide_site_preview_links -theme: claro +theme: seven region: highlighted weight: -3 provider: null From 41b957f86cf8e3e6ae1d3e5076c5815b879a5702 Mon Sep 17 00:00:00 2001 From: Edward Yuen Date: Thu, 23 Mar 2023 12:09:50 +1100 Subject: [PATCH 4/7] [SRM-763] Missing tide_site_preview. - Adds claro site preview block. --- ...ck.block.claro_tide_site_preview_links.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml diff --git a/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml b/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml new file mode 100644 index 00000000..56271298 --- /dev/null +++ b/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml @@ -0,0 +1,21 @@ +uuid: 05383036-b773-4f1b-b260-2a4cbbb07fdb +langcode: en +status: true +dependencies: + module: + - tide_site_preview + theme: + - claro +id: claro_tide_site_preview_links +theme: claro +region: highlighted +weight: 0 +provider: null +plugin: tide_site_preview_links_block +settings: + id: tide_site_preview_links_block + label: 'Click the links below to preview this revision on frontend sites' + label_display: visible + provider: tide_site_preview + open_new_window: 1 +visibility: { } From f72a318d3d6a2206d19aa859010870681c055827 Mon Sep 17 00:00:00 2001 From: Edward Yuen Date: Thu, 23 Mar 2023 12:21:35 +1100 Subject: [PATCH 5/7] Removes UUID. --- .../optional/block.block.claro_tide_site_preview_links.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml b/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml index 56271298..1ed0e658 100644 --- a/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml +++ b/modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml @@ -1,4 +1,3 @@ -uuid: 05383036-b773-4f1b-b260-2a4cbbb07fdb langcode: en status: true dependencies: From 7ff4c623c4303dbf87fb383c9b24397935e294db Mon Sep 17 00:00:00 2001 From: Vincent Gao Date: Wed, 19 Apr 2023 14:58:41 +1000 Subject: [PATCH 6/7] update linkit_profile.site_content --- .../linkit.linkit_profile.site_content.yml | 13 ++++++++--- tide_site.install | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/config/install/linkit.linkit_profile.site_content.yml b/config/install/linkit.linkit_profile.site_content.yml index 3055ff78..bd9d1110 100644 --- a/config/install/linkit.linkit_profile.site_content.yml +++ b/config/install/linkit.linkit_profile.site_content.yml @@ -3,8 +3,6 @@ status: true dependencies: module: - node -_core: - default_config_hash: i9NpUDkHXWv0nBVl_hba1YmpdozfyJrBYe5-8njLB4E id: site_content label: 'Site Content' description: '' @@ -20,4 +18,13 @@ matchers: group_by_bundle: true substitution_type: canonical limit: 100 - + e91d515d-454e-47d4-adf7-6fc13b8f66cd: + id: email + uuid: e91d515d-454e-47d4-adf7-6fc13b8f66cd + settings: { } + weight: 0 + 7802f100-9fda-4458-8416-0f537a7b851d: + id: phone + uuid: 7802f100-9fda-4458-8416-0f537a7b851d + settings: { } + weight: 0 \ No newline at end of file diff --git a/tide_site.install b/tide_site.install index 63db3e0a..560a784a 100644 --- a/tide_site.install +++ b/tide_site.install @@ -646,3 +646,25 @@ function tide_site_update_8024() { } $config->save(); } + +/** + * Update linkit.linkit_profile.site_content config. + */ +function tide_site_update_8025() { + $configs = [ + 'linkit.linkit_profile.site_content' => 'linkit_profile', + ]; + \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers'); + $config_location = [__DIR__ . '/config/install']; + foreach ($configs as $config => $type) { + $storage = \Drupal::entityTypeManager()->getStorage($type); + $id = substr($config, strrpos($config, '.') + 1); + $config_entity = $storage->load($id); + if ($config_entity !== NULL){ + $storage->delete([$config_entity]); + } + $config_read = _tide_read_config($config, $config_location, TRUE); + $new_config_entity = $storage->createFromStorageRecord($config_read); + $new_config_entity->save(); + } +} From 687b0c8deab440b9195654c4375b4b99b4e893c7 Mon Sep 17 00:00:00 2001 From: Vincent Gao Date: Wed, 19 Apr 2023 16:01:40 +1000 Subject: [PATCH 7/7] update linkit.linkit_profile.site_content --- tide_site.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tide_site.install b/tide_site.install index 560a784a..451c919a 100644 --- a/tide_site.install +++ b/tide_site.install @@ -663,7 +663,7 @@ function tide_site_update_8025() { if ($config_entity !== NULL){ $storage->delete([$config_entity]); } - $config_read = _tide_read_config($config, $config_location, TRUE); + $config_read = _tide_read_config($config, $config_location, FALSE); $new_config_entity = $storage->createFromStorageRecord($config_read); $new_config_entity->save(); }