Ability to view Code References by Owner

Author: handstandsam

invert-report/src/jsMain/kotlin/com/squareup/invert/common/ReportDataRepo.kt

@@ -6,8 +6,8 @@ import com.squareup.invert.common.pages.InvertedDependenciesNavRoute
 import com.squareup.invert.common.utils.DependencyComputations
 import com.squareup.invert.models.ConfigurationName
 import com.squareup.invert.models.DependencyId
-import com.squareup.invert.models.ModulePath
 import com.squareup.invert.models.GradlePluginId
+import com.squareup.invert.models.ModulePath
 import com.squareup.invert.models.OwnerName
 import com.squareup.invert.models.Stat
 import com.squareup.invert.models.StatKey
@@ -161,17 +161,15 @@ class ReportDataRepo(
       moduleToOwnerMap.first().also { moduleToOwnerMap ->
         statsJsReportModel?.statsByModule?.map { moduleToStatsMap ->
           moduleToStatsMap.value[statKey]?.let { stat: Stat ->
-            println(stat)
             val moduleName = moduleToStatsMap.key
-            val ownerName = moduleToOwnerMap?.get(moduleName) ?: ""
 
             if (stat is Stat.CodeReferencesStat) {
               stat.value.forEach { codeReference ->
                 allForKey.add(
                   ModuleOwnerAndCodeReference(
                     codeReference = codeReference,
                     module = moduleName,
-                    owner = ownerName,
+                    owner = codeReference.owner ?: moduleToOwnerMap?.get(moduleName) ?: "",
                     metadata = statsJsReportModel.statInfos[statKey]!!
                   )
                 )

invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/CodeReferencesReportPage.kt

@@ -18,31 +18,49 @@ import com.squareup.invert.models.OwnerName
 import com.squareup.invert.models.StatDataType
 import org.jetbrains.compose.web.dom.A
 import org.jetbrains.compose.web.dom.H1
+import org.jetbrains.compose.web.dom.H3
 import org.jetbrains.compose.web.dom.Text
+import ui.BootstrapColumn
 import ui.BootstrapLoadingMessageWithSpinner
 import ui.BootstrapLoadingSpinner
+import ui.BootstrapRow
+import ui.BootstrapSelectDropdown
+import ui.BootstrapSelectOption
 import ui.BootstrapTable
 import kotlin.reflect.KClass
 
 data class CodeReferencesNavRoute(
-  val statKey: String? = null
+  val statKey: String? = null,
+  val owner: String? = null,
 ) : BaseNavRoute(CodeReferencesReportPage.navPage) {
 
   override fun toSearchParams(): Map<String, String> = toParamsWithOnlyPageId(this)
     .also { params ->
       statKey?.let {
         params[STATKEY_PARAM] = it
       }
+      if (!owner.isNullOrBlank()) {
+        params[OWNER_PARAM] = owner
+      }
     }
 
   companion object {
 
     private const val STATKEY_PARAM = "statkey"
+    private const val OWNER_PARAM = "owner"
 
     fun parser(params: Map<String, String?>): CodeReferencesNavRoute {
       val statKey = params[STATKEY_PARAM]
+      val owner = params[OWNER_PARAM]?.trim()?.let {
+        if (it.isNotBlank()) {
+          it
+        } else {
+          null
+        }
+      }
       return CodeReferencesNavRoute(
         statKey = statKey,
+        owner = owner,
       )
     }
   }
@@ -70,10 +88,11 @@ fun CodeReferencesComposable(
   navRouteRepo: NavRouteRepo = DependencyGraph.navRouteRepo,
 ) {
   val allModulesOrig by reportDataRepo.allModules.collectAsState(null)
+  val allOwnerNames by reportDataRepo.allOwnerNames.collectAsState(null)
   val moduleToOwnerMapFlowValue: Map<ModulePath, OwnerName>? by reportDataRepo.moduleToOwnerMap.collectAsState(null)
 
   val statInfosOrig by reportDataRepo.statInfos.collectAsState(null)
-  if (statInfosOrig == null) {
+  if (statInfosOrig == null || allOwnerNames == null) {
     BootstrapLoadingMessageWithSpinner("Loading Stats")
     return
   }
@@ -98,6 +117,7 @@ fun CodeReferencesComposable(
     }
   }
 
+
   if (moduleToOwnerMapFlowValue == null || metadata == null) {
     BootstrapLoadingSpinner()
     return
@@ -137,24 +157,61 @@ fun CodeReferencesComposable(
       return
     }
 
+    val allCodeReferencesForStat: Set<ModuleOwnerAndCodeReference> = statsForKey!!.toSet()
+
     val extraKeys = mutableSetOf<ExtraKey>()
-    statsForKey!!.forEach { moduleOwnerAndCodeReference ->
-      moduleOwnerAndCodeReference.codeReference.extras.forEach {
-        extraKeys.add(it.key)
+    allCodeReferencesForStat
+      .forEach { moduleOwnerAndCodeReference ->
+        moduleOwnerAndCodeReference.codeReference.extras.forEach {
+          extraKeys.add(it.key)
+        }
+      }
+
+    val filteredByOwner: List<ModuleOwnerAndCodeReference> = allCodeReferencesForStat
+      .filter { ownerAndCodeReference: ModuleOwnerAndCodeReference ->
+        if (!codeReferencesNavRoute.owner.isNullOrBlank()) {
+          ownerAndCodeReference.codeReference.owner == codeReferencesNavRoute.owner || codeReferencesNavRoute.owner == ownerAndCodeReference.owner
+        } else {
+          true
+        }
+      }
+
+    val codeReferencesByOwner = allCodeReferencesForStat.groupBy { it.owner }
+    val totalCount = allCodeReferencesForStat.size
+    BootstrapRow {
+      BootstrapColumn(12) {
+        H3 {
+          Text("Filter by Owner")
+          BootstrapSelectDropdown(
+            placeholderText = "-- All Owners ($totalCount Total) --",
+            currentValue = codeReferencesNavRoute.owner ?: "",
+            options = codeReferencesByOwner.map {
+              BootstrapSelectOption(
+                value = it.key,
+                displayText = "${it.key} (${it.value.size} of $totalCount)"
+              )
+            }.sortedBy { it.displayText }
+          ) {
+            navRouteRepo.updateNavRoute(
+              codeReferencesNavRoute.copy(owner = it)
+            )
+          }
+        }
       }
     }
 
     BootstrapTable(
       headers = listOf("Module", "Owner", "File", "Code") + extraKeys,
-      rows = statsForKey!!.map {
-        val listOfExtraValues: List<String> = extraKeys.map { key -> it.codeReference.extras[key] ?: "" }
-        listOf(
-          it.module,
-          it.codeReference.owner ?: (it.owner + " (Module Owner)"),
-          it.codeReference.toHrefLink(projectMetadata!!, false),
-          it.codeReference.code ?: ""
-        ) + listOfExtraValues
-      },
+      rows = filteredByOwner
+        .map {
+          val listOfExtraValues: List<String> = extraKeys.map { key -> it.codeReference.extras[key] ?: "" }
+          listOf(
+            it.module,
+            it.codeReference.owner ?: (it.owner + " (Module Owner)"),
+            it.codeReference.toHrefLink(projectMetadata!!, false),
+            it.codeReference.code ?: ""
+          ) + listOfExtraValues
+        },
       maxResultsLimitConstant = PagingConstants.MAX_RESULTS,
       sortAscending = true,
       sortByColumn = 2,

invert-report/src/jsMain/kotlin/ui/BootstrapComposables.kt

@@ -512,10 +512,15 @@ fun BootstrapSearchBox(
   }
 }
 
+data class BootstrapSelectOption(
+  val value: String,
+  val displayText: String
+)
+
 @Composable
 fun BootstrapSelectDropdown(
   placeholderText: String,
-  options: List<String>,
+  options: List<BootstrapSelectOption>,
   currentValue: String,
   onValueChange: (String?) -> Unit
 ) {
@@ -528,13 +533,13 @@ fun BootstrapSelectDropdown(
     Option(value = "") {
       Text(placeholderText)
     }
-    options.forEach { optionText ->
-      Option(value = optionText, {
-        if (optionText == currentValue) {
+    options.forEach { option ->
+      Option(value = option.value, {
+        if (option.value == currentValue) {
           selected()
         }
       }) {
-        Text(optionText)
+        Text(option.displayText)
       }
     }
   }