Merge pull request #862 from Udhay-Adithya/fix-scripts-state

fix ui state not being consistent with the original request model

Author: animator

lib/providers/collection_providers.dart

@@ -270,7 +270,7 @@ class CollectionStateNotifier
     ref.read(codePaneVisibleStateProvider.notifier).state = false;
     final defaultUriScheme = ref.read(settingsProvider).defaultUriScheme;
     final EnvironmentModel? originalEnvironmentModel =
-        ref.read(selectedEnvironmentModelProvider);
+        ref.read(activeEnvironmentModelProvider);
 
     if (requestId == null || state == null) {
       return;
@@ -281,10 +281,11 @@ class CollectionStateNotifier
       return;
     }
 
-    if (requestModel != null &&
-        !requestModel.preRequestScript.isNullOrEmpty()) {
-      requestModel = await handlePreRequestScript(
-        requestModel,
+    RequestModel executionRequestModel = requestModel!.copyWith();
+
+    if (!requestModel.preRequestScript.isNullOrEmpty()) {
+      executionRequestModel = await handlePreRequestScript(
+        executionRequestModel,
         originalEnvironmentModel,
         (envModel, updatedValues) {
           ref
@@ -298,9 +299,9 @@ class CollectionStateNotifier
       );
     }
 
-    APIType apiType = requestModel!.apiType;
+    APIType apiType = executionRequestModel.apiType;
     HttpRequestModel substitutedHttpRequestModel =
-        getSubstitutedHttpRequestModel(requestModel.httpRequestModel!);
+        getSubstitutedHttpRequestModel(executionRequestModel.httpRequestModel!);
 
     // set current model's isWorking to true and update state
     var map = {...state!};

lib/providers/environment_providers.dart

@@ -15,6 +15,15 @@ final selectedEnvironmentModelProvider =
   return selectedId != null ? environments![selectedId] : null;
 });
 
+final activeEnvironmentModelProvider = StateProvider<EnvironmentModel?>((ref) {
+  final activeId = ref.watch(activeEnvironmentIdStateProvider);
+  final environments = ref.watch(environmentsStateNotifierProvider);
+  if (activeId != null && environments != null) {
+    return environments[activeId];
+  }
+  return null;
+});
+
 final availableEnvironmentVariablesStateProvider =
     StateProvider<Map<String, List<EnvironmentVariableModel>>>((ref) {
   Map<String, List<EnvironmentVariableModel>> result = {};

lib/screens/history/history_widgets/his_scripts_tab.dart

@@ -61,7 +61,7 @@ class _ScriptsCodePaneState extends ConsumerState<HistoryScriptsTab> {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(
-          padding: const EdgeInsets.all(8.0),
+          padding: kP6,
           child: ADDropdownButton<int>(
             value: _selectedTabIndex,
             values: tabs,
@@ -75,7 +75,10 @@ class _ScriptsCodePaneState extends ConsumerState<HistoryScriptsTab> {
           ),
         ),
         Expanded(
-          child: content[_selectedTabIndex],
+          child: Padding(
+            padding: kPt5o10,
+            child: content[_selectedTabIndex],
+          ),
         ),
       ],
     );

lib/utils/pre_post_script_utils.dart

@@ -59,7 +59,7 @@ Future<RequestModel> handlePreRequestScript(
       debugPrint(
           "Warning: Pre-request script updated environment variables, but no active environment was selected to save them to.");
     }
-    return requestModel;
+    return newRequestModel;
   }
   return newRequestModel;
 }
@@ -71,7 +71,7 @@ Future<RequestModel> handlePostResponseScript(
 ) async {
   final scriptResult = await executePostResponseScript(
     currentRequestModel: requestModel,
-    activeEnvironment: originalEnvironmentModel?.toJson() ?? {},
+    activeEnvironment: originalEnvironmentModel?.toJson() ?? {"values": []},
   );
 
   final newRequestModel =