allow custom attributes in LDAP Explorer, fixes #8367

inverse-inc · Nov 6, 2024 · e6435e8 · e6435e8
1 parent 2b27dbe
commit e6435e8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/html/pfappserver/root/src/views/Configuration/sources/_components/LdapRuleCondition.vue b/html/pfappserver/root/src/views/Configuration/sources/_components/LdapRuleCondition.vue
@@ -2,6 +2,7 @@
   <div class="base-flex-wrap" align-v="center">
     <ldap-attribute-selector ref="attributeComponentRef"
                              :namespace="`${namespace}.attribute`"
+                             taggable
     />
 
     <base-input-chosen-one ref="operatorComponentRef" v-if="attributeValue"
@@ -11,6 +12,7 @@
 
     <component :is="valueComponent" ref="valueComponentRef" v-if="operatorValue"
                :namespace="`${namespace}.value`"
+               taggable
                v-bind="valueBind"
     />
 

diff --git a/.../root/src/views/Configuration/sources/_components/ldapCondition/LdapAttributeSelector.vue b/.../root/src/views/Configuration/sources/_components/ldapCondition/LdapAttributeSelector.vue
@@ -4,9 +4,11 @@
     :value="inputValue"
     :label="text"
     :isLoading="isLoading"
+    :taggable="taggable"
     :track-by="text"
     :single-label="singleLabel"
     :on-select="onSelect"
+    :on-tag="onTag"
     :on-remove="onRemove"
     :on-open="onOpen"
     :on-close="onClose"
@@ -54,10 +56,7 @@ function setup(props, _) { // eslint-disable-line
   const isFocused = ref(false)
   const isLoading = computed(() => inject(ProvidedKeys.LdapAttributesLoading).value)
   const isConnected = computed(() => inject(ProvidedKeys.connectedToLdap).value)
-  const allOptions = computed(() => {
-    if (!isConnected.value) {
-      return []
-    }
+  const inputOptions = computed(() => {
     return moveSelectionToTop(inject(ProvidedKeys.LdapAttributes).value.map(valueToSelectValue))
   })
   const isDisabled = inject('isLoading')
@@ -109,6 +108,10 @@ function setup(props, _) { // eslint-disable-line
     validateChoice()
   }
 
+  function onTag(value) {
+    onSelect(valueToSelectValue(value))
+  }
+
   function onOpen() {
     isFocused.value = true
   }
@@ -124,12 +127,13 @@ function setup(props, _) { // eslint-disable-line
   validateChoice()
 
   return {
-    inputOptions: allOptions,
+    inputOptions,
     isDisabled,
     isFocused,
     isLoading,
     isConnected,
     onSelect,
+    onTag,
     onOpen,
     onClose,
     onRemove,

diff --git a/...rver/root/src/views/Configuration/sources/_components/ldapCondition/MultiselectFacade.vue b/...rver/root/src/views/Configuration/sources/_components/ldapCondition/MultiselectFacade.vue
@@ -25,10 +25,12 @@
                  :selected-label="selectedLabel"
                  :show-labels="showLabels"
                  :show-pointer="showPointer"
+                 :taggable="taggable"
                  :track-by="trackBy"
                  :value="value"
                  @search-change="onSearch"
                  @select="onSelect"
+                 @tag="onTag"
                  @open="onOpen"
                  @remove="onRemove"
                  @close="onClose"
@@ -105,7 +107,6 @@ export const props = {
     validator: value => ['sm', 'md', 'lg'].includes(value)
   },
 
-
   onSearch: {
     type: Function,
     default: () => {}
@@ -116,6 +117,11 @@ export const props = {
     default: () => {}
   },
 
+  onTag: {
+    type: Function,
+    default: () => {}
+  },
+
   onOpen: {
     type: Function,
     default: () => {}