Fixing ldap form

Author: davidjumani

src/config/section/config.js

@@ -42,7 +42,7 @@ export default {
           label: 'label.configure.ldap',
           listView: true,
           args: [
-            'hostname', 'port'
+            'hostname', 'port', 'domainid'
           ]
         },
         {

src/views/iam/AddLdapAccount.vue

@@ -48,8 +48,14 @@
           <a-form
             :form="form"
             @submit="handleSubmit"
-            layout="vertical"
-          >
+            layout="vertical" >
+            <a-form-item :label="$t('label.filterby')">
+              <a-select @change="fetchListLdapUsers" v-model="selectedFilter" >
+                <a-select-option v-for="opt in filters" :key="opt.id" >
+                  {{ opt.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
             <a-form-item :label="$t('label.domain')">
               <a-select
                 showSearch
@@ -119,6 +125,7 @@
 <script>
 import { api } from '@/api'
 import { timeZone } from '@/utils/timezone'
+import store from '@/store'
 
 export default {
   name: 'AddLdapAccount',
@@ -131,6 +138,8 @@ export default {
       listDomains: [],
       listRoles: [],
       timeZoneMap: [],
+      filters: [],
+      selectedFilter: '',
       listLoading: false,
       timeZoneLoading: false,
       domainLoading: false,
@@ -175,8 +184,32 @@ export default {
         title: this.$t('label.email'),
         dataIndex: 'email',
         scopedSlots: { customRender: 'email' }
+      },
+      {
+        title: this.$t('Conflict'),
+        dataIndex: 'conflictingusersource',
+        scopedSlots: { customRender: 'conflictingusersource' }
+      }
+    ]
+    this.filters = [
+      {
+        id: 'NoFilter',
+        name: 'No filter'
+      },
+      {
+        id: 'LocalDomain',
+        name: 'Local domain'
+      },
+      {
+        id: 'AnyDomain',
+        name: 'Any domain'
+      },
+      {
+        id: 'PotentialImport',
+        name: 'Potential import'
       }
     ]
+    this.selectedFilter = this.filters[0].id
   },
   mounted () {
     this.fetchData()
@@ -222,8 +255,11 @@ export default {
     },
     fetchListLdapUsers () {
       return new Promise((resolve, reject) => {
+        this.listLoading = true
         const params = {}
         params.listtype = 'new'
+        params.userfilter = this.selectedFilter
+        params.domainid = store.getters.userInfo.domainid
         api('listLdapUsers', params).then(json => {
           const listLdapUsers = json.ldapuserresponse.LdapUser
           if (listLdapUsers) {
@@ -233,8 +269,12 @@ export default {
             }
           }
           resolve(listLdapUsers)
+          this.dataSource = listLdapUsers
+          this.oldDataSource = listLdapUsers
         }).catch(error => {
           reject(error)
+        }).finally(() => {
+          this.listLoading = false
         })
       })
     },