From 2cb602b8c501ba055411be974c9c20b2019989b4 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 18 Dec 2024 12:02:21 +0200 Subject: [PATCH 1/4] Add overwrites --- conf/cmi/grants_metadata.settings.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/cmi/grants_metadata.settings.yml b/conf/cmi/grants_metadata.settings.yml index f37c30d87..67319f1ce 100644 --- a/conf/cmi/grants_metadata.settings.yml +++ b/conf/cmi/grants_metadata.settings.yml @@ -484,6 +484,12 @@ overridden_configuration: applicationOpen: '2024-01-03T11:08:26' applicationClose: '2029-07-30T11:19:00' disableCopying: 0 + - + 68: + grants_metadata: + applicationOpen: '2024-01-03T11:08:26' + applicationClose: '2029-07-30T11:19:00' + disableCopying: 0 - 71: grants_metadata: From a21ecdead3868f05759956e625bfaf573da113d1 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 18 Dec 2024 12:03:44 +0200 Subject: [PATCH 2/4] Add overwrites 70 --- conf/cmi/grants_metadata.settings.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/cmi/grants_metadata.settings.yml b/conf/cmi/grants_metadata.settings.yml index 67319f1ce..f989b5e55 100644 --- a/conf/cmi/grants_metadata.settings.yml +++ b/conf/cmi/grants_metadata.settings.yml @@ -490,6 +490,12 @@ overridden_configuration: applicationOpen: '2024-01-03T11:08:26' applicationClose: '2029-07-30T11:19:00' disableCopying: 0 + - + 70: + grants_metadata: + applicationOpen: '2022-10-03T11:08:26' + applicationClose: '2029-07-30T11:19:00' + disableCopying: 0 - 71: grants_metadata: From 19a6f962011afa4351c55289220d204b078110bd Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 18 Dec 2024 13:45:46 +0200 Subject: [PATCH 3/4] Fix hyteed --- conf/cmi/webform.webform.hyteed_yleis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/cmi/webform.webform.hyteed_yleis.yml b/conf/cmi/webform.webform.hyteed_yleis.yml index e9caeae6b..5ee41c350 100644 --- a/conf/cmi/webform.webform.hyteed_yleis.yml +++ b/conf/cmi/webform.webform.hyteed_yleis.yml @@ -23,8 +23,8 @@ third_party_settings: applicationActingYearsNextCount: '1' applicationContinuous: 0 disableCopying: 0 - status: development - parent: d8472e68-d6bd-4de2-a409-f0a177bf9e94 + status: released + parent: '' avus2BreakingChange: 0 weight: 0 open: null From 367f3357032edb349095703ad6ebfb5975064f18 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 18 Dec 2024 14:30:56 +0200 Subject: [PATCH 4/4] Fix sotepeed + import --- conf/cmi/webform.webform.sotepe_yleis.yml | 6 +++--- .../src/Commands/WebformConfigOverrideCommands.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/cmi/webform.webform.sotepe_yleis.yml b/conf/cmi/webform.webform.sotepe_yleis.yml index a1bd7fe6f..3199ad7d6 100644 --- a/conf/cmi/webform.webform.sotepe_yleis.yml +++ b/conf/cmi/webform.webform.sotepe_yleis.yml @@ -17,14 +17,14 @@ third_party_settings: 49: '49' applicationTargetGroup: '30' applicationOpen: '2022-10-03T11:08:26' - applicationClose: '2029-07-30T11:19:00' + applicationClose: '2024-07-30T11:19:00' applicationActingYearsType: next_x_years applicationActingYears: { } applicationActingYearsNextCount: '1' applicationContinuous: 0 disableCopying: 0 - status: development - parent: d8472e68-d6bd-4de2-a409-f0a177bf9e94 + status: released + parent: "" avus2BreakingChange: 0 weight: 0 open: null diff --git a/public/modules/custom/grants_webform_import/src/Commands/WebformConfigOverrideCommands.php b/public/modules/custom/grants_webform_import/src/Commands/WebformConfigOverrideCommands.php index aaddf6c32..710f5f2b0 100644 --- a/public/modules/custom/grants_webform_import/src/Commands/WebformConfigOverrideCommands.php +++ b/public/modules/custom/grants_webform_import/src/Commands/WebformConfigOverrideCommands.php @@ -259,7 +259,7 @@ private function getApplicationTypeIdMapping(): array { // Get an array of all the items with a "parent". $itemsWithParent = array_filter($mapping, function ($item) { - return isset($item['parent']); + return isset($item['parent']) && $item['parent'] !== ""; }); // Get the parent UUIDs.