From 49ea02621b49e5eb815b237d0550302c918e04f1 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 7 Oct 2025 11:38:28 +0200
Subject: Resolve "UserFilter bearbeitbar machen"

Closes #5910

Merge request studip/studip!4506
---
 lib/classes/JsonApi/Schemas/UserFilter.php         |  2 +-
 resources/vue/components/StudipUserFilter.vue      | 36 +++++++++++------
 .../components/admission/ConditionalAdmission.vue  | 22 ++++++++--
 .../components/admission/PreferentialAdmission.vue | 47 ++++++++++++++++++----
 .../vue/components/form_inputs/UserFilterInput.vue | 28 +++++++++++--
 5 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/lib/classes/JsonApi/Schemas/UserFilter.php b/lib/classes/JsonApi/Schemas/UserFilter.php
index 7e390cf..8be264b 100644
--- a/lib/classes/JsonApi/Schemas/UserFilter.php
+++ b/lib/classes/JsonApi/Schemas/UserFilter.php
@@ -25,7 +25,7 @@ class UserFilter extends SchemaProvider
                     'value' => $field->getValue(),
                 ]
             ],
-            $resource->getFields()
+            array_values($resource->getFields())
         );
 
         $resource->show_user_count = true;
diff --git a/resources/vue/components/StudipUserFilter.vue b/resources/vue/components/StudipUserFilter.vue
index 48c6c0f..e7edba1 100644
--- a/resources/vue/components/StudipUserFilter.vue
+++ b/resources/vue/components/StudipUserFilter.vue
@@ -44,11 +44,14 @@
                         {{ name }}
                     </option>
                 </select>
-                <studip-icon v-if="element.attributes.type && currentFilter.length > 1"
-                             shape="trash"
-                             role="button"
-                             :title="$gettext('Dieses Feld löschen')"
-                             @click="removeField(index)"></studip-icon>
+                <a v-if="element.attributes.type && currentFilter.length > 1"
+                   class="undecorated"
+                   @click.prevent="removeField(index)"
+                   :title="$gettext('Dieses Feld löschen')"
+                   tabindex="0"
+                >
+                    <studip-icon shape="trash"></studip-icon>
+                </a>
             </section>
             <section>
                 <button class="button add"
@@ -106,11 +109,14 @@ export default {
                         }
                     }
                 }
+
                 this.currentFilter[fieldIndex].attributes.type = type;
                 this.currentFilter[fieldIndex].attributes.realtype = this.fieldConfig[type].type;
                 this.currentFilter[fieldIndex].attributes.typeparam = this.fieldConfig[type].typeparam;
-                this.currentFilter[fieldIndex].attributes['compare-operator'] = Object.keys(this.fieldConfig[type].compareOps)[0];
-                this.currentFilter[fieldIndex].attributes.value = Object.keys(this.fieldConfig[type].values)[0];
+                if (!this.currentFilter[fieldIndex].attributes.id) {
+                    this.currentFilter[fieldIndex].attributes['compare-operator'] = Object.keys(this.fieldConfig[type].compareOps)[0];
+                    this.currentFilter[fieldIndex].attributes.value = Object.keys(this.fieldConfig[type].values)[0];
+                }
             }
         },
         addField() {
@@ -124,10 +130,10 @@ export default {
             // We need to build a new structure here as the "type" attribute looks different for datafield conditions.
             const data = this.currentFilter.map(item => ({
                 attributes: {
-                        type: item.attributes.realtype,
-                        typeparam: item.attributes.typeparam,
-                        'compare-operator': item.attributes['compare-operator'],
-                        value: item.attributes.value
+                    type: item.attributes.realtype,
+                    typeparam: item.attributes.typeparam,
+                    'compare-operator': item.attributes['compare-operator'],
+                    value: item.attributes.value
                 }
             }));
 
@@ -160,7 +166,13 @@ export default {
             }
         ).then(response => {
             this.availableFields = response.data;
-            this.addField();
+            if (this.currentFilter?.length === 0) {
+                this.addField();
+            } else {
+                for (let i = 0 ; i < this.currentFilter.length ; i++) {
+                    this.addFieldConfig(this.currentFilter[i].attributes.type, i);
+                }
+            }
         });
     }
 }
diff --git a/resources/vue/components/admission/ConditionalAdmission.vue b/resources/vue/components/admission/ConditionalAdmission.vue
index d4243ce..56c8268 100644
--- a/resources/vue/components/admission/ConditionalAdmission.vue
+++ b/resources/vue/components/admission/ConditionalAdmission.vue
@@ -29,6 +29,10 @@
                                :value="filter.id">
                         <span v-html="filter.attributes.text"></span>
                     </label>
+                    <a @click.prevent="editFilter(index)"
+                       :title="$gettext('Diese Bedingung bearbeiten')">
+                        <studip-icon shape="edit"></studip-icon>
+                    </a>
                     <a @click.prevent="deleteFilter(index)"
                        :title="$gettext('Diese Bedingung löschen')">
                         <studip-icon shape="trash"></studip-icon>
@@ -77,11 +81,12 @@
         </section>
         <section>
             <button class="button add"
-                    @click.prevent="editFilter">
+                    @click.prevent="editFilter(null)">
                 {{ $gettext('Bedingung hinzufügen') }}
             </button>
         </section>
         <studip-user-filter v-if="showEditFilter"
+                            :filter="currentFilter"
                             @submit="confirmDialog"
                             @close="closeDialog"></studip-user-filter>
     </form>
@@ -102,6 +107,8 @@ export default {
             ungrouped: [],
             groups: [],
             showEditFilter: false,
+            currentFilterIndex: null,
+            currentFilter: null,
             selectedFilters: []
         }
     },
@@ -122,14 +129,18 @@ export default {
         }
     },
     methods: {
-        editFilter() {
+        editFilter(index) {
             this.showEditFilter = true;
+            this.currentFilterIndex = index;
+            this.currentFilter = index === null ? [] : this.ungrouped[index].attributes.fields;
         },
         deleteFilter(index) {
             this.ungrouped.splice(index, 1);
         },
         closeDialog() {
             this.showEditFilter = false;
+            this.currentFilterIndex = null;
+            this.currentFilter = null;
         },
         confirmDialog(filter) {
             STUDIP.jsonapi.withPromises().post(
@@ -144,8 +155,13 @@ export default {
                     }
                 })
             .then(response => {
-                this.ungrouped.push(response.data);
+                if (this.currentFilterIndex !== null) {
+                    this.ungrouped[this.currentFilterIndex] = response.data;
+                } else {
+                    this.ungrouped.push(response.data);
+                }
                 this.showEditFilter = false;
+                this.currentFilterIndex = this.currentFilter = null;
             });
         },
         setRuleData(data) {
diff --git a/resources/vue/components/admission/PreferentialAdmission.vue b/resources/vue/components/admission/PreferentialAdmission.vue
index eefc375..1b67bb7 100644
--- a/resources/vue/components/admission/PreferentialAdmission.vue
+++ b/resources/vue/components/admission/PreferentialAdmission.vue
@@ -18,7 +18,21 @@
                     <p v-if="conditions.length > 1 && index >= 1">
                         {{ $gettext('oder') }}
                     </p>
-                    <p v-html="filter.attributes.text"></p>
+                    <div>
+                        <p class="condition-text"
+                           v-html="filter.attributes.text"
+                        ></p>
+                        <a @click.prevent="editFilter(index)"
+                           :title="$gettext('Diese Bedingung bearbeiten')"
+                        >
+                            <studip-icon shape="edit"></studip-icon>
+                        </a>
+                        <a @click.prevent="deleteFilter(index)"
+                           :title="$gettext('Diese Bedingung löschen')"
+                        >
+                            <studip-icon shape="trash"></studip-icon>
+                        </a>
+                    </div>
                 </div>
             </div>
             <p v-if="conditions.length === 0">
@@ -27,7 +41,7 @@
         </section>
         <section>
             <button class="button add"
-                    @click.prevent="editFilter">
+                    @click.prevent="editFilter(null)">
                 {{ $gettext('Bedingung hinzufügen') }}
             </button>
         </section>
@@ -40,6 +54,7 @@
             </label>
         </section>
         <studip-user-filter v-if="showEditFilter"
+                            :filter="currentFilter"
                             @submit="confirmDialog"
                             @close="closeDialog"></studip-user-filter>
     </form>
@@ -59,13 +74,12 @@ export default {
             conditions: [],
             favorSemester: false,
             showEditFilter: false,
+            currentFilter: null,
+            currentFilterIndex: null,
             selectedFilters: []
         }
     },
     computed: {
-        groupsAllowed() {
-            return this.assignedRuleTypes.includes('ParticipantRestrictedAdmission')
-        },
         payload() {
             return {
                 type: 'PreferentialAdmission',
@@ -78,11 +92,18 @@ export default {
         }
     },
     methods: {
-        editFilter() {
+        editFilter(index) {
             this.showEditFilter = true;
+            this.currentFilterIndex = index;
+            this.currentFilter = index === null ? [] : this.conditions[index].attributes.fields;
+        },
+        deleteFilter(index) {
+            this.conditions.splice(index, 1);
         },
         closeDialog() {
             this.showEditFilter = false;
+            this.currentFilterIndex = null;
+            this.currentFilter = null;
         },
         confirmDialog(filter) {
             STUDIP.jsonapi.withPromises().post(
@@ -97,8 +118,14 @@ export default {
                     }
                 })
             .then(response => {
-                this.conditions.push(response.data);
+                if (this.currentFilterIndex !== null) {
+                    this.conditions[this.currentFilterIndex] = response.data;
+                } else {
+                    this.conditions.push(response.data);
+                }
                 this.showEditFilter = false;
+                this.currentFilterIndex = null;
+                this.currentFilter = null;
             });
         },
         setRuleData(data) {
@@ -119,3 +146,9 @@ export default {
     }
 }
 </script>
+
+<style lang="scss" scoped>
+.condition-text {
+    display: inline-block;
+}
+</style>
diff --git a/resources/vue/components/form_inputs/UserFilterInput.vue b/resources/vue/components/form_inputs/UserFilterInput.vue
index 21eb71a..50eb536 100644
--- a/resources/vue/components/form_inputs/UserFilterInput.vue
+++ b/resources/vue/components/form_inputs/UserFilterInput.vue
@@ -14,6 +14,13 @@
                         <td v-html="filter.attributes.text"></td>
                         <td class="actions">
                             <a class="undecorated"
+                               @click.prevent="editFilter(index)"
+                               :title="$gettext('Diesen Filter bearbeiten')"
+                               tabindex="0"
+                            >
+                                <studip-icon shape="edit"></studip-icon>
+                            </a>
+                            <a class="undecorated"
                                @click.prevent="deleteFilter(index)"
                                :title="$gettext('Diesen Filter löschen')"
                                tabindex="0">
@@ -26,11 +33,11 @@
         </section>
         <button class="button"
                 type="button"
-                @click.prevent="editFilter(0)">
+                @click.prevent="editFilter(null)">
             {{ $gettext('Filter hinzufügen') }}
         </button>
         <studip-user-filter v-if="currentFilter !== null"
-                            :filter="currentFilter !== 0 ? filters[currentFilter] : []"
+                            :filter="currentFilterData"
                             :context="context"
                             :target="target"
                             @submit="submitFilter"
@@ -64,13 +71,25 @@ export default {
         return {
             key: 0,
             currentFilter: null,
+            currentFilterData: [],
             filters: [],
             stringified: ''
         }
     },
     methods: {
         editFilter(index) {
-            this.currentFilter = index;
+            this.currentFilter = index !== null ? index : -1;
+            if (this.currentFilter !== -1) {
+                let data = [];
+
+                for (const field of Object.entries(this.filters[index].attributes.fields)) {
+                    data.push(field[1]);
+                }
+
+                this.currentFilterData = data;
+            } else {
+                this.currentFilterData = [];
+            }
         },
         submitFilter(filter) {
             STUDIP.jsonapi.withPromises().post(
@@ -85,12 +104,13 @@ export default {
                     }
                 })
                 .then(response => {
-                    if (this.currentFilter !== 0) {
+                    if (this.currentFilter !== -1) {
                         this.filters[this.currentFilter] = response.data;
                     } else {
                         this.filters.push(response.data);
                     }
                     this.currentFilter = null;
+                    this.currentFilterData = [];
                     this.changed();
                 })
                 .catch(error => {
-- 
cgit v1.0