Filter not required variables for requests #663

Author: vepanimas

src/main/com/intellij/lang/jsgraphql/ide/config/env/GraphQLConfigEnvironment.kt

@@ -296,12 +296,17 @@ data class GraphQLEnvironmentSnapshot(val variables: Map<String, String?>) {
         val EMPTY = GraphQLEnvironmentSnapshot(emptyMap())
     }
 
-    val hasMissingValues = variables.values.any { it.isNullOrBlank() }
+    fun hasMissingValues(nameFilter: Collection<String>? = null): Boolean {
+        return variables.any { (nameFilter == null || it.key in nameFilter) && it.value.isNullOrBlank() }
+    }
 
     val hasVariables = variables.isNotEmpty()
 
+    fun update(project: Project, dir: VirtualFile): GraphQLEnvironmentSnapshot =
+        GraphQLConfigEnvironment.getInstance(project).createSnapshot(variables.keys, dir)
+
     override fun toString(): String {
         // don't write env values to log
-        return "GraphQLEnvironmentSnapshot(variables=${variables.keys.joinToString()}, hasMissingValues=$hasMissingValues)"
+        return "GraphQLEnvironmentSnapshot(variables=${variables.keys.joinToString()}, hasMissingValues=${hasMissingValues()})"
     }
 }

src/main/com/intellij/lang/jsgraphql/ide/config/env/GraphQLEnvironmentVariablesDialog.kt

@@ -25,6 +25,7 @@ class GraphQLEnvironmentVariablesDialog(
     private val environment: GraphQLEnvironmentSnapshot,
     private val fileOrDir: VirtualFile,
     private val onlyEmpty: Boolean,
+    private val nameFilter: Collection<String>? = null,
 ) : DialogWrapper(project) {
 
     private val env = GraphQLConfigEnvironment.getInstance(project)
@@ -57,6 +58,10 @@ class GraphQLEnvironmentVariablesDialog(
 
     private fun createVariablesTable(): EnvVariablesTable {
         return environment.variables
+            .asSequence()
+            .filter {
+                nameFilter == null || it.key in nameFilter
+            }
             .filter {
                 if (onlyEmpty) {
                     it.value.isNullOrBlank()
@@ -67,6 +72,7 @@ class GraphQLEnvironmentVariablesDialog(
             .map {
                 EnvironmentVariable(it.key, env.getExplicitVariable(it.key, fileOrDir), false)
             }
+            .toList()
             .let { MyEnvVariablesTable(it) }
     }
 

src/main/com/intellij/lang/jsgraphql/ide/config/env/GraphQLExpandVariableContext.kt

@@ -43,7 +43,7 @@ private fun expandVariable(value: Any, context: GraphQLExpandVariableContext) =
 internal fun extractEnvironmentVariables(
     project: Project,
     isLegacy: Boolean,
-    vararg items: Any,
+    vararg items: Any?,
 ): Collection<String> {
     val variables = mutableSetOf<String>()
     val parser = GraphQLConfigEnvironmentParser.getInstance(project)

src/main/com/intellij/lang/jsgraphql/ide/config/model/GraphQLConfigEndpoint.kt

@@ -7,10 +7,10 @@
  */
 package com.intellij.lang.jsgraphql.ide.config.model
 
-import com.intellij.lang.jsgraphql.ide.config.env.GraphQLConfigEnvironment
-import com.intellij.lang.jsgraphql.ide.config.env.GraphQLEnvironmentSnapshot
+import com.intellij.lang.jsgraphql.ide.config.env.*
 import com.intellij.lang.jsgraphql.ide.config.env.GraphQLExpandVariableContext
 import com.intellij.lang.jsgraphql.ide.config.env.expandVariables
+import com.intellij.lang.jsgraphql.ide.config.env.extractEnvironmentVariables
 import com.intellij.lang.jsgraphql.ide.config.loader.GraphQLRawEndpoint
 import com.intellij.lang.jsgraphql.ide.config.loader.GraphQLRawSchemaPointer
 import com.intellij.lang.jsgraphql.ide.config.parseMap
@@ -49,11 +49,10 @@ class GraphQLConfigEndpoint(
 
     val schemaPointer: GraphQLSchemaPointer? = rawSchemaPointer?.let { GraphQLSchemaPointer(project, dir, it, isLegacy, environment) }
 
-    fun withUpdatedEnvironment(): GraphQLConfigEndpoint {
-        val updatedEnvironment =
-            GraphQLConfigEnvironment.getInstance(project).createSnapshot(environment.variables.keys, dir)
-        return GraphQLConfigEndpoint(project, rawData, dir, isLegacy, updatedEnvironment, rawSchemaPointer, config)
-    }
+    val usedVariables: Collection<String> = extractEnvironmentVariables(project, isLegacy, rawData.url, rawData.headers)
+
+    fun withUpdatedEnvironment(): GraphQLConfigEndpoint =
+        GraphQLConfigEndpoint(project, rawData, dir, isLegacy, environment.update(project, dir), rawSchemaPointer, config)
 
     private fun createExpandContext() = GraphQLExpandVariableContext(project, dir, isLegacy, environment)
 

src/main/com/intellij/lang/jsgraphql/ide/introspection/GraphQLIntrospectionUtil.kt

@@ -52,9 +52,9 @@ fun promptForEnvVariables(project: Project, endpoint: GraphQLConfigEndpoint?): G
     if (endpoint == null) return null
 
     val environment = endpoint.environment
-    val hasMissingVariableValues = environment.hasMissingValues
+    val hasMissingVariableValues = environment.hasMissingValues(endpoint.usedVariables)
     if (hasMissingVariableValues) {
-        val variableDialog = GraphQLEnvironmentVariablesDialog(project, environment, endpoint.dir, true)
+        val variableDialog = GraphQLEnvironmentVariablesDialog(project, environment, endpoint.dir, true, endpoint.usedVariables)
         if (!variableDialog.showAndGet()) {
             return null
         }