Filter extractor catalog by label

Author: bodom0015

app/controllers/Extractors.scala

@@ -55,6 +55,7 @@ class Extractors  @Inject() (extractions: ExtractionService,
     implicit val user = request.user
     // Filter extractors by the trigger type if necessary
     var runningExtractors: List[ExtractorInfo] = extractorService.listExtractorsInfo(List.empty)
+
     request.getQueryString("processTriggerSearchFilter") match {
       case Some("file/*") => runningExtractors = runningExtractors.filter(re => re.process.file.length > 0)
       case Some("dataset/*") => runningExtractors = runningExtractors.filter(re => re.process.dataset.length > 0)
@@ -63,8 +64,17 @@ class Extractors  @Inject() (extractions: ExtractionService,
     }
     val selectedExtractors: List[String] = extractorService.getEnabledExtractors()
     val groups = extractions.groupByType(extractions.findAll())
-    val labels = extractorService.listExtractorsLabels().groupBy(_.category.getOrElse("Other"))
-    Ok(views.html.updateExtractors(runningExtractors, selectedExtractors, groups, labels))
+    val allLabels = extractorService.listExtractorsLabels()
+    val categorizedLabels = allLabels.groupBy(_.category.getOrElse("Other"))
+    request.getQueryString("labelFilter") match {
+      case None => {}
+      case Some(lblName) => allLabels.find(lbl => lblName == lbl.name) match {
+        case Some(label) => runningExtractors = runningExtractors.filter(re => label.extractors.contains(re.name))
+        case None => {}
+      }
+    }
+
+    Ok(views.html.updateExtractors(runningExtractors, selectedExtractors, groups, categorizedLabels))
   }
 
   def manageLabels = ServerAdminAction { implicit request =>

app/views/updateExtractors.scala.html

@@ -44,9 +44,9 @@ <h1>Extractor Catalog</h1>
                             <div class="control-group">
                                 <div class="btn-group" data-toggle="buttons">
                                 @for(label <- catLabels) {
-                                    <label class="btn btn-primary active">
-                                        <input id="[email protected]" class="label-checkbox" type="checkbox" autocomplete="off" checked> @label.name
-                                    </label>
+                                    <button onclick="submitFilters('@label.name', this)" id="[email protected]" role="button" class="btn btn-primary label-filter-btn">
+                                        <input type="checkbox" autocomplete="off" checked> @label.name
+                                    </button>
                                 }
                                 </div>
                             </div>
@@ -71,11 +71,11 @@ <h1>Extractor Catalog</h1>
                                 </div>
                             </div>
 
-                            <!-- TODO: Process trigger search filter -->
+                            <!-- Process trigger search filter -->
                             <div class="form-group">
                                 <label for="processTriggerSearchFilter" class="col-sm-3 control-label">Triggers On:</label>
                                 <div class="col-sm-9">
-                                    <select class="form-control" name="processTriggerSearchFilter" id="processTriggerSearchFilter" onchange="this.form.submit()">
+                                    <select class="form-control" name="processTriggerSearchFilter" id="processTriggerSearchFilter" onchange="submitFilters(null, this)">
                                         <option>file/*</option>
                                         <option>dataset/*</option>
                                         <option>metadata/*</option>
@@ -344,26 +344,38 @@ <h1>Extractor Catalog</h1>
         </div>
     </div>
 
-    @if(showOptional("filterSection")) {
-        <script>
-                $('document').ready(function () {
-                    var params = new URLSearchParams(window.location.search);
-                    var processTriggerParam = "processTriggerSearchFilter"
-                    if (params.has(processTriggerParam)) {
-                        document.getElementById(processTriggerParam).value = params.get(processTriggerParam);
-                    }
-                    var labelsParam = "labelsFilter"
-                    if (params.has(labelsParam)) {
-                        // If we have a label param, uncheck all other labels
-                        var labelNames = params.get(labelsParam).split(',');
-                        if (labels => 1) { $('.label-checkbox').prop("checked", false); }
-
-                        // Check only the labels in the query string
-                        labelNames.forEach(function(labelName) {
-                            $('label-' + labelName).prop("checked", true);
-                        });
-                    }
-                });
-        </script>
-    }
+    <script>
+            function submitFilters(labelName, context) {
+                // Grab existing query string values
+                var currentParams = new URLSearchParams(window.location.search);
+                var targets = context.formAction.split('@routes.Extractors.selectExtractors()')
+
+                // Set new query strings parameters based on form value
+                var newParams = new URLSearchParams(targets[1]);
+                var newLabelName = labelName || currentParams.get('labelFilter')
+                if (newLabelName) {
+                    newParams.set('labelFilter', newLabelName);
+                }
+                window.location.search = newParams.toString();
+            }
+
+            $('document').ready(function () {
+                var params = new URLSearchParams(window.location.search);
+                var processTriggerParam = "processTriggerSearchFilter"
+                if (params.has(processTriggerParam)) {
+                    $(processTriggerParam).val(params.get(processTriggerParam));
+                }
+                var labelParam = "labelFilter"
+                if (params.has(labelParam)) {
+                    // If we have a label param, uncheck all other labels
+                    $('.label-filter-btn').removeClass("btn-primary");
+                    $('.label-filter-btn').addClass("btn-default");
+
+                    // Check only the label in the query string
+                    var labelName = params.get(labelParam);
+                    $('#label-' + labelName).removeClass("btn-default");
+                    $('#label-' + labelName).addClass("btn-primary");
+                }
+            });
+    </script>
 }