update the badge numbers of all tabs in the Request Editor to count inherited and environment (if applicable) entries

Author: sunny-chung

CHANGELOG.md

@@ -6,7 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
-Nothing yet.
+The current behavior of badge numbers, in the Request Editor, that do not count inherited properties does not bring convenience in practical. This behavior is changed starting from this version.
+
+### Changed
+
+- The badge numbers of Body, Query, Header, Pre Flight, Post Flight tabs in the Request Editor now count inherited entries
+- The badge number of the Variable tab in the Request Editor now counts inherited and environment variables
 
 
 ## [1.8.0] -- 2025-06-16

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/model/UserRequestTemplate.kt

@@ -179,11 +179,9 @@ data class UserRequestTemplate(
     data class Scope(val baseExample: UserRequestExample, val selectedExample: UserRequestExample, val variableResolver: VariableResolver) {
         fun String.resolveVariables(): String = variableResolver.resolve(this)
 
-        fun getMergedKeyValues(
+        fun concatActiveValues(
             propertyGetter: (UserRequestExample) -> List<UserKeyValuePair>?,
             disabledIds: Set<String>?,
-            isResolveKeyVariable: Boolean = true,
-            isUniqueKey: Boolean = false,
             environmentPropertyGetter: (Environment) -> List<UserKeyValuePair> = { emptyList() },
         ): List<UserKeyValuePair> {
             val envValues = (variableResolver.environment?.let { env -> environmentPropertyGetter(env) } ?: emptyList())
@@ -196,6 +194,20 @@ data class UserRequestTemplate(
                 .filter { it.isEnabled }
 
             return (envValues + baseValues + currentValues)
+        }
+
+        fun getMergedKeyValues(
+            propertyGetter: (UserRequestExample) -> List<UserKeyValuePair>?,
+            disabledIds: Set<String>?,
+            isResolveKeyVariable: Boolean = true,
+            isUniqueKey: Boolean = false,
+            environmentPropertyGetter: (Environment) -> List<UserKeyValuePair> = { emptyList() },
+        ): List<UserKeyValuePair> {
+            return concatActiveValues(
+                propertyGetter = propertyGetter,
+                environmentPropertyGetter = environmentPropertyGetter,
+                disabledIds = disabledIds
+            )
                 .map { it.copy(
                     key = it.key.let { if (isResolveKeyVariable) it.resolveVariables() else it },
                     value = it.value.resolveVariables(),
@@ -234,11 +246,15 @@ data class UserRequestTemplate(
         }
     }
 
-    fun <R> withScope(exampleId: String, environment: Environment?, resolveVariableMode: ResolveVariableMode = ExpandByEnvironment, action: Scope.() -> R): R {
+    fun createScope(exampleId: String, environment: Environment?, resolveVariableMode: ResolveVariableMode = ExpandByEnvironment): Scope {
         val baseExample = examples.first()
         val selectedExample = examples.first { it.id == exampleId }
 
-        return Scope(baseExample, selectedExample, VariableResolver(environment, this, exampleId, resolveVariableMode)).action()
+        return Scope(baseExample, selectedExample, VariableResolver(environment, this, exampleId, resolveVariableMode))
+    }
+
+    fun <R> withScope(exampleId: String, environment: Environment?, resolveVariableMode: ResolveVariableMode = ExpandByEnvironment, action: Scope.() -> R): R {
+        return createScope(exampleId, environment, resolveVariableMode).action()
     }
 
     fun getPreFlightVariables(exampleId: String, environment: Environment?) = withScope(exampleId, environment) {

src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/RequestEditorView.kt

@@ -606,30 +606,52 @@ fun RequestEditorView(
         }
 
         fun List<UserKeyValuePair>.countActive() = count { it.isEnabled }
-
-        val tabBadgeNum = { tab: RequestTab -> when (tab) {
-            RequestTab.Body -> when (val body = selectedExample.body) {
-                is FileBody -> isApplicable { it.overrides?.isOverrideBody } * body.filePath.countNotBlank()
-                is FormUrlEncodedBody -> body.value.countActive()
-                is MultipartBody -> body.value.countActive()
-                is GraphqlBody -> isApplicable { it.overrides?.isOverrideBodyContent } * body.document.countNotBlank() +
-                        isApplicable { it.overrides?.isOverrideBodyVariables } * body.variables.countNotBlank()
-                is StringBody -> isApplicable { it.overrides?.isOverrideBody } * body.value.countNotBlank()
-                null -> 0
+        fun UserRequestTemplate.Scope.countActive(
+            propertyGetter: (UserRequestExample) -> List<UserKeyValuePair>?,
+            disabledIds: Set<String>?,
+            environmentPropertyGetter: (Environment) -> List<UserKeyValuePair> = { emptyList() },
+        ) = concatActiveValues(propertyGetter, disabledIds, environmentPropertyGetter).count()
+
+        fun UserRequestTemplate.Scope.countNotBlank(
+            propertyGetter: (UserRequestExample) -> String?,
+            isOverride: Boolean?
+        ): Int {
+            val example = if (isOverride == true) {
+                selectedExample
+            } else {
+                baseExample
             }
-            RequestTab.Query -> selectedExample.queryParameters.countActive()
-            RequestTab.Header -> selectedExample.headers.countActive()
-            RequestTab.PreFlight -> isApplicable { it.overrides?.isOverridePreFlightScript } *
-                selectedExample.preFlight.executeCode.countNotBlank() +
-                selectedExample.preFlight.updateVariablesFromHeader.countActive() +
-                selectedExample.preFlight.updateVariablesFromQueryParameters.countActive() +
-                selectedExample.preFlight.updateVariablesFromBody.countActive() +
-                selectedExample.preFlight.updateVariablesFromGraphqlVariables.countActive()
-            RequestTab.PostFlight -> selectedExample.postFlight.updateVariablesFromHeader.countActive() +
-                selectedExample.postFlight.updateVariablesFromBody.countActive()
-            RequestTab.Cookie -> if (subprojectConfig.isCookieEnabled()) applicableCookies.countActive() else 0
-            RequestTab.Variable -> selectedExample.variables.countActive()
-        } }
+            return propertyGetter(example).countNotBlank()
+        }
+
+        val scope = request.createScope(selectedExample.id, environment)
+
+        val tabBadgeNum = with(scope) {
+            val overrides = selectedExample.overrides
+            { tab: RequestTab -> when (tab) {
+                RequestTab.Body -> when (selectedExample.body) {
+                    is FileBody -> countNotBlank({ (it.body as? FileBody)?.filePath }, overrides?.isOverrideBody)
+                    is FormUrlEncodedBody -> countActive({ (it.body as? FormUrlEncodedBody)?.value }, overrides?.disabledBodyKeyValueIds)
+                    is MultipartBody -> countActive({ (it.body as? MultipartBody)?.value }, overrides?.disabledBodyKeyValueIds)
+                    is GraphqlBody -> countNotBlank({ (it.body as? GraphqlBody)?.document }, overrides?.isOverrideBodyContent) +
+                        countNotBlank({ (it.body as? GraphqlBody)?.variables }, overrides?.isOverrideBodyVariables)
+                    is StringBody -> countNotBlank({ (it.body as? StringBody)?.value }, overrides?.isOverrideBody)
+                    null -> 0
+                }
+                RequestTab.Query -> countActive({ it.queryParameters }, overrides?.disabledQueryParameterIds)
+                RequestTab.Header -> countActive({ it.headers }, overrides?.disabledHeaderIds)
+                RequestTab.PreFlight ->
+                    countNotBlank({ it.preFlight.executeCode }, overrides?.isOverridePreFlightScript) +
+                    countActive({ it.preFlight.updateVariablesFromHeader }, overrides?.disablePreFlightUpdateVarIds) +
+                    countActive({ it.preFlight.updateVariablesFromBody }, overrides?.disablePreFlightUpdateVarIds) +
+                    countActive({ it.preFlight.updateVariablesFromQueryParameters }, overrides?.disablePreFlightUpdateVarIds) +
+                    countActive({ it.preFlight.updateVariablesFromGraphqlVariables }, overrides?.disablePreFlightUpdateVarIds)
+                RequestTab.PostFlight -> countActive({ it.postFlight.updateVariablesFromHeader }, overrides?.disablePostFlightUpdateVarIds) +
+                    countActive({ it.postFlight.updateVariablesFromBody }, overrides?.disablePostFlightUpdateVarIds)
+                RequestTab.Cookie -> if (subprojectConfig.isCookieEnabled()) applicableCookies.countActive() else 0
+                RequestTab.Variable -> request.getAllVariables(selectedExampleId, environment).count()
+            } }
+        }
 
         TabsView(
             modifier = Modifier.fillMaxWidth().background(color = colors.backgroundLight).testTag(TestTag.RequestParameterTypeTabContainer.name),