From dce9433aab3f6619ef578978a5b1b66f7b950d3e Mon Sep 17 00:00:00 2001 From: mehsaandev Date: Wed, 12 Mar 2025 04:26:02 +0500 Subject: [PATCH 1/2] fix: added env check on config map --- modules/ensemble/lib/ensemble.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/ensemble/lib/ensemble.dart b/modules/ensemble/lib/ensemble.dart index 447ce7b86..959a8bd51 100644 --- a/modules/ensemble/lib/ensemble.dart +++ b/modules/ensemble/lib/ensemble.dart @@ -185,10 +185,12 @@ class Ensemble extends WithEnsemble with EnsembleRouteObserver { final configString = await rootBundle.loadString('${path}/config/appConfig.json'); final Map configMap = json.decode(configString); - // Loop through the envVariables from appConfig.json file and add them to the envOverrides - configMap["envVariables"].forEach((key, value) { - envOverrides![key] = value; - }); + if (configMap["envVariables"] != null) { + // Loop through the envVariables from appConfig.json file and add them to the envOverrides + configMap["envVariables"].forEach((key, value) { + envOverrides![key] = value; + }); + } } catch (e) { debugPrint("appConfig.json file doesn't exist"); } From 7007dd4d79dbea28e6753c2a850c80a19613fa48 Mon Sep 17 00:00:00 2001 From: mehsaandev Date: Wed, 12 Mar 2025 04:27:48 +0500 Subject: [PATCH 2/2] reverted localprovider config path --- .../lib/framework/definition_providers/local_provider.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ensemble/lib/framework/definition_providers/local_provider.dart b/modules/ensemble/lib/framework/definition_providers/local_provider.dart index 719a7cfe0..047a55131 100644 --- a/modules/ensemble/lib/framework/definition_providers/local_provider.dart +++ b/modules/ensemble/lib/framework/definition_providers/local_provider.dart @@ -38,7 +38,7 @@ class LocalDefinitionProvider extends FileDefinitionProvider { // Note: Web with local definition caches even if we disable browser cache // so you may need to re-run the app on definition changes var pageStr = await rootBundle - .loadString('${path}screens/${screenId ?? screenName ?? appHome}.yaml'); + .loadString('${path}/screens/${screenId ?? screenName ?? appHome}.yaml'); if (pageStr.isEmpty) { return ScreenDefinition(YamlMap()); }