From cc610d658950ff2679f3a362dca044e81194b20a Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 4 Apr 2024 13:48:16 +0200
Subject: [PATCH 01/72] Remove color function

---
 .../components/search/dropdown_filter.ts      | 15 +++--
 .../search/filter_collection_element.ts       |  3 +-
 .../components/search/search_token.ts         | 15 +++--
 app/views/layouts/_searchbar.html.erb         | 60 +++++--------------
 4 files changed, 37 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index fb5bc8a16e..3499a1959a 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -1,6 +1,11 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { FilterCollection, Label, FilterCollectionElement } from "components/search/filter_collection_element";
+import {
+    FilterCollection,
+    Label,
+    FilterCollectionElement,
+    AccentColor
+} from "components/search/filter_collection_element";
 import { i18n } from "i18n/i18n";
 import { DodonaElement } from "components/meta/dodona_element";
 
@@ -10,7 +15,7 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-dropdown-filter
  *
- * @prop {(s: Label) => string} color - a function that fetches the color associated with each label
+ * @prop {AccentColor} color - the color associated with the filter
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} param - the searchQuery param to be used for this filter
  * @prop {boolean} multi - whether one or more labels can be selected at the same time
@@ -19,8 +24,8 @@ import { DodonaElement } from "components/meta/dodona_element";
  */
 @customElement("d-dropdown-filter")
 export class DropdownFilter extends FilterCollectionElement {
-    @property()
-    color: (s: Label) => string;
+    @property({ type: String })
+    color: AccentColor;
     @property()
     type: string;
 
@@ -43,7 +48,7 @@ export class DropdownFilter extends FilterCollectionElement {
         return html`
             <div class="dropdown dropdown-filter">
                 <a class="token token-bordered" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
-                    ${this.getSelectedLabels().map( s => html`<i class="mdi mdi-circle mdi-12 mdi-colored-accent accent-${this.color(s)} left-icon"></i>`)}
+                    ${this.getSelectedLabels().map( () => html`<i class="mdi mdi-circle mdi-12 mdi-colored-accent accent-${this.color} left-icon"></i>`)}
                     ${i18n.t(`js.dropdown.${this.multi?"multi":"single"}.${this.type}`)}
                     <i class="mdi mdi-chevron-down mdi-18 right-icon"></i>
                 </a>
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_collection_element.ts
index 63a4607ba7..4e34077db5 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_collection_element.ts
@@ -3,10 +3,11 @@ import { searchQueryState } from "state/SearchQuery";
 import { DodonaElement } from "components/meta/dodona_element";
 
 export type Label = {id: string, name: string};
+export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" | "teal" | "orange" | "brown" | "blue-gray";
 export type FilterCollection = {
     data: Label[],
     multi: boolean,
-    color: (l: Label) => string,
+    color: AccentColor,
     paramVal: (l: Label) => string,
     param: string
 };
diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index ebfb53c10b..184550dd9e 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -1,6 +1,11 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { FilterCollection, FilterCollectionElement, Label } from "components/search/filter_collection_element";
+import {
+    AccentColor,
+    FilterCollection,
+    FilterCollectionElement,
+    Label
+} from "components/search/filter_collection_element";
 import { DodonaElement } from "components/meta/dodona_element";
 
 /**
@@ -9,7 +14,7 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-search-token
  *
- * @prop {(s: Label) => string} color - a function that fetches the color associated with each label
+ * @prop {AccentColor} color - the color associated with the filter
  * @prop {string} param - the searchQuery param to be used for this filter
  * @prop {boolean} multi - whether one or more labels can be selected at the same time
  * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
@@ -17,8 +22,8 @@ import { DodonaElement } from "components/meta/dodona_element";
  */
 @customElement("d-search-token")
 export class SearchToken extends FilterCollectionElement {
-    @property()
-    color: (l: Label) => string;
+    @property({ type: String })
+    color: AccentColor;
 
     processClick(e: Event, label: Label): void {
         this.unSelect(label);
@@ -28,7 +33,7 @@ export class SearchToken extends FilterCollectionElement {
     render(): TemplateResult {
         return html`
             ${ this.getSelectedLabels().map( label => html`
-                <div class="token accent-${this.color(label)}">
+                <div class="token accent-${this.color}">
                     <span class="token-label">${label.name}</span>
                     <a href="#" class="close" tabindex="-1"  @click=${e => this.processClick(e, label)}>
                         <i class="mdi mdi-close mdi-18"></i>
diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index dbdc79437c..7f1ade7397 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -36,9 +36,7 @@
             paramVal: function(l) { return l.name.toString(); },
             multi: true,
             data: <%= raw render template: 'labels/index', formats: :json %>,
-            color: function (label) {
-                return label.color;
-            },
+            color: "purple"
         };
         <% end %>
         <% if local_assigns.fetch :programming_languages, false %>
@@ -47,9 +45,7 @@
             paramVal: function(p) { return p.name.toString(); },
             multi: false,
             data: <%= raw render template: 'programming_languages/index', formats: :json %>,
-            color: function () {
-                return "red";
-            },
+            color: "red",
         };
         <% end %>
         <% if local_assigns.fetch :repositories, false %>
@@ -58,9 +54,7 @@
             paramVal: function(r) { return r.id.toString(); },
             multi: false,
             data: <%= raw render template: 'repositories/index', formats: :json %>,
-            color: function () {
-                return "blue-gray";
-            },
+            color: "blue-gray",
         };
         <% end %>
         <% if local_assigns.fetch(:institutions, []).length > 1 %>
@@ -69,9 +63,7 @@
             paramVal: function(i) { return i.id.toString(); },
             multi: false,
             data: <%= raw local_assigns.fetch(:institutions, []).map{|i| {id: i.id, name: i.name}}.to_json %>,
-            color: function () {
-                return "pink";
-            },
+            color: "pink",
         };
         <% end %>
         <% if local_assigns.fetch :course_labels, false %>
@@ -82,9 +74,7 @@
             },
             multi: true,
             data: <%= raw local_assigns.fetch(:course_labels, []).map{|cl| {id: cl.id, name: cl.name}}.to_json %>,
-            color: function () {
-                return "orange";
-            },
+            color: "orange",
         };
         <% end %>
         <% if local_assigns.fetch :statuses, false %>
@@ -95,9 +85,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:statuses, []).map{|s| {id: s, name: Submission.human_enum_name(:status, s)}}.to_json %>,
-            color: function () {
-                return "indigo";
-            },
+            color: "indigo",
         };
         <% end %>
         <% if local_assigns.fetch :question_states, false %>
@@ -108,9 +96,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:question_states, []).map{|s| {id: s, name: Question.human_enum_name(:question_state, s)}}.to_json %>,
-            color: function () {
-                return "indigo";
-            },
+            color: "indigo",
         };
         <% end %>
         <% if local_assigns.fetch :event_types, false %>
@@ -121,9 +107,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:event_types, []).map{|s| {id: s, name: Event.human_enum_name(:event_type, s)}}.to_json %>,
-            color: function () {
-                return "deep-purple";
-            },
+            color: "deep-purple",
         };
         <% end %>
         <% if local_assigns.fetch :activity_types, false %>
@@ -134,9 +118,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:activity_types, []).map{|s| {id: s.name, name: s.model_name.human}}.to_json %>,
-            color: function () {
-                return "deep-purple";
-            },
+            color: "deep-purple",
         };
         <% end %>
         <% if local_assigns.fetch :description_languages, false %>
@@ -147,9 +129,7 @@
             },
             multi: true,
             data: <%= raw local_assigns.fetch(:description_languages, []).map{|l| {id: l, name: t("js.#{l}")}}.to_json %>,
-            color: function () {
-                return "orange";
-            },
+            color: "orange",
         };
         <% end %>
         <% if local_assigns.fetch :judges, false %>
@@ -160,9 +140,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:judges, []).map{|judge| {id: judge.id, name: "#{judge.name}-judge"}}.to_json %>,
-            color: function () {
-                return "red";
-            }
+            color: "red",
         }
         <% end %>
         <% if local_assigns.fetch :courses, false %>
@@ -173,9 +151,7 @@
             },
             multi: false,
             data: <%= raw local_assigns.fetch(:courses, []).map{|course| {id: course.id, name: "#{course.name} (#{course.formatted_year})"}}.to_json %>,
-            color: function () {
-                return "orange";
-            }
+            color: "orange"
         };
         <% end %>
         <% if local_assigns.fetch :exercises, false %>
@@ -186,9 +162,7 @@
           },
           multi: false,
           data: <%= raw local_assigns.fetch(:exercises, []).map{|exercise| {id: exercise.id, name: exercise.name}}.to_json %>,
-          color: function () {
-            return "blue-gray";
-          }
+          color: "blue-gray"
         };
         <% end %>
         <% if local_assigns.fetch :popularity, false %>
@@ -199,9 +173,7 @@
               },
               multi: true,
               data: <%= raw local_assigns.fetch(:popularity, []).map{|s| {id: s, name: Activity.human_enum_name(:popularity, s)}}.to_json %>,
-              color: function () {
-                return "pink";
-              },
+              color: "pink",
             };
         <% end %>
       <% if local_assigns.fetch :draft, false %>
@@ -215,9 +187,7 @@
             {id: true, name: "<%= t("activities.index.filters.draft") %>"},
             {id: false, name: "<%= t("activities.index.filters.not_draft") %>"}
           ],
-          color: function () {
-            return "indigo";
-          },
+          color: "indigo",
         };
       <% end %>
 

From 810fa47aae22c7cc2bd3ece8d745be697e3497c4 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 4 Apr 2024 14:11:01 +0200
Subject: [PATCH 02/72] Remove paramval function

---
 .../components/search/dropdown_filter.ts      |  2 -
 .../search/filter_collection_element.ts       | 17 ++---
 .../components/search/filter_tabs.ts          |  2 -
 .../components/search/search_field.ts         |  5 +-
 .../components/search/search_token.ts         |  1 -
 .../search/standalone-dropdown-filter.ts      |  4 +-
 app/views/layouts/_searchbar.html.erb         | 69 +++++--------------
 7 files changed, 24 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index 3499a1959a..b73aacf8e9 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -19,7 +19,6 @@ import { DodonaElement } from "components/meta/dodona_element";
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} param - the searchQuery param to be used for this filter
  * @prop {boolean} multi - whether one or more labels can be selected at the same time
- * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-dropdown-filter")
@@ -97,7 +96,6 @@ export class DropdownFilters extends DodonaElement {
                 <d-dropdown-filter
                     .labels=${c.data}
                     .color=${c.color}
-                    .paramVal=${c.paramVal}
                     .param=${c.param}
                     .multi=${c.multi}
                     .type=${type}
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_collection_element.ts
index 4e34077db5..8d832075c8 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_collection_element.ts
@@ -8,7 +8,6 @@ export type FilterCollection = {
     data: Label[],
     multi: boolean,
     color: AccentColor,
-    paramVal: (l: Label) => string,
     param: string
 };
 
@@ -27,8 +26,6 @@ export class FilterCollectionElement extends DodonaElement {
     param: string;
     @property({ type: Boolean })
     multi: boolean;
-    @property()
-    paramVal: (l: Label) => string;
     @property({ type: Array })
     labels: Array<Label> = [];
 
@@ -48,24 +45,20 @@ export class FilterCollectionElement extends DodonaElement {
         super.update(changedProperties);
     }
 
-    private str(label: Label): string {
-        return this.paramVal(label).toString();
-    }
-
     private get multiSelected(): string[] {
         return searchQueryState.arrayQueryParams.get(this.param) || [];
     }
 
     private multiUnSelect(label: Label): void {
-        searchQueryState.arrayQueryParams.set(this.param, this.multiSelected.filter(s => s !== this.str(label)));
+        searchQueryState.arrayQueryParams.set(this.param, this.multiSelected.filter(s => s !== label.id));
     }
 
     private multiIsSelected(label: Label): boolean {
-        return this.multiSelected.includes(this.str(label));
+        return this.multiSelected.includes(label.id);
     }
 
     private multiSelect(label: Label): void {
-        searchQueryState.arrayQueryParams.set(this.param, [...this.multiSelected, this.str(label)]);
+        searchQueryState.arrayQueryParams.set(this.param, [...this.multiSelected, label.id]);
     }
 
     private singleUnSelect(label: Label): void {
@@ -73,11 +66,11 @@ export class FilterCollectionElement extends DodonaElement {
     }
 
     private singleSelect(label: Label): void {
-        searchQueryState.queryParams.set(this.param, this.str(label));
+        searchQueryState.queryParams.set(this.param, label.id);
     }
 
     private singleIsSelected(label: Label): boolean {
-        return searchQueryState.queryParams.get(this.param) === this.str(label);
+        return searchQueryState.queryParams.get(this.param) === label.id;
     }
 
     isSelected = this.singleIsSelected;
diff --git a/app/assets/javascripts/components/search/filter_tabs.ts b/app/assets/javascripts/components/search/filter_tabs.ts
index bf63f0e978..b6bc4523f3 100644
--- a/app/assets/javascripts/components/search/filter_tabs.ts
+++ b/app/assets/javascripts/components/search/filter_tabs.ts
@@ -19,8 +19,6 @@ export class FilterTabs extends watchMixin(FilterCollectionElement) {
     multi = false;
     @property()
     param = "tab";
-    @property()
-    paramVal = (label: Label): string => label.id.toString();
     @property({ type: Array })
     labels: TabInfo[];
 
diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index 71f8ff62ef..28773a4737 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -3,7 +3,7 @@ import { html, TemplateResult } from "lit";
 import { createDelayer } from "utilities";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { ref } from "lit/directives/ref.js";
-import { FilterCollectionElement, Label } from "components/search/filter_collection_element";
+import { FilterCollection, FilterCollectionElement, Label } from "components/search/filter_collection_element";
 import { searchQueryState } from "state/SearchQuery";
 import { search } from "search";
 import { DodonaElement } from "components/meta/dodona_element";
@@ -83,7 +83,7 @@ export class SearchField extends DodonaElement {
     @property({ type: Boolean })
     eager: boolean;
     @property( { type: Array })
-    filterCollections: Record<string, { data: Label[], multi: boolean, paramVal: (l: Label) => string, param: string }>;
+    filterCollections: Record<string, FilterCollection>;
 
     @property({ state: true })
     filter?: string = "";
@@ -171,7 +171,6 @@ export class SearchField extends DodonaElement {
                         .labels=${c.data}
                         .type=${type}
                         .filter=${this.filter}
-                        .paramVal=${c.paramVal}
                         .param=${c.param}
                         .multi=${c.multi}
                         .index=${i}
diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index 184550dd9e..734223ebeb 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -66,7 +66,6 @@ export class SearchTokens extends DodonaElement {
                 <d-search-token
                     .labels=${c.data}
                     .color=${c.color}
-                    .paramVal=${c.paramVal}
                     .param=${c.param}
                     .multi=${c.multi}
                 >
diff --git a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
index ed95745cf4..d014f0b1e3 100644
--- a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
+++ b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
@@ -17,15 +17,13 @@ import { watchMixin } from "components/meta/watch_mixin";
 export class StandaloneDropdownFilter extends watchMixin(FilterCollectionElement) {
     @property()
     multi = false;
-    @property()
-    paramVal = (label: Label): string => label.id.toString();
     @property({ type: String })
     default;
 
     watch = {
         default: () => {
             if (this.getSelectedLabels().length === 0) {
-                this.select(this.labels.find(label => this.paramVal(label) === this.default));
+                this.select(this.labels.find(label => label.id === this.default));
             }
         }
     };
diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index 7f1ade7397..513ecec442 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -33,159 +33,122 @@
         <% if local_assigns.fetch :labels, false %>
         filterCollections["labels"] = {
             param: "labels",
-            paramVal: function(l) { return l.name.toString(); },
             multi: true,
-            data: <%= raw render template: 'labels/index', formats: :json %>,
+            data: <%= raw @labels.map { |l| {id: l.name.to_s, name: l.name.to_s}}.to_json %>,
             color: "purple"
         };
         <% end %>
         <% if local_assigns.fetch :programming_languages, false %>
         filterCollections["programming_languages"] = {
             param: "programming_language",
-            paramVal: function(p) { return p.name.toString(); },
             multi: false,
-            data: <%= raw render template: 'programming_languages/index', formats: :json %>,
+            data: <%= raw @programming_languages.map { |l| {id: l.name.to_s, name: l.name.to_s}}.to_json %>,
             color: "red",
         };
         <% end %>
         <% if local_assigns.fetch :repositories, false %>
         filterCollections["repositories"] = {
             param: "repository_id",
-            paramVal: function(r) { return r.id.toString(); },
             multi: false,
-            data: <%= raw render template: 'repositories/index', formats: :json %>,
+            data: <%= raw @repositories.map { |l| {id: l.id.to_s, name: l.name.to_s}}.to_json %>,
             color: "blue-gray",
         };
         <% end %>
         <% if local_assigns.fetch(:institutions, []).length > 1 %>
         filterCollections["institutions"] = {
             param: "institution_id",
-            paramVal: function(i) { return i.id.toString(); },
             multi: false,
-            data: <%= raw local_assigns.fetch(:institutions, []).map{|i| {id: i.id, name: i.name}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:institutions, []).map{|i| {id: i.id.to_s, name: i.name.to_s}}.to_json %>,
             color: "pink",
         };
         <% end %>
         <% if local_assigns.fetch :course_labels, false %>
         filterCollections["course_labels"] = {
             param: "course_labels",
-            paramVal: function (cl) {
-                return cl.name.toString();
-            },
             multi: true,
-            data: <%= raw local_assigns.fetch(:course_labels, []).map{|cl| {id: cl.id, name: cl.name}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:course_labels, []).map{|cl| {id: cl.name.to_s, name: cl.name.to_s}}.to_json %>,
             color: "orange",
         };
         <% end %>
         <% if local_assigns.fetch :statuses, false %>
         filterCollections["statuses"] = {
             param: "status",
-            paramVal: function (s) {
-                return s.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:statuses, []).map{|s| {id: s, name: Submission.human_enum_name(:status, s)}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:statuses, []).map{|s| {id: s.to_s, name: Submission.human_enum_name(:status, s)}}.to_json %>,
             color: "indigo",
         };
         <% end %>
         <% if local_assigns.fetch :question_states, false %>
         filterCollections["question_states"] = {
             param: "question_state",
-            paramVal: function (s) {
-                return s.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:question_states, []).map{|s| {id: s, name: Question.human_enum_name(:question_state, s)}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:question_states, []).map{|s| {id: s.to_s, name: Question.human_enum_name(:question_state, s)}}.to_json %>,
             color: "indigo",
         };
         <% end %>
         <% if local_assigns.fetch :event_types, false %>
         filterCollections["event_types"] = {
             param: "type",
-            paramVal: function (s) {
-                return s.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:event_types, []).map{|s| {id: s, name: Event.human_enum_name(:event_type, s)}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:event_types, []).map{|s| {id: s.to_s, name: Event.human_enum_name(:event_type, s)}}.to_json %>,
             color: "deep-purple",
         };
         <% end %>
         <% if local_assigns.fetch :activity_types, false %>
         filterCollections["activity_types"] = {
             param: "type",
-            paramVal: function (s) {
-                return s.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:activity_types, []).map{|s| {id: s.name, name: s.model_name.human}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:activity_types, []).map{|s| {id: s.name.to_s, name: s.model_name.human}}.to_json %>,
             color: "deep-purple",
         };
         <% end %>
         <% if local_assigns.fetch :description_languages, false %>
         filterCollections["description_languages"] = {
             param: "description_languages",
-            paramVal: function (lang) {
-                return lang.id.toString();
-            },
             multi: true,
-            data: <%= raw local_assigns.fetch(:description_languages, []).map{|l| {id: l, name: t("js.#{l}")}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:description_languages, []).map{|l| {id: l.to_s, name: t("js.#{l}")}}.to_json %>,
             color: "orange",
         };
         <% end %>
         <% if local_assigns.fetch :judges, false %>
         filterCollections["judges"] = {
             param: "judge_id",
-            paramVal: function(judge) {
-                return judge.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:judges, []).map{|judge| {id: judge.id, name: "#{judge.name}-judge"}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:judges, []).map{|judge| {id: judge.id.to_s, name: "#{judge.name}-judge"}}.to_json %>,
             color: "red",
         }
         <% end %>
         <% if local_assigns.fetch :courses, false %>
         filterCollections["courses"] = {
             param: "course_id",
-            paramVal: function(course) {
-                return course.id.toString();
-            },
             multi: false,
-            data: <%= raw local_assigns.fetch(:courses, []).map{|course| {id: course.id, name: "#{course.name} (#{course.formatted_year})"}}.to_json %>,
+            data: <%= raw local_assigns.fetch(:courses, []).map{|course| {id: course.id.to_s, name: "#{course.name} (#{course.formatted_year})"}}.to_json %>,
             color: "orange"
         };
         <% end %>
         <% if local_assigns.fetch :exercises, false %>
         filterCollections["exercises"] = {
           param: "exercise_id",
-          paramVal: function(exercise) {
-            return exercise.id.toString();
-          },
           multi: false,
-          data: <%= raw local_assigns.fetch(:exercises, []).map{|exercise| {id: exercise.id, name: exercise.name}}.to_json %>,
+          data: <%= raw local_assigns.fetch(:exercises, []).map{|exercise| {id: exercise.id.to_s, name: exercise.name}}.to_json %>,
           color: "blue-gray"
         };
         <% end %>
         <% if local_assigns.fetch :popularity, false %>
             filterCollections["popularity"] = {
               param: "popularity",
-              paramVal: function (s) {
-                return s.id.toString();
-              },
               multi: true,
-              data: <%= raw local_assigns.fetch(:popularity, []).map{|s| {id: s, name: Activity.human_enum_name(:popularity, s)}}.to_json %>,
+              data: <%= raw local_assigns.fetch(:popularity, []).map{|s| {id: s.to_s, name: Activity.human_enum_name(:popularity, s)}}.to_json %>,
               color: "pink",
             };
         <% end %>
       <% if local_assigns.fetch :draft, false %>
         filterCollections["draft"] = {
           param: "draft",
-          paramVal: function (s) {
-            return s.id.toString();
-          },
           multi: false,
           data: [
-            {id: true, name: "<%= t("activities.index.filters.draft") %>"},
-            {id: false, name: "<%= t("activities.index.filters.not_draft") %>"}
+            {id: "true", name: "<%= t("activities.index.filters.draft") %>"},
+            {id: "false", name: "<%= t("activities.index.filters.not_draft") %>"}
           ],
           color: "indigo",
         };

From 84872dce567298b38955f9c9117fdbeba1503144 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 4 Apr 2024 14:29:28 +0200
Subject: [PATCH 03/72] Pass through filter collection objects

---
 .../components/search/dropdown_filter.ts      | 12 ++-----
 .../search/filter_collection_element.ts       | 31 ++++++++++++-------
 .../components/search/search_field.ts         |  9 ++----
 .../components/search/search_option.ts        |  1 -
 .../components/search/search_token.ts         | 16 ++--------
 .../search/standalone-dropdown-filter.ts      |  6 ++--
 app/views/pages/home.html.erb                 |  6 ++--
 7 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index b73aacf8e9..305c19f9be 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -15,16 +15,11 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-dropdown-filter
  *
- * @prop {AccentColor} color - the color associated with the filter
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
- * @prop {string} param - the searchQuery param to be used for this filter
- * @prop {boolean} multi - whether one or more labels can be selected at the same time
- * @prop {[Label]} labels - all labels that could potentially be selected
+ * @prop {FilterCollection} filterCollection - the filter collection for which the dropdown should be displayed
  */
 @customElement("d-dropdown-filter")
 export class DropdownFilter extends FilterCollectionElement {
-    @property({ type: String })
-    color: AccentColor;
     @property()
     type: string;
 
@@ -94,10 +89,7 @@ export class DropdownFilters extends DodonaElement {
         return html`
             ${this.filterCollections.map(([type, c]) => html`
                 <d-dropdown-filter
-                    .labels=${c.data}
-                    .color=${c.color}
-                    .param=${c.param}
-                    .multi=${c.multi}
+                    .filterCollection=${c}
                     .type=${type}
                 >
                 </d-dropdown-filter>
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_collection_element.ts
index 8d832075c8..4a12bd543f 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_collection_element.ts
@@ -7,7 +7,7 @@ export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" |
 export type FilterCollection = {
     data: Label[],
     multi: boolean,
-    color: AccentColor,
+    color?: AccentColor,
     param: string
 };
 
@@ -16,18 +16,27 @@ export type FilterCollection = {
  * The class manages selection and deselection of filter labels
  * It interacts with the searchQuery using the listener paradigm to keep the selected filters up to date
  *
- * @prop {string} param - the searchQuery param to be used for this filter
- * @prop {boolean} multi - whether one or more labels can be selected at the same time
- * @prop {function(Label): string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
- * @prop {[Label]} labels - all labels that could potentially be selected
+ * @prop {FilterCollection} filterCollection - the filter collection to be displayed
  */
 export class FilterCollectionElement extends DodonaElement {
-    @property()
-    param: string;
-    @property({ type: Boolean })
-    multi: boolean;
-    @property({ type: Array })
-    labels: Array<Label> = [];
+    @property({ type: Object, attribute: "filter-collection" })
+    filterCollection: FilterCollection;
+
+    get param(): string {
+        return this.filterCollection.param;
+    }
+
+    get multi(): boolean {
+        return this.filterCollection.multi;
+    }
+
+    get labels(): Label[] {
+        return this.filterCollection.data;
+    }
+
+    get color(): AccentColor | undefined {
+        return this.filterCollection.color;
+    }
 
     update(changedProperties: Map<string, unknown>): void {
         if ((changedProperties.has("param") || changedProperties.has("multi")) &&
diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index 28773a4737..75adfc89f5 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -17,10 +17,7 @@ import { i18n } from "i18n/i18n";
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} filter - The string for which typeahead suggestions should be provided
  * @prop {number} index - bookkeeping param to remember the order across multiple elements
- * @prop {string} param - the searchQuery param to be used for this filter
- * @prop {boolean} multi - whether one or more labels can be selected at the same time
- * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
- * @prop {[Label]} labels - all labels that could potentially be selected
+ * @prop { FilterCollection } filterCollection - the filter collection for which the dropdown should be displayed
  */
 @customElement("d-search-field-suggestion")
 export class SearchFieldSuggestion extends FilterCollectionElement {
@@ -168,11 +165,9 @@ export class SearchField extends DodonaElement {
             <ul class="dropdown-menu ${this.filter && this.hasSuggestions ? "show-search-dropdown" : ""}">
                 ${Object.entries(this.filterCollections).map(([type, c], i) => html`
                     <d-search-field-suggestion
-                        .labels=${c.data}
                         .type=${type}
                         .filter=${this.filter}
-                        .param=${c.param}
-                        .multi=${c.multi}
+                        .filterCollection=${c}
                         .index=${i}
                         ${ref(this.suggestionFieldChanged)}
                     >
diff --git a/app/assets/javascripts/components/search/search_option.ts b/app/assets/javascripts/components/search/search_option.ts
index 5b57a878c6..cf27df7663 100644
--- a/app/assets/javascripts/components/search/search_option.ts
+++ b/app/assets/javascripts/components/search/search_option.ts
@@ -2,7 +2,6 @@ import { customElement, property } from "lit/decorators.js";
 import { DodonaElement } from "components/meta/dodona_element";
 import { searchQueryState } from "state/SearchQuery";
 import { html, TemplateResult } from "lit";
-import { i18n } from "i18n/i18n";
 
 export type Option = {param: string, label: string};
 
diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index 734223ebeb..50b192906e 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -14,17 +14,10 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-search-token
  *
- * @prop {AccentColor} color - the color associated with the filter
- * @prop {string} param - the searchQuery param to be used for this filter
- * @prop {boolean} multi - whether one or more labels can be selected at the same time
- * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
- * @prop {[Label]} labels - all labels that could potentially be selected
- */
+ * @prop {FilterCollection} filterCollection - the filter collection for which the tokens should be displayed
+ **/
 @customElement("d-search-token")
 export class SearchToken extends FilterCollectionElement {
-    @property({ type: String })
-    color: AccentColor;
-
     processClick(e: Event, label: Label): void {
         this.unSelect(label);
         e.preventDefault();
@@ -64,10 +57,7 @@ export class SearchTokens extends DodonaElement {
         return html`
             ${Object.values(this.filterCollections).map(c => html`
                 <d-search-token
-                    .labels=${c.data}
-                    .color=${c.color}
-                    .param=${c.param}
-                    .multi=${c.multi}
+                    .filterCollection=${c}
                 >
                 </d-search-token>
             `)}
diff --git a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
index d014f0b1e3..ed3ed08f18 100644
--- a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
+++ b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
@@ -15,11 +15,13 @@ import { watchMixin } from "components/meta/watch_mixin";
  */
 @customElement("d-standalone-dropdown-filter")
 export class StandaloneDropdownFilter extends watchMixin(FilterCollectionElement) {
-    @property()
-    multi = false;
     @property({ type: String })
     default;
 
+    get multi(): boolean {
+        return false;
+    }
+
     watch = {
         default: () => {
             if (this.getSelectedLabels().length === 0) {
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
index 9f608d88d1..888e157f32 100644
--- a/app/views/pages/home.html.erb
+++ b/app/views/pages/home.html.erb
@@ -23,8 +23,10 @@
         <div class="page-subtitle justify-content-between">
           <h3><%= t('.courses') %></h3>
           <d-standalone-dropdown-filter class="mt-2"
-                                        param="year"
-                                        labels="<%= @years.map { |y| { id: y, name: Course.format_year(y) } }.to_json %>"
+                                        filter-collection="<%= {
+                                                                 param: 'year',
+                                                                 data: @years.map { |y| { id: y, name: Course.format_year(y) } }
+                                                               }.to_json %>"
                                         default="<%= @year %>">
           </d-standalone-dropdown-filter>
         </div>

From 0447296fa262aebcf22f3751d06934dcb680d930 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 4 Apr 2024 14:31:12 +0200
Subject: [PATCH 04/72] Revert "Pass through filter collection objects"

This reverts commit 84872dce567298b38955f9c9117fdbeba1503144.
---
 .../components/search/dropdown_filter.ts      | 12 +++++--
 .../search/filter_collection_element.ts       | 31 +++++++------------
 .../components/search/search_field.ts         |  9 ++++--
 .../components/search/search_option.ts        |  1 +
 .../components/search/search_token.ts         | 16 ++++++++--
 .../search/standalone-dropdown-filter.ts      |  6 ++--
 app/views/pages/home.html.erb                 |  6 ++--
 7 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index 305c19f9be..b73aacf8e9 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -15,11 +15,16 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-dropdown-filter
  *
+ * @prop {AccentColor} color - the color associated with the filter
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
- * @prop {FilterCollection} filterCollection - the filter collection for which the dropdown should be displayed
+ * @prop {string} param - the searchQuery param to be used for this filter
+ * @prop {boolean} multi - whether one or more labels can be selected at the same time
+ * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-dropdown-filter")
 export class DropdownFilter extends FilterCollectionElement {
+    @property({ type: String })
+    color: AccentColor;
     @property()
     type: string;
 
@@ -89,7 +94,10 @@ export class DropdownFilters extends DodonaElement {
         return html`
             ${this.filterCollections.map(([type, c]) => html`
                 <d-dropdown-filter
-                    .filterCollection=${c}
+                    .labels=${c.data}
+                    .color=${c.color}
+                    .param=${c.param}
+                    .multi=${c.multi}
                     .type=${type}
                 >
                 </d-dropdown-filter>
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_collection_element.ts
index 4a12bd543f..8d832075c8 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_collection_element.ts
@@ -7,7 +7,7 @@ export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" |
 export type FilterCollection = {
     data: Label[],
     multi: boolean,
-    color?: AccentColor,
+    color: AccentColor,
     param: string
 };
 
@@ -16,27 +16,18 @@ export type FilterCollection = {
  * The class manages selection and deselection of filter labels
  * It interacts with the searchQuery using the listener paradigm to keep the selected filters up to date
  *
- * @prop {FilterCollection} filterCollection - the filter collection to be displayed
+ * @prop {string} param - the searchQuery param to be used for this filter
+ * @prop {boolean} multi - whether one or more labels can be selected at the same time
+ * @prop {function(Label): string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
+ * @prop {[Label]} labels - all labels that could potentially be selected
  */
 export class FilterCollectionElement extends DodonaElement {
-    @property({ type: Object, attribute: "filter-collection" })
-    filterCollection: FilterCollection;
-
-    get param(): string {
-        return this.filterCollection.param;
-    }
-
-    get multi(): boolean {
-        return this.filterCollection.multi;
-    }
-
-    get labels(): Label[] {
-        return this.filterCollection.data;
-    }
-
-    get color(): AccentColor | undefined {
-        return this.filterCollection.color;
-    }
+    @property()
+    param: string;
+    @property({ type: Boolean })
+    multi: boolean;
+    @property({ type: Array })
+    labels: Array<Label> = [];
 
     update(changedProperties: Map<string, unknown>): void {
         if ((changedProperties.has("param") || changedProperties.has("multi")) &&
diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index 75adfc89f5..28773a4737 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -17,7 +17,10 @@ import { i18n } from "i18n/i18n";
  * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} filter - The string for which typeahead suggestions should be provided
  * @prop {number} index - bookkeeping param to remember the order across multiple elements
- * @prop { FilterCollection } filterCollection - the filter collection for which the dropdown should be displayed
+ * @prop {string} param - the searchQuery param to be used for this filter
+ * @prop {boolean} multi - whether one or more labels can be selected at the same time
+ * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
+ * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-search-field-suggestion")
 export class SearchFieldSuggestion extends FilterCollectionElement {
@@ -165,9 +168,11 @@ export class SearchField extends DodonaElement {
             <ul class="dropdown-menu ${this.filter && this.hasSuggestions ? "show-search-dropdown" : ""}">
                 ${Object.entries(this.filterCollections).map(([type, c], i) => html`
                     <d-search-field-suggestion
+                        .labels=${c.data}
                         .type=${type}
                         .filter=${this.filter}
-                        .filterCollection=${c}
+                        .param=${c.param}
+                        .multi=${c.multi}
                         .index=${i}
                         ${ref(this.suggestionFieldChanged)}
                     >
diff --git a/app/assets/javascripts/components/search/search_option.ts b/app/assets/javascripts/components/search/search_option.ts
index cf27df7663..5b57a878c6 100644
--- a/app/assets/javascripts/components/search/search_option.ts
+++ b/app/assets/javascripts/components/search/search_option.ts
@@ -2,6 +2,7 @@ import { customElement, property } from "lit/decorators.js";
 import { DodonaElement } from "components/meta/dodona_element";
 import { searchQueryState } from "state/SearchQuery";
 import { html, TemplateResult } from "lit";
+import { i18n } from "i18n/i18n";
 
 export type Option = {param: string, label: string};
 
diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index 50b192906e..734223ebeb 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -14,10 +14,17 @@ import { DodonaElement } from "components/meta/dodona_element";
  *
  * @element d-search-token
  *
- * @prop {FilterCollection} filterCollection - the filter collection for which the tokens should be displayed
- **/
+ * @prop {AccentColor} color - the color associated with the filter
+ * @prop {string} param - the searchQuery param to be used for this filter
+ * @prop {boolean} multi - whether one or more labels can be selected at the same time
+ * @prop {(l: Label) => string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
+ * @prop {[Label]} labels - all labels that could potentially be selected
+ */
 @customElement("d-search-token")
 export class SearchToken extends FilterCollectionElement {
+    @property({ type: String })
+    color: AccentColor;
+
     processClick(e: Event, label: Label): void {
         this.unSelect(label);
         e.preventDefault();
@@ -57,7 +64,10 @@ export class SearchTokens extends DodonaElement {
         return html`
             ${Object.values(this.filterCollections).map(c => html`
                 <d-search-token
-                    .filterCollection=${c}
+                    .labels=${c.data}
+                    .color=${c.color}
+                    .param=${c.param}
+                    .multi=${c.multi}
                 >
                 </d-search-token>
             `)}
diff --git a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
index ed3ed08f18..d014f0b1e3 100644
--- a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
+++ b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
@@ -15,13 +15,11 @@ import { watchMixin } from "components/meta/watch_mixin";
  */
 @customElement("d-standalone-dropdown-filter")
 export class StandaloneDropdownFilter extends watchMixin(FilterCollectionElement) {
+    @property()
+    multi = false;
     @property({ type: String })
     default;
 
-    get multi(): boolean {
-        return false;
-    }
-
     watch = {
         default: () => {
             if (this.getSelectedLabels().length === 0) {
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
index 888e157f32..9f608d88d1 100644
--- a/app/views/pages/home.html.erb
+++ b/app/views/pages/home.html.erb
@@ -23,10 +23,8 @@
         <div class="page-subtitle justify-content-between">
           <h3><%= t('.courses') %></h3>
           <d-standalone-dropdown-filter class="mt-2"
-                                        filter-collection="<%= {
-                                                                 param: 'year',
-                                                                 data: @years.map { |y| { id: y, name: Course.format_year(y) } }
-                                                               }.to_json %>"
+                                        param="year"
+                                        labels="<%= @years.map { |y| { id: y, name: Course.format_year(y) } }.to_json %>"
                                         default="<%= @year %>">
           </d-standalone-dropdown-filter>
         </div>

From b7a03dc86e30ee06c12d6e82f55b65feb666be44 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 5 Apr 2024 12:06:54 +0200
Subject: [PATCH 05/72] create flecible count by filters

---
 app/models/activity.rb            | 10 +++++-----
 app/models/concerns/filterable.rb | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 53f51ba712..394add0216 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -76,12 +76,12 @@ class Activity < ApplicationRecord
   scope :in_repository, ->(repository) { where repository: repository }
 
   scope :by_name, ->(name) { where('name_nl LIKE ? OR name_en LIKE ? OR path LIKE ?', "%#{name}%", "%#{name}%", "%#{name}%") }
-  scope :by_status, ->(status) { where(status: status.in?(statuses) ? status : -1) }
-  scope :by_access, ->(access) { where(access: access.in?(accesses) ? access : -1) }
+  filterable_by :status, value_check: ->(value) { value.in? statuses }
+  filterable_by :access, value_check: ->(value) { value.in? accesses }
+  filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
+  filterable_by :type
+  filterable_by :judge, column: 'judge_id'
   scope :by_labels, ->(labels) { includes(:labels).where(labels: { name: labels }).group(:id).having('COUNT(DISTINCT(activity_labels.label_id)) = ?', labels.uniq.length) }
-  scope :by_programming_language, ->(programming_language) { includes(:programming_language).where(programming_languages: { name: programming_language }) }
-  scope :by_type, ->(type) { where(type: type) }
-  scope :by_judge, ->(judge) { where(judge_id: judge) }
   scope :is_draft, ->(value = true) { where(draft: value) }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 1890741021..37efd88159 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -5,4 +5,29 @@ module Filterable
     before_save :set_search
     scope :by_filter, ->(filter) { filter.split.map(&:strip).select(&:present?).inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
   end
+
+  class_methods do
+    # Creates a scope for the column, with the name `by_#{column}`
+    # It also creates a method `count_by_#{column}` that returns the count, by unique value, for the column
+    # params:
+    # +name+:: The name of the scope
+    # +column+:: The column to create the scope for
+    # +associations+:: The associations to include in the scope
+    # +valueCheck+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
+    def filterable_by(name, column: name, associations: [], value_check: ->(value) { true })
+      scope "by_#{name}", lambda { |value|
+        if value_check.call(value)
+          includes(associations).where(column => value)
+        else
+          none
+        end
+      }
+
+      define_singleton_method("count_by_#{name}") do
+        group(column).count
+      end
+
+
+    end
+  end
 end

From bf8764c01cfc0d1c22b220853ae3a4a5c7ea14e6 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 5 Apr 2024 13:00:21 +0200
Subject: [PATCH 06/72] Return named filter info

---
 app/models/activity.rb            |  4 ++--
 app/models/concerns/filterable.rb | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 394add0216..cac0563cd9 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -79,8 +79,8 @@ class Activity < ApplicationRecord
   filterable_by :status, value_check: ->(value) { value.in? statuses }
   filterable_by :access, value_check: ->(value) { value.in? accesses }
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
-  filterable_by :type
-  filterable_by :judge, column: 'judge_id'
+  filterable_by :type, name_hash: -> { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
+  filterable_by :judge, column: 'judge_id', name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
   scope :by_labels, ->(labels) { includes(:labels).where(labels: { name: labels }).group(:id).having('COUNT(DISTINCT(activity_labels.label_id)) = ?', labels.uniq.length) }
   scope :is_draft, ->(value = true) { where(draft: value) }
   scope :by_description_languages, lambda { |languages|
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 37efd88159..822152fba0 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -8,13 +8,14 @@ module Filterable
 
   class_methods do
     # Creates a scope for the column, with the name `by_#{column}`
-    # It also creates a method `count_by_#{column}` that returns the count, by unique value, for the column
+    # It also creates a method `#{column}_filter_options` that returns the possible values for the column, with the count of each value
     # params:
     # +name+:: The name of the scope
     # +column+:: The column to create the scope for
     # +associations+:: The associations to include in the scope
-    # +valueCheck+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
-    def filterable_by(name, column: name, associations: [], value_check: ->(value) { true })
+    # +value_check+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
+    # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
+    def filterable_by(name, column: name, associations: [], value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
       scope "by_#{name}", lambda { |value|
         if value_check.call(value)
           includes(associations).where(column => value)
@@ -23,10 +24,12 @@ def filterable_by(name, column: name, associations: [], value_check: ->(value) {
         end
       }
 
-      define_singleton_method("count_by_#{name}") do
-        group(column).count
-      end
+      define_singleton_method("#{name}_filter_options") do
+        count = group(column).count
+        names = name_hash.call(count.keys)
 
+        count.map { |key, value| { id: key, name: names[key], count: value } }
+      end
 
     end
   end

From 6f7124989261d1468b1f06ff060d9b28b73b354b Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 5 Apr 2024 13:12:34 +0200
Subject: [PATCH 07/72] Replace autoinclude by class method

---
 app/models/activity.rb            |  5 +----
 app/models/concerns/filterable.rb | 14 +++++++++-----
 app/models/course.rb              |  5 +----
 app/models/user.rb                |  6 ++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index cac0563cd9..85cf2d7d4f 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -76,6 +76,7 @@ class Activity < ApplicationRecord
   scope :in_repository, ->(repository) { where repository: repository }
 
   scope :by_name, ->(name) { where('name_nl LIKE ? OR name_en LIKE ? OR path LIKE ?', "%#{name}%", "%#{name}%", "%#{name}%") }
+  search_by :name_nl, :name_en, :path
   filterable_by :status, value_check: ->(value) { value.in? statuses }
   filterable_by :access, value_check: ->(value) { value.in? accesses }
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
@@ -424,10 +425,6 @@ def safe_destroy
     destroy
   end
 
-  def set_search
-    self.search = "#{Activity.human_enum_name(:status, status, locale: :nl)} #{Activity.human_enum_name(:status, status, locale: :en)} #{Activity.human_enum_name(:access, access, locale: :en)} #{Activity.human_enum_name(:access, access, locale: :nl)} #{name_nl} #{name_en} #{path}"
-  end
-
   def self.parse_type(type)
     return Exercise.name unless type
     return type if types.include?(type)
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 822152fba0..8628bad5c5 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -1,12 +1,16 @@
 module Filterable
   extend ActiveSupport::Concern
 
-  included do
-    before_save :set_search
-    scope :by_filter, ->(filter) { filter.split.map(&:strip).select(&:present?).inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
-  end
-
   class_methods do
+    def search_by(*columns)
+      define_method(:set_search) do
+        self.search = columns.map { |column| send(column) || '' }.join(' ')
+      end
+
+      before_save :set_search
+      scope :by_filter, ->(filter) { filter.split.map(&:strip).select(&:present?).inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
+    end
+
     # Creates a scope for the column, with the name `by_#{column}`
     # It also creates a method `#{column}_filter_options` that returns the possible values for the column, with the count of each value
     # params:
diff --git a/app/models/course.rb b/app/models/course.rb
index 708e4ca7cc..d3d8da2d39 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -161,6 +161,7 @@ class Course < ApplicationRecord
   validate :should_have_institution_when_visible_for_institution
   validate :should_have_institution_when_open_for_institution
 
+  search_by :name, :teacher, :year
   scope :by_name, ->(name) { where('name LIKE ?', "%#{name}%") }
   scope :by_teacher, ->(teacher) { where('teacher LIKE ?', "%#{teacher}%") }
   scope :by_institution, ->(institution) { where(institution: institution) }
@@ -413,10 +414,6 @@ def self.format_year(year)
     year.sub(/ ?- ?/, '–')
   end
 
-  def set_search
-    self.search = "#{teacher || ''} #{name || ''} #{year || ''}"
-  end
-
   def color
     colors = %w[blue-gray orange cyan purple teal pink indigo brown deep-purple]
     colors[year.to_i % colors.size]
diff --git a/app/models/user.rb b/app/models/user.rb
index bc3fc08e4f..f77985b3da 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -136,6 +136,8 @@ class User < ApplicationRecord
 
   accepts_nested_attributes_for :identities, limit: 1
 
+  search_by :username, :first_name, :last_name
+
   scope :by_permission, ->(permission) { where(permission: permission) }
   scope :by_institution, ->(institution) { where(institution: institution) }
 
@@ -384,10 +386,6 @@ def self.from_username_and_institution(username, institution_id)
     find_by(username: username, institution_id: institution_id)
   end
 
-  def set_search
-    self.search = "#{username || ''} #{first_name || ''} #{last_name || ''}"
-  end
-
   # Be careful when using force institution. This expects the providers to be updated externally
   def merge_into(other, force: false, force_institution: false)
     errors.add(:merge, 'User belongs to different institution') if !force_institution && other.institution_id != institution_id && other.institution_id.present? && institution_id.present?

From ab642b651bf458f3af010107d3e6569a975cc658 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 5 Apr 2024 14:13:17 +0200
Subject: [PATCH 08/72] Make filter options available in controller

---
 app/controllers/activities_controller.rb |  8 ++++---
 app/controllers/concerns/has_filter.rb   | 27 ++++++++++++++++++++++++
 app/models/activity.rb                   |  2 +-
 app/models/concerns/filterable.rb        |  4 ++--
 app/views/layouts/_searchbar.html.erb    |  6 +++++-
 5 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 app/controllers/concerns/has_filter.rb

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index d6f81f8d8d..f6015f579d 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -2,6 +2,7 @@ class ActivitiesController < ApplicationController
   include SeriesHelper
   include SetLtiMessage
   include Sortable
+  include HasFilter
 
   INPUT_SERVICE_WORKER = 'inputServiceWorker.js'.freeze
 
@@ -19,13 +20,13 @@ class ActivitiesController < ApplicationController
 
   has_scope :by_filter, as: 'filter'
   has_scope :by_labels, as: 'labels', type: :array, if: ->(this) { this.params[:labels].is_a?(Array) }
-  has_scope :by_programming_language, as: 'programming_language'
-  has_scope :by_type, as: 'type'
   has_scope :in_repository, as: 'repository_id'
   has_scope :by_description_languages, as: 'description_languages', type: :array
-  has_scope :by_judge, as: 'judge_id'
   has_scope :by_popularities, as: 'popularity', type: :array
   has_scope :is_draft, as: 'draft'
+  has_filter :programming_language, 'red'
+  has_filter :type, 'deep-purple'
+  has_filter :judge, 'red'
 
   has_scope :repository_scope, as: 'tab' do |controller, scope, value|
     course = Series.find(controller.params[:id]).course if controller.params[:id]
@@ -74,6 +75,7 @@ def index
     end
 
     unless @activities.empty?
+      @filters = filters(@activities)
       @activities = apply_scopes(@activities)
       @activities = @activities.paginate(page: parse_pagination_param(params[:page]))
     end
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
new file mode 100644
index 0000000000..c3cd4fd368
--- /dev/null
+++ b/app/controllers/concerns/has_filter.rb
@@ -0,0 +1,27 @@
+module HasFilter
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def has_filter(name, color, multi: false)
+      if multi
+        has_scope "by_#{name}", as: name, type: :array
+      else
+        has_scope "by_#{name}", as: name
+      end
+
+      @@filters ||= []
+      @@filters << [name, multi, color]
+    end
+  end
+  def filters(target)
+    @@filters.map do |filter, multi, color|
+      params_without_current = params.except(:controller, :action, :page, filter)
+      {
+        param: filter,
+        data: apply_scopes(target, params_without_current).send("#{filter}_filter_options"),
+        multi: multi,
+        color: color
+      }
+    end
+  end
+end
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 85cf2d7d4f..437061b29d 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -80,7 +80,7 @@ class Activity < ApplicationRecord
   filterable_by :status, value_check: ->(value) { value.in? statuses }
   filterable_by :access, value_check: ->(value) { value.in? accesses }
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
-  filterable_by :type, name_hash: -> { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
+  filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
   filterable_by :judge, column: 'judge_id', name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
   scope :by_labels, ->(labels) { includes(:labels).where(labels: { name: labels }).group(:id).having('COUNT(DISTINCT(activity_labels.label_id)) = ?', labels.uniq.length) }
   scope :is_draft, ->(value = true) { where(draft: value) }
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 8628bad5c5..701eb76d81 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -29,10 +29,10 @@ def filterable_by(name, column: name, associations: [], value_check: ->(value) {
       }
 
       define_singleton_method("#{name}_filter_options") do
-        count = group(column).count
+        count = joins(associations).group(column).count
         names = name_hash.call(count.keys)
 
-        count.map { |key, value| { id: key, name: names[key], count: value } }
+        count.map { |key, value| { id: key.to_s, name: names[key], count: value } }
       end
 
     end
diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index 513ecec442..bb2f35762b 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -29,7 +29,7 @@
 
 <script type="text/javascript">
     dodona.ready.then(function () {
-        const filterCollections = {};
+        let filterCollections = {};
         <% if local_assigns.fetch :labels, false %>
         filterCollections["labels"] = {
             param: "labels",
@@ -154,6 +154,10 @@
         };
       <% end %>
 
+        <% if @filters.present? %>
+          filterCollections = <%= raw @filters.map { |v| [v[:param], v] }.to_h.to_json %>;
+        <% end %>
+
         dodona.search.setRefreshElement("<%= local_assigns.fetch :refresh_element, "" %>");
 
         // load the given localStorageKey if present. This key is used to retrieve the values stored in localStorage

From fb772c470415b53dda1f1a3bf9b071674994e05c Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 18 Apr 2024 14:18:14 +0200
Subject: [PATCH 09/72] Display counts

---
 app/assets/javascripts/components/search/dropdown_filter.ts   | 4 +++-
 .../components/search/filter_collection_element.ts            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index b73aacf8e9..ca53622fd3 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -43,6 +43,7 @@ export class DropdownFilter extends FilterCollectionElement {
         if (this.labels.length === 0) {
             return html``;
         }
+        console.log(this.labels);
 
         return html`
             <div class="dropdown dropdown-filter">
@@ -58,12 +59,13 @@ export class DropdownFilter extends FilterCollectionElement {
                             <input type="text" class="form-control " @input=${e => this.filter = e.target.value} placeholder="${i18n.t("js.dropdown.search")}">
                         </span></li>
                     ` : ""}
-                    ${this.filteredLabels.map(s => html`
+                    ${this.filteredLabels.sort((a, b) => b.count - a.count).map(s => html`
                             <li><span class="dropdown-item-text ">
                                 <div class="form-check">
                                     <input class="form-check-input" type="${this.multi?"checkbox":"radio"}" .checked=${this.isSelected(s)} @click="${() => this.toggle(s)}" id="check-${this.param}-${s.id}">
                                     <label class="form-check-label" for="check-${this.param}-${s.id}">
                                         ${s.name}
+                                        ${s.count ? html`<span class="badge colored-secondary rounded-pill float-end">${s.count}</span>` : ""}
                                     </label>
                                 </div>
                             </span></li>
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_collection_element.ts
index 8d832075c8..7f2dec157d 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_collection_element.ts
@@ -2,7 +2,7 @@ import { property } from "lit/decorators.js";
 import { searchQueryState } from "state/SearchQuery";
 import { DodonaElement } from "components/meta/dodona_element";
 
-export type Label = {id: string, name: string};
+export type Label = {id: string, name: string, count?: number};
 export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" | "teal" | "orange" | "brown" | "blue-gray";
 export type FilterCollection = {
     data: Label[],

From a51f6c26d2bad108ea4cb495faeb4dccc03fadfb Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 11:58:35 +0200
Subject: [PATCH 10/72] Add support for multi filters

---
 app/controllers/activities_controller.rb |  2 +-
 app/controllers/concerns/has_filter.rb   |  7 ++++---
 app/models/activity.rb                   |  2 +-
 app/models/concerns/filterable.rb        | 14 ++++++++------
 bin/server                               |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index f6015f579d..21d5805216 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -19,7 +19,6 @@ class ActivitiesController < ApplicationController
   protect_from_forgery except: %i[media input_service_worker]
 
   has_scope :by_filter, as: 'filter'
-  has_scope :by_labels, as: 'labels', type: :array, if: ->(this) { this.params[:labels].is_a?(Array) }
   has_scope :in_repository, as: 'repository_id'
   has_scope :by_description_languages, as: 'description_languages', type: :array
   has_scope :by_popularities, as: 'popularity', type: :array
@@ -27,6 +26,7 @@ class ActivitiesController < ApplicationController
   has_filter :programming_language, 'red'
   has_filter :type, 'deep-purple'
   has_filter :judge, 'red'
+  has_filter :labels, 'purple', multi: true
 
   has_scope :repository_scope, as: 'tab' do |controller, scope, value|
     course = Series.find(controller.params[:id]).course if controller.params[:id]
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index c3cd4fd368..970c0806d3 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -4,7 +4,7 @@ module HasFilter
   class_methods do
     def has_filter(name, color, multi: false)
       if multi
-        has_scope "by_#{name}", as: name, type: :array
+        has_scope "by_#{name}", as: name, type: :array, if: ->(this) { this.params[name].is_a?(Array) }
       else
         has_scope "by_#{name}", as: name
       end
@@ -15,10 +15,11 @@ def has_filter(name, color, multi: false)
   end
   def filters(target)
     @@filters.map do |filter, multi, color|
-      params_without_current = params.except(:controller, :action, :page, filter)
+      scope_params = params.except(:controller, :action, :page)
+      scope_params = scope_params.except(filter) unless multi
       {
         param: filter,
-        data: apply_scopes(target, params_without_current).send("#{filter}_filter_options"),
+        data: apply_scopes(target, scope_params).send("#{filter}_filter_options"),
         multi: multi,
         color: color
       }
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 437061b29d..7182a9a08f 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -82,7 +82,7 @@ class Activity < ApplicationRecord
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
   filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
   filterable_by :judge, column: 'judge_id', name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
-  scope :by_labels, ->(labels) { includes(:labels).where(labels: { name: labels }).group(:id).having('COUNT(DISTINCT(activity_labels.label_id)) = ?', labels.uniq.length) }
+  filterable_by :labels, multi: true, associations: :labels, column: 'labels.name'
   scope :is_draft, ->(value = true) { where(draft: value) }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 701eb76d81..c43ccde9fc 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -19,22 +19,24 @@ def search_by(*columns)
     # +associations+:: The associations to include in the scope
     # +value_check+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
     # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
-    def filterable_by(name, column: name, associations: [], value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
+    def filterable_by(name, column: name, associations: [], multi: false, value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
       scope "by_#{name}", lambda { |value|
-        if value_check.call(value)
-          includes(associations).where(column => value)
+        if value_check.call(value) && (!multi || value.is_a?(Array))
+          scope = includes(association).where(column => value)
+          scope = scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length) if multi
+          scope
         else
           none
         end
       }
 
       define_singleton_method("#{name}_filter_options") do
-        count = joins(associations).group(column).count
+        count = unscoped.where(id: select(:id)).joins(associations).group(column).count
+
         names = name_hash.call(count.keys)
 
-        count.map { |key, value| { id: key.to_s, name: names[key], count: value } }
+        count.map { |key, value| { id: key.to_s, name: names[key].to_s, count: value } }
       end
-
     end
   end
 end
diff --git a/bin/server b/bin/server
index ce5526cbbd..9f195aec85 100755
--- a/bin/server
+++ b/bin/server
@@ -1,7 +1,7 @@
 #!/bin/bash
 bundle install
 yarn install
-bundle exec rails s -p 3000 &
+#bundle exec rails s -p 3000 &
 bundle exec rails jobs:work &
 yarn build:css --watch &
 NODE_ENV=development yarn build:js --watch

From 8beadd36576c0e1f7fadc354d4a331acf071fbba Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 12:01:49 +0200
Subject: [PATCH 11/72] Fix bug

---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index c43ccde9fc..25b347c59b 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -22,7 +22,7 @@ def search_by(*columns)
     def filterable_by(name, column: name, associations: [], multi: false, value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
       scope "by_#{name}", lambda { |value|
         if value_check.call(value) && (!multi || value.is_a?(Array))
-          scope = includes(association).where(column => value)
+          scope = includes(associations).where(column => value)
           scope = scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length) if multi
           scope
         else

From b7dfa430d017b97159119dcb72d2d2a81df113be Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 13:39:39 +0200
Subject: [PATCH 12/72] fix non standerdize name options

---
 app/controllers/activities_controller.rb | 9 ++-------
 app/models/activity.rb                   | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 21d5805216..2bb1ce3991 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -19,14 +19,14 @@ class ActivitiesController < ApplicationController
   protect_from_forgery except: %i[media input_service_worker]
 
   has_scope :by_filter, as: 'filter'
-  has_scope :in_repository, as: 'repository_id'
   has_scope :by_description_languages, as: 'description_languages', type: :array
   has_scope :by_popularities, as: 'popularity', type: :array
-  has_scope :is_draft, as: 'draft'
   has_filter :programming_language, 'red'
   has_filter :type, 'deep-purple'
   has_filter :judge, 'red'
   has_filter :labels, 'purple', multi: true
+  has_filter :repository, 'blue-gray'
+  has_filter :draft, 'indigo'
 
   has_scope :repository_scope, as: 'tab' do |controller, scope, value|
     course = Series.find(controller.params[:id]).course if controller.params[:id]
@@ -69,11 +69,6 @@ def index
                     policy_scope(Activity).order_by_popularity(:DESC)
                   end
 
-    if params[:repository_id]
-      @repository = Repository.find(params[:repository_id])
-      @activities = @activities.in_repository(@repository)
-    end
-
     unless @activities.empty?
       @filters = filters(@activities)
       @activities = apply_scopes(@activities)
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 7182a9a08f..bb0a625904 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -73,8 +73,6 @@ class Activity < ApplicationRecord
   scope :content_pages, -> { where(type: ContentPage.name) }
   scope :exercises, -> { where(type: Exercise.name) }
 
-  scope :in_repository, ->(repository) { where repository: repository }
-
   scope :by_name, ->(name) { where('name_nl LIKE ? OR name_en LIKE ? OR path LIKE ?', "%#{name}%", "%#{name}%", "%#{name}%") }
   search_by :name_nl, :name_en, :path
   filterable_by :status, value_check: ->(value) { value.in? statuses }
@@ -83,7 +81,8 @@ class Activity < ApplicationRecord
   filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
   filterable_by :judge, column: 'judge_id', name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
   filterable_by :labels, multi: true, associations: :labels, column: 'labels.name'
-  scope :is_draft, ->(value = true) { where(draft: value) }
+  filterable_by :repository, column: 'repository_id', name_hash: ->(values) { Repository.where(id: values).to_h { |r| [r.id, r.name] } }
+  filterable_by :draft, name_hash: ->(values) { { true => I18n.t('activities.index.filters.draft'), false => I18n.t('activities.index.filters.not_draft') } }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
     by_language = by_language.where(description_en_present: true) if languages.include? 'en'

From 95138fe3b446af5bc9ed17cf947bad05a622150e Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 14:17:02 +0200
Subject: [PATCH 13/72] Create custom count functions

---
 app/controllers/activities_controller.rb |  4 ++--
 app/models/activity.rb                   | 26 +++++++++++++++++-------
 test/models/activity_test.rb             | 20 ------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 2bb1ce3991..bfdd1708c6 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -19,14 +19,14 @@ class ActivitiesController < ApplicationController
   protect_from_forgery except: %i[media input_service_worker]
 
   has_scope :by_filter, as: 'filter'
-  has_scope :by_description_languages, as: 'description_languages', type: :array
-  has_scope :by_popularities, as: 'popularity', type: :array
   has_filter :programming_language, 'red'
   has_filter :type, 'deep-purple'
   has_filter :judge, 'red'
   has_filter :labels, 'purple', multi: true
   has_filter :repository, 'blue-gray'
   has_filter :draft, 'indigo'
+  has_filter :popularity, 'pink'
+  has_filter :description_languages, 'orange', multi: true
 
   has_scope :repository_scope, as: 'tab' do |controller, scope, value|
     course = Series.find(controller.params[:id]).course if controller.params[:id]
diff --git a/app/models/activity.rb b/app/models/activity.rb
index bb0a625904..7a149d65b0 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -89,19 +89,31 @@ class Activity < ApplicationRecord
     by_language = by_language.where(description_nl_present: true) if languages.include? 'nl'
     by_language
   }
+  define_singleton_method('description_languages_filter_options') do
+    count_by_description_languages = unscoped.where(id: select(:id)).select(
+      'COUNT(CASE WHEN description_nl_present THEN 1 ELSE NULL END) AS nl',
+      'COUNT(CASE WHEN description_en_present THEN 1 ELSE NULL END) AS en'
+    )
+    count_by_description_languages.first.attributes.except('id').map do |lang, count|
+      { id: lang, name: I18n.t("js.#{lang}"), count: count }
+    end.filter { |lang| lang[:count].positive? }
+  end
   scope :by_popularity, lambda { |popularity|
     thresholds = POPULARITY_THRESHOLDS[popularity.to_sym]
     filtered = where("series_count >= #{thresholds[:min]}")
     filtered = filtered.where("series_count <= #{thresholds[:max]}") if thresholds[:max].present?
     filtered
   }
-  scope :by_popularities, lambda { |popularities|
-    filtered = by_popularity(popularities.first)
-    popularities.drop(1).each do |popularity|
-      filtered = filtered.or(by_popularity(popularity))
-    end
-    filtered
-  }
+  define_singleton_method('popularity_filter_options') do
+    count_by_popularity = unscoped.where(id: select(:id)).select(
+      POPULARITY_THRESHOLDS.map do |popularity, thresholds|
+        "COUNT(CASE WHEN series_count >= #{thresholds[:min]} #{thresholds[:max].present? ? "AND series_count <= #{thresholds[:max]}" : ''} THEN 1 ELSE NULL END) AS #{popularity}"
+      end
+    )
+    count_by_popularity.first.attributes.except('id').map do |popularity, count|
+      { id: popularity, name: human_enum_name(:popularity, popularity), count: count }
+    end.filter { |popularity| popularity[:count].positive? }
+  end
 
   scope :order_by_name, ->(direction) { reorder(Arel.sql("name_#{I18n.locale} IS NULL, name_#{I18n.locale} #{direction}")).order(path: direction) }
   scope :order_by_popularity, ->(direction) { reorder("series_count #{direction}") }
diff --git a/test/models/activity_test.rb b/test/models/activity_test.rb
index 8a0fd4b9a0..1b097232d2 100644
--- a/test/models/activity_test.rb
+++ b/test/models/activity_test.rb
@@ -227,26 +227,6 @@ class ActivityTest < ActiveSupport::TestCase
     assert_equal [very_popular1.id], Activity.by_popularity(:very_popular).pluck(:id)
   end
 
-  test 'should be able to filter by popularity with multiple values' do
-    Activity.delete_all
-    unpopular1 = create :exercise
-    unpopular2 = create :exercise
-    neutral1 = create :exercise
-    popular1 = create :exercise
-    popular2 = create :exercise
-    very_popular1 = create :exercise
-
-    create :series, course: create(:course), exercises: [unpopular2]
-
-    3.times { create :series, course: create(:course), exercises: [neutral1] }
-    12.times { create :series, course: create(:course), exercises: [popular1] }
-    50.times { create :series, course: create(:course), exercises: [popular2] }
-    101.times { create :series, course: create(:course), exercises: [very_popular1] }
-
-    assert_equal [unpopular1.id, unpopular2.id, popular1.id, popular2.id], Activity.by_popularities(%i[unpopular popular]).order_by_popularity('ASC').pluck(:id)
-    assert_equal [neutral1.id, very_popular1.id], Activity.by_popularities(%i[neutral very_popular]).order_by_popularity('ASC').pluck(:id)
-  end
-
   test 'repository mine should filter correctly' do
     repository = create :repository, :git_stubbed
     user = create :staff

From befc03ab92b3ee33a8ac8fa551f4bde57956b367 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 14:52:44 +0200
Subject: [PATCH 14/72] Simplify js

---
 .../components/search/dropdown_filter.ts      | 26 +++++++----------
 .../components/search/filter_collection.ts    | 20 +++++++++++++
 ...ollection_element.ts => filter_element.ts} |  4 +--
 .../components/search/filter_tabs.ts          |  4 +--
 .../components/search/search_field.ts         | 23 ++++++---------
 .../components/search/search_token.ts         | 21 ++++++--------
 .../search/standalone-dropdown-filter.ts      |  4 +--
 app/assets/javascripts/search.ts              |  9 ++++++
 app/views/layouts/_searchbar.html.erb         | 28 +++++--------------
 .../components/search/dropdown_filter.test.ts |  2 +-
 .../components/search/search_field.test.ts    |  4 +--
 .../components/search/search_token.test.ts    |  2 +-
 12 files changed, 74 insertions(+), 73 deletions(-)
 create mode 100644 app/assets/javascripts/components/search/filter_collection.ts
 rename app/assets/javascripts/components/search/{filter_collection_element.ts => filter_element.ts} (97%)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index ca53622fd3..28dd557724 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -1,13 +1,12 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import {
-    FilterCollection,
     Label,
-    FilterCollectionElement,
+    FilterElement,
     AccentColor
-} from "components/search/filter_collection_element";
+} from "components/search/filter_element";
 import { i18n } from "i18n/i18n";
-import { DodonaElement } from "components/meta/dodona_element";
+import { FilterCollection } from "components/search/filter_collection";
 
 /**
  * This component inherits from FilterCollectionElement.
@@ -22,11 +21,9 @@ import { DodonaElement } from "components/meta/dodona_element";
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-dropdown-filter")
-export class DropdownFilter extends FilterCollectionElement {
+export class DropdownFilter extends FilterElement {
     @property({ type: String })
     color: AccentColor;
-    @property()
-    type: string;
 
     @property({ state: true })
     filter = "";
@@ -49,7 +46,7 @@ export class DropdownFilter extends FilterCollectionElement {
             <div class="dropdown dropdown-filter">
                 <a class="token token-bordered" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
                     ${this.getSelectedLabels().map( () => html`<i class="mdi mdi-circle mdi-12 mdi-colored-accent accent-${this.color} left-icon"></i>`)}
-                    ${i18n.t(`js.dropdown.${this.multi?"multi":"single"}.${this.type}`)}
+                    ${i18n.t(`js.search.filter.${this.param}`)}
                     <i class="mdi mdi-chevron-down mdi-18 right-icon"></i>
                 </a>
 
@@ -81,26 +78,23 @@ export class DropdownFilter extends FilterCollectionElement {
  *
  * @element d-dropdown-filters
  *
- * @prop {[string, FilterCollection][]} filterCollections - the list of filterCollections for which a dropdown should be displayed
+ * @prop {FilterOptions[]} filters - the list of filterOptions for which a dropdown should be displayed
+ * @prop {string[]} hide - the list of filter params that should be hidden
  */
 @customElement("d-dropdown-filters")
-export class DropdownFilters extends DodonaElement {
-    @property( { type: Array })
-    filterCollections: [string, FilterCollection][];
-
+export class DropdownFilters extends FilterCollection {
     render(): TemplateResult {
-        if (!this.filterCollections) {
+        if (!this.visibleFilters) {
             return html``;
         }
 
         return html`
-            ${this.filterCollections.map(([type, c]) => html`
+            ${this.visibleFilters.map(c => html`
                 <d-dropdown-filter
                     .labels=${c.data}
                     .color=${c.color}
                     .param=${c.param}
                     .multi=${c.multi}
-                    .type=${type}
                 >
                 </d-dropdown-filter>
             `)}
diff --git a/app/assets/javascripts/components/search/filter_collection.ts b/app/assets/javascripts/components/search/filter_collection.ts
new file mode 100644
index 0000000000..b88a00b718
--- /dev/null
+++ b/app/assets/javascripts/components/search/filter_collection.ts
@@ -0,0 +1,20 @@
+import { DodonaElement } from "components/meta/dodona_element";
+import { property } from "lit/decorators.js";
+import { FilterOptions } from "components/search/filter_element";
+import { search } from "search";
+
+export class FilterCollection extends DodonaElement {
+    @property({ type: Array })
+    filters: FilterOptions[] = [];
+    @property({ type: Array })
+    hide: string[] = [];
+
+    constructor() {
+        super();
+        search.filterCollections.push(this);
+    }
+
+    get visibleFilters(): FilterOptions[] {
+        return this.filters.filter(f => !this.hide.includes(f.param));
+    }
+}
diff --git a/app/assets/javascripts/components/search/filter_collection_element.ts b/app/assets/javascripts/components/search/filter_element.ts
similarity index 97%
rename from app/assets/javascripts/components/search/filter_collection_element.ts
rename to app/assets/javascripts/components/search/filter_element.ts
index 7f2dec157d..d644b437e2 100644
--- a/app/assets/javascripts/components/search/filter_collection_element.ts
+++ b/app/assets/javascripts/components/search/filter_element.ts
@@ -4,7 +4,7 @@ import { DodonaElement } from "components/meta/dodona_element";
 
 export type Label = {id: string, name: string, count?: number};
 export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" | "teal" | "orange" | "brown" | "blue-gray";
-export type FilterCollection = {
+export type FilterOptions = {
     data: Label[],
     multi: boolean,
     color: AccentColor,
@@ -21,7 +21,7 @@ export type FilterCollection = {
  * @prop {function(Label): string} paramVal - a function that extracts the value that should be used in a searchQuery for a selected label
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
-export class FilterCollectionElement extends DodonaElement {
+export class FilterElement extends DodonaElement {
     @property()
     param: string;
     @property({ type: Boolean })
diff --git a/app/assets/javascripts/components/search/filter_tabs.ts b/app/assets/javascripts/components/search/filter_tabs.ts
index b6bc4523f3..a3a5575cf5 100644
--- a/app/assets/javascripts/components/search/filter_tabs.ts
+++ b/app/assets/javascripts/components/search/filter_tabs.ts
@@ -1,6 +1,6 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { FilterCollectionElement, Label } from "components/search/filter_collection_element";
+import { FilterElement, Label } from "components/search/filter_element";
 import { watchMixin } from "components/meta/watch_mixin";
 
 type TabInfo = {id: string, name: string, title?: string, count?: number};
@@ -14,7 +14,7 @@ type TabInfo = {id: string, name: string, title?: string, count?: number};
  * @prop {{id: string, name: string, title: string}[]} labels - all labels that could potentially be selected
  */
 @customElement("d-filter-tabs")
-export class FilterTabs extends watchMixin(FilterCollectionElement) {
+export class FilterTabs extends watchMixin(FilterElement) {
     @property()
     multi = false;
     @property()
diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index 28773a4737..6852405667 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -3,18 +3,17 @@ import { html, TemplateResult } from "lit";
 import { createDelayer } from "utilities";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { ref } from "lit/directives/ref.js";
-import { FilterCollection, FilterCollectionElement, Label } from "components/search/filter_collection_element";
+import { FilterElement, Label } from "components/search/filter_element";
 import { searchQueryState } from "state/SearchQuery";
 import { search } from "search";
-import { DodonaElement } from "components/meta/dodona_element";
 import { i18n } from "i18n/i18n";
+import { FilterCollection } from "components/search/filter_collection";
 /**
  * This component inherits from FilterCollectionElement.
  * It represents a list of filters to be used in a dropdown as typeahead suggestions
  *
  * @element d-search-field-suggestion
  *
- * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} filter - The string for which typeahead suggestions should be provided
  * @prop {number} index - bookkeeping param to remember the order across multiple elements
  * @prop {string} param - the searchQuery param to be used for this filter
@@ -23,9 +22,7 @@ import { i18n } from "i18n/i18n";
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-search-field-suggestion")
-export class SearchFieldSuggestion extends FilterCollectionElement {
-    @property()
-    type: string;
+export class SearchFieldSuggestion extends FilterElement {
     @property()
     filter: string;
     @property({ type: Number })
@@ -54,7 +51,7 @@ export class SearchFieldSuggestion extends FilterCollectionElement {
     render(): TemplateResult {
         return this.getFilteredLabels().length == 0 ? html`` : html`
             <li>
-                <h6 class='dropdown-header'>${i18n.t(`js.${this.type}`)}</h6>
+                <h6 class='dropdown-header'>${i18n.t(`js.search.filter.${this.param}`)}</h6>
             </li>
             ${ this.getFilteredLabels().map( label => html`
                 <li><a class="dropdown-item" href="#" @click=${e => this.handleClick(e, label)}>
@@ -73,17 +70,16 @@ export class SearchFieldSuggestion extends FilterCollectionElement {
  *
  * @prop {string} placeholder - The placeholder text for an empty searchfield
  * @prop {boolean} eager - if true a search will be run before user input happens
- * @prop {Record<string, { data: Label[], multi: boolean, paramVal: (l: Label) => string, param: string }>} filterCollections
+ * @prop {FilterOptions[]} filters - The list of filter lists to be used as search suggestions
+ * @prop {string[]} hide - The list of filter lists to be ignored as search suggestions
  *  - The list of filter lists to be used as search suggestions
  */
 @customElement("d-search-field")
-export class SearchField extends DodonaElement {
+export class SearchField extends FilterCollection {
     @property({ type: String })
     placeholder: string;
     @property({ type: Boolean })
     eager: boolean;
-    @property( { type: Array })
-    filterCollections: Record<string, FilterCollection>;
 
     @property({ state: true })
     filter?: string = "";
@@ -150,7 +146,7 @@ export class SearchField extends DodonaElement {
     }
 
     render(): TemplateResult {
-        if (!this.filterCollections) {
+        if (!this.visibleFilters) {
             return html``;
         }
 
@@ -166,10 +162,9 @@ export class SearchField extends DodonaElement {
                 @keydown=${e => this.keydown(e)}
             />
             <ul class="dropdown-menu ${this.filter && this.hasSuggestions ? "show-search-dropdown" : ""}">
-                ${Object.entries(this.filterCollections).map(([type, c], i) => html`
+                ${this.visibleFilters.map((c, i) => html`
                     <d-search-field-suggestion
                         .labels=${c.data}
-                        .type=${type}
                         .filter=${this.filter}
                         .param=${c.param}
                         .multi=${c.multi}
diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index 734223ebeb..4390b72d68 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -2,11 +2,10 @@ import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import {
     AccentColor,
-    FilterCollection,
-    FilterCollectionElement,
+    FilterElement,
     Label
-} from "components/search/filter_collection_element";
-import { DodonaElement } from "components/meta/dodona_element";
+} from "components/search/filter_element";
+import { FilterCollection } from "components/search/filter_collection";
 
 /**
  * This component inherits from FilterCollectionElement.
@@ -21,7 +20,7 @@ import { DodonaElement } from "components/meta/dodona_element";
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-search-token")
-export class SearchToken extends FilterCollectionElement {
+export class SearchToken extends FilterElement {
     @property({ type: String })
     color: AccentColor;
 
@@ -49,20 +48,18 @@ export class SearchToken extends FilterCollectionElement {
  *
  * @element d-search-tokens
  *
- * @prop {Record<string, FilterCollection>} filterCollections - the filter collections for which tokens should be shown
+ * @prop {FilterOptions[]} filters - the list of filterOptions for which tokens could be created
+ * @prop {string[]} hide - the list of filter params that should never be shown
  */
 @customElement("d-search-tokens")
-export class SearchTokens extends DodonaElement {
-    @property( { type: Array })
-    filterCollections: Record<string, FilterCollection>;
-
+export class SearchTokens extends FilterCollection {
     render(): TemplateResult {
-        if (!this.filterCollections) {
+        if (!this.visibleFilters) {
             return html``;
         }
 
         return html`
-            ${Object.values(this.filterCollections).map(c => html`
+            ${this.visibleFilters.map(c => html`
                 <d-search-token
                     .labels=${c.data}
                     .color=${c.color}
diff --git a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
index d014f0b1e3..4b148b73a6 100644
--- a/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
+++ b/app/assets/javascripts/components/search/standalone-dropdown-filter.ts
@@ -1,5 +1,5 @@
 import { customElement, property } from "lit/decorators.js";
-import { FilterCollectionElement, Label } from "components/search/filter_collection_element";
+import { FilterElement, Label } from "components/search/filter_element";
 import { html, TemplateResult } from "lit";
 import { watchMixin } from "components/meta/watch_mixin";
 
@@ -14,7 +14,7 @@ import { watchMixin } from "components/meta/watch_mixin";
  * @prop {[Label]} labels - all labels that could potentially be selected
  */
 @customElement("d-standalone-dropdown-filter")
-export class StandaloneDropdownFilter extends watchMixin(FilterCollectionElement) {
+export class StandaloneDropdownFilter extends watchMixin(FilterElement) {
     @property()
     multi = false;
     @property({ type: String })
diff --git a/app/assets/javascripts/search.ts b/app/assets/javascripts/search.ts
index 20869e73c3..b3217302cd 100644
--- a/app/assets/javascripts/search.ts
+++ b/app/assets/javascripts/search.ts
@@ -2,6 +2,8 @@ import { createDelayer, fetch, getURLParameter, updateArrayURLParameter, updateU
 import { InactiveTimeout } from "auto_reload";
 import { LoadingBar } from "components/search/loading_bar";
 import { searchQueryState } from "state/SearchQuery";
+import { FilterOptions } from "components/search/filter_element";
+import { FilterCollection } from "components/search/filter_collection";
 const RELOAD_SECONDS = 2;
 
 
@@ -12,6 +14,7 @@ class Search {
     searchIndex = 0;
     appliedIndex = 0;
     loadingBars: LoadingBar[] = [];
+    filterCollections: FilterCollection[] = [];
 
     setRefreshElement(refreshElement: string): void {
         this.refreshElement = refreshElement;
@@ -124,6 +127,12 @@ class Search {
                 }
             });
     }
+
+    public updateFilters(filterOptions: FilterOptions[]): void {
+        this.filterCollections.forEach(collection => {
+            collection.filters = filterOptions;
+        });
+    }
 }
 
 export const search = new Search();
diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index bb2f35762b..b92b91138c 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -6,7 +6,9 @@
   <div class='table-toolbar-tools'>
     <i class="mdi mdi-magnify"></i>
     <form class='search' onsubmit="return false;">
-      <d-search-field placeholder="<%= t("layout.search.search") %>"></d-search-field>
+      <d-search-field placeholder="<%= t("layout.search.search") %>"
+                      eager="<%= local_assigns.fetch :eager, false %>"
+      ></d-search-field>
       <d-loading-bar search-based></d-loading-bar>
     </form>
     <% if local_assigns[:options]&.any? %>
@@ -14,7 +16,9 @@
     <% end %>
   </div>
   <div class="d-flex align-items-center">
-    <d-dropdown-filters class="dropdown-filters"></d-dropdown-filters>
+    <d-dropdown-filters class="dropdown-filters"
+                        hide="<%= (local_assigns.fetch :no_dropdown_for, []).to_json %>"
+    ></d-dropdown-filters>
     <% if local_assigns[:actions]&.any? %>
       <div class="flex-spacer"></div>
       <d-search-actions
@@ -154,10 +158,6 @@
         };
       <% end %>
 
-        <% if @filters.present? %>
-          filterCollections = <%= raw @filters.map { |v| [v[:param], v] }.to_h.to_json %>;
-        <% end %>
-
         dodona.search.setRefreshElement("<%= local_assigns.fetch :refresh_element, "" %>");
 
         // load the given localStorageKey if present. This key is used to retrieve the values stored in localStorage
@@ -166,20 +166,6 @@
         dodona.search.autoSearch = <%= local_assigns.fetch :autoSearch, true %>;
         dodona.search.setLocalStorageKey(localStorageKey);
 
-        const searchFields = Array.from(document.getElementsByTagName("d-search-field"));
-        searchFields.forEach( searchField => {
-          searchField.filterCollections = filterCollections;
-          searchField.eager = <%= local_assigns.fetch :eager, false %>;
-          searchField.placeholder = '<%= t("layout.search.search") %>';
-        });
-
-        const searchTokens = Array.from(document.getElementsByTagName("d-search-tokens"));
-        searchTokens.forEach(st => st.filterCollections = filterCollections);
-
-        const noDropdownFilters = <%= raw (local_assigns.fetch :no_dropdown_for, []).to_json %>;
-        const dropdownFilterCollections = Object.entries(filterCollections).filter(([type, _]) => !noDropdownFilters.includes(type))
-        const dropdownFilters = Array.from(document.getElementsByTagName("d-dropdown-filters"));
-        dropdownFilters.forEach(df => df.filterCollections = dropdownFilterCollections);
-
+        dodona.search.updateFilters(<%= raw @filters.to_json %>);
     });
 </script>
diff --git a/test/javascript/components/search/dropdown_filter.test.ts b/test/javascript/components/search/dropdown_filter.test.ts
index 02a3a1fcc4..dfa46c12c3 100644
--- a/test/javascript/components/search/dropdown_filter.test.ts
+++ b/test/javascript/components/search/dropdown_filter.test.ts
@@ -4,7 +4,7 @@ import { fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { getByLabelText, screen } from "@testing-library/dom";
 import { html } from "lit/development";
-import { Label } from "components/search/filter_collection_element";
+import { Label } from "../../../../app/assets/javascripts/components/search/filter_element";
 import { searchQueryState } from "state/SearchQuery";
 
 describe("DropdownFilter", () => {
diff --git a/test/javascript/components/search/search_field.test.ts b/test/javascript/components/search/search_field.test.ts
index f57eacc0c0..1f987239c3 100644
--- a/test/javascript/components/search/search_field.test.ts
+++ b/test/javascript/components/search/search_field.test.ts
@@ -3,7 +3,7 @@ import { aTimeout, fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { screen } from "@testing-library/dom";
 import { SearchField, SearchFieldSuggestion } from "components/search/search_field";
-import { Label, FilterCollection } from "components/search/filter_collection_element";
+import { Label, FilterOptions } from "../../../../app/assets/javascripts/components/search/filter_element";
 import { html } from "lit";
 import { searchQueryState } from "state/SearchQuery";
 import { textContentMatcher } from "../../test_helpers";
@@ -65,7 +65,7 @@ describe("SearchField", () => {
     let searchField: SearchField;
     beforeEach(async () => {
         searchQueryState.queryParams.clear();
-        const filterCollections: Record<string, FilterCollection> = {
+        const filterCollections: Record<string, FilterOptions> = {
             first: {
                 param: "foo",
                 data: [
diff --git a/test/javascript/components/search/search_token.test.ts b/test/javascript/components/search/search_token.test.ts
index c7c7812455..fa36c882fa 100644
--- a/test/javascript/components/search/search_token.test.ts
+++ b/test/javascript/components/search/search_token.test.ts
@@ -4,7 +4,7 @@ import { fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { screen } from "@testing-library/dom";
 import { html } from "lit/development";
-import { Label } from "components/search/filter_collection_element";
+import { Label } from "../../../../app/assets/javascripts/components/search/filter_element";
 import { searchQueryState } from "state/SearchQuery";
 
 describe("SearchToken", () => {

From f37d2328e70efdc485f69e8982d57a1b000d899f Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 14:56:20 +0200
Subject: [PATCH 15/72] Autoupdate

---
 app/views/activities/index.js.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/activities/index.js.erb b/app/views/activities/index.js.erb
index d5578dae44..82d0b11e8b 100644
--- a/app/views/activities/index.js.erb
+++ b/app/views/activities/index.js.erb
@@ -1 +1,2 @@
-dodona.setHTMLExecuteScripts(document.querySelector("#activities-table-wrapper"),"<%= escape_javascript(render partial: 'activities_table', locals: {activities: @activities}) %>");
\ No newline at end of file
+dodona.setHTMLExecuteScripts(document.querySelector("#activities-table-wrapper"),"<%= escape_javascript(render partial: 'activities_table', locals: {activities: @activities}) %>");
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From 4e7e410f2a3eb05d60eab55c4e6ad5c8f21cb65f Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 15:12:07 +0200
Subject: [PATCH 16/72] Fix translations

---
 .../components/search/dropdown_filter.ts      |   1 -
 app/assets/javascripts/i18n/translations.json | 107 +++++++-----------
 config/locales/js/en.yml                      |  37 ++----
 config/locales/js/nl.yml                      |  36 ++----
 4 files changed, 61 insertions(+), 120 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index 28dd557724..29ed066db6 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -40,7 +40,6 @@ export class DropdownFilter extends FilterElement {
         if (this.labels.length === 0) {
             return html``;
         }
-        console.log(this.labels);
 
         return html`
             <div class="dropdown dropdown-filter">
diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index df4b2ffde9..0b511160a2 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -189,40 +189,7 @@
       "description_languages": "Language of the description",
       "draft": "Draft",
       "dropdown": {
-        "multi": {
-          "activity_types": "Activity types",
-          "course_labels": "Member labels",
-          "courses": "Courses",
-          "description_languages": "Languages",
-          "event_types": "Event types",
-          "institutions": "Institutions",
-          "judges": "Judges",
-          "labels": "Labels",
-          "popularity": "Popularity",
-          "programming_languages": "Programming Languages",
-          "question_states": "Statuses",
-          "repositories": "Repositories",
-          "search_options": "Options",
-          "statuses": "Statuses"
-        },
-        "search": "Search",
-        "single": {
-          "activity_types": "Activity type",
-          "course_labels": "Member label",
-          "courses": "Course",
-          "description_languages": "Language",
-          "draft": "Draft",
-          "event_types": "Event type",
-          "exercises": "Exercise",
-          "institutions": "Institution",
-          "judges": "Judge",
-          "labels": "Label",
-          "popularity": "Popularity",
-          "programming_languages": "Programming Language",
-          "question_states": "Status",
-          "repositories": "Repository",
-          "statuses": "Status"
-        }
+        "search": "Search"
       },
       "en": "English",
       "event_types": "Event types",
@@ -359,6 +326,24 @@
       "score_item": {
         "error": "Error while updating"
       },
+      "search": {
+        "filter": {
+          "course": "Course",
+          "course_labels": "Member labels",
+          "description_languages": "Languages",
+          "draft": "Draft",
+          "exercise": "Exercise",
+          "institution": "Institution",
+          "judge": "Judge",
+          "labels": "Labels",
+          "popularity": "Popularity",
+          "programming_language": "Programming Language",
+          "question_state": "Status",
+          "repository": "Repository",
+          "status": "Status",
+          "type": "Type"
+        }
+      },
       "sign_in_search_bar": {
         "institution_search": "Type to search for your institution",
         "log_in": "Sign in"
@@ -720,40 +705,7 @@
       "description_languages": "Taal van de beschrijving",
       "draft": "Concept",
       "dropdown": {
-        "multi": {
-          "activity_types": "Activiteitstypes",
-          "course_labels": "Gebruikerlabels",
-          "courses": "Cursussen",
-          "description_languages": "Talen",
-          "event_types": "Event types",
-          "institutions": "Onderwijsinstellingen",
-          "judges": "Judges",
-          "labels": "Labels",
-          "popularity": "Populariteit",
-          "programming_languages": "Programmeertalen",
-          "question_states": "Toestanden",
-          "repositories": "Repository's",
-          "search_options": "Opties",
-          "statuses": "Statussen"
-        },
-        "search": "Zoeken",
-        "single": {
-          "activity_types": "Activiteitstype",
-          "course_labels": "Gebruikerlabel",
-          "courses": "Cursus",
-          "description_languages": "Taal",
-          "draft": "Concept",
-          "event_types": "Event type",
-          "exercises": "Oefening",
-          "institutions": "Onderwijsinstelling",
-          "judges": "Judge",
-          "labels": "Label",
-          "popularity": "Populariteit",
-          "programming_languages": "Programmeertaal",
-          "question_states": "Toestand",
-          "repositories": "Repository",
-          "statuses": "Status"
-        }
+        "search": "Zoeken"
       },
       "en": "Engels",
       "event_types": "Event types",
@@ -890,6 +842,25 @@
       "score_item": {
         "error": "Fout bij bijwerken"
       },
+      "search": {
+        "filter": {
+          "course": "Cursus",
+          "course_labels": "Gebruikerlabels",
+          "description_languages": "Talen",
+          "draft": "Concept",
+          "exercise": "Oefening",
+          "institution": "Onderwijsinstelling",
+          "judge": "Judge",
+          "labels": "Labels",
+          "popularity": "Populariteit",
+          "programming_language": "Programmeertaal",
+          "question_state": "Toestand",
+          "repository": "Repository",
+          "search_options": "Opties",
+          "status": "Status",
+          "type": "Type"
+        }
+      },
       "sign_in_search_bar": {
         "institution_search": "Typ om jouw school te vinden",
         "log_in": "Aanmelden"
diff --git a/config/locales/js/en.yml b/config/locales/js/en.yml
index e57f1ab421..0198561c61 100644
--- a/config/locales/js/en.yml
+++ b/config/locales/js/en.yml
@@ -227,36 +227,21 @@ en:
       36: "🎸 Rock that code!"
     dropdown:
       search: Search
-      multi:
+    search:
+      filter:
         labels: Labels
-        programming_languages: Programming Languages
-        judges: Judges
-        repositories: Repositories
-        institutions: Institutions
+        programming_language: Programming Language
+        judge: Judge
+        repository: Repository
+        institution: Institution
         course_labels: Member labels
-        statuses: Statuses
-        event_types: Event types
-        activity_types: Activity types
+        status: Status
+        type: Type
         description_languages: Languages
-        courses: Courses
-        question_states: Statuses
+        course: Course
+        question_state: Status
         popularity: Popularity
-        search_options: Options
-      single:
-        labels: Label
-        programming_languages: Programming Language
-        judges: Judge
-        repositories: Repository
-        institutions: Institution
-        course_labels: Member label
-        statuses: Status
-        event_types: Event type
-        activity_types: Activity type
-        description_languages: Language
-        courses: Course
-        question_states: Status
-        popularity: Popularity
-        exercises: Exercise
+        exercise: Exercise
         draft: "Draft"
     saved_annotation:
       title: Title
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index e1e0670b12..be9baaeb81 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -227,36 +227,22 @@ nl:
       36: "Bravo! Je hebt deze oefening tot een goed einde gebracht."
     dropdown:
       search: Zoeken
-      multi:
+    search:
+      filter:
         labels: Labels
-        programming_languages: Programmeertalen
-        judges: Judges
-        repositories: Repository's
-        institutions: Onderwijsinstellingen
+        programming_language: Programmeertaal
+        judge: Judge
+        repository: Repository
+        institution: Onderwijsinstelling
         course_labels: Gebruikerlabels
-        statuses: Statussen
-        event_types: Event types
-        activity_types: Activiteitstypes
+        status: Status
+        type: Type
         description_languages: Talen
-        courses: Cursussen
-        question_states: Toestanden
+        course: Cursus
+        question_state: Toestand
         popularity: Populariteit
         search_options: Opties
-      single:
-        labels: Label
-        programming_languages: Programmeertaal
-        judges: Judge
-        repositories: Repository
-        institutions: Onderwijsinstelling
-        course_labels: Gebruikerlabel
-        statuses: Status
-        event_types: Event type
-        activity_types: Activiteitstype
-        description_languages: Taal
-        courses: Cursus
-        question_states: Toestand
-        popularity: Populariteit
-        exercises: Oefening
+        exercise: Oefening
         draft: "Concept"
     saved_annotation:
       title: Titel

From 8dde4f768f56a5c3b74fd1ae949f68cdbaf4760d Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 15:23:37 +0200
Subject: [PATCH 17/72] Add disabeled state to filters

---
 .../components/search/dropdown_filter.ts           | 14 +++++++-------
 .../components/dropdown-filter.css.scss            |  7 +++++++
 app/assets/stylesheets/components/token.css.scss   |  6 ++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index 29ed066db6..f7b1f893f6 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -36,14 +36,14 @@ export class DropdownFilter extends FilterElement {
         return this.showFilter ? this.labels.filter(s => s.name.toLowerCase().includes(this.filter.toLowerCase())) : this.labels;
     }
 
-    render(): TemplateResult {
-        if (this.labels.length === 0) {
-            return html``;
-        }
+    get disabled(): boolean {
+        return this.labels.length === 0 || (!this.multi && this.labels.length === 1);
+    }
 
+    render(): TemplateResult {
         return html`
             <div class="dropdown dropdown-filter">
-                <a class="token token-bordered" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
+                <a class="token token-bordered ${this.disabled ? "disabled" : ""}" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
                     ${this.getSelectedLabels().map( () => html`<i class="mdi mdi-circle mdi-12 mdi-colored-accent accent-${this.color} left-icon"></i>`)}
                     ${i18n.t(`js.search.filter.${this.param}`)}
                     <i class="mdi mdi-chevron-down mdi-18 right-icon"></i>
@@ -59,9 +59,9 @@ export class DropdownFilter extends FilterElement {
                             <li><span class="dropdown-item-text ">
                                 <div class="form-check">
                                     <input class="form-check-input" type="${this.multi?"checkbox":"radio"}" .checked=${this.isSelected(s)} @click="${() => this.toggle(s)}" id="check-${this.param}-${s.id}">
-                                    <label class="form-check-label" for="check-${this.param}-${s.id}">
+                                    <label class="form-check-label" for="check-${this.param}-${s.id}" style="min-width: max-content">
                                         ${s.name}
-                                        ${s.count ? html`<span class="badge colored-secondary rounded-pill float-end">${s.count}</span>` : ""}
+                                        ${s.count ? html`<span class="badge colored-secondary rounded-pill float-end ms-1">${s.count}</span>` : ""}
                                     </label>
                                 </div>
                             </span></li>
diff --git a/app/assets/stylesheets/components/dropdown-filter.css.scss b/app/assets/stylesheets/components/dropdown-filter.css.scss
index 2cae0619e7..ba22476407 100644
--- a/app/assets/stylesheets/components/dropdown-filter.css.scss
+++ b/app/assets/stylesheets/components/dropdown-filter.css.scss
@@ -9,4 +9,11 @@
     max-height: 450px;
     overflow-y: auto;
   }
+
+  &.disabled {
+    .dropdown-toggle {
+      background-color: #f8f9fa;
+      color: #6c757d;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/components/token.css.scss b/app/assets/stylesheets/components/token.css.scss
index d7fc25b253..19b07927aa 100644
--- a/app/assets/stylesheets/components/token.css.scss
+++ b/app/assets/stylesheets/components/token.css.scss
@@ -35,6 +35,12 @@
 .token.token-bordered {
   border: 1px solid var(--d-divider);
   color: var(--d-on-surface);
+
+  &.disabled {
+    opacity: 0.38;
+    cursor: initial;
+    pointer-events: none;
+  }
 }
 
 a.token {

From b11b565b6ee1e8938d293ff47125785a5e2b59f5 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Fri, 19 Apr 2024 16:02:48 +0200
Subject: [PATCH 18/72] Convert activity read states

---
 app/assets/javascripts/search.ts                   | 4 ++--
 app/controllers/activity_read_states_controller.rb | 9 ++++++++-
 app/views/activities/index.html.erb                | 2 +-
 app/views/activity_read_states/index.html.erb      | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/search.ts b/app/assets/javascripts/search.ts
index b3217302cd..e09c7fd032 100644
--- a/app/assets/javascripts/search.ts
+++ b/app/assets/javascripts/search.ts
@@ -128,9 +128,9 @@ class Search {
             });
     }
 
-    public updateFilters(filterOptions: FilterOptions[]): void {
+    public updateFilters(filterOptions: FilterOptions[] | undefined): void {
         this.filterCollections.forEach(collection => {
-            collection.filters = filterOptions;
+            collection.filters = filterOptions || [];
         });
     }
 }
diff --git a/app/controllers/activity_read_states_controller.rb b/app/controllers/activity_read_states_controller.rb
index 3bf67cb25d..0cab6aba10 100644
--- a/app/controllers/activity_read_states_controller.rb
+++ b/app/controllers/activity_read_states_controller.rb
@@ -73,7 +73,14 @@ def set_activity_read_states
 
     if params[:course_id]
       @course = Course.find(params[:course_id])
-      @course_labels = CourseLabel.where(course: @course) if @user.blank? && current_user&.course_admin?(@course)
+      if @user.blank? && current_user&.course_admin?(@course)
+        @filters = [{
+          param: 'course_labels',
+          multi: true,
+          data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
+          color: 'orange'
+        }]
+      end
     end
 
     @series = Series.find(params[:series_id]) if params[:series_id]
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index fa3a8a3f1d..4ce2cdde21 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -6,7 +6,7 @@
       </div>
       <div class="card-supporting-text">
         <d-filter-tabs labels="<%= @tabs.to_json %>"></d-filter-tabs>
-        <%= render partial: 'layouts/searchbar', locals: {labels: @labels, programming_languages: @programming_languages, repositories: @repositories, activity_types: [ContentPage, Exercise], description_languages: ["en", "nl"], judges: @judges, popularity: Activity::POPULARITY_THRESHOLDS.keys, draft: current_user&.draft_exercises&.any?, no_dropdown_for: ["judges"]} %>
+        <%= render partial: 'layouts/searchbar', locals: {labels: @labels, no_dropdown_for: ["judge"]} %>
         <div id="activities-table-wrapper">
           <%= render partial: 'activities_table', locals: {activities: @activities} %>
         </div>
diff --git a/app/views/activity_read_states/index.html.erb b/app/views/activity_read_states/index.html.erb
index d82a8c2672..22a733bee2 100644
--- a/app/views/activity_read_states/index.html.erb
+++ b/app/views/activity_read_states/index.html.erb
@@ -34,7 +34,7 @@
         <% end %>
       </div>
       <div class="card-supporting-text" id="refresh_element">
-        <%= render partial: 'layouts/searchbar', locals: {course_labels: @course_labels,  refresh_element: "#refresh_element"} %>
+        <%= render partial: 'layouts/searchbar', locals: {refresh_element: "#refresh_element"} %>
         <div id="read-states-table-wrapper">
           <%= render partial: 'read_states_table', locals: { read_states: @read_states, activity: @activity, course: @course, user: @user} %>
         </div>

From 5293075f9a41dafea7d58b159ba4f8b1161a2da3 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 22 Apr 2024 10:14:56 +0200
Subject: [PATCH 19/72] Rename by id filters

---
 app/controllers/activities_controller.rb | 9 +++++++--
 app/models/activity.rb                   | 4 ++--
 app/views/judges/show.html.erb           | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index bfdd1708c6..af17aa0876 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -21,9 +21,9 @@ class ActivitiesController < ApplicationController
   has_scope :by_filter, as: 'filter'
   has_filter :programming_language, 'red'
   has_filter :type, 'deep-purple'
-  has_filter :judge, 'red'
+  has_filter :judge_id, 'red'
   has_filter :labels, 'purple', multi: true
-  has_filter :repository, 'blue-gray'
+  has_filter :repository_id, 'blue-gray'
   has_filter :draft, 'indigo'
   has_filter :popularity, 'pink'
   has_filter :description_languages, 'orange', multi: true
@@ -69,6 +69,11 @@ def index
                     policy_scope(Activity).order_by_popularity(:DESC)
                   end
 
+    if params[:repository_id]
+      @repository = Repository.find(params[:repository_id])
+      @activities = @activities.by_repoitory_id(params[:repository_id])
+    end
+
     unless @activities.empty?
       @filters = filters(@activities)
       @activities = apply_scopes(@activities)
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 7a149d65b0..b3f356d313 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -79,9 +79,9 @@ class Activity < ApplicationRecord
   filterable_by :access, value_check: ->(value) { value.in? accesses }
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
   filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
-  filterable_by :judge, column: 'judge_id', name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
+  filterable_by :judge_id, name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
   filterable_by :labels, multi: true, associations: :labels, column: 'labels.name'
-  filterable_by :repository, column: 'repository_id', name_hash: ->(values) { Repository.where(id: values).to_h { |r| [r.id, r.name] } }
+  filterable_by :repository_id, name_hash: ->(values) { Repository.where(id: values).to_h { |r| [r.id, r.name] } }
   filterable_by :draft, name_hash: ->(values) { { true => I18n.t('activities.index.filters.draft'), false => I18n.t('activities.index.filters.not_draft') } }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
diff --git a/app/views/judges/show.html.erb b/app/views/judges/show.html.erb
index aae6ce6f62..dc9aea224e 100644
--- a/app/views/judges/show.html.erb
+++ b/app/views/judges/show.html.erb
@@ -32,7 +32,7 @@
             <strong><%= t ".all_submissions" %>:</strong> <%= link_to Submission.of_judge(@judge).count, judge_submissions_path(@judge), title: @judge.name, class: "ellipsis-overflow"  %>
           </p>
           <p>
-            <strong><%= t ".all_exercises" %>:</strong> <%= link_to Activity.by_judge(@judge).count, activities_url(judge_id: @judge.id), title: @judge.name, class: "ellipsis-overflow" %>
+            <strong><%= t ".all_exercises" %>:</strong> <%= link_to Activity.by_judge_id(@judge.id).count, activities_url(judge_id: @judge.id), title: @judge.name, class: "ellipsis-overflow" %>
           </p>
         </div>
         <div class="col-sm-6 col-12">

From 46acf6fd29e17dd5d9caccdd449fac2eef7648b9 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 23 Apr 2024 09:53:27 +0200
Subject: [PATCH 20/72] Fix filters for questions

---
 app/assets/javascripts/i18n/translations.json | 20 +++++------
 app/controllers/annotations_controller.rb     | 11 ++++---
 app/controllers/concerns/has_filter.rb        | 33 +++++++++++--------
 app/models/annotation.rb                      |  2 ++
 app/models/question.rb                        |  2 ++
 app/views/activities/index.html.erb           |  2 +-
 app/views/annotations/question_index.html.erb |  2 +-
 app/views/annotations/question_index.js.erb   |  1 +
 bin/server                                    |  2 +-
 config/locales/js/en.yml                      | 10 +++---
 config/locales/js/nl.yml                      | 10 +++---
 11 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index 0b511160a2..76d149bc4f 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -328,18 +328,18 @@
       },
       "search": {
         "filter": {
-          "course": "Course",
+          "course_id": "Course",
           "course_labels": "Member labels",
           "description_languages": "Languages",
           "draft": "Draft",
-          "exercise": "Exercise",
-          "institution": "Institution",
-          "judge": "Judge",
+          "exercise_id": "Exercise",
+          "institution_id": "Institution",
+          "judge_id": "Judge",
           "labels": "Labels",
           "popularity": "Popularity",
           "programming_language": "Programming Language",
           "question_state": "Status",
-          "repository": "Repository",
+          "repository_id": "Repository",
           "status": "Status",
           "type": "Type"
         }
@@ -844,18 +844,18 @@
       },
       "search": {
         "filter": {
-          "course": "Cursus",
+          "course_id": "Cursus",
           "course_labels": "Gebruikerlabels",
           "description_languages": "Talen",
           "draft": "Concept",
-          "exercise": "Oefening",
-          "institution": "Onderwijsinstelling",
-          "judge": "Judge",
+          "exercise_id": "Oefening",
+          "institution_id": "Onderwijsinstelling",
+          "judge_id": "Judge",
           "labels": "Labels",
           "popularity": "Populariteit",
           "programming_language": "Programmeertaal",
           "question_state": "Toestand",
-          "repository": "Repository",
+          "repository_id": "Repository",
           "search_options": "Opties",
           "status": "Status",
           "type": "Type"
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 5f8a6c77c1..f21a92ba3e 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -1,10 +1,12 @@
 class AnnotationsController < ApplicationController
+  include HasFilter
   before_action :set_submission, only: %i[create]
   before_action :set_annotation, only: %i[show update destroy]
 
   has_scope :by_submission, as: :submission_id
   has_scope :by_user, as: :user_id
-  has_scope :by_course, as: :course_id
+  has_filter :course_id, "orange"
+  has_filter :question_state, "indigo"
 
   has_scope :by_filter, as: 'filter' do |controller, scope, value|
     scope.by_filter(value, skip_user: controller.params[:user_id].present?, skip_exercise: controller.params[:exercise_id].present?)
@@ -19,7 +21,9 @@ def question_index
     authorize Question, :index?
     @user = User.find(params[:user_id]) if params[:user_id]
 
-    @questions = policy_scope(Question).merge(apply_scopes(Question).all)
+    @questions = policy_scope(Question)
+    @filters = filters(@questions)
+    @questions = @questions.merge(apply_scopes(Question).all)
     @questions = @questions.where(question_state: params[:question_state]) if params[:question_state]
 
     @unfiltered = @user.nil? && params[:course_id].nil?
@@ -34,9 +38,6 @@ def question_index
 
     # Preload dependencies for efficiency
     @questions = @questions.includes(:user, :last_updated_by, submission: %i[exercise course])
-
-    @courses = policy_scope(Course.where(id: @questions.pluck(:course_id)))
-
     @questions = @questions.order(created_at: :desc).paginate(page: parse_pagination_param(params[:page]))
     @title = I18n.t('questions.index.title')
     @crumbs = []
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index 970c0806d3..f25d6ab254 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -1,7 +1,25 @@
 module HasFilter
   extend ActiveSupport::Concern
 
+  included do
+    delegate :filter_options, to: :class
+    self.filter_options = []
+    def filters(target)
+      filter_options.map do |filter, multi, color|
+        scope_params = params.except(:controller, :action, :page)
+        scope_params = scope_params.except(filter) unless multi
+        {
+          param: filter,
+          data: apply_scopes(target, scope_params).send("#{filter}_filter_options"),
+          multi: multi,
+          color: color
+        }
+      end
+    end
+  end
+
   class_methods do
+    attr_accessor :filter_options
     def has_filter(name, color, multi: false)
       if multi
         has_scope "by_#{name}", as: name, type: :array, if: ->(this) { this.params[name].is_a?(Array) }
@@ -9,20 +27,7 @@ def has_filter(name, color, multi: false)
         has_scope "by_#{name}", as: name
       end
 
-      @@filters ||= []
-      @@filters << [name, multi, color]
-    end
-  end
-  def filters(target)
-    @@filters.map do |filter, multi, color|
-      scope_params = params.except(:controller, :action, :page)
-      scope_params = scope_params.except(filter) unless multi
-      {
-        param: filter,
-        data: apply_scopes(target, scope_params).send("#{filter}_filter_options"),
-        multi: multi,
-        color: color
-      }
+      filter_options << [name, multi, color]
     end
   end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index cdb0b33107..0ea64a236c 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -22,6 +22,7 @@
 #
 class Annotation < ApplicationRecord
   include ApplicationHelper
+  include Filterable
 
   belongs_to :course
   belongs_to :submission
@@ -58,6 +59,7 @@ class Annotation < ApplicationRecord
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_exercise_name, ->(name) { where(submission: Submission.by_exercise_name(name)) }
   scope :by_exercise, ->(exercise_id) { where(submission: { exercise_id: exercise_id }) }
+  filterable_by :course_id, name_hash: ->(values) { Course.where(id: values).to_h { |c| [c.id, c.name] } }
 
   scope :order_by_annotation_text, ->(direction) { reorder(annotation_text: direction) }
   scope :order_by_created_at, ->(direction) { reorder(created_at: direction) }
diff --git a/app/models/question.rb b/app/models/question.rb
index 39c04546c3..c1e41ba765 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -27,6 +27,8 @@ class Question < Annotation
   after_save :schedule_reset_in_progress, if: :saved_change_to_question_state?
   after_commit :clear_transition
 
+  filterable_by :question_state, name_hash: ->(values){ Question.question_states.to_h {|s| [s, human_enum_name(:question_state, s)]} }
+
   enum question_state: { unanswered: 0, in_progress: 1, answered: 2 }
   alias_attribute :question_text, :annotation_text
 
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 4ce2cdde21..0a9111e1bd 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -6,7 +6,7 @@
       </div>
       <div class="card-supporting-text">
         <d-filter-tabs labels="<%= @tabs.to_json %>"></d-filter-tabs>
-        <%= render partial: 'layouts/searchbar', locals: {labels: @labels, no_dropdown_for: ["judge"]} %>
+        <%= render partial: 'layouts/searchbar', locals: {labels: @labels, no_dropdown_for: ["judge_id"]} %>
         <div id="activities-table-wrapper">
           <%= render partial: 'activities_table', locals: {activities: @activities} %>
         </div>
diff --git a/app/views/annotations/question_index.html.erb b/app/views/annotations/question_index.html.erb
index beed5c2e38..6a3a7b0dda 100644
--- a/app/views/annotations/question_index.html.erb
+++ b/app/views/annotations/question_index.html.erb
@@ -26,7 +26,7 @@
           <% options << { label: t('questions.index.watch'), param: 'refresh' } %>
           <% options << { label: t('questions.index.everything'), param: 'everything' } if @unfiltered %>
         <% end %>
-        <%= render partial: 'layouts/searchbar', locals: { options: options, refresh_element: "#question-container", courses: @courses, question_states: Question.question_states.keys } %>
+        <%= render partial: 'layouts/searchbar', locals: { options: options, refresh_element: "#question-container"} %>
         <div id="questions-table-wrapper">
           <%= render partial: 'questions_table_with_pagination', locals: { questions: @questions } %>
         </div>
diff --git a/app/views/annotations/question_index.js.erb b/app/views/annotations/question_index.js.erb
index 942e429281..0546c1db39 100644
--- a/app/views/annotations/question_index.js.erb
+++ b/app/views/annotations/question_index.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#questions-table-wrapper"), "<%= escape_javascript(render partial: 'questions_table_with_pagination', locals: {questions: @questions}) %>");
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/bin/server b/bin/server
index 9f195aec85..ce5526cbbd 100755
--- a/bin/server
+++ b/bin/server
@@ -1,7 +1,7 @@
 #!/bin/bash
 bundle install
 yarn install
-#bundle exec rails s -p 3000 &
+bundle exec rails s -p 3000 &
 bundle exec rails jobs:work &
 yarn build:css --watch &
 NODE_ENV=development yarn build:js --watch
diff --git a/config/locales/js/en.yml b/config/locales/js/en.yml
index 0198561c61..66b896d5ab 100644
--- a/config/locales/js/en.yml
+++ b/config/locales/js/en.yml
@@ -231,17 +231,17 @@ en:
       filter:
         labels: Labels
         programming_language: Programming Language
-        judge: Judge
-        repository: Repository
-        institution: Institution
+        judge_id: Judge
+        repository_id: Repository
+        institution_id: Institution
         course_labels: Member labels
         status: Status
         type: Type
         description_languages: Languages
-        course: Course
+        course_id: Course
         question_state: Status
         popularity: Popularity
-        exercise: Exercise
+        exercise_id: Exercise
         draft: "Draft"
     saved_annotation:
       title: Title
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index be9baaeb81..2112f88a98 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -231,18 +231,18 @@ nl:
       filter:
         labels: Labels
         programming_language: Programmeertaal
-        judge: Judge
-        repository: Repository
-        institution: Onderwijsinstelling
+        judge_id: Judge
+        repository_id: Repository
+        institution_id: Onderwijsinstelling
         course_labels: Gebruikerlabels
         status: Status
         type: Type
         description_languages: Talen
-        course: Cursus
+        course_id: Cursus
         question_state: Toestand
         popularity: Populariteit
         search_options: Opties
-        exercise: Oefening
+        exercise_id: Oefening
         draft: "Concept"
     saved_annotation:
       title: Titel

From f39264ff95e352c5ad5f258df118baaf4970ccd5 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 23 Apr 2024 14:35:28 +0200
Subject: [PATCH 21/72] Fix course member search

---
 app/controllers/course_members_controller.rb | 12 +++++++-----
 app/models/concerns/filterable.rb            |  2 +-
 app/models/course_membership.rb              | 11 ++++-------
 app/views/course_members/index.html.erb      |  2 --
 app/views/course_members/index.js.erb        |  1 +
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
index 838eb9b6af..ecb17e06c1 100644
--- a/app/controllers/course_members_controller.rb
+++ b/app/controllers/course_members_controller.rb
@@ -1,11 +1,12 @@
 class CourseMembersController < ApplicationController
+  include HasFilter
   before_action :set_course
   before_action :set_course_membership_and_user, only: %i[show edit update]
 
   has_scope :by_permission
-  has_scope :by_institution, as: 'institution_id'
   has_scope :by_filter, as: 'filter'
-  has_scope :by_course_labels, as: 'course_labels', type: :array
+  has_filter :course_labels, 'orange', multi: true
+  has_filter :institution_id, 'pink'
 
   has_scope :order_by, using: %i[column direction], type: :hash do |controller, scope, value|
     column, direction = value
@@ -30,13 +31,14 @@ def index
                  %w[course_admin student]
                end
 
-    @course_memberships = apply_scopes(@course.course_memberships.order_by_status_in_course_and_name('ASC'))
+    @course_memberships = @course.course_memberships.order_by_status_in_course_and_name('ASC')
+                                                    .where(status: statuses)
+    @filters = filters(@course_memberships)
+    @course_memberships = apply_scopes(@course_memberships)
                           .includes(:course_labels, user: [:institution])
-                          .where(status: statuses)
 
     @title = I18n.t('courses.index.users')
     @crumbs = [[@course.name, course_path(@course)], [I18n.t('courses.index.users'), '#']]
-    @course_labels = CourseLabel.where(course: @course)
 
     respond_to do |format|
       format.html do
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 25b347c59b..23d9cc8a6d 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -22,7 +22,7 @@ def search_by(*columns)
     def filterable_by(name, column: name, associations: [], multi: false, value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
       scope "by_#{name}", lambda { |value|
         if value_check.call(value) && (!multi || value.is_a?(Array))
-          scope = includes(associations).where(column => value)
+          scope = joins(associations).where(column => value)
           scope = scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length) if multi
           scope
         else
diff --git a/app/models/course_membership.rb b/app/models/course_membership.rb
index 4c4f06d547..862ae50b9e 100644
--- a/app/models/course_membership.rb
+++ b/app/models/course_membership.rb
@@ -12,6 +12,7 @@
 #
 
 class CourseMembership < ApplicationRecord
+  include Filterable
   enum status: { pending: 0, course_admin: 1, student: 2, unsubscribed: 3 }
 
   belongs_to :course
@@ -28,15 +29,11 @@ class CourseMembership < ApplicationRecord
   after_save :invalidate_caches
   after_save :delete_unused_course_labels
 
-  scope :by_institution, ->(institution) { where(user: User.by_institution(institution)) }
   scope :by_permission, ->(permission) { where(user: User.by_permission(permission)) }
   scope :by_filter, ->(filter) { where(user: User.by_filter(filter)) }
-  scope :by_course_labels, lambda { |course_labels|
-    includes(:course_labels)
-      .where(course_labels: { name: course_labels })
-      .group(:id)
-      .having('COUNT(DISTINCT(course_membership_labels.course_label_id)) = ?', course_labels.uniq.length)
-  }
+  filterable_by :course_labels, associations: :course_labels, column: 'course_labels.name', multi: true
+  filterable_by :institution_id, associations: { user: [:institution] }, column: 'institutions.id',
+                name_hash: ->(values) { Institution.find(values).to_h { |i| [i.id, i.name] } }
 
   scope :order_by_status_in_course_and_name, ->(direction) { joins(:user).merge(User.order_by_status_in_course_and_name(direction)) }
   scope :order_by_progress, ->(direction, course) { joins(:user).merge(User.order_by_progress(direction, course)) }
diff --git a/app/views/course_members/index.html.erb b/app/views/course_members/index.html.erb
index f82adae00b..f42e7c79e7 100644
--- a/app/views/course_members/index.html.erb
+++ b/app/views/course_members/index.html.erb
@@ -86,8 +86,6 @@
                                url: course_members_path(@course, format: :csv),
                            }
                        ],
-                       course_labels: @course_labels,
-                       institutions: Institution.of_course_by_members(@course)
                    } %>
         <div id="users-table-wrapper">
           <%= render partial: 'members_table',
diff --git a/app/views/course_members/index.js.erb b/app/views/course_members/index.js.erb
index 3249f48b0d..be3fa5b787 100644
--- a/app/views/course_members/index.js.erb
+++ b/app/views/course_members/index.js.erb
@@ -1,2 +1,3 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships}) %>")
 dodona.ready.then(dodona.initTooltips);
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From 60c073c278aeb701da9ee2c8343c853b3a2f1587 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 23 Apr 2024 15:16:37 +0200
Subject: [PATCH 22/72] Fix course

---
 app/controllers/courses_controller.rb | 14 ++++++++++++--
 app/models/concerns/filterable.rb     |  1 +
 app/models/course.rb                  |  1 +
 app/views/courses/index.html.erb      |  2 +-
 app/views/courses/index.js.erb        |  1 +
 app/views/courses/new.html.erb        |  2 +-
 app/views/courses/scoresheet.html.erb |  1 -
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c7331cdb0e..13804148ec 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -2,13 +2,14 @@
 
 class CoursesController < ApplicationController
   include SetLtiMessage
+  include HasFilter
 
   before_action :set_course_and_current_membership, except: %i[index new create]
   before_action :set_lti_message, only: %i[show]
   before_action :set_lti_provider, only: %i[show]
 
   has_scope :by_filter, as: 'filter'
-  has_scope :by_institution, as: 'institution_id'
+  has_filter :institution_id, 'pink'
   has_scope :at_least_one_started, type: :boolean, only: :scoresheet do |controller, scope|
     scope.at_least_one_started_in_course(Course.find(controller.params[:id])).or(scope.at_least_one_read_in_course(Course.find(controller.params[:id])))
   end
@@ -50,6 +51,7 @@ def index
     @show_institution_courses = current_user&.institution && @courses.where(institution: current_user.institution).count > 0
 
     if params[:copy_courses]
+      @filters = filters(@courses)
       @courses = apply_scopes(@courses)
       @courses = @courses.reorder(featured: :desc, year: :desc, name: :asc)
       @own_courses = @courses.select { |course| current_user&.admin_of?(course) }
@@ -60,8 +62,10 @@ def index
         @courses = @courses.where(institution: current_user.institution)
       elsif current_user && params[:tab] == 'my'
         @courses = current_user.subscribed_courses
+        @filters = filters(@courses)
       elsif params[:tab] == 'featured'
         @courses = @courses.where(featured: true)
+        @filters = filters(@courses)
       end
       @courses = apply_scopes(@courses)
     end
@@ -96,6 +100,7 @@ def show
   # GET /courses/new
   def new
     authorize Course
+    @filters = filters(Course.all)
     if params[:copy_options]&.fetch(:base_id).present?
       @copy_options = copy_options
       @copy_options[:base] = Course.find(@copy_options[:base_id])
@@ -221,7 +226,12 @@ def statistics
   def scoresheet
     @title = I18n.t('courses.scoresheet.scoresheet')
     @crumbs = [[@course.name, course_path(@course)], [I18n.t('courses.scoresheet.scoresheet'), '#']]
-    @course_labels = CourseLabel.where(course: @course)
+    @filters = [{
+                  param: 'course_labels',
+                  multi: true,
+                  data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
+                  color: 'orange'
+                }]
 
     unless request.format == :html
       scores = @course.scoresheet
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 23d9cc8a6d..837c285589 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -36,6 +36,7 @@ def filterable_by(name, column: name, associations: [], multi: false, value_chec
         names = name_hash.call(count.keys)
 
         count.map { |key, value| { id: key.to_s, name: names[key].to_s, count: value } }
+             .filter { |option| option[:name].present? }
       end
     end
   end
diff --git a/app/models/course.rb b/app/models/course.rb
index 8df3a4b238..9e8e8990d6 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -165,6 +165,7 @@ class Course < ApplicationRecord
   scope :by_name, ->(name) { where('name LIKE ?', "%#{name}%") }
   scope :by_teacher, ->(teacher) { where('teacher LIKE ?', "%#{teacher}%") }
   scope :by_institution, ->(institution) { where(institution: institution) }
+  filterable_by :institution_id, name_hash: ->(values) { Institution.where(id: values).to_h { |i| [i.id, i.name] } }
   scope :can_register, lambda { |user|
     if user&.institutional?
       where(registration: %i[open_for_all open_for_institutional_users])
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index da1d490fd4..63e686800a 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -25,7 +25,7 @@
           labels << { name: t('courses.index.my_courses'), id: 'my' } if @show_my_courses
         %>
         <d-filter-tabs labels="<%= labels.to_json %>"></d-filter-tabs>
-        <%= render partial: 'layouts/searchbar', locals: {institutions: Institution.all, eager: true, no_dropdown_for: ["institutions"], options: [{param: 'can_register', label: "#{t(".only_show_can_register")}"}]  } %>
+        <%= render partial: 'layouts/searchbar', locals: {eager: true, no_dropdown_for: ["institutions"], options: [{param: 'can_register', label: "#{t(".only_show_can_register")}"}]  } %>
         <div id="courses-table-wrapper"></div>
       </div>
     </div>
diff --git a/app/views/courses/index.js.erb b/app/views/courses/index.js.erb
index 20ddef67ff..66a70cc562 100644
--- a/app/views/courses/index.js.erb
+++ b/app/views/courses/index.js.erb
@@ -11,3 +11,4 @@ if (dodona.copyCoursesLoaded) {
 <% else %>
 dodona.setHTMLExecuteScripts(document.querySelector("#courses-table-wrapper"), "<%= escape_javascript(render partial: 'courses/courses_table', locals: {courses: @courses}) %>")
 <% end %>
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 5689cfc632..2ef053b16b 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -69,7 +69,7 @@
         <div id="choose-step" class="panel-collapse collapse" role="tabpanel">
           <div class="panel-body">
             <div class="stepper-part">
-              <%= render(partial: 'layouts/searchbar', locals: {baseUrl: courses_path(copy_courses: true), eager: true, institutions: Institution.all}) %>
+              <%= render(partial: 'layouts/searchbar', locals: {baseUrl: courses_path(copy_courses: true), eager: true}) %>
               <div id="courses-table-wrapper"></div>
             </div>
           </div>
diff --git a/app/views/courses/scoresheet.html.erb b/app/views/courses/scoresheet.html.erb
index 2231c8b9ab..1070a4e5bf 100644
--- a/app/views/courses/scoresheet.html.erb
+++ b/app/views/courses/scoresheet.html.erb
@@ -29,7 +29,6 @@
           options: [
                 { label: t('.at_least_one_started'), param: 'at_least_one_started' }
             ],
-            course_labels: @course_labels,
             eager: true
         } %>
         <div id="scoresheet-table-wrapper"></div>

From 2e3ebcccd5d6afbe429a7a0974497d76022be99a Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 23 Apr 2024 15:17:06 +0200
Subject: [PATCH 23/72] Fix course

---
 app/views/courses/scoresheet.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/courses/scoresheet.js.erb b/app/views/courses/scoresheet.js.erb
index 0e56630e69..9fc2c3f45b 100644
--- a/app/views/courses/scoresheet.js.erb
+++ b/app/views/courses/scoresheet.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#scoresheet-table-wrapper"), "<%= escape_javascript(render partial: 'scoresheet_table', locals: {course: @course, series: @series, users: @users, hash: @hash, histogram: @histogram, total_activity_count: @total_activity_count, total_by_user: @total_by_user, total_histogram: @total_histogram}) %>")
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From 879254599d18fb6287dd6be7cc7adb41352f7dfd Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 29 Apr 2024 10:06:33 +0200
Subject: [PATCH 24/72] Fix course label filters

---
 .../activity_read_states_controller.rb        | 17 ++++++------
 app/controllers/courses_controller.rb         |  6 +++++
 app/controllers/evaluations_controller.rb     | 21 ++++++++++++---
 app/controllers/series_controller.rb          |  7 +++++
 app/controllers/submissions_controller.rb     | 14 ++++++++--
 app/models/activity_read_state.rb             |  3 ++-
 app/models/concerns/filterable.rb             | 26 +++++++++++++++++++
 app/models/submission.rb                      |  3 ++-
 app/models/user.rb                            |  5 ++--
 app/views/evaluations/_add_users.html.erb     |  2 --
 app/views/evaluations/add_users.js.erb        |  1 +
 app/views/evaluations/edit.html.erb           |  2 --
 app/views/evaluations/edit.js.erb             |  1 +
 app/views/evaluations/show.html.erb           |  2 +-
 app/views/evaluations/show.js.erb             |  1 +
 app/views/series/scoresheet.html.erb          |  1 -
 app/views/submissions/index.html.erb          |  2 +-
 17 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/app/controllers/activity_read_states_controller.rb b/app/controllers/activity_read_states_controller.rb
index 0cab6aba10..b797c0f735 100644
--- a/app/controllers/activity_read_states_controller.rb
+++ b/app/controllers/activity_read_states_controller.rb
@@ -73,14 +73,6 @@ def set_activity_read_states
 
     if params[:course_id]
       @course = Course.find(params[:course_id])
-      if @user.blank? && current_user&.course_admin?(@course)
-        @filters = [{
-          param: 'course_labels',
-          multi: true,
-          data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
-          color: 'orange'
-        }]
-      end
     end
 
     @series = Series.find(params[:series_id]) if params[:series_id]
@@ -99,6 +91,15 @@ def set_activity_read_states
       @read_states = @read_states.in_course(@course)
     end
 
+    if @course.present? && @user.blank? && current_user&.course_admin?(@course)
+      @filters = [{
+        param: 'course_labels',
+        multi: true,
+        data: @read_states.course_labels_filter_options(@course.id),
+        color: 'orange'
+      }]
+    end
+
     @course_membership = CourseMembership.find_by(user: @user, course: @course) if @user.present? && @course.present?
   end
 end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 13804148ec..4c51eff34f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -236,6 +236,12 @@ def scoresheet
     unless request.format == :html
       scores = @course.scoresheet
       @users = apply_scopes(scores[:users])
+      @filters = [{
+        param: 'course_labels',
+        multi: true,
+        data: @users.course_labels_filter_options(@course.id),
+        color: 'orange'
+      }]
       @series = scores[:series]
 
       # this maps a [user_id, series_id] tuple to an object containing the number of accepted and started exercises
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 8dfaeb42be..0475639887 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -1,11 +1,12 @@
 class EvaluationsController < ApplicationController
   include SeriesHelper
   include EvaluationHelper
+  include HasFilter
 
   before_action :set_evaluation, only: %i[show edit update destroy overview set_multi_user add_user remove_user mark_undecided_complete export_grades modify_grading_visibility]
   before_action :set_series, only: %i[new]
 
-  has_scope :by_institution, as: 'institution_id'
+  has_filter :institution_id, 'pink'
   has_scope :by_filter, as: 'filter'
   has_scope :by_course_labels, as: 'course_labels', type: :array do |controller, scope, value|
     if controller.params[:action] == 'show'
@@ -23,7 +24,7 @@ def show
     end
     @feedbacks = @evaluation.evaluation_sheet
     @users = apply_scopes(@evaluation.users)
-    @course_labels = CourseLabel.where(course: @evaluation.series.course)
+    set_filters(@evaluation.users)
     @crumbs = [[@evaluation.series.course.name, course_url(@evaluation.series.course)], [@evaluation.series.name, breadcrumb_series_path(@evaluation.series, current_user)], [I18n.t('evaluations.show.evaluation'), '#']]
     @title = I18n.t('evaluations.show.evaluation')
   end
@@ -47,7 +48,7 @@ def new
   def edit
     @should_confirm = params[:confirm].present?
     @course = @evaluation.series.course
-    @course_labels = CourseLabel.where(course: @course)
+    set_filters(@course.course_memberships)
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
                           .order(status: :asc)
@@ -72,7 +73,7 @@ def create
     authorize @evaluation
     @evaluation.exercises = @evaluation.series.exercises
     @course = @evaluation.series.course
-    @course_labels = CourseLabel.where(course: @course)
+    set_filters(@course.course_memberships)
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
                           .order(status: :asc)
@@ -178,4 +179,16 @@ def set_evaluation
   def set_series
     @series = Series.find(params[:series_id])
   end
+
+  def set_filters(users)
+    @filters = filters(users)
+
+    course = @evaluation.series.course
+    @filters << {
+      param: 'course_labels',
+      multi: true,
+      data: users.course_labels_filter_options(course.id),
+      color: 'orange'
+    }
+  end
 end
diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb
index d4a8a7cd1e..e75d0a765b 100644
--- a/app/controllers/series_controller.rb
+++ b/app/controllers/series_controller.rb
@@ -1,6 +1,7 @@
 class SeriesController < ApplicationController
   include ExportHelper
   include SetLtiMessage
+  include HasFilter
 
   before_action :set_series, except: %i[index new create]
   before_action :check_token, only: %i[show overview]
@@ -203,6 +204,12 @@ def scoresheet
 
     scores = @series.scoresheet
     @users = apply_scopes(scores[:users])
+    @filters = [{
+      param: 'course_labels',
+      multi: true,
+      data: @users.course_labels_filter_options(@course.id),
+      color: 'orange'
+    }]
     @activities = scores[:activities]
     @submissions = scores[:submissions]
     @read_states = scores[:read_states]
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 1ee113dfbe..74a7083a64 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -3,6 +3,7 @@ class SubmissionsController < ApplicationController
   include TimeHelper
   include ActionView::Helpers::DateHelper
   include Sortable
+  include HasFilter
 
   before_action :set_submission, only: %i[show download evaluate edit media]
   before_action :set_submissions, only: %i[index mass_rejudge show]
@@ -35,7 +36,7 @@ def index
     @submissions = @submissions.includes(:annotations).paginate(page: parse_pagination_param(params[:page]))
 
     # If the result is the same, don't send it.
-    return unless stale?(@submissions)
+    # return unless stale?(@submissions)
     # If returning non-HTML, we are done.
     return unless request.format.html?
 
@@ -164,7 +165,6 @@ def set_submissions
     end
     if params[:course_id]
       @course = Course.find(params[:course_id])
-      @course_labels = CourseLabel.where(course: @course) if @user.blank? && current_user&.course_admin?(@course)
     end
 
     @series = Series.find(params[:series_id]) if params[:series_id]
@@ -186,6 +186,16 @@ def set_submissions
       @submissions = @submissions.of_judge(@judge)
     end
 
+    @filters = filters(@submissions)
+    if @course.present? && @user.blank? && current_user&.course_admin?(@course)
+      @filters << {
+        param: 'course_labels',
+        multi: true,
+        data: @submissions.course_labels_filter_options(@course.id),
+        color: 'orange'
+      }
+    end
+
     @course_membership = CourseMembership.find_by(user: @user, course: @course) if @user.present? && @course.present?
 
     return unless params[:most_recent_per_user]
diff --git a/app/models/activity_read_state.rb b/app/models/activity_read_state.rb
index bbe631f8e5..406fed22d4 100644
--- a/app/models/activity_read_state.rb
+++ b/app/models/activity_read_state.rb
@@ -10,6 +10,7 @@
 #  updated_at  :datetime         not null
 #
 class ActivityReadState < ApplicationRecord
+  include Filterable
   belongs_to :activity
   belongs_to :course, optional: true
   belongs_to :user
@@ -37,7 +38,7 @@ class ActivityReadState < ApplicationRecord
     end.reduce(&:merge)
   }
 
-  scope :by_course_labels, ->(labels, course_id) { where(user: CourseMembership.where(course_id: course_id).by_course_labels(labels).map(&:user)) }
+  filterable_by_course_labels through_user: true
 
   def invalidate_caches
     activity.invalidate_delayed_users_read
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 837c285589..92dd65af62 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -39,5 +39,31 @@ def filterable_by(name, column: name, associations: [], multi: false, value_chec
              .filter { |option| option[:name].present? }
       end
     end
+
+    def filterable_by_course_labels(through_user: false)
+      if through_user
+        has_many :course_memberships, through: :user
+        has_many :course_labels, through: :course_memberships
+      end
+
+      scope :by_course_labels, lambda { |labels, course_id|
+        unscoped.where(id: select(:id))
+                .joins(:course_labels)
+                .where(course_memberships: { course_id: course_id } )
+                .where(course_labels: { name: labels })
+                .group(:id).having('COUNT(DISTINCT(course_labels.id)) = ?', labels.uniq.length)
+      }
+
+      define_singleton_method('course_labels_filter_options') do |course_id|
+        count = unscoped.where(id: select(:id))
+                        .joins(:course_labels)
+                        .where(course_memberships: { course_id: course_id } )
+                        .group('course_labels.name')
+                        .count
+
+        count.map { |key, value| { id: key.to_s, name: key.to_s, count: value } }
+             .filter { |option| option[:name].present? }
+      end
+    end
   end
 end
diff --git a/app/models/submission.rb b/app/models/submission.rb
index c63ad5bb07..124364748d 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -19,6 +19,7 @@
 class Submission < ApplicationRecord
   include Cacheable
   include ActiveModel::Dirty
+  include Filterable
 
   SECONDS_BETWEEN_SUBMISSIONS = 5 # Used for rate limiting
   PUNCHCARD_MATRIX_CACHE_STRING = '/courses/%<course_id>s/user/%<user_id>s/timezone/%<timezone>s/punchcard_matrix'.freeze
@@ -75,7 +76,7 @@ class Submission < ApplicationRecord
       scopes.any? ? merge(scopes.reduce(&:or)) : self
     end.reduce(&:merge)
   }
-  scope :by_course_labels, ->(labels, course_id) { where(user: CourseMembership.where(course_id: course_id).by_course_labels(labels).map(&:user)) }
+  filterable_by_course_labels through_user: true
 
   scope :most_recent, lambda {
     submissions = select('MAX(submissions.id) as id')
diff --git a/app/models/user.rb b/app/models/user.rb
index f77985b3da..c17e69bc1e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,6 +117,7 @@ class User < ApplicationRecord
 
   has_many :annotations, dependent: :restrict_with_error
   has_many :questions, dependent: :restrict_with_error
+  has_many :course_labels, through: :course_memberships
 
   devise :omniauthable, omniauth_providers: %i[google_oauth2 lti office365 oidc saml smartschool surf elixir]
 
@@ -139,10 +140,10 @@ class User < ApplicationRecord
   search_by :username, :first_name, :last_name
 
   scope :by_permission, ->(permission) { where(permission: permission) }
-  scope :by_institution, ->(institution) { where(institution: institution) }
+  filterable_by :institution_id, name_hash: ->(ids) { Institution.where(id: ids).to_h { |i| [i.id, i.name] } }
 
   scope :in_course, ->(course) { joins(:course_memberships).where(course_memberships: { course_id: course.id }) }
-  scope :by_course_labels, ->(labels, course_id) { where(id: CourseMembership.where(course_id: course_id).by_course_labels(labels).select(:user_id)) }
+  filterable_by_course_labels
   scope :at_least_one_started_in_series, ->(series) { where(id: Submission.where(course_id: series.course_id, exercise_id: series.exercises).select('DISTINCT(user_id)')) }
   scope :at_least_one_read_in_series, ->(series) { where(id: ActivityReadState.in_series(series).select('DISTINCT(user_id)')) }
   scope :at_least_one_started_in_course, ->(course) { where(id: Submission.where(course_id: course.id, exercise_id: course.exercises).select('DISTINCT(user_id)')) }
diff --git a/app/views/evaluations/_add_users.html.erb b/app/views/evaluations/_add_users.html.erb
index e4bc470b91..df10f7c4da 100644
--- a/app/views/evaluations/_add_users.html.erb
+++ b/app/views/evaluations/_add_users.html.erb
@@ -47,8 +47,6 @@
     <%= render partial: 'layouts/searchbar', locals: {
       baseUrl: edit_evaluation_url(@evaluation),
       eager: false,
-      course_labels: @course_labels,
-      institutions: Institution.of_course_by_members(@course),
       } %>
     <div id="users-table-wrapper">
       <%= render partial: 'members_table',
diff --git a/app/views/evaluations/add_users.js.erb b/app/views/evaluations/add_users.js.erb
index 13bd30fb6a..4a70fdce9c 100644
--- a/app/views/evaluations/add_users.js.erb
+++ b/app/views/evaluations/add_users.js.erb
@@ -1,3 +1,4 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships, confirm: false}) %>")
 window.dodona.initTooltips();
 window.dodona.initCheckboxes();
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/app/views/evaluations/edit.html.erb b/app/views/evaluations/edit.html.erb
index 959f5ff4c4..fd947b4e10 100644
--- a/app/views/evaluations/edit.html.erb
+++ b/app/views/evaluations/edit.html.erb
@@ -50,8 +50,6 @@
               <%= render partial: 'layouts/searchbar', locals: {
                 baseUrl: edit_evaluation_url(@evaluation, confirm: true),
                 eager: false,
-                course_labels: @course_labels,
-                institutions: Institution.of_course_by_members(@course),
                 } %>
               <div id="users-table-wrapper">
                 <%= render partial: 'members_table',
diff --git a/app/views/evaluations/edit.js.erb b/app/views/evaluations/edit.js.erb
index 37ca3232aa..44459baef6 100644
--- a/app/views/evaluations/edit.js.erb
+++ b/app/views/evaluations/edit.js.erb
@@ -1,3 +1,4 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships, confirm: @should_confirm}) %>")
 window.dodona.initTooltips();
 window.dodona.initCheckboxes();
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/app/views/evaluations/show.html.erb b/app/views/evaluations/show.html.erb
index 2b858da5e6..6755c54ead 100644
--- a/app/views/evaluations/show.html.erb
+++ b/app/views/evaluations/show.html.erb
@@ -42,7 +42,7 @@
     </div>
     <div class="card">
       <div class="card-supporting-text">
-      <%= render partial: 'layouts/searchbar', locals: { course_labels: @course_labels } %>
+      <%= render partial: 'layouts/searchbar' %>
         <div class="card-tab">
           <ul id="user-tabs" class="nav nav-tabs" role="tablist">
             <li role="presentation">
diff --git a/app/views/evaluations/show.js.erb b/app/views/evaluations/show.js.erb
index 4ba37586ce..e640095071 100644
--- a/app/views/evaluations/show.js.erb
+++ b/app/views/evaluations/show.js.erb
@@ -3,4 +3,5 @@ const gradeTable = document.querySelector("#evaluation-grade-table-wrapper");
 if(gradeTable) {
     dodona.setHTMLExecuteScripts(gradeTable, "<%= escape_javascript(render 'evaluation_grade_table', feedbacks: @feedbacks, evaluation: @evaluation, users: @users) %>")
 }
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
 
diff --git a/app/views/series/scoresheet.html.erb b/app/views/series/scoresheet.html.erb
index a108e9a708..ca4ae3dc57 100644
--- a/app/views/series/scoresheet.html.erb
+++ b/app/views/series/scoresheet.html.erb
@@ -32,7 +32,6 @@
             options: [
                   { label: t('.at_least_one_started'), param: 'at_least_one_started' }
               ],
-              course_labels: @course_labels
           } %>
           <div id="scoresheet-table-wrapper">
             <%= render partial: "scoresheet_table", locals: {course: @course, series: @series, activities: @activities, users: @users, submissions: @submissions, read_states: @read_states, statuses: @statuses, read_state_counts: @read_state_counts, submission_counts: @submission_counts, summary_by_user: @summary_by_user, total: @total} %>
diff --git a/app/views/submissions/index.html.erb b/app/views/submissions/index.html.erb
index cdfab70db7..9fdbe4010c 100644
--- a/app/views/submissions/index.html.erb
+++ b/app/views/submissions/index.html.erb
@@ -45,7 +45,7 @@
              options << {label: t('.watch_submissions'), param: 'refresh'}
           %>
         <% end %>
-        <%= render partial: 'layouts/searchbar', locals: {actions: actions, options: options, course_labels: @course_labels, statuses: Submission.statuses.keys, refresh_element: "#refresh_element"} %>
+        <%= render partial: 'layouts/searchbar', locals: {actions: actions, options: options, statuses: Submission.statuses.keys, refresh_element: "#refresh_element"} %>
         <div id="submissions-table-wrapper">
           <%= render partial: 'submissions_table', locals: {submissions: @submissions, exercise: @activity, course: @course, user: @user} %>
         </div>

From 62a16f8b7b2d8c8ae132c58f801cfbfcc1f85c2a Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 11:19:15 +0200
Subject: [PATCH 25/72] Fix course labels filters for evaluations

---
 app/controllers/activities_controller.rb  |  2 +-
 app/controllers/evaluations_controller.rb | 38 ++++++++++++++---------
 app/models/course_membership.rb           |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 945d4dfab0..f5494d8bbe 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -71,7 +71,7 @@ def index
 
     if params[:repository_id]
       @repository = Repository.find(params[:repository_id])
-      @activities = @activities.by_repoitory_id(params[:repository_id])
+      @activities = @activities.by_repository_id(params[:repository_id])
     end
 
     unless @activities.empty?
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 0475639887..87d7df8e22 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -23,8 +23,16 @@ def show
       return
     end
     @feedbacks = @evaluation.evaluation_sheet
+    @filters = filters(@evaluation.users)
     @users = apply_scopes(@evaluation.users)
-    set_filters(@evaluation.users)
+
+    course = @evaluation.series.course
+    @filters << {
+      param: 'course_labels',
+      multi: true,
+      data: @users.course_labels_filter_options(course.id),
+      color: 'orange'
+    }
     @crumbs = [[@evaluation.series.course.name, course_url(@evaluation.series.course)], [@evaluation.series.name, breadcrumb_series_path(@evaluation.series, current_user)], [I18n.t('evaluations.show.evaluation'), '#']]
     @title = I18n.t('evaluations.show.evaluation')
   end
@@ -48,7 +56,13 @@ def new
   def edit
     @should_confirm = params[:confirm].present?
     @course = @evaluation.series.course
-    set_filters(@course.course_memberships)
+    @filters = filters(@course.course_memberships)
+    @filters << {
+      param: 'course_labels',
+      multi: true,
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options(),
+      color: 'orange'
+    }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
                           .order(status: :asc)
@@ -73,7 +87,13 @@ def create
     authorize @evaluation
     @evaluation.exercises = @evaluation.series.exercises
     @course = @evaluation.series.course
-    set_filters(@course.course_memberships)
+    @filters = filters(@course.course_memberships)
+    @filters << {
+      param: 'course_labels',
+      multi: true,
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options(),
+      color: 'orange'
+    }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
                           .order(status: :asc)
@@ -179,16 +199,4 @@ def set_evaluation
   def set_series
     @series = Series.find(params[:series_id])
   end
-
-  def set_filters(users)
-    @filters = filters(users)
-
-    course = @evaluation.series.course
-    @filters << {
-      param: 'course_labels',
-      multi: true,
-      data: users.course_labels_filter_options(course.id),
-      color: 'orange'
-    }
-  end
 end
diff --git a/app/models/course_membership.rb b/app/models/course_membership.rb
index 862ae50b9e..70ed9b5edf 100644
--- a/app/models/course_membership.rb
+++ b/app/models/course_membership.rb
@@ -33,7 +33,7 @@ class CourseMembership < ApplicationRecord
   scope :by_filter, ->(filter) { where(user: User.by_filter(filter)) }
   filterable_by :course_labels, associations: :course_labels, column: 'course_labels.name', multi: true
   filterable_by :institution_id, associations: { user: [:institution] }, column: 'institutions.id',
-                name_hash: ->(values) { Institution.find(values).to_h { |i| [i.id, i.name] } }
+                                 name_hash: ->(values) { Institution.find(values).to_h { |i| [i.id, i.name] } }
 
   scope :order_by_status_in_course_and_name, ->(direction) { joins(:user).merge(User.order_by_status_in_course_and_name(direction)) }
   scope :order_by_progress, ->(direction, course) { joins(:user).merge(User.order_by_progress(direction, course)) }

From 57110bbde15a31e191b09f96acdb9a281583f22e Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 11:38:10 +0200
Subject: [PATCH 26/72] Fix event types

---
 app/assets/javascripts/i18n/translations.json | 2 ++
 app/controllers/events_controller.rb          | 5 ++++-
 app/models/event.rb                           | 4 +++-
 app/views/events/index.html.erb               | 2 +-
 app/views/events/index.js.erb                 | 1 +
 config/locales/js/en.yml                      | 1 +
 config/locales/js/nl.yml                      | 1 +
 config/locales/models/en.yml                  | 1 +
 config/locales/models/nl.yml                  | 1 +
 9 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index 76d149bc4f..33959ce65f 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -332,6 +332,7 @@
           "course_labels": "Member labels",
           "description_languages": "Languages",
           "draft": "Draft",
+          "event_type": "Type",
           "exercise_id": "Exercise",
           "institution_id": "Institution",
           "judge_id": "Judge",
@@ -848,6 +849,7 @@
           "course_labels": "Gebruikerlabels",
           "description_languages": "Talen",
           "draft": "Concept",
+          "event_type": "type",
           "exercise_id": "Oefening",
           "institution_id": "Onderwijsinstelling",
           "judge_id": "Judge",
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 7f94d45278..dfdb326e07 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,8 +1,11 @@
 class EventsController < ApplicationController
-  has_scope :by_type, as: 'type'
+  include HasFilter
+
+  has_filter :event_type, 'deep-purple'
 
   def index
     authorize Event
+    @filters = filters(policy_scope(Event))
     @events = apply_scopes(policy_scope(Event)).paginate(page: parse_pagination_param(params[:page]))
     @title = I18n.t('events.index.title')
   end
diff --git a/app/models/event.rb b/app/models/event.rb
index 417e01d8b3..cd80f371ee 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -11,12 +11,14 @@
 #
 
 class Event < ApplicationRecord
+  include Filterable
   enum event_type: { rejudge: 0, permission_change: 1, exercise_repository: 2, error: 3, no_auth_id_sign_in: 4 }
   belongs_to :user, optional: true
 
   validates :event_type, presence: true
   validates :message, presence: true
 
-  scope :by_type, ->(type) { where(event_type: type.in?(event_types) ? type : -1) }
+  filterable_by :event_type, name_hash: ->(values) { Event.event_types.to_h { |s| [s, human_enum_name(:event_type, s)] } },
+                             value_check: ->(value) { value.in? event_types }
   default_scope { order(id: :desc) }
 end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index cf78c4e7f8..dbacc229ef 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -5,7 +5,7 @@
         <h2 class="card-title-text"><%= t(".title") %></h2>
       </div>
       <div class="card-supporting-text">
-        <%= render partial: 'layouts/searchbar', locals: {event_types: Event.event_types.keys} %>
+        <%= render partial: 'layouts/searchbar'%>
         <div id="events-table-wrapper">
           <%= render partial: 'events_table', locals: {events: @events} %>
         </div>
diff --git a/app/views/events/index.js.erb b/app/views/events/index.js.erb
index ed6ead185b..92174a2b88 100644
--- a/app/views/events/index.js.erb
+++ b/app/views/events/index.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#events-table-wrapper"), "<%= escape_javascript(render partial: 'events/events_table', locals: {events: @events}) %>")
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/config/locales/js/en.yml b/config/locales/js/en.yml
index 66b896d5ab..b676e060c2 100644
--- a/config/locales/js/en.yml
+++ b/config/locales/js/en.yml
@@ -243,6 +243,7 @@ en:
         popularity: Popularity
         exercise_id: Exercise
         draft: "Draft"
+        event_type: Type
     saved_annotation:
       title: Title
       annotation_text: Text
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index 2112f88a98..e3c44a2e93 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -244,6 +244,7 @@ nl:
         search_options: Opties
         exercise_id: Oefening
         draft: "Concept"
+        event_type: type
     saved_annotation:
       title: Titel
       annotation_text: Tekst
diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
index 68e0057cc8..0788b6c750 100644
--- a/config/locales/models/en.yml
+++ b/config/locales/models/en.yml
@@ -173,6 +173,7 @@ en:
           permission_change: Change in permission level
           exercise_repository: Creation of exercise repository
           error: Error
+          no_auth_id_sign_in: User logged in without auth_id
       export:
         statuses:
           started: Started
diff --git a/config/locales/models/nl.yml b/config/locales/models/nl.yml
index e8bfdd6616..bb00288415 100644
--- a/config/locales/models/nl.yml
+++ b/config/locales/models/nl.yml
@@ -174,6 +174,7 @@ nl:
           permission_change: Verandering in toegangsniveau
           exercise_repository: Aanmaak van oefeningenrepository
           error: Error
+          no_auth_id_sign_in: Gebruiker heeft ingelogd zonder auth_id
       export:
         statuses:
           started: Begonnen

From 457f9284f5e083165337b3600cb2707afb454848 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 11:49:23 +0200
Subject: [PATCH 27/72] COnvert feedbacks searchbar

---
 app/controllers/feedbacks_controller.rb | 7 +++++--
 app/models/submission.rb                | 3 ++-
 app/views/feedbacks/edit.html.erb       | 2 +-
 app/views/feedbacks/edit.js.erb         | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index f445dcbacf..23cabd317c 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -1,5 +1,6 @@
 class FeedbacksController < ApplicationController
   include SeriesHelper
+  include HasFilter
 
   before_action :set_feedback, only: %i[show edit update destroy_scores]
 
@@ -7,7 +8,7 @@ class FeedbacksController < ApplicationController
     scope.by_filter(value, skip_user: true, skip_exercise: true)
   end
 
-  has_scope :by_status, as: 'status'
+  has_filter :status, 'indigo'
 
   content_security_policy only: %i[show] do |policy|
     # allow sandboxed description
@@ -43,9 +44,11 @@ def show
   end
 
   def edit
-    @submissions = apply_scopes(Submission)
+    @submissions = Submission
                    .in_series(@feedback.evaluation.series)
                    .where(user: @feedback.user, exercise: @feedback.exercise)
+    @filters = filters(@submissions)
+    @submissions = apply_scopes(@submissions)
                    .paginate(page: parse_pagination_param(params[:page]))
     @crumbs = [
       [@feedback.evaluation.series.course.name, course_url(@feedback.evaluation.series.course)],
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 124364748d..baa705a0e0 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -66,7 +66,8 @@ class Submission < ApplicationRecord
   # As this scope is used for the progress bars on the course page, the speedup was relevant
   scope :judged, -> { where(status: ['unknown', 'correct', 'wrong', 'time limit exceeded', 'runtime error', 'compilation error', 'memory limit exceeded', 'internal error', 'output limit exceeded']) }
   scope :by_exercise_name, ->(name) { where(exercise: Exercise.by_name(name)) }
-  scope :by_status, ->(status) { where(status: status.in?(statuses) ? status : -1) }
+  filterable_by :status, name_hash: ->(values) { statuses.to_h { |s| [s, human_enum_name(:status, s)] } },
+                         value_check: ->(value) { value.in? statuses }
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_filter, lambda { |filter, skip_user:, skip_exercise:|
     filter.split.map(&:strip).select(&:present?).map do |part|
diff --git a/app/views/feedbacks/edit.html.erb b/app/views/feedbacks/edit.html.erb
index 472568e33a..67295bef2b 100644
--- a/app/views/feedbacks/edit.html.erb
+++ b/app/views/feedbacks/edit.html.erb
@@ -6,7 +6,7 @@
         <h2 class="card-title-text"><%= t('.title', user: @feedback.user.full_name, exercise: @feedback.exercise.name) %></h2>
       </div>
       <div class="card-supporting-text card-border">
-        <%= render partial: 'layouts/searchbar', locals: { statuses: Submission.statuses.keys } %>
+        <%= render partial: 'layouts/searchbar' %>
         <div id="submissions-table-wrapper">
           <%= render partial: 'submissions_table', locals: { submissions: @submissions } %>
         </div>
diff --git a/app/views/feedbacks/edit.js.erb b/app/views/feedbacks/edit.js.erb
index 15460db2c0..b90ffdc2af 100644
--- a/app/views/feedbacks/edit.js.erb
+++ b/app/views/feedbacks/edit.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#submissions-table-wrapper"), "<%= escape_javascript(render partial: 'submissions_table', locals: { submissions: @submissions }) %>")
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From 8fa9e881622444b980af29c6c5971f710af2ab05 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 12:01:36 +0200
Subject: [PATCH 28/72] Fix repository searchbars

---
 app/views/layouts/_searchbar.html.erb  | 11 +++++++++--
 app/views/repositories/admins.html.erb |  2 +-
 app/views/repositories/show.html.erb   |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index b92b91138c..b661127255 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -1,13 +1,20 @@
 <%= content_for :javascripts do %>
   <%= javascript_include_tag 'search' %>
 <% end %>
+<%
+  no_filter_for = local_assigns.fetch :no_filter_for, []
+  no_dropdown_for = local_assigns.fetch :no_dropdown_for, []
+  no_dropdown_for += no_filter_for
+%>
 <div class='table-toolbar'>
-  <d-search-tokens class="search-tokens"></d-search-tokens>
+  <d-search-tokens class="search-tokens"
+                   hide="<%= no_filter_for.to_json %>"></d-search-tokens>
   <div class='table-toolbar-tools'>
     <i class="mdi mdi-magnify"></i>
     <form class='search' onsubmit="return false;">
       <d-search-field placeholder="<%= t("layout.search.search") %>"
                       eager="<%= local_assigns.fetch :eager, false %>"
+                      hide="<%= no_filter_for.to_json %>"
       ></d-search-field>
       <d-loading-bar search-based></d-loading-bar>
     </form>
@@ -17,7 +24,7 @@
   </div>
   <div class="d-flex align-items-center">
     <d-dropdown-filters class="dropdown-filters"
-                        hide="<%= (local_assigns.fetch :no_dropdown_for, []).to_json %>"
+                        hide="<%= no_dropdown_for.to_json %>"
     ></d-dropdown-filters>
     <% if local_assigns[:actions]&.any? %>
       <div class="flex-spacer"></div>
diff --git a/app/views/repositories/admins.html.erb b/app/views/repositories/admins.html.erb
index b6847b96d0..1c3bad3aca 100644
--- a/app/views/repositories/admins.html.erb
+++ b/app/views/repositories/admins.html.erb
@@ -17,7 +17,7 @@
       </div>
       <div class="card-supporting-text card-border">
         <h3><%= t ".add_admins" %></h3>
-        <%= render(partial: 'layouts/searchbar', locals: {baseUrl: available_for_repository_users_path(:repository_id => @repository.id), eager: true, institutions: Institution.all}) %>
+        <%= render(partial: 'layouts/searchbar', locals: {baseUrl: available_for_repository_users_path(:repository_id => @repository.id), eager: true}) %>
         <div id="users-table-wrapper">
         </div>
       </div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 60c6970b22..c8014f537a 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -69,7 +69,7 @@
       </div>
       <div class="card-supporting-text card-border">
         <h4><%= t ".learning_activities" %></h4>
-        <%= render(partial: 'layouts/searchbar', locals: {baseUrl: activities_path(repository_id: @repository.id), eager: true, activity_types: [ContentPage, Exercise], description_languages: ["en", "nl"], labels: @labels, programming_languages: @programming_languages, judges: @judges}) %>
+        <%= render(partial: 'layouts/searchbar', locals: {baseUrl: activities_path(repository_id: @repository.id), eager: true, no_filter_for: ['repository_id']}) %>
         <div id="activities-table-wrapper">
         </div>
       </div>

From 7030d61a6fc0b711fb7a02607f7f969fdb7275e9 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 14:59:24 +0200
Subject: [PATCH 29/72] Fix saved annotations

---
 .../saved_annotations/saved_annotation_list.ts   | 14 ++++++++++++++
 app/assets/javascripts/state/SavedAnnotations.ts | 13 +++++++++++++
 app/controllers/concerns/has_filter.rb           |  6 ++++++
 app/controllers/saved_annotations_controller.rb  | 16 ++++++++--------
 app/models/annotation.rb                         |  3 ++-
 app/models/saved_annotation.rb                   |  5 +++--
 app/views/saved_annotations/index.html.erb       |  2 +-
 app/views/saved_annotations/new.html.erb         |  2 +-
 app/views/saved_annotations/new.js.erb           |  1 +
 9 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/components/saved_annotations/saved_annotation_list.ts b/app/assets/javascripts/components/saved_annotations/saved_annotation_list.ts
index b080421d53..e00d47c994 100644
--- a/app/assets/javascripts/components/saved_annotations/saved_annotation_list.ts
+++ b/app/assets/javascripts/components/saved_annotations/saved_annotation_list.ts
@@ -5,6 +5,8 @@ import "components/pagination";
 import { searchQueryState } from "state/SearchQuery";
 import { DodonaElement } from "components/meta/dodona_element";
 import { i18n } from "i18n/i18n";
+import { FilterOptions } from "components/search/filter_element";
+import { search } from "search";
 
 /**
  * This component represents a list of saved annotations
@@ -43,7 +45,19 @@ export class SavedAnnotationList extends DodonaElement {
         return pagination;
     }
 
+    lastFilters: FilterOptions[] = [];
+    get filters(): FilterOptions[] {
+        const filters = savedAnnotationState.getFilters(this.queryParams, this.arrayQueryParams);
+        if (filters === undefined) {
+            // return last filters if the updated filters are not yet available
+            return this.lastFilters;
+        }
+        this.lastFilters = filters;
+        return filters;
+    }
+
     render(): TemplateResult {
+        search.updateFilters(this.filters);
         return this.savedAnnotations.length > 0 ? html`
             <div class="table-scroll-wrapper">
                 <table class="table table-index table-resource">
diff --git a/app/assets/javascripts/state/SavedAnnotations.ts b/app/assets/javascripts/state/SavedAnnotations.ts
index ab77a0ce17..e61c713f2c 100644
--- a/app/assets/javascripts/state/SavedAnnotations.ts
+++ b/app/assets/javascripts/state/SavedAnnotations.ts
@@ -5,6 +5,7 @@ import { State } from "state/state_system/State";
 import { stateProperty } from "state/state_system/StateProperty";
 import { StateMap } from "state/state_system/StateMap";
 import { i18n } from "i18n/i18n";
+import { FilterOptions } from "components/search/filter_element";
 
 export type SavedAnnotation = {
     annotations_count?: number;
@@ -33,6 +34,7 @@ function addParametersToUrl(url: string, params?: Map<string, string>, arrayPara
 class SavedAnnotationState extends State {
     @stateProperty private listByURL = new StateMap<string, SavedAnnotation[]>();
     @stateProperty private paginationByURL = new StateMap<string, Pagination>();
+    @stateProperty private filtersByURL = new StateMap<string, FilterOptions[]>();
     @stateProperty private byId = new StateMap<number, SavedAnnotation>();
 
     private get url(): string {
@@ -43,6 +45,7 @@ class SavedAnnotationState extends State {
         const response = await fetch(url);
         this.listByURL.set(url, await response.json());
         this.paginationByURL.set(url, JSON.parse(response.headers.get("X-Pagination")));
+        this.filtersByURL.set(url, JSON.parse(response.headers.get("X-Filters")));
         return this.listByURL.get(url);
     }
 
@@ -90,6 +93,16 @@ class SavedAnnotationState extends State {
         return this.paginationByURL.get(url);
     }
 
+    getFilters(params?: Map<string, string>, arrayParams?: Map<string, string[]>): FilterOptions[] {
+        const url = addParametersToUrl(`${this.url}.json`, params, arrayParams);
+        delayerByURL.get(url)(() => {
+            if (!this.paginationByURL.has(url)) {
+                this.fetchList(url);
+            }
+        }, 200);
+        return this.filtersByURL.get(url);
+    }
+
     get(id: number): SavedAnnotation {
         delayerByID.get(id)(() => {
             if (!this.byId.has(id)) {
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index f25d6ab254..1dc5508a3b 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -29,5 +29,11 @@ def has_filter(name, color, multi: false)
 
       filter_options << [name, multi, color]
     end
+
+    def set_filter_headers(options = {})
+      after_action(options) do
+        headers['X-Filters'] = @filters.to_json
+      end
+    end
   end
 end
diff --git a/app/controllers/saved_annotations_controller.rb b/app/controllers/saved_annotations_controller.rb
index 4051969233..5c03d973c0 100644
--- a/app/controllers/saved_annotations_controller.rb
+++ b/app/controllers/saved_annotations_controller.rb
@@ -1,11 +1,13 @@
 class SavedAnnotationsController < ApplicationController
   include Sortable
+  include HasFilter
   set_pagination_headers :saved_annotations, only: [:index]
+  set_filter_headers only: [:index]
   before_action :set_saved_annotation, only: %i[show update destroy edit]
 
   has_scope :by_user, as: 'user_id'
-  has_scope :by_course, as: 'course_id'
-  has_scope :by_exercise, as: 'exercise_id'
+  has_filter :course_id, 'orange'
+  has_filter :exercise_id, 'blue-gray'
   has_scope :by_filter, as: 'filter'
 
   order_by :annotations_count, :title, :annotation_text, :created_at
@@ -14,10 +16,9 @@ def index
     authorize SavedAnnotation
     @title = I18n.t('saved_annotations.index.title')
     @crumbs = [[I18n.t('saved_annotations.index.title'), saved_annotations_path]]
-    saved_annotations = policy_scope(SavedAnnotation.order_by_annotations_count(:DESC))
-    @courses = Course.where(id: saved_annotations.pluck(:course_id).uniq)
-    @exercises = Activity.where(id: saved_annotations.pluck(:exercise_id).uniq)
-    @saved_annotations = apply_scopes(saved_annotations)
+    saved_annotations = policy_scope(SavedAnnotation)
+    @filters = filters(saved_annotations)
+    @saved_annotations = apply_scopes(saved_annotations.order_by_annotations_count(:DESC))
                          .includes(:course).includes(:user).includes(:exercise)
                          .paginate(page: parse_pagination_param(params[:page]), per_page: parse_pagination_param(params[:per_page]))
   end
@@ -42,8 +43,7 @@ def new
     authorize SavedAnnotation
     @annotations = AnnotationPolicy::Scope.new(current_user, Annotation.all).resolve
     @annotations = @annotations.where(saved_annotation_id: nil).where(user_id: current_user.id)
-    @courses = Course.where(id: @annotations.joins(:submission).pluck('submissions.course_id').uniq)
-    @exercises = Activity.where(id: @annotations.joins(:submission).pluck('submissions.exercise_id').uniq)
+    @filters = filters(@annotations)
     @annotations = apply_scopes(@annotations.order_by_created_at(:DESC))
                    .includes(:course).includes(:user).includes(:submission)
                    .paginate(page: parse_pagination_param(params[:page]), per_page: parse_pagination_param(params[:per_page]))
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 0ea64a236c..bb7cad4383 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -58,8 +58,9 @@ class Annotation < ApplicationRecord
   scope :by_course, ->(course_id) { where(submission: Submission.in_course(Course.find(course_id))) }
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_exercise_name, ->(name) { where(submission: Submission.by_exercise_name(name)) }
-  scope :by_exercise, ->(exercise_id) { where(submission: { exercise_id: exercise_id }) }
   filterable_by :course_id, name_hash: ->(values) { Course.where(id: values).to_h { |c| [c.id, c.name] } }
+  filterable_by :exercise_id, associations: :submission, column: 'submissions.exercise_id',
+                              name_hash: ->(values) { Exercise.where(id: values).to_h { |e| [e.id, e.name] } }
 
   scope :order_by_annotation_text, ->(direction) { reorder(annotation_text: direction) }
   scope :order_by_created_at, ->(direction) { reorder(created_at: direction) }
diff --git a/app/models/saved_annotation.rb b/app/models/saved_annotation.rb
index ef7cb470f9..5c609805d3 100644
--- a/app/models/saved_annotation.rb
+++ b/app/models/saved_annotation.rb
@@ -13,6 +13,7 @@
 #  annotations_count :integer          default(0)
 #
 class SavedAnnotation < ApplicationRecord
+  include Filterable
   validates :title, presence: true
   validates :annotation_text, presence: true
 
@@ -24,8 +25,8 @@ class SavedAnnotation < ApplicationRecord
   has_many :submissions, through: :annotations
 
   scope :by_user, ->(user_id) { where user_id: user_id }
-  scope :by_course, ->(course_id) { where course_id: course_id }
-  scope :by_exercise, ->(exercise_id) { where exercise_id: exercise_id }
+  filterable_by :exercise_id, name_hash: ->(values) { Exercise.where(id: values).to_h { |exercise| [exercise.id, exercise.name] } }
+  filterable_by :course_id, name_hash: ->(values) { Course.where(id: values).to_h { |course| [course.id, course.name] } }
   scope :by_filter, ->(filter) { where 'title LIKE ? or annotation_text LIKE ?', "%#{filter}%", "%#{filter}%" }
 
   scope :order_by_annotations_count, ->(direction) { reorder(annotations_count: direction) }
diff --git a/app/views/saved_annotations/index.html.erb b/app/views/saved_annotations/index.html.erb
index a02435d104..d4b6326884 100644
--- a/app/views/saved_annotations/index.html.erb
+++ b/app/views/saved_annotations/index.html.erb
@@ -11,7 +11,7 @@
         <% end %>
       </div>
       <div class="card-supporting-text" id="refresh-element">
-        <%= render partial: 'layouts/searchbar', locals: { courses: @courses, exercises: @exercises, autoSearch: false } %>
+        <%= render partial: 'layouts/searchbar', locals: { autoSearch: false } %>
         <div id="questions-table-wrapper">
           <d-saved-annotation-list></d-saved-annotation-list>
         </div>
diff --git a/app/views/saved_annotations/new.html.erb b/app/views/saved_annotations/new.html.erb
index 7919e9a573..56b9870799 100644
--- a/app/views/saved_annotations/new.html.erb
+++ b/app/views/saved_annotations/new.html.erb
@@ -5,7 +5,7 @@
         <h2 class="card-title-text"><%= t ".title" %></h2>
       </div>
       <div class="card-supporting-text" id="annotation-container">
-        <%= render partial: 'layouts/searchbar', locals: { refresh_element: "#annotation-container", courses: @courses, exercises: @exercises } %>
+        <%= render partial: 'layouts/searchbar', locals: { refresh_element: "#annotation-container" } %>
         <div id="questions-table-wrapper">
           <%= render partial: 'annotations/annotations_table', locals: { annotations: @annotations, allow_save: true } %>
         </div>
diff --git a/app/views/saved_annotations/new.js.erb b/app/views/saved_annotations/new.js.erb
index 437a9c43ef..7016a72401 100644
--- a/app/views/saved_annotations/new.js.erb
+++ b/app/views/saved_annotations/new.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#questions-table-wrapper"), "<%= escape_javascript(render partial: 'annotations/annotations_table', locals: { annotations: @annotations, allow_save: true }) %>");
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From bebda0f418dc008a7184edad5ee06a7d57013dd9 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 15:06:01 +0200
Subject: [PATCH 30/72] Fix series

---
 app/controllers/activities_controller.rb | 1 +
 app/views/activities/available.js.erb    | 1 +
 app/views/series/edit.html.erb           | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index f5494d8bbe..14905bddcb 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -103,6 +103,7 @@ def available
     authorize @series, :edit?
     @activities = policy_scope(Activity)
     @activities = @activities.or(Activity.where(repository: @course.usable_repositories)).order_by_popularity(:DESC)
+    @filters = filters(@activities)
     @activities = apply_scopes(@activities)
     @activities = @activities.order("name_#{I18n.locale}").order(path: :asc).paginate(page: parse_pagination_param(params[:page]))
   end
diff --git a/app/views/activities/available.js.erb b/app/views/activities/available.js.erb
index 472417792a..e6eb6758f5 100644
--- a/app/views/activities/available.js.erb
+++ b/app/views/activities/available.js.erb
@@ -1,2 +1,3 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#activities-table-wrapper"), "<%= escape_javascript(render partial: 'series_activities_add_table', locals: {activities: @activities, series: @series}) %>");
 dodona.seriesEditActivitiesLoaded();
+dodona.search.updateFilters(<%= raw @filters.to_json %>);
diff --git a/app/views/series/edit.html.erb b/app/views/series/edit.html.erb
index bc7c9db62a..4000f6b533 100644
--- a/app/views/series/edit.html.erb
+++ b/app/views/series/edit.html.erb
@@ -87,7 +87,7 @@
           <div class="col-12">
             <h4 id="add-activities"><%= t ".add_activities" %></h4>
             <d-filter-tabs labels="<%= @tabs.to_json %>"></d-filter-tabs>
-            <%= render partial: 'layouts/searchbar', locals: {baseUrl: available_activities_series_path(@series), eager: true, labels: @labels, programming_languages: @programming_languages, repositories: @repositories, activity_types: [ContentPage, Exercise], description_languages: ["en", "nl"], popularity: Activity::POPULARITY_THRESHOLDS.keys, local_storage_key: 'seriesActivitySearch', draft: current_user&.draft_exercises&.any?} %>
+            <%= render partial: 'layouts/searchbar', locals: {baseUrl: available_activities_series_path(@series), eager: true, local_storage_key: 'seriesActivitySearch'} %>
             <div id="activities-table-wrapper">
             </div>
           </div>

From 3d2e327b81f74ac468c851f7bf19bf5aa99eadcc Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 16:33:31 +0200
Subject: [PATCH 31/72] Fix submissions

---
 app/controllers/submissions_controller.rb | 5 +++--
 app/views/submissions/index.html.erb      | 2 +-
 app/views/submissions/index.js.erb        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 74a7083a64..2d79df4414 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -13,7 +13,7 @@ class SubmissionsController < ApplicationController
     scope.by_filter(value, skip_user: controller.params[:user_id].present?, skip_exercise: controller.params[:activity_id].present?)
   end
 
-  has_scope :by_status, as: 'status'
+  has_filter :status, 'indigo'
 
   has_scope :by_course_labels, as: 'course_labels', type: :array do |controller, scope, value|
     course = Course.find_by(id: controller.params[:course_id]) if controller.params[:course_id].present?
@@ -158,7 +158,7 @@ def set_submission
   # The logic here is very similar to that of set_activity_read_states in activity_read_states_controller
   # changes made here are potentially applicable to both functions
   def set_submissions
-    @submissions = policy_scope(Submission).merge(apply_scopes(Submission).all)
+    @submissions = policy_scope(Submission)
     if params[:user_id]
       @user = User.find(params[:user_id])
       @submissions = @submissions.of_user(@user)
@@ -187,6 +187,7 @@ def set_submissions
     end
 
     @filters = filters(@submissions)
+    @submissions = apply_scopes(@submissions)
     if @course.present? && @user.blank? && current_user&.course_admin?(@course)
       @filters << {
         param: 'course_labels',
diff --git a/app/views/submissions/index.html.erb b/app/views/submissions/index.html.erb
index 9fdbe4010c..5c48709a8a 100644
--- a/app/views/submissions/index.html.erb
+++ b/app/views/submissions/index.html.erb
@@ -45,7 +45,7 @@
              options << {label: t('.watch_submissions'), param: 'refresh'}
           %>
         <% end %>
-        <%= render partial: 'layouts/searchbar', locals: {actions: actions, options: options, statuses: Submission.statuses.keys, refresh_element: "#refresh_element"} %>
+        <%= render partial: 'layouts/searchbar', locals: {actions: actions, options: options, refresh_element: "#refresh_element"} %>
         <div id="submissions-table-wrapper">
           <%= render partial: 'submissions_table', locals: {submissions: @submissions, exercise: @activity, course: @course, user: @user} %>
         </div>
diff --git a/app/views/submissions/index.js.erb b/app/views/submissions/index.js.erb
index c3e18555db..1369c2081f 100644
--- a/app/views/submissions/index.js.erb
+++ b/app/views/submissions/index.js.erb
@@ -6,3 +6,4 @@ if (dodona.feedbackTableLoaded) {
         <%= raw "#{@course&.id || 'undefined'}" %>
     );
 }
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From 8d928753e5f3384d1d25631f8a6f977da5cf55a1 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 16:37:33 +0200
Subject: [PATCH 32/72] fix users

---
 app/controllers/users_controller.rb | 4 +++-
 app/views/users/index.html.erb      | 2 +-
 app/views/users/index.js.erb        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0fd1ef660e..7c703d0cbc 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,9 +1,10 @@
 class UsersController < ApplicationController
+  include HasFilter
   before_action :set_user, only: %i[show edit update destroy impersonate token_sign_in]
   before_action :set_users, only: %i[index available_for_repository]
 
   has_scope :by_permission
-  has_scope :by_institution, as: 'institution_id'
+  has_filter :institution_id, 'pink'
   has_scope :by_filter, as: 'filter'
 
   # GET /users
@@ -122,6 +123,7 @@ def set_user
 
   def set_users
     authorize User
+    @filters = filters(User)
     @users = apply_scopes(User).order(permission: :desc, last_name: :asc, first_name: :asc).paginate(page: parse_pagination_param(params[:page]))
   end
 end
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 995824747d..aa426427de 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -10,7 +10,7 @@
         <% end %>
       </div>
       <div class="card-supporting-text">
-        <%= render partial: 'layouts/searchbar', locals: {institutions: Institution.all} %>
+        <%= render partial: 'layouts/searchbar' %>
         <div id="users-table-wrapper">
           <%= render partial: 'users_table', locals: {users: @users, pagination_opts: @pagination_opts} %>
         </div>
diff --git a/app/views/users/index.js.erb b/app/views/users/index.js.erb
index cf8fcdea7f..e2b7b310df 100644
--- a/app/views/users/index.js.erb
+++ b/app/views/users/index.js.erb
@@ -1 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'users/users_table', locals: {users: @users, pagination_opts: @pagination_opts }) %>");
+dodona.search.updateFilters(<%= raw @filters.to_json %>);

From f07a7d3c6a40e45b98d2b64637af2fa0687a8bb8 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 16:57:55 +0200
Subject: [PATCH 33/72] Simplify enums

---
 app/models/activity.rb            | 4 ++--
 app/models/concerns/filterable.rb | 9 ++++++++-
 app/models/event.rb               | 3 +--
 app/models/submission.rb          | 3 +--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index b3f356d313..92e9a02deb 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -75,8 +75,8 @@ class Activity < ApplicationRecord
 
   scope :by_name, ->(name) { where('name_nl LIKE ? OR name_en LIKE ? OR path LIKE ?', "%#{name}%", "%#{name}%", "%#{name}%") }
   search_by :name_nl, :name_en, :path
-  filterable_by :status, value_check: ->(value) { value.in? statuses }
-  filterable_by :access, value_check: ->(value) { value.in? accesses }
+  filterable_by :status, is_enum: true
+  filterable_by :access, is_enum: true
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
   filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
   filterable_by :judge_id, name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 92dd65af62..6bf72e5bf7 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -19,7 +19,14 @@ def search_by(*columns)
     # +associations+:: The associations to include in the scope
     # +value_check+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
     # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
-    def filterable_by(name, column: name, associations: [], multi: false, value_check: ->(value) { true }, name_hash: ->(values) { values.to_h { |value| [value, value] } })
+    def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, name_hash: ->(values) { values.to_h { |value| [value, value] } })
+      if is_enum
+        value_check = ->(value) { value.in? send(column.to_s.pluralize.to_s) }
+        name_hash = ->(values) { send(column.to_s.pluralize.to_s).to_h { |s| [s, human_enum_name(column.to_s.pluralize.to_s, s)] } }
+      else
+        value_check = ->(value) { true }
+      end
+
       scope "by_#{name}", lambda { |value|
         if value_check.call(value) && (!multi || value.is_a?(Array))
           scope = joins(associations).where(column => value)
diff --git a/app/models/event.rb b/app/models/event.rb
index cd80f371ee..2741c6ee9c 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -18,7 +18,6 @@ class Event < ApplicationRecord
   validates :event_type, presence: true
   validates :message, presence: true
 
-  filterable_by :event_type, name_hash: ->(values) { Event.event_types.to_h { |s| [s, human_enum_name(:event_type, s)] } },
-                             value_check: ->(value) { value.in? event_types }
+  filterable_by :event_type, is_enum: true
   default_scope { order(id: :desc) }
 end
diff --git a/app/models/submission.rb b/app/models/submission.rb
index baa705a0e0..7b77fbf9f9 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -66,8 +66,7 @@ class Submission < ApplicationRecord
   # As this scope is used for the progress bars on the course page, the speedup was relevant
   scope :judged, -> { where(status: ['unknown', 'correct', 'wrong', 'time limit exceeded', 'runtime error', 'compilation error', 'memory limit exceeded', 'internal error', 'output limit exceeded']) }
   scope :by_exercise_name, ->(name) { where(exercise: Exercise.by_name(name)) }
-  filterable_by :status, name_hash: ->(values) { statuses.to_h { |s| [s, human_enum_name(:status, s)] } },
-                         value_check: ->(value) { value.in? statuses }
+  filterable_by :status, is_enum: true
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_filter, lambda { |filter, skip_user:, skip_exercise:|
     filter.split.map(&:strip).select(&:present?).map do |part|

From 2c80ae839ae25c7fe19bdadc4c11679c41a92687 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 30 Apr 2024 17:08:33 +0200
Subject: [PATCH 34/72] Simplify model naming

---
 app/models/activity.rb            |  4 ++--
 app/models/annotation.rb          |  5 ++---
 app/models/concerns/filterable.rb | 21 ++++++++++++++-------
 app/models/course.rb              |  2 +-
 app/models/course_membership.rb   |  3 +--
 app/models/question.rb            |  3 +--
 app/models/saved_annotation.rb    |  4 ++--
 app/models/user.rb                |  2 +-
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 92e9a02deb..29f42befb2 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -79,9 +79,9 @@ class Activity < ApplicationRecord
   filterable_by :access, is_enum: true
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
   filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
-  filterable_by :judge_id, name_hash: ->(values) { Judge.where(id: values).to_h { |j| [j.id, j.name] } }
+  filterable_by :judge_id, model: Judge
   filterable_by :labels, multi: true, associations: :labels, column: 'labels.name'
-  filterable_by :repository_id, name_hash: ->(values) { Repository.where(id: values).to_h { |r| [r.id, r.name] } }
+  filterable_by :repository_id, model: Repository
   filterable_by :draft, name_hash: ->(values) { { true => I18n.t('activities.index.filters.draft'), false => I18n.t('activities.index.filters.not_draft') } }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index bb7cad4383..8a2539e9d2 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -58,9 +58,8 @@ class Annotation < ApplicationRecord
   scope :by_course, ->(course_id) { where(submission: Submission.in_course(Course.find(course_id))) }
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_exercise_name, ->(name) { where(submission: Submission.by_exercise_name(name)) }
-  filterable_by :course_id, name_hash: ->(values) { Course.where(id: values).to_h { |c| [c.id, c.name] } }
-  filterable_by :exercise_id, associations: :submission, column: 'submissions.exercise_id',
-                              name_hash: ->(values) { Exercise.where(id: values).to_h { |e| [e.id, e.name] } }
+  filterable_by :course_id, model: Course
+  filterable_by :exercise_id, associations: :submission, column: 'submissions.exercise_id', model: Exercise
 
   scope :order_by_annotation_text, ->(direction) { reorder(annotation_text: direction) }
   scope :order_by_created_at, ->(direction) { reorder(created_at: direction) }
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 6bf72e5bf7..6aec998bf4 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -19,13 +19,20 @@ def search_by(*columns)
     # +associations+:: The associations to include in the scope
     # +value_check+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
     # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
-    def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, name_hash: ->(values) { values.to_h { |value| [value, value] } })
-      if is_enum
-        value_check = ->(value) { value.in? send(column.to_s.pluralize.to_s) }
-        name_hash = ->(values) { send(column.to_s.pluralize.to_s).to_h { |s| [s, human_enum_name(column.to_s.pluralize.to_s, s)] } }
-      else
-        value_check = ->(value) { true }
-      end
+    def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, model: nil, name_hash: nil)
+      value_check = if is_enum
+                      ->(value) { value.in? send(column.to_s.pluralize.to_s) }
+                    else
+                      ->(value) { true }
+                    end
+
+      name_hash ||= if is_enum
+                      ->(values) { values.to_h { |s| [s, human_enum_name(column.to_s.pluralize.to_s, s)] } }
+                    elsif model
+                      ->(values) { model.where(id: values).to_h { |s| [s.id, s.name] } }
+                    else
+                      ->(values) { values.to_h { |s| [s, s] } }
+                    end
 
       scope "by_#{name}", lambda { |value|
         if value_check.call(value) && (!multi || value.is_a?(Array))
diff --git a/app/models/course.rb b/app/models/course.rb
index 9e8e8990d6..30d79d0815 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -165,7 +165,7 @@ class Course < ApplicationRecord
   scope :by_name, ->(name) { where('name LIKE ?', "%#{name}%") }
   scope :by_teacher, ->(teacher) { where('teacher LIKE ?', "%#{teacher}%") }
   scope :by_institution, ->(institution) { where(institution: institution) }
-  filterable_by :institution_id, name_hash: ->(values) { Institution.where(id: values).to_h { |i| [i.id, i.name] } }
+  filterable_by :institution_id, model: Institution
   scope :can_register, lambda { |user|
     if user&.institutional?
       where(registration: %i[open_for_all open_for_institutional_users])
diff --git a/app/models/course_membership.rb b/app/models/course_membership.rb
index 70ed9b5edf..94d7a01a6f 100644
--- a/app/models/course_membership.rb
+++ b/app/models/course_membership.rb
@@ -32,8 +32,7 @@ class CourseMembership < ApplicationRecord
   scope :by_permission, ->(permission) { where(user: User.by_permission(permission)) }
   scope :by_filter, ->(filter) { where(user: User.by_filter(filter)) }
   filterable_by :course_labels, associations: :course_labels, column: 'course_labels.name', multi: true
-  filterable_by :institution_id, associations: { user: [:institution] }, column: 'institutions.id',
-                                 name_hash: ->(values) { Institution.find(values).to_h { |i| [i.id, i.name] } }
+  filterable_by :institution_id, associations: { user: [:institution] }, column: 'institutions.id', model: Institution
 
   scope :order_by_status_in_course_and_name, ->(direction) { joins(:user).merge(User.order_by_status_in_course_and_name(direction)) }
   scope :order_by_progress, ->(direction, course) { joins(:user).merge(User.order_by_progress(direction, course)) }
diff --git a/app/models/question.rb b/app/models/question.rb
index c1e41ba765..9dc3aec3c2 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -27,8 +27,7 @@ class Question < Annotation
   after_save :schedule_reset_in_progress, if: :saved_change_to_question_state?
   after_commit :clear_transition
 
-  filterable_by :question_state, name_hash: ->(values){ Question.question_states.to_h {|s| [s, human_enum_name(:question_state, s)]} }
-
+  filterable_by :question_state, is_enum: true
   enum question_state: { unanswered: 0, in_progress: 1, answered: 2 }
   alias_attribute :question_text, :annotation_text
 
diff --git a/app/models/saved_annotation.rb b/app/models/saved_annotation.rb
index 5c609805d3..4a03e6fac7 100644
--- a/app/models/saved_annotation.rb
+++ b/app/models/saved_annotation.rb
@@ -25,8 +25,8 @@ class SavedAnnotation < ApplicationRecord
   has_many :submissions, through: :annotations
 
   scope :by_user, ->(user_id) { where user_id: user_id }
-  filterable_by :exercise_id, name_hash: ->(values) { Exercise.where(id: values).to_h { |exercise| [exercise.id, exercise.name] } }
-  filterable_by :course_id, name_hash: ->(values) { Course.where(id: values).to_h { |course| [course.id, course.name] } }
+  filterable_by :exercise_id, model: Exercise
+  filterable_by :course_id, model: Course
   scope :by_filter, ->(filter) { where 'title LIKE ? or annotation_text LIKE ?', "%#{filter}%", "%#{filter}%" }
 
   scope :order_by_annotations_count, ->(direction) { reorder(annotations_count: direction) }
diff --git a/app/models/user.rb b/app/models/user.rb
index c17e69bc1e..28cfdd3b3a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -140,7 +140,7 @@ class User < ApplicationRecord
   search_by :username, :first_name, :last_name
 
   scope :by_permission, ->(permission) { where(permission: permission) }
-  filterable_by :institution_id, name_hash: ->(ids) { Institution.where(id: ids).to_h { |i| [i.id, i.name] } }
+  filterable_by :institution_id, model: Institution
 
   scope :in_course, ->(course) { joins(:course_memberships).where(course_memberships: { course_id: course.id }) }
   filterable_by_course_labels

From f9be4c990ca866a7586f76fe2169da22d60d86fd Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 09:14:39 +0200
Subject: [PATCH 35/72] remove unused code

---
 app/views/layouts/_searchbar.html.erb | 125 --------------------------
 1 file changed, 125 deletions(-)

diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index b661127255..06478ad9f0 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -40,131 +40,6 @@
 
 <script type="text/javascript">
     dodona.ready.then(function () {
-        let filterCollections = {};
-        <% if local_assigns.fetch :labels, false %>
-        filterCollections["labels"] = {
-            param: "labels",
-            multi: true,
-            data: <%= raw @labels.map { |l| {id: l.name.to_s, name: l.name.to_s}}.to_json %>,
-            color: "purple"
-        };
-        <% end %>
-        <% if local_assigns.fetch :programming_languages, false %>
-        filterCollections["programming_languages"] = {
-            param: "programming_language",
-            multi: false,
-            data: <%= raw @programming_languages.map { |l| {id: l.name.to_s, name: l.name.to_s}}.to_json %>,
-            color: "red",
-        };
-        <% end %>
-        <% if local_assigns.fetch :repositories, false %>
-        filterCollections["repositories"] = {
-            param: "repository_id",
-            multi: false,
-            data: <%= raw @repositories.map { |l| {id: l.id.to_s, name: l.name.to_s}}.to_json %>,
-            color: "blue-gray",
-        };
-        <% end %>
-        <% if local_assigns.fetch(:institutions, []).length > 1 %>
-        filterCollections["institutions"] = {
-            param: "institution_id",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:institutions, []).map{|i| {id: i.id.to_s, name: i.name.to_s}}.to_json %>,
-            color: "pink",
-        };
-        <% end %>
-        <% if local_assigns.fetch :course_labels, false %>
-        filterCollections["course_labels"] = {
-            param: "course_labels",
-            multi: true,
-            data: <%= raw local_assigns.fetch(:course_labels, []).map{|cl| {id: cl.name.to_s, name: cl.name.to_s}}.to_json %>,
-            color: "orange",
-        };
-        <% end %>
-        <% if local_assigns.fetch :statuses, false %>
-        filterCollections["statuses"] = {
-            param: "status",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:statuses, []).map{|s| {id: s.to_s, name: Submission.human_enum_name(:status, s)}}.to_json %>,
-            color: "indigo",
-        };
-        <% end %>
-        <% if local_assigns.fetch :question_states, false %>
-        filterCollections["question_states"] = {
-            param: "question_state",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:question_states, []).map{|s| {id: s.to_s, name: Question.human_enum_name(:question_state, s)}}.to_json %>,
-            color: "indigo",
-        };
-        <% end %>
-        <% if local_assigns.fetch :event_types, false %>
-        filterCollections["event_types"] = {
-            param: "type",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:event_types, []).map{|s| {id: s.to_s, name: Event.human_enum_name(:event_type, s)}}.to_json %>,
-            color: "deep-purple",
-        };
-        <% end %>
-        <% if local_assigns.fetch :activity_types, false %>
-        filterCollections["activity_types"] = {
-            param: "type",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:activity_types, []).map{|s| {id: s.name.to_s, name: s.model_name.human}}.to_json %>,
-            color: "deep-purple",
-        };
-        <% end %>
-        <% if local_assigns.fetch :description_languages, false %>
-        filterCollections["description_languages"] = {
-            param: "description_languages",
-            multi: true,
-            data: <%= raw local_assigns.fetch(:description_languages, []).map{|l| {id: l.to_s, name: t("js.#{l}")}}.to_json %>,
-            color: "orange",
-        };
-        <% end %>
-        <% if local_assigns.fetch :judges, false %>
-        filterCollections["judges"] = {
-            param: "judge_id",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:judges, []).map{|judge| {id: judge.id.to_s, name: "#{judge.name}-judge"}}.to_json %>,
-            color: "red",
-        }
-        <% end %>
-        <% if local_assigns.fetch :courses, false %>
-        filterCollections["courses"] = {
-            param: "course_id",
-            multi: false,
-            data: <%= raw local_assigns.fetch(:courses, []).map{|course| {id: course.id.to_s, name: "#{course.name} (#{course.formatted_year})"}}.to_json %>,
-            color: "orange"
-        };
-        <% end %>
-        <% if local_assigns.fetch :exercises, false %>
-        filterCollections["exercises"] = {
-          param: "exercise_id",
-          multi: false,
-          data: <%= raw local_assigns.fetch(:exercises, []).map{|exercise| {id: exercise.id.to_s, name: exercise.name}}.to_json %>,
-          color: "blue-gray"
-        };
-        <% end %>
-        <% if local_assigns.fetch :popularity, false %>
-            filterCollections["popularity"] = {
-              param: "popularity",
-              multi: true,
-              data: <%= raw local_assigns.fetch(:popularity, []).map{|s| {id: s.to_s, name: Activity.human_enum_name(:popularity, s)}}.to_json %>,
-              color: "pink",
-            };
-        <% end %>
-      <% if local_assigns.fetch :draft, false %>
-        filterCollections["draft"] = {
-          param: "draft",
-          multi: false,
-          data: [
-            {id: "true", name: "<%= t("activities.index.filters.draft") %>"},
-            {id: "false", name: "<%= t("activities.index.filters.not_draft") %>"}
-          ],
-          color: "indigo",
-        };
-      <% end %>
-
         dodona.search.setRefreshElement("<%= local_assigns.fetch :refresh_element, "" %>");
 
         // load the given localStorageKey if present. This key is used to retrieve the values stored in localStorage

From 98bdf227d8c5c38c1373b50e0341aa44738e4b67 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 09:17:21 +0200
Subject: [PATCH 36/72] Always include hasfilter

---
 app/controllers/activities_controller.rb        | 1 -
 app/controllers/annotations_controller.rb       | 1 -
 app/controllers/application_controller.rb       | 1 +
 app/controllers/course_members_controller.rb    | 1 -
 app/controllers/courses_controller.rb           | 1 -
 app/controllers/evaluations_controller.rb       | 1 -
 app/controllers/events_controller.rb            | 2 --
 app/controllers/feedbacks_controller.rb         | 1 -
 app/controllers/saved_annotations_controller.rb | 1 -
 app/controllers/series_controller.rb            | 1 -
 app/controllers/submissions_controller.rb       | 1 -
 app/controllers/users_controller.rb             | 1 -
 12 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 14905bddcb..87ed8c4c8d 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -2,7 +2,6 @@ class ActivitiesController < ApplicationController
   include SeriesHelper
   include SetLtiMessage
   include Sortable
-  include HasFilter
 
   INPUT_SERVICE_WORKER = 'inputServiceWorker.js'.freeze
 
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index f21a92ba3e..e9ee3e46b5 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -1,5 +1,4 @@
 class AnnotationsController < ApplicationController
-  include HasFilter
   before_action :set_submission, only: %i[create]
   before_action :set_annotation, only: %i[show update destroy]
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9e11c7e15a..e7f1a51836 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,6 +2,7 @@ class ApplicationController < ActionController::Base
   include Pundit::Authorization
   include SetCurrentRequestDetails
   include ApplicationHelper
+  include HasFilter
 
   MAX_STORED_URL_LENGTH = 1024
 
diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
index ecb17e06c1..012982944c 100644
--- a/app/controllers/course_members_controller.rb
+++ b/app/controllers/course_members_controller.rb
@@ -1,5 +1,4 @@
 class CourseMembersController < ApplicationController
-  include HasFilter
   before_action :set_course
   before_action :set_course_membership_and_user, only: %i[show edit update]
 
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 4c51eff34f..921766580c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -2,7 +2,6 @@
 
 class CoursesController < ApplicationController
   include SetLtiMessage
-  include HasFilter
 
   before_action :set_course_and_current_membership, except: %i[index new create]
   before_action :set_lti_message, only: %i[show]
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 87d7df8e22..8a4509740e 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -1,7 +1,6 @@
 class EvaluationsController < ApplicationController
   include SeriesHelper
   include EvaluationHelper
-  include HasFilter
 
   before_action :set_evaluation, only: %i[show edit update destroy overview set_multi_user add_user remove_user mark_undecided_complete export_grades modify_grading_visibility]
   before_action :set_series, only: %i[new]
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index dfdb326e07..f8f67360be 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,6 +1,4 @@
 class EventsController < ApplicationController
-  include HasFilter
-
   has_filter :event_type, 'deep-purple'
 
   def index
diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index 23cabd317c..fb06c26d09 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -1,6 +1,5 @@
 class FeedbacksController < ApplicationController
   include SeriesHelper
-  include HasFilter
 
   before_action :set_feedback, only: %i[show edit update destroy_scores]
 
diff --git a/app/controllers/saved_annotations_controller.rb b/app/controllers/saved_annotations_controller.rb
index 5c03d973c0..d8075fdef8 100644
--- a/app/controllers/saved_annotations_controller.rb
+++ b/app/controllers/saved_annotations_controller.rb
@@ -1,6 +1,5 @@
 class SavedAnnotationsController < ApplicationController
   include Sortable
-  include HasFilter
   set_pagination_headers :saved_annotations, only: [:index]
   set_filter_headers only: [:index]
   before_action :set_saved_annotation, only: %i[show update destroy edit]
diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb
index e75d0a765b..3cb0e149dc 100644
--- a/app/controllers/series_controller.rb
+++ b/app/controllers/series_controller.rb
@@ -1,7 +1,6 @@
 class SeriesController < ApplicationController
   include ExportHelper
   include SetLtiMessage
-  include HasFilter
 
   before_action :set_series, except: %i[index new create]
   before_action :check_token, only: %i[show overview]
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 2d79df4414..0dd23dc12d 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -3,7 +3,6 @@ class SubmissionsController < ApplicationController
   include TimeHelper
   include ActionView::Helpers::DateHelper
   include Sortable
-  include HasFilter
 
   before_action :set_submission, only: %i[show download evaluate edit media]
   before_action :set_submissions, only: %i[index mass_rejudge show]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7c703d0cbc..73a1138b0e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,4 @@
 class UsersController < ApplicationController
-  include HasFilter
   before_action :set_user, only: %i[show edit update destroy impersonate token_sign_in]
   before_action :set_users, only: %i[index available_for_repository]
 

From 2d22ea156cb166964007fdcf055b12d9af12fdc1 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 09:19:58 +0200
Subject: [PATCH 37/72] Always include filterable

---
 app/models/activity.rb            | 1 -
 app/models/activity_read_state.rb | 1 -
 app/models/annotation.rb          | 1 -
 app/models/application_record.rb  | 1 +
 app/models/course.rb              | 1 -
 app/models/course_membership.rb   | 1 -
 app/models/event.rb               | 1 -
 app/models/saved_annotation.rb    | 1 -
 app/models/submission.rb          | 1 -
 app/models/user.rb                | 1 -
 10 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 29f42befb2..9fd2b15f83 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -30,7 +30,6 @@
 
 class Activity < ApplicationRecord
   include ActionView::Helpers::DateHelper
-  include Filterable
   include StringHelper
   include Cacheable
   include Tokenable
diff --git a/app/models/activity_read_state.rb b/app/models/activity_read_state.rb
index 406fed22d4..e24c160405 100644
--- a/app/models/activity_read_state.rb
+++ b/app/models/activity_read_state.rb
@@ -10,7 +10,6 @@
 #  updated_at  :datetime         not null
 #
 class ActivityReadState < ApplicationRecord
-  include Filterable
   belongs_to :activity
   belongs_to :course, optional: true
   belongs_to :user
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 8a2539e9d2..dfae1c7279 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -22,7 +22,6 @@
 #
 class Annotation < ApplicationRecord
   include ApplicationHelper
-  include Filterable
 
   belongs_to :course
   belongs_to :submission
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 3874fb8a80..1631bed207 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,4 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
+  include Filterable
   self.abstract_class = true
 
   def self.human_enum_name(enum_name, enum_value, options = {})
diff --git a/app/models/course.rb b/app/models/course.rb
index 30d79d0815..23088f3110 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -23,7 +23,6 @@
 require 'csv'
 
 class Course < ApplicationRecord
-  include Filterable
   include Cacheable
   include Tokenable
   include ActionView::Helpers::SanitizeHelper
diff --git a/app/models/course_membership.rb b/app/models/course_membership.rb
index 94d7a01a6f..548db78442 100644
--- a/app/models/course_membership.rb
+++ b/app/models/course_membership.rb
@@ -12,7 +12,6 @@
 #
 
 class CourseMembership < ApplicationRecord
-  include Filterable
   enum status: { pending: 0, course_admin: 1, student: 2, unsubscribed: 3 }
 
   belongs_to :course
diff --git a/app/models/event.rb b/app/models/event.rb
index 2741c6ee9c..ba81987bc1 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -11,7 +11,6 @@
 #
 
 class Event < ApplicationRecord
-  include Filterable
   enum event_type: { rejudge: 0, permission_change: 1, exercise_repository: 2, error: 3, no_auth_id_sign_in: 4 }
   belongs_to :user, optional: true
 
diff --git a/app/models/saved_annotation.rb b/app/models/saved_annotation.rb
index 4a03e6fac7..76dd4a3167 100644
--- a/app/models/saved_annotation.rb
+++ b/app/models/saved_annotation.rb
@@ -13,7 +13,6 @@
 #  annotations_count :integer          default(0)
 #
 class SavedAnnotation < ApplicationRecord
-  include Filterable
   validates :title, presence: true
   validates :annotation_text, presence: true
 
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 7b77fbf9f9..262fc23342 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -19,7 +19,6 @@
 class Submission < ApplicationRecord
   include Cacheable
   include ActiveModel::Dirty
-  include Filterable
 
   SECONDS_BETWEEN_SUBMISSIONS = 5 # Used for rate limiting
   PUNCHCARD_MATRIX_CACHE_STRING = '/courses/%<course_id>s/user/%<user_id>s/timezone/%<timezone>s/punchcard_matrix'.freeze
diff --git a/app/models/user.rb b/app/models/user.rb
index 28cfdd3b3a..b9387229db 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,7 +24,6 @@
 require 'securerandom'
 
 class User < ApplicationRecord
-  include Filterable
   include StringHelper
   include Cacheable
   include Tokenable

From 559b800009aa57d0555b18ca66852eb302a1df01 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 10:56:41 +0200
Subject: [PATCH 38/72] Fix javascript tests

---
 .../components/search/dropdown_filter.ts        |  1 -
 .../components/search/dropdown_filter.test.ts   |  5 +----
 .../components/search/search_field.test.ts      | 17 +++++++----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index f7b1f893f6..f7960a9e6b 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -15,7 +15,6 @@ import { FilterCollection } from "components/search/filter_collection";
  * @element d-dropdown-filter
  *
  * @prop {AccentColor} color - the color associated with the filter
- * @prop {string} type - The type of the filter collection, used to determine the dropdown button text
  * @prop {string} param - the searchQuery param to be used for this filter
  * @prop {boolean} multi - whether one or more labels can be selected at the same time
  * @prop {[Label]} labels - all labels that could potentially be selected
diff --git a/test/javascript/components/search/dropdown_filter.test.ts b/test/javascript/components/search/dropdown_filter.test.ts
index dfa46c12c3..ea93102bb9 100644
--- a/test/javascript/components/search/dropdown_filter.test.ts
+++ b/test/javascript/components/search/dropdown_filter.test.ts
@@ -4,7 +4,6 @@ import { fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { getByLabelText, screen } from "@testing-library/dom";
 import { html } from "lit/development";
-import { Label } from "../../../../app/assets/javascripts/components/search/filter_element";
 import { searchQueryState } from "state/SearchQuery";
 
 describe("DropdownFilter", () => {
@@ -15,9 +14,7 @@ describe("DropdownFilter", () => {
         dropdownFilter = await fixture(html`
             <d-dropdown-filter param="foo"
                                        labels='[{ "name": "fool", "id": "1" }, { "name": "bar", "id": "2" }, { "name": "baz", "id": "3" }]'
-                                       type="test"
-                                       .paramVal=${(l: Label) => l.id}
-                                       .color=${() => "pink"}
+                                       color="pink"
                                        .multi=${false}>
             </d-dropdown-filter>`) as DropdownFilter;
     });
diff --git a/test/javascript/components/search/search_field.test.ts b/test/javascript/components/search/search_field.test.ts
index 1f987239c3..dac5fa4988 100644
--- a/test/javascript/components/search/search_field.test.ts
+++ b/test/javascript/components/search/search_field.test.ts
@@ -16,7 +16,6 @@ describe("SearchFieldSuggestion", () => {
             <d-search-field-suggestion param="foo"
                                        labels='[{ "name": "fool", "id": "1" }, { "name": "bar", "id": "2" }, { "name": "baz", "id": "3" }]'
                                        type="test"
-                                       .paramVal=${(l: Label) => l.id}
                                        filter="ba"
                                        .multi=${false}>
             </d-search-field-suggestion>`) as SearchFieldSuggestion;
@@ -65,8 +64,8 @@ describe("SearchField", () => {
     let searchField: SearchField;
     beforeEach(async () => {
         searchQueryState.queryParams.clear();
-        const filterCollections: Record<string, FilterOptions> = {
-            first: {
+        const filters: FilterOptions[] = [
+            {
                 param: "foo",
                 data: [
                     { name: "fool", id: "1" },
@@ -74,10 +73,9 @@ describe("SearchField", () => {
                     { name: "baz", id: "3" },
                 ],
                 multi: false,
-                color: () => "red",
-                paramVal: (l: Label) => l.id,
+                color: "red",
             },
-            second: {
+            {
                 param: "bar",
                 data: [
                     { name: "food", id: "1" },
@@ -85,14 +83,13 @@ describe("SearchField", () => {
                     { name: "baz", id: "3" },
                 ],
                 multi: false,
-                color: () => "red",
-                paramVal: (l: Label) => l.id,
+                color: "red",
             }
-        };
+        ];
 
         searchField = await fixture(html`
             <d-search-field placeholder="Search"
-                            .filterCollections="${filterCollections}"
+                            .filters="${filters}"
             ></d-search-field>
         `);
     });

From d413a4a86844bdf2e733771797490e35f57e524a Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 11:12:38 +0200
Subject: [PATCH 39/72] Revert "Always include hasfilter"

This reverts commit 98bdf227d8c5c38c1373b50e0341aa44738e4b67.
---
 app/controllers/activities_controller.rb        | 1 +
 app/controllers/annotations_controller.rb       | 1 +
 app/controllers/application_controller.rb       | 1 -
 app/controllers/course_members_controller.rb    | 1 +
 app/controllers/courses_controller.rb           | 1 +
 app/controllers/evaluations_controller.rb       | 1 +
 app/controllers/events_controller.rb            | 2 ++
 app/controllers/feedbacks_controller.rb         | 1 +
 app/controllers/saved_annotations_controller.rb | 1 +
 app/controllers/series_controller.rb            | 1 +
 app/controllers/submissions_controller.rb       | 1 +
 app/controllers/users_controller.rb             | 1 +
 12 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 87ed8c4c8d..14905bddcb 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -2,6 +2,7 @@ class ActivitiesController < ApplicationController
   include SeriesHelper
   include SetLtiMessage
   include Sortable
+  include HasFilter
 
   INPUT_SERVICE_WORKER = 'inputServiceWorker.js'.freeze
 
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index e9ee3e46b5..f21a92ba3e 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -1,4 +1,5 @@
 class AnnotationsController < ApplicationController
+  include HasFilter
   before_action :set_submission, only: %i[create]
   before_action :set_annotation, only: %i[show update destroy]
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e7f1a51836..9e11c7e15a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base
   include Pundit::Authorization
   include SetCurrentRequestDetails
   include ApplicationHelper
-  include HasFilter
 
   MAX_STORED_URL_LENGTH = 1024
 
diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
index 012982944c..ecb17e06c1 100644
--- a/app/controllers/course_members_controller.rb
+++ b/app/controllers/course_members_controller.rb
@@ -1,4 +1,5 @@
 class CourseMembersController < ApplicationController
+  include HasFilter
   before_action :set_course
   before_action :set_course_membership_and_user, only: %i[show edit update]
 
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 921766580c..4c51eff34f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -2,6 +2,7 @@
 
 class CoursesController < ApplicationController
   include SetLtiMessage
+  include HasFilter
 
   before_action :set_course_and_current_membership, except: %i[index new create]
   before_action :set_lti_message, only: %i[show]
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 8a4509740e..87d7df8e22 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -1,6 +1,7 @@
 class EvaluationsController < ApplicationController
   include SeriesHelper
   include EvaluationHelper
+  include HasFilter
 
   before_action :set_evaluation, only: %i[show edit update destroy overview set_multi_user add_user remove_user mark_undecided_complete export_grades modify_grading_visibility]
   before_action :set_series, only: %i[new]
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index f8f67360be..dfdb326e07 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,4 +1,6 @@
 class EventsController < ApplicationController
+  include HasFilter
+
   has_filter :event_type, 'deep-purple'
 
   def index
diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index fb06c26d09..23cabd317c 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -1,5 +1,6 @@
 class FeedbacksController < ApplicationController
   include SeriesHelper
+  include HasFilter
 
   before_action :set_feedback, only: %i[show edit update destroy_scores]
 
diff --git a/app/controllers/saved_annotations_controller.rb b/app/controllers/saved_annotations_controller.rb
index d8075fdef8..5c03d973c0 100644
--- a/app/controllers/saved_annotations_controller.rb
+++ b/app/controllers/saved_annotations_controller.rb
@@ -1,5 +1,6 @@
 class SavedAnnotationsController < ApplicationController
   include Sortable
+  include HasFilter
   set_pagination_headers :saved_annotations, only: [:index]
   set_filter_headers only: [:index]
   before_action :set_saved_annotation, only: %i[show update destroy edit]
diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb
index 3cb0e149dc..e75d0a765b 100644
--- a/app/controllers/series_controller.rb
+++ b/app/controllers/series_controller.rb
@@ -1,6 +1,7 @@
 class SeriesController < ApplicationController
   include ExportHelper
   include SetLtiMessage
+  include HasFilter
 
   before_action :set_series, except: %i[index new create]
   before_action :check_token, only: %i[show overview]
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 0dd23dc12d..2d79df4414 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -3,6 +3,7 @@ class SubmissionsController < ApplicationController
   include TimeHelper
   include ActionView::Helpers::DateHelper
   include Sortable
+  include HasFilter
 
   before_action :set_submission, only: %i[show download evaluate edit media]
   before_action :set_submissions, only: %i[index mass_rejudge show]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 73a1138b0e..7c703d0cbc 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,5 @@
 class UsersController < ApplicationController
+  include HasFilter
   before_action :set_user, only: %i[show edit update destroy impersonate token_sign_in]
   before_action :set_users, only: %i[index available_for_repository]
 

From 16763baae20cc60c133cc36af005824cc498c8af Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 11:42:11 +0200
Subject: [PATCH 40/72] Fix rails tests

---
 app/controllers/submissions_controller.rb | 2 +-
 app/models/concerns/filterable.rb         | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 2d79df4414..7a41085cb3 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -36,7 +36,7 @@ def index
     @submissions = @submissions.includes(:annotations).paginate(page: parse_pagination_param(params[:page]))
 
     # If the result is the same, don't send it.
-    # return unless stale?(@submissions)
+    return unless stale?(@submissions)
     # If returning non-HTML, we are done.
     return unless request.format.html?
 
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 6aec998bf4..ac10c0b7ea 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -62,10 +62,8 @@ def filterable_by_course_labels(through_user: false)
 
       scope :by_course_labels, lambda { |labels, course_id|
         unscoped.where(id: select(:id))
-                .joins(:course_labels)
-                .where(course_memberships: { course_id: course_id } )
-                .where(course_labels: { name: labels })
-                .group(:id).having('COUNT(DISTINCT(course_labels.id)) = ?', labels.uniq.length)
+                .joins(:course_memberships)
+                .where(course_memberships: { id: CourseMembership.where(course_id: course_id).by_course_labels(labels) })
       }
 
       define_singleton_method('course_labels_filter_options') do |course_id|

From 609dcec7b08ae054cbee0ab33b816cd958dcc683 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 13:53:46 +0200
Subject: [PATCH 41/72] Fix linting

---
 app/controllers/activity_read_states_controller.rb |  4 +---
 app/controllers/annotations_controller.rb          |  4 ++--
 app/controllers/concerns/has_filter.rb             |  3 ++-
 app/controllers/course_members_controller.rb       |  5 +++--
 app/controllers/courses_controller.rb              | 10 +++++-----
 app/controllers/evaluations_controller.rb          |  4 ++--
 app/controllers/submissions_controller.rb          |  4 +---
 app/models/activity.rb                             |  4 ++--
 app/models/concerns/filterable.rb                  | 12 +++++++-----
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/activity_read_states_controller.rb b/app/controllers/activity_read_states_controller.rb
index b797c0f735..7077e01538 100644
--- a/app/controllers/activity_read_states_controller.rb
+++ b/app/controllers/activity_read_states_controller.rb
@@ -71,9 +71,7 @@ def set_activity_read_states
       @read_states = @read_states.of_user(@user)
     end
 
-    if params[:course_id]
-      @course = Course.find(params[:course_id])
-    end
+    @course = Course.find(params[:course_id]) if params[:course_id]
 
     @series = Series.find(params[:series_id]) if params[:series_id]
     @activity = ContentPage.find(params[:activity_id]) if params[:activity_id]
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index f21a92ba3e..510cf8762a 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -5,8 +5,8 @@ class AnnotationsController < ApplicationController
 
   has_scope :by_submission, as: :submission_id
   has_scope :by_user, as: :user_id
-  has_filter :course_id, "orange"
-  has_filter :question_state, "indigo"
+  has_filter :course_id, 'orange'
+  has_filter :question_state, 'indigo'
 
   has_scope :by_filter, as: 'filter' do |controller, scope, value|
     scope.by_filter(value, skip_user: controller.params[:user_id].present?, skip_exercise: controller.params[:exercise_id].present?)
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index 1dc5508a3b..df16feeebb 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -20,7 +20,8 @@ def filters(target)
 
   class_methods do
     attr_accessor :filter_options
-    def has_filter(name, color, multi: false)
+
+    def has_filter(name, color, multi: false) # rubocop:disable Naming/PredicateName
       if multi
         has_scope "by_#{name}", as: name, type: :array, if: ->(this) { this.params[name].is_a?(Array) }
       else
diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
index ecb17e06c1..1f5d709108 100644
--- a/app/controllers/course_members_controller.rb
+++ b/app/controllers/course_members_controller.rb
@@ -31,8 +31,9 @@ def index
                  %w[course_admin student]
                end
 
-    @course_memberships = @course.course_memberships.order_by_status_in_course_and_name('ASC')
-                                                    .where(status: statuses)
+    @course_memberships = @course.course_memberships
+                                 .order_by_status_in_course_and_name('ASC')
+                                 .where(status: statuses)
     @filters = filters(@course_memberships)
     @course_memberships = apply_scopes(@course_memberships)
                           .includes(:course_labels, user: [:institution])
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 4c51eff34f..f52934f4c7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -227,11 +227,11 @@ def scoresheet
     @title = I18n.t('courses.scoresheet.scoresheet')
     @crumbs = [[@course.name, course_path(@course)], [I18n.t('courses.scoresheet.scoresheet'), '#']]
     @filters = [{
-                  param: 'course_labels',
-                  multi: true,
-                  data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
-                  color: 'orange'
-                }]
+      param: 'course_labels',
+      multi: true,
+      data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
+      color: 'orange'
+    }]
 
     unless request.format == :html
       scores = @course.scoresheet
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 87d7df8e22..273286490c 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -60,7 +60,7 @@ def edit
     @filters << {
       param: 'course_labels',
       multi: true,
-      data: apply_scopes(@course.course_memberships).course_labels_filter_options(),
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options,
       color: 'orange'
     }
     @course_memberships = apply_scopes(@course.course_memberships)
@@ -91,7 +91,7 @@ def create
     @filters << {
       param: 'course_labels',
       multi: true,
-      data: apply_scopes(@course.course_memberships).course_labels_filter_options(),
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options,
       color: 'orange'
     }
     @course_memberships = apply_scopes(@course.course_memberships)
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 7a41085cb3..dfb8a7c48f 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -163,10 +163,8 @@ def set_submissions
       @user = User.find(params[:user_id])
       @submissions = @submissions.of_user(@user)
     end
-    if params[:course_id]
-      @course = Course.find(params[:course_id])
-    end
 
+    @course = Course.find(params[:course_id]) if params[:course_id]
     @series = Series.find(params[:series_id]) if params[:series_id]
     @activity = Exercise.find(params[:activity_id]) if params[:activity_id]
     @judge = Judge.find(params[:judge_id]) if params[:judge_id]
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 9fd2b15f83..63c3b19ea8 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -77,11 +77,11 @@ class Activity < ApplicationRecord
   filterable_by :status, is_enum: true
   filterable_by :access, is_enum: true
   filterable_by :programming_language, column: 'programming_languages.name', associations: :programming_language
-  filterable_by :type, name_hash: ->(value) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
+  filterable_by :type, name_hash: ->(_) { { Exercise.name => Exercise.model_name.human, ContentPage.name => ContentPage.model_name.human } }
   filterable_by :judge_id, model: Judge
   filterable_by :labels, multi: true, associations: :labels, column: 'labels.name'
   filterable_by :repository_id, model: Repository
-  filterable_by :draft, name_hash: ->(values) { { true => I18n.t('activities.index.filters.draft'), false => I18n.t('activities.index.filters.not_draft') } }
+  filterable_by :draft, name_hash: ->(_) { { true => I18n.t('activities.index.filters.draft'), false => I18n.t('activities.index.filters.not_draft') } }
   scope :by_description_languages, lambda { |languages|
     by_language = all # allow chaining of scopes
     by_language = by_language.where(description_en_present: true) if languages.include? 'en'
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index ac10c0b7ea..6301aeaf12 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -17,17 +17,19 @@ def search_by(*columns)
     # +name+:: The name of the scope
     # +column+:: The column to create the scope for
     # +associations+:: The associations to include in the scope
-    # +value_check+:: A lambda that must return true for a value, otherwise the scope will return an empty relation
+    # +multi+:: If the scope should accept multiple values
+    # +is_enum+:: If the column is an enum
+    # +model+:: If the column is a foreign key, the model to use to get the human readable name for the column values
     # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
-    def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, model: nil, name_hash: nil)
+    def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, model: nil, name_hash: nil) # rubocop:disable Metrics/ParameterLists
       value_check = if is_enum
                       ->(value) { value.in? send(column.to_s.pluralize.to_s) }
                     else
-                      ->(value) { true }
+                      ->(_) { true }
                     end
 
       name_hash ||= if is_enum
-                      ->(values) { values.to_h { |s| [s, human_enum_name(column.to_s.pluralize.to_s, s)] } }
+                      ->(values) { values.index_with { |s| human_enum_name(column.to_s.pluralize.to_s, s) } }
                     elsif model
                       ->(values) { model.where(id: values).to_h { |s| [s.id, s.name] } }
                     else
@@ -69,7 +71,7 @@ def filterable_by_course_labels(through_user: false)
       define_singleton_method('course_labels_filter_options') do |course_id|
         count = unscoped.where(id: select(:id))
                         .joins(:course_labels)
-                        .where(course_memberships: { course_id: course_id } )
+                        .where(course_memberships: { course_id: course_id })
                         .group('course_labels.name')
                         .count
 

From f2215c4f79305ae5cd9c8eb1fded3c4f2eee0f29 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 14:43:20 +0200
Subject: [PATCH 42/72] Move color responsibility to frontend

---
 .../components/search/filter_element.ts          |  3 ++-
 app/assets/javascripts/search.ts                 |  7 +++++--
 app/controllers/activities_controller.rb         | 16 ++++++++--------
 .../activity_read_states_controller.rb           |  3 +--
 app/controllers/annotations_controller.rb        |  4 ++--
 app/controllers/concerns/has_filter.rb           | 16 +++++++---------
 app/controllers/course_members_controller.rb     |  4 ++--
 app/controllers/courses_controller.rb            |  4 +---
 app/controllers/evaluations_controller.rb        |  5 +----
 app/controllers/events_controller.rb             |  2 +-
 app/controllers/feedbacks_controller.rb          |  2 +-
 app/controllers/saved_annotations_controller.rb  |  4 ++--
 app/controllers/series_controller.rb             |  1 -
 app/controllers/submissions_controller.rb        |  3 +--
 app/controllers/users_controller.rb              |  2 +-
 15 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/components/search/filter_element.ts b/app/assets/javascripts/components/search/filter_element.ts
index d644b437e2..51ef672dd5 100644
--- a/app/assets/javascripts/components/search/filter_element.ts
+++ b/app/assets/javascripts/components/search/filter_element.ts
@@ -4,10 +4,11 @@ import { DodonaElement } from "components/meta/dodona_element";
 
 export type Label = {id: string, name: string, count?: number};
 export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" | "teal" | "orange" | "brown" | "blue-gray";
+export const ACCENT_COLORS: AccentColor[] = ["pink", "deep-purple", "teal", "orange", "brown", "blue-gray", "red", "purple", "indigo"];
 export type FilterOptions = {
     data: Label[],
     multi: boolean,
-    color: AccentColor,
+    color?: AccentColor,
     param: string
 };
 
diff --git a/app/assets/javascripts/search.ts b/app/assets/javascripts/search.ts
index e09c7fd032..417bb44b30 100644
--- a/app/assets/javascripts/search.ts
+++ b/app/assets/javascripts/search.ts
@@ -2,7 +2,7 @@ import { createDelayer, fetch, getURLParameter, updateArrayURLParameter, updateU
 import { InactiveTimeout } from "auto_reload";
 import { LoadingBar } from "components/search/loading_bar";
 import { searchQueryState } from "state/SearchQuery";
-import { FilterOptions } from "components/search/filter_element";
+import { ACCENT_COLORS, FilterOptions } from "components/search/filter_element";
 import { FilterCollection } from "components/search/filter_collection";
 const RELOAD_SECONDS = 2;
 
@@ -129,8 +129,11 @@ class Search {
     }
 
     public updateFilters(filterOptions: FilterOptions[] | undefined): void {
+        const coloredFilterOptions = (filterOptions || []).map((filterOption, index) => {
+            return { ...filterOption, color: ACCENT_COLORS[index % ACCENT_COLORS.length] };
+        });
         this.filterCollections.forEach(collection => {
-            collection.filters = filterOptions || [];
+            collection.filters = coloredFilterOptions;
         });
     }
 }
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 14905bddcb..5c396c6ba9 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -19,14 +19,14 @@ class ActivitiesController < ApplicationController
   protect_from_forgery except: %i[media input_service_worker]
 
   has_scope :by_filter, as: 'filter'
-  has_filter :programming_language, 'red'
-  has_filter :type, 'deep-purple'
-  has_filter :judge_id, 'red'
-  has_filter :labels, 'purple', multi: true
-  has_filter :repository_id, 'blue-gray'
-  has_filter :draft, 'indigo'
-  has_filter :popularity, 'pink'
-  has_filter :description_languages, 'orange', multi: true
+  has_filter :programming_language
+  has_filter :type
+  has_filter :judge_id
+  has_filter :labels,  multi: true
+  has_filter :repository_id
+  has_filter :draft
+  has_filter :popularity
+  has_filter :description_languages, multi: true
 
   has_scope :repository_scope, as: 'tab' do |controller, scope, value|
     course = Series.find(controller.params[:id]).course if controller.params[:id]
diff --git a/app/controllers/activity_read_states_controller.rb b/app/controllers/activity_read_states_controller.rb
index 7077e01538..eb8aa1cfcb 100644
--- a/app/controllers/activity_read_states_controller.rb
+++ b/app/controllers/activity_read_states_controller.rb
@@ -93,8 +93,7 @@ def set_activity_read_states
       @filters = [{
         param: 'course_labels',
         multi: true,
-        data: @read_states.course_labels_filter_options(@course.id),
-        color: 'orange'
+        data: @read_states.course_labels_filter_options(@course.id)
       }]
     end
 
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 510cf8762a..fca30e845a 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -5,8 +5,8 @@ class AnnotationsController < ApplicationController
 
   has_scope :by_submission, as: :submission_id
   has_scope :by_user, as: :user_id
-  has_filter :course_id, 'orange'
-  has_filter :question_state, 'indigo'
+  has_filter :course_id
+  has_filter :question_state
 
   has_scope :by_filter, as: 'filter' do |controller, scope, value|
     scope.by_filter(value, skip_user: controller.params[:user_id].present?, skip_exercise: controller.params[:exercise_id].present?)
diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index df16feeebb..3b9c64e9f0 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -1,18 +1,16 @@
 module HasFilter
   extend ActiveSupport::Concern
-
   included do
     delegate :filter_options, to: :class
     self.filter_options = []
     def filters(target)
-      filter_options.map do |filter, multi, color|
+      filter_options.map do |name, multi|
         scope_params = params.except(:controller, :action, :page)
-        scope_params = scope_params.except(filter) unless multi
+        scope_params = scope_params.except(name) unless multi
         {
-          param: filter,
-          data: apply_scopes(target, scope_params).send("#{filter}_filter_options"),
-          multi: multi,
-          color: color
+          param: name,
+          data: apply_scopes(target, scope_params).send("#{name}_filter_options"),
+          multi: multi
         }
       end
     end
@@ -21,14 +19,14 @@ def filters(target)
   class_methods do
     attr_accessor :filter_options
 
-    def has_filter(name, color, multi: false) # rubocop:disable Naming/PredicateName
+    def has_filter(name, multi: false) # rubocop:disable Naming/PredicateName
       if multi
         has_scope "by_#{name}", as: name, type: :array, if: ->(this) { this.params[name].is_a?(Array) }
       else
         has_scope "by_#{name}", as: name
       end
 
-      filter_options << [name, multi, color]
+      filter_options << [name, multi]
     end
 
     def set_filter_headers(options = {})
diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
index 1f5d709108..d1a8bacc6e 100644
--- a/app/controllers/course_members_controller.rb
+++ b/app/controllers/course_members_controller.rb
@@ -5,8 +5,8 @@ class CourseMembersController < ApplicationController
 
   has_scope :by_permission
   has_scope :by_filter, as: 'filter'
-  has_filter :course_labels, 'orange', multi: true
-  has_filter :institution_id, 'pink'
+  has_filter :course_labels, multi: true
+  has_filter :institution_id
 
   has_scope :order_by, using: %i[column direction], type: :hash do |controller, scope, value|
     column, direction = value
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f52934f4c7..0154dd25d9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -9,7 +9,7 @@ class CoursesController < ApplicationController
   before_action :set_lti_provider, only: %i[show]
 
   has_scope :by_filter, as: 'filter'
-  has_filter :institution_id, 'pink'
+  has_filter :institution_id
   has_scope :at_least_one_started, type: :boolean, only: :scoresheet do |controller, scope|
     scope.at_least_one_started_in_course(Course.find(controller.params[:id])).or(scope.at_least_one_read_in_course(Course.find(controller.params[:id])))
   end
@@ -230,7 +230,6 @@ def scoresheet
       param: 'course_labels',
       multi: true,
       data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
-      color: 'orange'
     }]
 
     unless request.format == :html
@@ -240,7 +239,6 @@ def scoresheet
         param: 'course_labels',
         multi: true,
         data: @users.course_labels_filter_options(@course.id),
-        color: 'orange'
       }]
       @series = scores[:series]
 
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 273286490c..083c5467bb 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -6,7 +6,7 @@ class EvaluationsController < ApplicationController
   before_action :set_evaluation, only: %i[show edit update destroy overview set_multi_user add_user remove_user mark_undecided_complete export_grades modify_grading_visibility]
   before_action :set_series, only: %i[new]
 
-  has_filter :institution_id, 'pink'
+  has_filter :institution_id
   has_scope :by_filter, as: 'filter'
   has_scope :by_course_labels, as: 'course_labels', type: :array do |controller, scope, value|
     if controller.params[:action] == 'show'
@@ -31,7 +31,6 @@ def show
       param: 'course_labels',
       multi: true,
       data: @users.course_labels_filter_options(course.id),
-      color: 'orange'
     }
     @crumbs = [[@evaluation.series.course.name, course_url(@evaluation.series.course)], [@evaluation.series.name, breadcrumb_series_path(@evaluation.series, current_user)], [I18n.t('evaluations.show.evaluation'), '#']]
     @title = I18n.t('evaluations.show.evaluation')
@@ -61,7 +60,6 @@ def edit
       param: 'course_labels',
       multi: true,
       data: apply_scopes(@course.course_memberships).course_labels_filter_options,
-      color: 'orange'
     }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
@@ -92,7 +90,6 @@ def create
       param: 'course_labels',
       multi: true,
       data: apply_scopes(@course.course_memberships).course_labels_filter_options,
-      color: 'orange'
     }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index dfdb326e07..7725184063 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,7 +1,7 @@
 class EventsController < ApplicationController
   include HasFilter
 
-  has_filter :event_type, 'deep-purple'
+  has_filter :event_type
 
   def index
     authorize Event
diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index 23cabd317c..d818f4c375 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -8,7 +8,7 @@ class FeedbacksController < ApplicationController
     scope.by_filter(value, skip_user: true, skip_exercise: true)
   end
 
-  has_filter :status, 'indigo'
+  has_filter :status
 
   content_security_policy only: %i[show] do |policy|
     # allow sandboxed description
diff --git a/app/controllers/saved_annotations_controller.rb b/app/controllers/saved_annotations_controller.rb
index 5c03d973c0..95b0fce998 100644
--- a/app/controllers/saved_annotations_controller.rb
+++ b/app/controllers/saved_annotations_controller.rb
@@ -6,8 +6,8 @@ class SavedAnnotationsController < ApplicationController
   before_action :set_saved_annotation, only: %i[show update destroy edit]
 
   has_scope :by_user, as: 'user_id'
-  has_filter :course_id, 'orange'
-  has_filter :exercise_id, 'blue-gray'
+  has_filter :course_id
+  has_filter :exercise_id
   has_scope :by_filter, as: 'filter'
 
   order_by :annotations_count, :title, :annotation_text, :created_at
diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb
index e75d0a765b..e2f0d7b157 100644
--- a/app/controllers/series_controller.rb
+++ b/app/controllers/series_controller.rb
@@ -208,7 +208,6 @@ def scoresheet
       param: 'course_labels',
       multi: true,
       data: @users.course_labels_filter_options(@course.id),
-      color: 'orange'
     }]
     @activities = scores[:activities]
     @submissions = scores[:submissions]
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index dfb8a7c48f..80ce145547 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -13,7 +13,7 @@ class SubmissionsController < ApplicationController
     scope.by_filter(value, skip_user: controller.params[:user_id].present?, skip_exercise: controller.params[:activity_id].present?)
   end
 
-  has_filter :status, 'indigo'
+  has_filter :status
 
   has_scope :by_course_labels, as: 'course_labels', type: :array do |controller, scope, value|
     course = Course.find_by(id: controller.params[:course_id]) if controller.params[:course_id].present?
@@ -191,7 +191,6 @@ def set_submissions
         param: 'course_labels',
         multi: true,
         data: @submissions.course_labels_filter_options(@course.id),
-        color: 'orange'
       }
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7c703d0cbc..5f4bcd6114 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,7 +4,7 @@ class UsersController < ApplicationController
   before_action :set_users, only: %i[index available_for_repository]
 
   has_scope :by_permission
-  has_filter :institution_id, 'pink'
+  has_filter :institution_id
   has_scope :by_filter, as: 'filter'
 
   # GET /users

From 7e581df86549c7273fdd0893c316d789c9ddcede Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 14:45:38 +0200
Subject: [PATCH 43/72] Simply xourse controller scoresheet

---
 app/controllers/courses_controller.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0154dd25d9..5a19364fae 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -226,11 +226,6 @@ def statistics
   def scoresheet
     @title = I18n.t('courses.scoresheet.scoresheet')
     @crumbs = [[@course.name, course_path(@course)], [I18n.t('courses.scoresheet.scoresheet'), '#']]
-    @filters = [{
-      param: 'course_labels',
-      multi: true,
-      data: CourseLabel.where(course: @course).map { |cl| { id: cl.name.to_s, name: cl.name.to_s } },
-    }]
 
     unless request.format == :html
       scores = @course.scoresheet
@@ -238,7 +233,7 @@ def scoresheet
       @filters = [{
         param: 'course_labels',
         multi: true,
-        data: @users.course_labels_filter_options(@course.id),
+        data: @users.course_labels_filter_options(@course.id)
       }]
       @series = scores[:series]
 

From deb9809fe192ef0114769c3dfc941291aff1b923 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 14:46:17 +0200
Subject: [PATCH 44/72] Fix linting

---
 app/controllers/activities_controller.rb  | 2 +-
 app/controllers/evaluations_controller.rb | 6 +++---
 app/controllers/series_controller.rb      | 2 +-
 app/controllers/submissions_controller.rb | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 5c396c6ba9..cbeb28eda0 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -22,7 +22,7 @@ class ActivitiesController < ApplicationController
   has_filter :programming_language
   has_filter :type
   has_filter :judge_id
-  has_filter :labels,  multi: true
+  has_filter :labels, multi: true
   has_filter :repository_id
   has_filter :draft
   has_filter :popularity
diff --git a/app/controllers/evaluations_controller.rb b/app/controllers/evaluations_controller.rb
index 083c5467bb..baeb149580 100644
--- a/app/controllers/evaluations_controller.rb
+++ b/app/controllers/evaluations_controller.rb
@@ -30,7 +30,7 @@ def show
     @filters << {
       param: 'course_labels',
       multi: true,
-      data: @users.course_labels_filter_options(course.id),
+      data: @users.course_labels_filter_options(course.id)
     }
     @crumbs = [[@evaluation.series.course.name, course_url(@evaluation.series.course)], [@evaluation.series.name, breadcrumb_series_path(@evaluation.series, current_user)], [I18n.t('evaluations.show.evaluation'), '#']]
     @title = I18n.t('evaluations.show.evaluation')
@@ -59,7 +59,7 @@ def edit
     @filters << {
       param: 'course_labels',
       multi: true,
-      data: apply_scopes(@course.course_memberships).course_labels_filter_options,
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options
     }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
@@ -89,7 +89,7 @@ def create
     @filters << {
       param: 'course_labels',
       multi: true,
-      data: apply_scopes(@course.course_memberships).course_labels_filter_options,
+      data: apply_scopes(@course.course_memberships).course_labels_filter_options
     }
     @course_memberships = apply_scopes(@course.course_memberships)
                           .includes(:course_labels, user: [:institution])
diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb
index e2f0d7b157..20a3a98d00 100644
--- a/app/controllers/series_controller.rb
+++ b/app/controllers/series_controller.rb
@@ -207,7 +207,7 @@ def scoresheet
     @filters = [{
       param: 'course_labels',
       multi: true,
-      data: @users.course_labels_filter_options(@course.id),
+      data: @users.course_labels_filter_options(@course.id)
     }]
     @activities = scores[:activities]
     @submissions = scores[:submissions]
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 80ce145547..384eab1223 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -190,7 +190,7 @@ def set_submissions
       @filters << {
         param: 'course_labels',
         multi: true,
-        data: @submissions.course_labels_filter_options(@course.id),
+        data: @submissions.course_labels_filter_options(@course.id)
       }
     end
 

From a0cde258edad4884a973c0f1d72e9035ab7c8dc1 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 14:53:27 +0200
Subject: [PATCH 45/72] Add count to searchfield suggestions

---
 app/assets/javascripts/components/search/search_field.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index 6852405667..f810ebeed2 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -56,6 +56,7 @@ export class SearchFieldSuggestion extends FilterElement {
             ${ this.getFilteredLabels().map( label => html`
                 <li><a class="dropdown-item" href="#" @click=${e => this.handleClick(e, label)}>
                     ${unsafeHTML(this.getHighlightedLabel(label.name))}
+                    ${label.count ? html`<span class="badge colored-secondary rounded-pill float-end ms-1">${label.count}</span>` : ""}
                 </a></li>
             `)}
         `;

From 4a5c75490fe89b6be5682f1249c1a3dedef54c9f Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 15:01:44 +0200
Subject: [PATCH 46/72] Remove unused scope

---
 app/models/annotation.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index dfae1c7279..0f073451c1 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -54,7 +54,6 @@ class Annotation < ApplicationRecord
   scope :by_submission, ->(submission_id) { where(submission_id: submission_id) }
   scope :by_user, ->(user_id) { where(user_id: user_id) }
   scope :released, -> { left_joins(:evaluation).where(evaluation_id: nil).or(where(evaluations: { released: true })) }
-  scope :by_course, ->(course_id) { where(submission: Submission.in_course(Course.find(course_id))) }
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_exercise_name, ->(name) { where(submission: Submission.by_exercise_name(name)) }
   filterable_by :course_id, model: Course

From fae53bdb1dd38374752e78081ba76b9e2eaa7de8 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 2 May 2024 15:05:23 +0200
Subject: [PATCH 47/72] Remove unused scope

---
 app/models/course.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index 23088f3110..4e6c34b433 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -163,7 +163,6 @@ class Course < ApplicationRecord
   search_by :name, :teacher, :year
   scope :by_name, ->(name) { where('name LIKE ?', "%#{name}%") }
   scope :by_teacher, ->(teacher) { where('teacher LIKE ?', "%#{teacher}%") }
-  scope :by_institution, ->(institution) { where(institution: institution) }
   filterable_by :institution_id, model: Institution
   scope :can_register, lambda { |user|
     if user&.institutional?

From f7b5ec85d7a23bdefb3e0023aa2165f74d26f7ba Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 13 May 2024 15:25:18 +0200
Subject: [PATCH 48/72] Avoid string repeat in type

---
 app/assets/javascripts/components/search/filter_element.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/search/filter_element.ts b/app/assets/javascripts/components/search/filter_element.ts
index 51ef672dd5..33f3a8e551 100644
--- a/app/assets/javascripts/components/search/filter_element.ts
+++ b/app/assets/javascripts/components/search/filter_element.ts
@@ -3,8 +3,9 @@ import { searchQueryState } from "state/SearchQuery";
 import { DodonaElement } from "components/meta/dodona_element";
 
 export type Label = {id: string, name: string, count?: number};
-export type AccentColor = "red" | "pink" | "purple" | "deep-purple" | "indigo" | "teal" | "orange" | "brown" | "blue-gray";
-export const ACCENT_COLORS: AccentColor[] = ["pink", "deep-purple", "teal", "orange", "brown", "blue-gray", "red", "purple", "indigo"];
+export const ACCENT_COLORS = ["pink", "deep-purple", "teal", "orange", "brown", "blue-gray", "red", "purple", "indigo"];
+export type AccentColor = typeof ACCENT_COLORS[number];
+
 export type FilterOptions = {
     data: Label[],
     multi: boolean,

From e9e08872e57d2c47c268c2027a56525e4befa69c Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 13 May 2024 16:14:27 +0200
Subject: [PATCH 49/72] Add documentation

---
 app/models/concerns/filterable.rb | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 6301aeaf12..48da852674 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -1,7 +1,16 @@
+# This concern allows models to define scopes for filtering by columns
+# These scopes are created with the name `by_#{column}`
+# and a correlating function that counts the possible values for the column is also created
 module Filterable
   extend ActiveSupport::Concern
 
   class_methods do
+    # Creates a scope called by_filter that searches for the give value in the search column
+    # Search should be a string column defined in the model
+    # It will be set to the concatenation of the values of the columns passed to the search_by method
+    # This is useful for searching for a value in multiple columns in an efficient way
+    # params:
+    # +columns+:: The columns to search for
     def search_by(*columns)
       define_method(:set_search) do
         self.search = columns.map { |column| send(column) || '' }.join(' ')
@@ -23,22 +32,30 @@ def search_by(*columns)
     # +name_hash+:: a lambda that takes a list af column values and returns a hash with the human readable name for each column value
     def filterable_by(name, column: name, associations: [], multi: false, is_enum: false, model: nil, name_hash: nil) # rubocop:disable Metrics/ParameterLists
       value_check = if is_enum
+                      # We should only allow filtering with valid options in the enum
                       ->(value) { value.in? send(column.to_s.pluralize.to_s) }
+                    elsif multi
+                      # If the scope accepts multiple values, the values should be an array
+                      ->(value) { value.is_a?(Array) }
                     else
                       ->(_) { true }
                     end
 
       name_hash ||= if is_enum
+                      # If the column is an enum, we should use the human readable name for the values
                       ->(values) { values.index_with { |s| human_enum_name(column.to_s.pluralize.to_s, s) } }
                     elsif model
+                      # If the column is a foreign key, we should use the name of the object
                       ->(values) { model.where(id: values).to_h { |s| [s.id, s.name] } }
                     else
+                      # Otherwise, we should just use the value itself
                       ->(values) { values.to_h { |s| [s, s] } }
                     end
 
       scope "by_#{name}", lambda { |value|
-        if value_check.call(value) && (!multi || value.is_a?(Array))
+        if value_check.call(value)
           scope = joins(associations).where(column => value)
+          # If the scope accepts multiple values, we should only return the results that match all the values
           scope = scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length) if multi
           scope
         else
@@ -46,16 +63,24 @@ def filterable_by(name, column: name, associations: [], multi: false, is_enum: f
         end
       }
 
+      # The method that returns the possible values for the column
+      # It returns a list of hashes with the id, name and count of each value
       define_singleton_method("#{name}_filter_options") do
+        # the current scope might already have a group by clause
+        # to get be able to write a new group by clause we reselect the currently filtered elements by id
         count = unscoped.where(id: select(:id)).joins(associations).group(column).count
 
         names = name_hash.call(count.keys)
 
         count.map { |key, value| { id: key.to_s, name: names[key].to_s, count: value } }
-             .filter { |option| option[:name].present? }
+             .filter { |option| option[:name].present? } # Remove empty values
       end
     end
 
+    # Creates a scope for course_labels, with the name `by_course_labels`
+    # It also creates a method `course_labels_filter_options`
+    # that returns the possible values for the column, with the count of each value
+    # This is a special case of the filterable_by method, as the course_id is required to get the course_labels
     def filterable_by_course_labels(through_user: false)
       if through_user
         has_many :course_memberships, through: :user

From e89c14aea96a23eb4d5a3100dbd1641f5569d6c1 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 13 May 2024 16:48:15 +0200
Subject: [PATCH 50/72] Make numbers less prominent

---
 app/assets/javascripts/components/search/dropdown_filter.ts | 2 +-
 app/assets/javascripts/components/search/search_field.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index f7960a9e6b..13e09a1ded 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -60,7 +60,7 @@ export class DropdownFilter extends FilterElement {
                                     <input class="form-check-input" type="${this.multi?"checkbox":"radio"}" .checked=${this.isSelected(s)} @click="${() => this.toggle(s)}" id="check-${this.param}-${s.id}">
                                     <label class="form-check-label" for="check-${this.param}-${s.id}" style="min-width: max-content">
                                         ${s.name}
-                                        ${s.count ? html`<span class="badge colored-secondary rounded-pill float-end ms-1">${s.count}</span>` : ""}
+                                        ${s.count ? html`<span class="text-muted float-end ms-4">${s.count}</span>` : ""}
                                     </label>
                                 </div>
                             </span></li>
diff --git a/app/assets/javascripts/components/search/search_field.ts b/app/assets/javascripts/components/search/search_field.ts
index f810ebeed2..16183d5cd1 100644
--- a/app/assets/javascripts/components/search/search_field.ts
+++ b/app/assets/javascripts/components/search/search_field.ts
@@ -56,7 +56,7 @@ export class SearchFieldSuggestion extends FilterElement {
             ${ this.getFilteredLabels().map( label => html`
                 <li><a class="dropdown-item" href="#" @click=${e => this.handleClick(e, label)}>
                     ${unsafeHTML(this.getHighlightedLabel(label.name))}
-                    ${label.count ? html`<span class="badge colored-secondary rounded-pill float-end ms-1">${label.count}</span>` : ""}
+                    ${label.count ? html`<span class="text-muted float-end ms-4">${label.count}</span>` : ""}
                 </a></li>
             `)}
         `;

From 9f054c699df607e489f675c89fc635b3ebb50dd4 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Mon, 13 May 2024 16:50:54 +0200
Subject: [PATCH 51/72] Remove inline style

---
 app/assets/javascripts/components/search/dropdown_filter.ts | 2 +-
 app/assets/stylesheets/components/dropdown-filter.css.scss  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/components/search/dropdown_filter.ts b/app/assets/javascripts/components/search/dropdown_filter.ts
index 13e09a1ded..e5e189696c 100644
--- a/app/assets/javascripts/components/search/dropdown_filter.ts
+++ b/app/assets/javascripts/components/search/dropdown_filter.ts
@@ -58,7 +58,7 @@ export class DropdownFilter extends FilterElement {
                             <li><span class="dropdown-item-text ">
                                 <div class="form-check">
                                     <input class="form-check-input" type="${this.multi?"checkbox":"radio"}" .checked=${this.isSelected(s)} @click="${() => this.toggle(s)}" id="check-${this.param}-${s.id}">
-                                    <label class="form-check-label" for="check-${this.param}-${s.id}" style="min-width: max-content">
+                                    <label class="form-check-label" for="check-${this.param}-${s.id}">
                                         ${s.name}
                                         ${s.count ? html`<span class="text-muted float-end ms-4">${s.count}</span>` : ""}
                                     </label>
diff --git a/app/assets/stylesheets/components/dropdown-filter.css.scss b/app/assets/stylesheets/components/dropdown-filter.css.scss
index ba22476407..5a6fd32539 100644
--- a/app/assets/stylesheets/components/dropdown-filter.css.scss
+++ b/app/assets/stylesheets/components/dropdown-filter.css.scss
@@ -3,6 +3,7 @@
 
   .form-check-label {
     width: 100%;
+    min-width: max-content;
   }
 
   .dropdown-menu {

From ff66570a6b01726e8086b9600df44a66b9da90d2 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 14 May 2024 10:05:43 +0200
Subject: [PATCH 52/72] Remove inline sql

---
 app/assets/javascripts/i18n/translations.json |  2 +-
 app/models/activity.rb                        | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index c5c8c61b1c..32138cd02c 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -708,7 +708,7 @@
       "date_on": "op",
       "description_languages": "Taal van de beschrijving",
       "dolos": {
-        "view_report": "Rapport bekijken"
+        "view_report": "Plagiaat bekijken"
       },
       "draft": "Concept",
       "dropdown": {
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 63c3b19ea8..357e982cc4 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -89,13 +89,11 @@ class Activity < ApplicationRecord
     by_language
   }
   define_singleton_method('description_languages_filter_options') do
-    count_by_description_languages = unscoped.where(id: select(:id)).select(
-      'COUNT(CASE WHEN description_nl_present THEN 1 ELSE NULL END) AS nl',
-      'COUNT(CASE WHEN description_en_present THEN 1 ELSE NULL END) AS en'
-    )
-    count_by_description_languages.first.attributes.except('id').map do |lang, count|
-      { id: lang, name: I18n.t("js.#{lang}"), count: count }
-    end.filter { |lang| lang[:count].positive? }
+    scope = unscoped.where(id: select(:id))
+
+    [{ id: 'nl', name: I18n.t('js.nl'), count: scope.where(description_nl_present: true).count },
+     { id: 'en', name: I18n.t('js.en'), count: scope.where(description_en_present: true).count }]
+      .filter { |lang| lang[:count].positive? }
   end
   scope :by_popularity, lambda { |popularity|
     thresholds = POPULARITY_THRESHOLDS[popularity.to_sym]

From 698b7b91c0f6baaab8bb8ed8b6bdce0c4cec3fad Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 14 May 2024 11:22:39 +0200
Subject: [PATCH 53/72] Only do reselect on group by clauses

---
 app/models/concerns/filterable.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 48da852674..9b6dcd84b6 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -56,7 +56,9 @@ def filterable_by(name, column: name, associations: [], multi: false, is_enum: f
         if value_check.call(value)
           scope = joins(associations).where(column => value)
           # If the scope accepts multiple values, we should only return the results that match all the values
-          scope = scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length) if multi
+          # This is done by grouping the results by id and checking if the count of distinct values is equal to the number of values
+          # To avoid the group by clause to impact future scopes, we reselect the currently filtered elements by id
+          scope = unscoped.where(id: scope.group(:id).having("COUNT(DISTINCT(#{column})) = ?", value.uniq.length).select(:id)) if multi
           scope
         else
           none
@@ -66,9 +68,7 @@ def filterable_by(name, column: name, associations: [], multi: false, is_enum: f
       # The method that returns the possible values for the column
       # It returns a list of hashes with the id, name and count of each value
       define_singleton_method("#{name}_filter_options") do
-        # the current scope might already have a group by clause
-        # to get be able to write a new group by clause we reselect the currently filtered elements by id
-        count = unscoped.where(id: select(:id)).joins(associations).group(column).count
+        count = joins(associations).group(column).count
 
         names = name_hash.call(count.keys)
 

From 632fdde68d89b985d92456be9c488b4a41e831a3 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 14 May 2024 14:00:01 +0200
Subject: [PATCH 54/72] Remove counts for submissions table

---
 app/models/submission.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/models/submission.rb b/app/models/submission.rb
index 262fc23342..3cded26846 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -65,7 +65,11 @@ class Submission < ApplicationRecord
   # As this scope is used for the progress bars on the course page, the speedup was relevant
   scope :judged, -> { where(status: ['unknown', 'correct', 'wrong', 'time limit exceeded', 'runtime error', 'compilation error', 'memory limit exceeded', 'internal error', 'output limit exceeded']) }
   scope :by_exercise_name, ->(name) { where(exercise: Exercise.by_name(name)) }
-  filterable_by :status, is_enum: true
+  scope :by_status, ->(status) { where(status: status.in?(statuses) ? status : -1) }
+  define_singleton_method(:status_filter_options) do
+    # Filter options without count as this is a very expensive operation
+    statuses.map { |key, _| { id: key.to_s, name: human_enum_name(:status, key) } }
+  end
   scope :by_username, ->(name) { where(user: User.by_filter(name)) }
   scope :by_filter, lambda { |filter, skip_user:, skip_exercise:|
     filter.split.map(&:strip).select(&:present?).map do |part|
@@ -75,7 +79,11 @@ class Submission < ApplicationRecord
       scopes.any? ? merge(scopes.reduce(&:or)) : self
     end.reduce(&:merge)
   }
-  filterable_by_course_labels through_user: true
+  scope :by_course_labels, ->(labels, course_id) { where(user: CourseMembership.where(course_id: course_id).by_course_labels(labels).map(&:user)) }
+  define_singleton_method(:course_labels_filter_options) do |course_id|
+    # Filter options without count as this is a very expensive operation
+    CourseLabel.where(course: course_id).map { |label| { id: label.name, name: label.name } }
+  end
 
   scope :most_recent, lambda {
     submissions = select('MAX(submissions.id) as id')

From edd9fcadf40c18ea9d6879ad1305239194c531bf Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 14 May 2024 14:13:03 +0200
Subject: [PATCH 55/72] Fix course filter on all courses page

---
 app/controllers/courses_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 9d3ec6929f..cb58de7d88 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -62,11 +62,10 @@ def index
         @courses = @courses.where(institution: current_user.institution)
       elsif current_user && params[:tab] == 'my'
         @courses = current_user.subscribed_courses
-        @filters = filters(@courses)
       elsif params[:tab] == 'featured'
         @courses = @courses.where(featured: true)
-        @filters = filters(@courses)
       end
+      @filters = filters(@courses) unless current_user && params[:tab] == 'institution'
       @courses = apply_scopes(@courses)
     end
 

From b9341569e3e147334f9fee77f9604c6000a6ac5e Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 16 May 2024 11:08:16 +0200
Subject: [PATCH 56/72] Add clear all active filters link

---
 .../components/search/search_token.ts         | 32 +++++++++++++++++++
 app/assets/javascripts/i18n/translations.json |  8 +++++
 config/locales/js/en.yml                      |  3 ++
 config/locales/js/nl.yml                      |  3 ++
 4 files changed, 46 insertions(+)

diff --git a/app/assets/javascripts/components/search/search_token.ts b/app/assets/javascripts/components/search/search_token.ts
index 4390b72d68..5c18e7c8d9 100644
--- a/app/assets/javascripts/components/search/search_token.ts
+++ b/app/assets/javascripts/components/search/search_token.ts
@@ -6,6 +6,8 @@ import {
     Label
 } from "components/search/filter_element";
 import { FilterCollection } from "components/search/filter_collection";
+import { searchQueryState } from "state/SearchQuery";
+import { i18n } from "i18n/i18n";
 
 /**
  * This component inherits from FilterCollectionElement.
@@ -53,6 +55,28 @@ export class SearchToken extends FilterElement {
  */
 @customElement("d-search-tokens")
 export class SearchTokens extends FilterCollection {
+    get activeFilters(): number {
+        let count = 0;
+        this.visibleFilters.forEach(f => {
+            if (f.multi) {
+                count += searchQueryState.arrayQueryParams.get(f.param)?.length || 0;
+            } else {
+                count += searchQueryState.queryParams.get(f.param) ? 1 : 0;
+            }
+        });
+        return count;
+    }
+
+    clearAll(): void {
+        this.visibleFilters.forEach(f => {
+            if (f.multi) {
+                searchQueryState.arrayQueryParams.set(f.param, []);
+            } else {
+                searchQueryState.queryParams.set(f.param, undefined);
+            }
+        });
+    }
+
     render(): TemplateResult {
         if (!this.visibleFilters) {
             return html``;
@@ -68,6 +92,14 @@ export class SearchTokens extends FilterCollection {
                 >
                 </d-search-token>
             `)}
+            ${this.activeFilters > 0 ? html`
+                <div class="help-block ms-1">
+                    ${i18n.t("js.search.tokens.active_filters", { smart_count: this.activeFilters })}
+                    <a href="#" @click=${() => this.clearAll()}>
+                        ${i18n.t("js.search.tokens.clear")}
+                    </a>
+                </div>
+            ` : html``}
         `;
     }
 }
diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index 32138cd02c..3636794793 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -346,6 +346,10 @@
           "repository_id": "Repository",
           "status": "Status",
           "type": "Type"
+        },
+        "tokens": {
+          "active_filters": "%{smart_count} active filter |||| %{smart_count} active filters",
+          "clear": "Clear all"
         }
       },
       "sign_in_search_bar": {
@@ -867,6 +871,10 @@
           "search_options": "Opties",
           "status": "Status",
           "type": "Type"
+        },
+        "tokens": {
+          "active_filters": "%{smart_count} filter actief |||| %{smart_count} filters actief",
+          "clear": "Alles wissen"
         }
       },
       "sign_in_search_bar": {
diff --git a/config/locales/js/en.yml b/config/locales/js/en.yml
index 60b665fdb7..33ffa8a620 100644
--- a/config/locales/js/en.yml
+++ b/config/locales/js/en.yml
@@ -228,6 +228,9 @@ en:
     dropdown:
       search: Search
     search:
+      tokens:
+        active_filters: "%{smart_count} active filter |||| %{smart_count} active filters"
+        clear: Clear all
       filter:
         labels: Labels
         programming_language: Programming Language
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index e15deae9ea..2b05de936d 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -228,6 +228,9 @@ nl:
     dropdown:
       search: Zoeken
     search:
+      tokens:
+        active_filters: "%{smart_count} filter actief |||| %{smart_count} filters actief"
+        clear: Alles wissen
       filter:
         labels: Labels
         programming_language: Programmeertaal

From da4d1080f9963825cb48aa0f3f9912546e6fc434 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 16 May 2024 11:15:07 +0200
Subject: [PATCH 57/72] Calculate question filter options after everything
 filter

---
 app/controllers/annotations_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index fca30e845a..6c20c21f4b 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -22,9 +22,6 @@ def question_index
     @user = User.find(params[:user_id]) if params[:user_id]
 
     @questions = policy_scope(Question)
-    @filters = filters(@questions)
-    @questions = @questions.merge(apply_scopes(Question).all)
-    @questions = @questions.where(question_state: params[:question_state]) if params[:question_state]
 
     @unfiltered = @user.nil? && params[:course_id].nil?
 
@@ -36,6 +33,10 @@ def question_index
       )
     end
 
+    @filters = filters(@questions)
+    @questions = @questions.merge(apply_scopes(Question).all)
+    @questions = @questions.where(question_state: params[:question_state]) if params[:question_state]
+
     # Preload dependencies for efficiency
     @questions = @questions.includes(:user, :last_updated_by, submission: %i[exercise course])
     @questions = @questions.order(created_at: :desc).paginate(page: parse_pagination_param(params[:page]))

From 726a1d62d393e00a0bf170b86835a21eece55349 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 09:30:50 +0200
Subject: [PATCH 58/72] Update app/controllers/feedbacks_controller.rb

Co-authored-by: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
---
 app/controllers/feedbacks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index d818f4c375..968101cd54 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -44,7 +44,7 @@ def show
   end
 
   def edit
-    @submissions = Submission
+    @submissions = Submission.all
                    .in_series(@feedback.evaluation.series)
                    .where(user: @feedback.user, exercise: @feedback.exercise)
     @filters = filters(@submissions)

From 174fc2a161faa3e54622a7d62653573f91d7c5c8 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 09:38:31 +0200
Subject: [PATCH 59/72] Move filterable by course labels to its own concern

---
 app/models/activity_read_state.rb             |  2 ++
 app/models/concerns/filterable.rb             | 28 ---------------
 .../concerns/filterable_by_course_labels.rb   | 34 +++++++++++++++++++
 app/models/user.rb                            |  1 +
 4 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 app/models/concerns/filterable_by_course_labels.rb

diff --git a/app/models/activity_read_state.rb b/app/models/activity_read_state.rb
index e24c160405..dc0e279e2b 100644
--- a/app/models/activity_read_state.rb
+++ b/app/models/activity_read_state.rb
@@ -10,6 +10,8 @@
 #  updated_at  :datetime         not null
 #
 class ActivityReadState < ApplicationRecord
+  include FilterableByCourseLabels
+
   belongs_to :activity
   belongs_to :course, optional: true
   belongs_to :user
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 9b6dcd84b6..105a1b772d 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -76,33 +76,5 @@ def filterable_by(name, column: name, associations: [], multi: false, is_enum: f
              .filter { |option| option[:name].present? } # Remove empty values
       end
     end
-
-    # Creates a scope for course_labels, with the name `by_course_labels`
-    # It also creates a method `course_labels_filter_options`
-    # that returns the possible values for the column, with the count of each value
-    # This is a special case of the filterable_by method, as the course_id is required to get the course_labels
-    def filterable_by_course_labels(through_user: false)
-      if through_user
-        has_many :course_memberships, through: :user
-        has_many :course_labels, through: :course_memberships
-      end
-
-      scope :by_course_labels, lambda { |labels, course_id|
-        unscoped.where(id: select(:id))
-                .joins(:course_memberships)
-                .where(course_memberships: { id: CourseMembership.where(course_id: course_id).by_course_labels(labels) })
-      }
-
-      define_singleton_method('course_labels_filter_options') do |course_id|
-        count = unscoped.where(id: select(:id))
-                        .joins(:course_labels)
-                        .where(course_memberships: { course_id: course_id })
-                        .group('course_labels.name')
-                        .count
-
-        count.map { |key, value| { id: key.to_s, name: key.to_s, count: value } }
-             .filter { |option| option[:name].present? }
-      end
-    end
   end
 end
diff --git a/app/models/concerns/filterable_by_course_labels.rb b/app/models/concerns/filterable_by_course_labels.rb
new file mode 100644
index 0000000000..24d1e57240
--- /dev/null
+++ b/app/models/concerns/filterable_by_course_labels.rb
@@ -0,0 +1,34 @@
+module FilterableByCourseLabels
+  extend ActiveSupport::Concern
+
+  class_methods do
+    # Creates a scope for course_labels, with the name `by_course_labels`
+    # It also creates a method `course_labels_filter_options`
+    # that returns the possible values for the column, with the count of each value
+    # This is a special case of the filterable_by method of the Filterable concern,
+    # as the course_id is required to get the course_labels
+    def filterable_by_course_labels(through_user: false)
+      if through_user
+        has_many :course_memberships, through: :user
+        has_many :course_labels, through: :course_memberships
+      end
+
+      scope :by_course_labels, lambda { |labels, course_id|
+        unscoped.where(id: select(:id))
+                .joins(:course_memberships)
+                .where(course_memberships: { id: CourseMembership.where(course_id: course_id).by_course_labels(labels) })
+      }
+
+      define_singleton_method('course_labels_filter_options') do |course_id|
+        count = unscoped.where(id: select(:id))
+                        .joins(:course_labels)
+                        .where(course_memberships: { course_id: course_id })
+                        .group('course_labels.name')
+                        .count
+
+        count.map { |key, value| { id: key.to_s, name: key.to_s, count: value } }
+             .filter { |option| option[:name].present? }
+      end
+    end
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index b9387229db..352c3a9a08 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -28,6 +28,7 @@ class User < ApplicationRecord
   include Cacheable
   include Tokenable
   include ActiveModel::Dirty
+  include FilterableByCourseLabels
 
   ATTEMPTED_EXERCISES_CACHE_STRING = '/courses/%<course_id>s/user/%<id>s/attempted_exercises'.freeze
   CORRECT_EXERCISES_CACHE_STRING = '/courses/%<course_id>s/user/%<id>s/correct_exercises'.freeze

From adf67d865cf1eb399a3f8eab11a82695585e438f Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 09:47:04 +0200
Subject: [PATCH 60/72] Only include filterable when needed

---
 app/models/activity.rb            | 1 +
 app/models/activity_read_state.rb | 1 +
 app/models/annotation.rb          | 1 +
 app/models/application_record.rb  | 1 -
 app/models/course.rb              | 1 +
 app/models/course_membership.rb   | 1 +
 app/models/event.rb               | 1 +
 app/models/question.rb            | 1 +
 app/models/saved_annotation.rb    | 1 +
 app/models/user.rb                | 1 +
 10 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 357e982cc4..359e6c774c 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -33,6 +33,7 @@ class Activity < ApplicationRecord
   include StringHelper
   include Cacheable
   include Tokenable
+  include Filterable
 
   USERS_READ_CACHE_STRING = '/course/%<course_id>s/activity/%<id>s/users_read'.freeze
   CONFIG_FILE = 'config.json'.freeze
diff --git a/app/models/activity_read_state.rb b/app/models/activity_read_state.rb
index dc0e279e2b..70b77c4b52 100644
--- a/app/models/activity_read_state.rb
+++ b/app/models/activity_read_state.rb
@@ -11,6 +11,7 @@
 #
 class ActivityReadState < ApplicationRecord
   include FilterableByCourseLabels
+  include Filterable
 
   belongs_to :activity
   belongs_to :course, optional: true
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 0f073451c1..25e1b4824a 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -22,6 +22,7 @@
 #
 class Annotation < ApplicationRecord
   include ApplicationHelper
+  include Filterable
 
   belongs_to :course
   belongs_to :submission
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 1631bed207..3874fb8a80 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,5 +1,4 @@
 class ApplicationRecord < ActiveRecord::Base
-  include Filterable
   self.abstract_class = true
 
   def self.human_enum_name(enum_name, enum_value, options = {})
diff --git a/app/models/course.rb b/app/models/course.rb
index 0d09348a5f..99f259f6ba 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -26,6 +26,7 @@ class Course < ApplicationRecord
   include Cacheable
   include Tokenable
   include ActionView::Helpers::SanitizeHelper
+  include Filterable
 
   SUBSCRIBED_MEMBERS_COUNT_CACHE_STRING = '/courses/%<id>d/subscribed_members_count'.freeze
   ACTIVITIES_COUNT_CACHE_STRING = '/courses/%<id>d/activities_count'.freeze
diff --git a/app/models/course_membership.rb b/app/models/course_membership.rb
index 548db78442..94d7a01a6f 100644
--- a/app/models/course_membership.rb
+++ b/app/models/course_membership.rb
@@ -12,6 +12,7 @@
 #
 
 class CourseMembership < ApplicationRecord
+  include Filterable
   enum status: { pending: 0, course_admin: 1, student: 2, unsubscribed: 3 }
 
   belongs_to :course
diff --git a/app/models/event.rb b/app/models/event.rb
index ba81987bc1..2741c6ee9c 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -11,6 +11,7 @@
 #
 
 class Event < ApplicationRecord
+  include Filterable
   enum event_type: { rejudge: 0, permission_change: 1, exercise_repository: 2, error: 3, no_auth_id_sign_in: 4 }
   belongs_to :user, optional: true
 
diff --git a/app/models/question.rb b/app/models/question.rb
index 9dc3aec3c2..0b610bb826 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -21,6 +21,7 @@
 #  columns             :integer
 #
 class Question < Annotation
+  include Filterable
   belongs_to :user, inverse_of: :questions
   counter_culture :user, column_name: proc { |question| question.answered? ? nil : 'open_questions_count' }
 
diff --git a/app/models/saved_annotation.rb b/app/models/saved_annotation.rb
index 76dd4a3167..4a03e6fac7 100644
--- a/app/models/saved_annotation.rb
+++ b/app/models/saved_annotation.rb
@@ -13,6 +13,7 @@
 #  annotations_count :integer          default(0)
 #
 class SavedAnnotation < ApplicationRecord
+  include Filterable
   validates :title, presence: true
   validates :annotation_text, presence: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 352c3a9a08..75b4b0ff7b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,6 +29,7 @@ class User < ApplicationRecord
   include Tokenable
   include ActiveModel::Dirty
   include FilterableByCourseLabels
+  include Filterable
 
   ATTEMPTED_EXERCISES_CACHE_STRING = '/courses/%<course_id>s/user/%<id>s/attempted_exercises'.freeze
   CORRECT_EXERCISES_CACHE_STRING = '/courses/%<course_id>s/user/%<id>s/correct_exercises'.freeze

From 1a691574b32015a9bb699c2529427335bfd593f3 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 09:52:46 +0200
Subject: [PATCH 61/72] Fix imports

---
 test/javascript/components/search/search_field.test.ts | 2 +-
 test/javascript/components/search/search_token.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/javascript/components/search/search_field.test.ts b/test/javascript/components/search/search_field.test.ts
index dac5fa4988..eeff026585 100644
--- a/test/javascript/components/search/search_field.test.ts
+++ b/test/javascript/components/search/search_field.test.ts
@@ -3,7 +3,7 @@ import { aTimeout, fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { screen } from "@testing-library/dom";
 import { SearchField, SearchFieldSuggestion } from "components/search/search_field";
-import { Label, FilterOptions } from "../../../../app/assets/javascripts/components/search/filter_element";
+import { FilterOptions } from "components/search/filter_element";
 import { html } from "lit";
 import { searchQueryState } from "state/SearchQuery";
 import { textContentMatcher } from "../../test_helpers";
diff --git a/test/javascript/components/search/search_token.test.ts b/test/javascript/components/search/search_token.test.ts
index fa36c882fa..5e700d2f41 100644
--- a/test/javascript/components/search/search_token.test.ts
+++ b/test/javascript/components/search/search_token.test.ts
@@ -4,7 +4,7 @@ import { fixture, nextFrame } from "@open-wc/testing-helpers";
 import userEvent from "@testing-library/user-event";
 import { screen } from "@testing-library/dom";
 import { html } from "lit/development";
-import { Label } from "../../../../app/assets/javascripts/components/search/filter_element";
+import { Label } from "components/search/filter_element";
 import { searchQueryState } from "state/SearchQuery";
 
 describe("SearchToken", () => {

From f78d1628638e611aa91c8809748a51f22b6fc0dc Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 10:46:35 +0200
Subject: [PATCH 62/72] Hide 'define_singleton_method' behind method

---
 app/assets/javascripts/i18n/translations.json |  2 +-
 app/models/activity.rb                        | 12 +++++-------
 app/models/concerns/filterable.rb             |  8 +++++++-
 app/models/submission.rb                      |  5 +++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index 3636794793..e5dd2757bc 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -712,7 +712,7 @@
       "date_on": "op",
       "description_languages": "Taal van de beschrijving",
       "dolos": {
-        "view_report": "Plagiaat bekijken"
+        "view_report": "Rapport bekijken"
       },
       "draft": "Concept",
       "dropdown": {
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 359e6c774c..3092cd2bfe 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -89,11 +89,9 @@ class Activity < ApplicationRecord
     by_language = by_language.where(description_nl_present: true) if languages.include? 'nl'
     by_language
   }
-  define_singleton_method('description_languages_filter_options') do
-    scope = unscoped.where(id: select(:id))
-
-    [{ id: 'nl', name: I18n.t('js.nl'), count: scope.where(description_nl_present: true).count },
-     { id: 'en', name: I18n.t('js.en'), count: scope.where(description_en_present: true).count }]
+  filter_options_for :description_languages do
+    [{ id: 'nl', name: I18n.t('js.nl'), count: where(description_nl_present: true).count },
+     { id: 'en', name: I18n.t('js.en'), count: where(description_en_present: true).count }]
       .filter { |lang| lang[:count].positive? }
   end
   scope :by_popularity, lambda { |popularity|
@@ -102,8 +100,8 @@ class Activity < ApplicationRecord
     filtered = filtered.where("series_count <= #{thresholds[:max]}") if thresholds[:max].present?
     filtered
   }
-  define_singleton_method('popularity_filter_options') do
-    count_by_popularity = unscoped.where(id: select(:id)).select(
+  filter_options_for :popularity do
+    count_by_popularity = select(
       POPULARITY_THRESHOLDS.map do |popularity, thresholds|
         "COUNT(CASE WHEN series_count >= #{thresholds[:min]} #{thresholds[:max].present? ? "AND series_count <= #{thresholds[:max]}" : ''} THEN 1 ELSE NULL END) AS #{popularity}"
       end
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index 105a1b772d..f50eeeceb5 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -20,6 +20,12 @@ def search_by(*columns)
       scope :by_filter, ->(filter) { filter.split.map(&:strip).select(&:present?).inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
     end
 
+    # Creates a method that returns the possible values for the column
+    # The return value should be a list of hashes with the id, name and count of each value
+    def filter_options_for(name, &block)
+      define_singleton_method("#{name}_filter_options", &block)
+    end
+
     # Creates a scope for the column, with the name `by_#{column}`
     # It also creates a method `#{column}_filter_options` that returns the possible values for the column, with the count of each value
     # params:
@@ -67,7 +73,7 @@ def filterable_by(name, column: name, associations: [], multi: false, is_enum: f
 
       # The method that returns the possible values for the column
       # It returns a list of hashes with the id, name and count of each value
-      define_singleton_method("#{name}_filter_options") do
+      filter_options_for name do
         count = joins(associations).group(column).count
 
         names = name_hash.call(count.keys)
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 542d891d1e..9172d831e5 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -19,6 +19,7 @@
 class Submission < ApplicationRecord
   include Cacheable
   include ActiveModel::Dirty
+  include Filterable
 
   SECONDS_BETWEEN_SUBMISSIONS = 5 # Used for rate limiting
   PUNCHCARD_MATRIX_CACHE_STRING = '/courses/%<course_id>s/user/%<user_id>s/timezone/%<timezone>s/punchcard_matrix'.freeze
@@ -66,7 +67,7 @@ class Submission < ApplicationRecord
   scope :judged, -> { where(status: ['unknown', 'correct', 'wrong', 'time limit exceeded', 'runtime error', 'compilation error', 'memory limit exceeded', 'internal error', 'output limit exceeded']) }
   scope :by_exercise_name, ->(name) { where(exercise: Exercise.by_name(name)) }
   scope :by_status, ->(status) { where(status: status.in?(statuses) ? status : -1) }
-  define_singleton_method(:status_filter_options) do
+  filter_options_for :status do
     # Filter options without count as this is a very expensive operation
     statuses.map { |key, _| { id: key.to_s, name: human_enum_name(:status, key) } }
   end
@@ -80,7 +81,7 @@ class Submission < ApplicationRecord
     end.reduce(&:merge)
   }
   scope :by_course_labels, ->(labels, course_id) { where(user: CourseMembership.where(course_id: course_id).by_course_labels(labels).map(&:user)) }
-  define_singleton_method(:course_labels_filter_options) do |course_id|
+  filter_options_for :course_labels do |course_id|
     # Filter options without count as this is a very expensive operation
     CourseLabel.where(course: course_id).map { |label| { id: label.name, name: label.name } }
   end

From 0e89451c73b9de298ab1e3e239c9fbc0f4372a67 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 11:21:55 +0200
Subject: [PATCH 63/72] Remove delegation

---
 app/controllers/concerns/has_filter.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index 3b9c64e9f0..d7bcce1a70 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -1,8 +1,9 @@
 module HasFilter
   extend ActiveSupport::Concern
   included do
-    delegate :filter_options, to: :class
+    class_attribute :filter_options
     self.filter_options = []
+
     def filters(target)
       filter_options.map do |name, multi|
         scope_params = params.except(:controller, :action, :page)
@@ -17,8 +18,6 @@ def filters(target)
   end
 
   class_methods do
-    attr_accessor :filter_options
-
     def has_filter(name, multi: false) # rubocop:disable Naming/PredicateName
       if multi
         has_scope "by_#{name}", as: name, type: :array, if: ->(this) { this.params[name].is_a?(Array) }

From 8e2ce0b401c74f9f9bc57f1f2c1a3f4c4bcd76d1 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 11:33:32 +0200
Subject: [PATCH 64/72] Don't modify parent

---
 app/controllers/concerns/has_filter.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/concerns/has_filter.rb b/app/controllers/concerns/has_filter.rb
index d7bcce1a70..d487177fa3 100644
--- a/app/controllers/concerns/has_filter.rb
+++ b/app/controllers/concerns/has_filter.rb
@@ -25,6 +25,9 @@ def has_filter(name, multi: false) # rubocop:disable Naming/PredicateName
         has_scope "by_#{name}", as: name
       end
 
+      # inherit filter options from parent controller, but don't modify it
+      self.filter_options = filter_options.dup
+
       filter_options << [name, multi]
     end
 

From b8171b2fca001c90f9b43b652ac034f831e7fa59 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 13:39:56 +0200
Subject: [PATCH 65/72] Fix rubocop

---
 app/controllers/feedbacks_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index 968101cd54..cc36be0d61 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -44,9 +44,8 @@ def show
   end
 
   def edit
-    @submissions = Submission.all
-                   .in_series(@feedback.evaluation.series)
-                   .where(user: @feedback.user, exercise: @feedback.exercise)
+    @submissions = Submission.in_series(@feedback.evaluation.series)
+                             .where(user: @feedback.user, exercise: @feedback.exercise)
     @filters = filters(@submissions)
     @submissions = apply_scopes(@submissions)
                    .paginate(page: parse_pagination_param(params[:page]))

From 9d872d8491fab18cac8bf99240762e063cdeb83e Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 28 May 2024 10:32:01 +0200
Subject: [PATCH 66/72] No need for extra keys

---
 config/locales/models/en.yml | 1 -
 config/locales/models/nl.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
index 145aae06a4..c752de4a94 100644
--- a/config/locales/models/en.yml
+++ b/config/locales/models/en.yml
@@ -175,7 +175,6 @@ en:
           permission_change: Change in permission level
           exercise_repository: Creation of exercise repository
           error: Error
-          no_auth_id_sign_in: User logged in without auth_id
       export:
         statuses:
           started: Started
diff --git a/config/locales/models/nl.yml b/config/locales/models/nl.yml
index ef5e3eb5dc..900620b19f 100644
--- a/config/locales/models/nl.yml
+++ b/config/locales/models/nl.yml
@@ -176,7 +176,6 @@ nl:
           permission_change: Verandering in toegangsniveau
           exercise_repository: Aanmaak van oefeningenrepository
           error: Error
-          no_auth_id_sign_in: Gebruiker heeft ingelogd zonder auth_id
       export:
         statuses:
           started: Begonnen

From 4c0adbcc4fda14ca50698215395da524be7fd1d2 Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 14:46:44 +0100
Subject: [PATCH 67/72] Fix linting

---
 app/models/concerns/filterable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
index d863c01a5d..13e3448008 100644
--- a/app/models/concerns/filterable.rb
+++ b/app/models/concerns/filterable.rb
@@ -17,7 +17,7 @@ def search_by(*columns)
       end
 
       before_save :set_search
-      scope :by_filter, ->(filter) { filter.split.map(&:strip).select(&:present?).inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
+      scope :by_filter, ->(filter) { filter.split.map(&:strip).compact_blank.inject(self) { |query, part| query.where("#{table_name}.search LIKE ?", "%#{part}%") } }
     end
 
     # Creates a method that returns the possible values for the column

From 1f11ba3d94e0e7ace2438f56467537ed2b36fdd5 Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 15:03:01 +0100
Subject: [PATCH 68/72] Fix tests

---
 app/policies/annotation_policy.rb    |  2 +-
 test/models/saved_annotation_test.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/policies/annotation_policy.rb b/app/policies/annotation_policy.rb
index 1045da391d..6fa65d1c96 100644
--- a/app/policies/annotation_policy.rb
+++ b/app/policies/annotation_policy.rb
@@ -5,7 +5,7 @@ def resolve
         scope.all
       elsif user
         common = scope.joins(:submission)
-        common.released.where(submission: { user: user }).or(common.where(submission: { course_id: user.administrating_courses.map(&:id) }))
+        common.released.where(submissions: { user: user }).or(common.where(submissions: { course_id: user.administrating_courses.map(&:id) }))
       else
         scope.none
       end
diff --git a/test/models/saved_annotation_test.rb b/test/models/saved_annotation_test.rb
index c413816661..a2dd64ca39 100644
--- a/test/models/saved_annotation_test.rb
+++ b/test/models/saved_annotation_test.rb
@@ -26,9 +26,9 @@ class SavedAnnotationTest < ActiveSupport::TestCase
     s2 = create :saved_annotation, course: course, user: user
     s3 = create :saved_annotation, course: create(:course), user: user
 
-    assert_includes SavedAnnotation.by_course(course), s1
-    assert_includes SavedAnnotation.by_course(course), s2
-    assert_not_includes SavedAnnotation.by_course(course), s3
+    assert_includes SavedAnnotation.by_course_id(course.id), s1
+    assert_includes SavedAnnotation.by_course_id(course.id), s2
+    assert_not_includes SavedAnnotation.by_course_id(course.id), s3
   end
 
   test 'filtering by exercise_id should contain nil values' do
@@ -38,8 +38,8 @@ class SavedAnnotationTest < ActiveSupport::TestCase
     s2 = create :saved_annotation, exercise: exercise, user: user
     s3 = create :saved_annotation, exercise: create(:exercise), user: user
 
-    assert_includes SavedAnnotation.by_exercise(exercise), s1
-    assert_includes SavedAnnotation.by_exercise(exercise), s2
-    assert_not_includes SavedAnnotation.by_exercise(exercise), s3
+    assert_includes SavedAnnotation.by_exercise_id(exercise.id), s1
+    assert_includes SavedAnnotation.by_exercise_id(exercise.id), s2
+    assert_not_includes SavedAnnotation.by_exercise_id(exercise.id), s3
   end
 end

From a5c64f2b0852f4e223ff1edf6f86a0304d79314e Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 16:12:49 +0100
Subject: [PATCH 69/72] Use json_escape

---
 app/views/activities/available.js.erb       | 2 +-
 app/views/activities/index.js.erb           | 2 +-
 app/views/annotations/question_index.js.erb | 2 +-
 app/views/course_members/index.js.erb       | 2 +-
 app/views/courses/index.js.erb              | 2 +-
 app/views/courses/scoresheet.js.erb         | 2 +-
 app/views/evaluations/add_users.js.erb      | 2 +-
 app/views/evaluations/edit.js.erb           | 2 +-
 app/views/evaluations/show.js.erb           | 2 +-
 app/views/events/index.js.erb               | 2 +-
 app/views/feedbacks/edit.js.erb             | 2 +-
 app/views/layouts/_searchbar.html.erb       | 2 +-
 app/views/saved_annotations/new.js.erb      | 2 +-
 app/views/submissions/index.js.erb          | 2 +-
 app/views/users/index.js.erb                | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/activities/available.js.erb b/app/views/activities/available.js.erb
index e6eb6758f5..a84d6a7cbf 100644
--- a/app/views/activities/available.js.erb
+++ b/app/views/activities/available.js.erb
@@ -1,3 +1,3 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#activities-table-wrapper"), "<%= escape_javascript(render partial: 'series_activities_add_table', locals: {activities: @activities, series: @series}) %>");
 dodona.seriesEditActivitiesLoaded();
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/activities/index.js.erb b/app/views/activities/index.js.erb
index 82d0b11e8b..5830329677 100644
--- a/app/views/activities/index.js.erb
+++ b/app/views/activities/index.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#activities-table-wrapper"),"<%= escape_javascript(render partial: 'activities_table', locals: {activities: @activities}) %>");
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/annotations/question_index.js.erb b/app/views/annotations/question_index.js.erb
index 0546c1db39..4544c7f154 100644
--- a/app/views/annotations/question_index.js.erb
+++ b/app/views/annotations/question_index.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#questions-table-wrapper"), "<%= escape_javascript(render partial: 'questions_table_with_pagination', locals: {questions: @questions}) %>");
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/course_members/index.js.erb b/app/views/course_members/index.js.erb
index be3fa5b787..f551a91050 100644
--- a/app/views/course_members/index.js.erb
+++ b/app/views/course_members/index.js.erb
@@ -1,3 +1,3 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships}) %>")
 dodona.ready.then(dodona.initTooltips);
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/courses/index.js.erb b/app/views/courses/index.js.erb
index 66a70cc562..474982bfb9 100644
--- a/app/views/courses/index.js.erb
+++ b/app/views/courses/index.js.erb
@@ -11,4 +11,4 @@ if (dodona.copyCoursesLoaded) {
 <% else %>
 dodona.setHTMLExecuteScripts(document.querySelector("#courses-table-wrapper"), "<%= escape_javascript(render partial: 'courses/courses_table', locals: {courses: @courses}) %>")
 <% end %>
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/courses/scoresheet.js.erb b/app/views/courses/scoresheet.js.erb
index 9fc2c3f45b..9c1bdc2625 100644
--- a/app/views/courses/scoresheet.js.erb
+++ b/app/views/courses/scoresheet.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#scoresheet-table-wrapper"), "<%= escape_javascript(render partial: 'scoresheet_table', locals: {course: @course, series: @series, users: @users, hash: @hash, histogram: @histogram, total_activity_count: @total_activity_count, total_by_user: @total_by_user, total_histogram: @total_histogram}) %>")
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/evaluations/add_users.js.erb b/app/views/evaluations/add_users.js.erb
index 4a70fdce9c..ab18a62cfe 100644
--- a/app/views/evaluations/add_users.js.erb
+++ b/app/views/evaluations/add_users.js.erb
@@ -1,4 +1,4 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships, confirm: false}) %>")
 window.dodona.initTooltips();
 window.dodona.initCheckboxes();
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/evaluations/edit.js.erb b/app/views/evaluations/edit.js.erb
index 44459baef6..b48b4e8fdb 100644
--- a/app/views/evaluations/edit.js.erb
+++ b/app/views/evaluations/edit.js.erb
@@ -1,4 +1,4 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'members_table', locals: {course_memberships: @course_memberships, confirm: @should_confirm}) %>")
 window.dodona.initTooltips();
 window.dodona.initCheckboxes();
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/evaluations/show.js.erb b/app/views/evaluations/show.js.erb
index e640095071..0a52128b3b 100644
--- a/app/views/evaluations/show.js.erb
+++ b/app/views/evaluations/show.js.erb
@@ -3,5 +3,5 @@ const gradeTable = document.querySelector("#evaluation-grade-table-wrapper");
 if(gradeTable) {
     dodona.setHTMLExecuteScripts(gradeTable, "<%= escape_javascript(render 'evaluation_grade_table', feedbacks: @feedbacks, evaluation: @evaluation, users: @users) %>")
 }
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
 
diff --git a/app/views/events/index.js.erb b/app/views/events/index.js.erb
index 92174a2b88..115793afba 100644
--- a/app/views/events/index.js.erb
+++ b/app/views/events/index.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#events-table-wrapper"), "<%= escape_javascript(render partial: 'events/events_table', locals: {events: @events}) %>")
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/feedbacks/edit.js.erb b/app/views/feedbacks/edit.js.erb
index b90ffdc2af..184b9666e9 100644
--- a/app/views/feedbacks/edit.js.erb
+++ b/app/views/feedbacks/edit.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#submissions-table-wrapper"), "<%= escape_javascript(render partial: 'submissions_table', locals: { submissions: @submissions }) %>")
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/layouts/_searchbar.html.erb b/app/views/layouts/_searchbar.html.erb
index 06478ad9f0..d68b016cc7 100644
--- a/app/views/layouts/_searchbar.html.erb
+++ b/app/views/layouts/_searchbar.html.erb
@@ -48,6 +48,6 @@
         dodona.search.autoSearch = <%= local_assigns.fetch :autoSearch, true %>;
         dodona.search.setLocalStorageKey(localStorageKey);
 
-        dodona.search.updateFilters(<%= raw @filters.to_json %>);
+        dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
     });
 </script>
diff --git a/app/views/saved_annotations/new.js.erb b/app/views/saved_annotations/new.js.erb
index 7016a72401..9b81695ae9 100644
--- a/app/views/saved_annotations/new.js.erb
+++ b/app/views/saved_annotations/new.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#questions-table-wrapper"), "<%= escape_javascript(render partial: 'annotations/annotations_table', locals: { annotations: @annotations, allow_save: true }) %>");
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/submissions/index.js.erb b/app/views/submissions/index.js.erb
index 1369c2081f..ef6a2ad3e0 100644
--- a/app/views/submissions/index.js.erb
+++ b/app/views/submissions/index.js.erb
@@ -6,4 +6,4 @@ if (dodona.feedbackTableLoaded) {
         <%= raw "#{@course&.id || 'undefined'}" %>
     );
 }
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);
diff --git a/app/views/users/index.js.erb b/app/views/users/index.js.erb
index e2b7b310df..ac06149ef3 100644
--- a/app/views/users/index.js.erb
+++ b/app/views/users/index.js.erb
@@ -1,2 +1,2 @@
 dodona.setHTMLExecuteScripts(document.querySelector("#users-table-wrapper"), "<%= escape_javascript(render partial: 'users/users_table', locals: {users: @users, pagination_opts: @pagination_opts }) %>");
-dodona.search.updateFilters(<%= raw @filters.to_json %>);
+dodona.search.updateFilters(<%= raw json_escape(@filters.to_json) %>);

From e7a4ac7a385290ad9fe510b5adb66015ee30982e Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 16:21:23 +0100
Subject: [PATCH 70/72] Remove unused translations key

---
 app/assets/javascripts/i18n/translations.json | 1 -
 config/locales/js/nl.yml                      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/assets/javascripts/i18n/translations.json b/app/assets/javascripts/i18n/translations.json
index eaf4fc7a37..fa881ec177 100644
--- a/app/assets/javascripts/i18n/translations.json
+++ b/app/assets/javascripts/i18n/translations.json
@@ -840,7 +840,6 @@
           "programming_language": "Programmeertaal",
           "question_state": "Toestand",
           "repository_id": "Repository",
-          "search_options": "Opties",
           "status": "Status",
           "type": "Type"
         },
diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
index a28246bd6c..33ea0931df 100644
--- a/config/locales/js/nl.yml
+++ b/config/locales/js/nl.yml
@@ -214,7 +214,6 @@ nl:
         course_id: Cursus
         question_state: Toestand
         popularity: Populariteit
-        search_options: Opties
         exercise_id: Oefening
         draft: "Concept"
         event_type: type

From 0c2bc88e725292c31a63c4038a4996d8831db952 Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 16:55:37 +0100
Subject: [PATCH 71/72] Remove unused filter statement

---
 app/controllers/courses_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index cb58de7d88..a923fa92d8 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -99,7 +99,6 @@ def show
   # GET /courses/new
   def new
     authorize Course
-    @filters = filters(Course.all)
     if params[:copy_options]&.fetch(:base_id).present?
       @copy_options = copy_options
       @copy_options[:base] = Course.find(@copy_options[:base_id])

From 2c4b3cf6e9667b29e739f75a6f3e3597f29f6d58 Mon Sep 17 00:00:00 2001
From: "jorg.vr" <jorg.vanrenterghem@ugent.be>
Date: Wed, 13 Nov 2024 17:11:48 +0100
Subject: [PATCH 72/72] Rename consistency

---
 app/controllers/auth/authentication_controller.rb | 2 +-
 app/models/provider.rb                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/auth/authentication_controller.rb b/app/controllers/auth/authentication_controller.rb
index b4a22f1bc7..9dfd3addbc 100644
--- a/app/controllers/auth/authentication_controller.rb
+++ b/app/controllers/auth/authentication_controller.rb
@@ -1,7 +1,7 @@
 class Auth::AuthenticationController < Devise::SessionsController
   # A sign-out route is inherited from the parent controller.
 
-  has_scope :by_institution, as: 'institution_id'
+  has_scope :by_institution_id, as: 'institution_id'
 
   skip_before_action :verify_authenticity_token, raise: false
 
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 0ee5990973..2633e3e508 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -35,7 +35,7 @@ class Provider < ApplicationRecord
   scope :saml, -> { where(type: Provider::Saml.name) }
   scope :smartschool, -> { where(type: Provider::Smartschool.name) }
   scope :surf, -> { where(type: Provider::Surf.name) }
-  scope :by_institution, ->(institution) { where(institution_id: institution) }
+  scope :by_institution_id, ->(institution) { where(institution_id: institution) }
 
   validates :mode, presence: true
   validate :at_least_one_preferred