fix(admin-ui): fix attribute api change for users

GluuFederation · Sep 7, 2022 · 2f4a9a9 · 2f4a9a9
1 parent 2b6c951
commit 2f4a9a9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/admin-ui/plugins/schema/redux/api/AttributeApi.js b/admin-ui/plugins/schema/redux/api/AttributeApi.js
@@ -8,7 +8,7 @@ export default class AttributeApi {
   // Get all attributes
   getAllAttributes = (opts) => {
     return new Promise((resolve, reject) => {
-      this.api.getAttributes(opts, (error, data) => {
+      this.api.getAllAttribute(opts, (error, data) => {
         handleResponse(error, reject, resolve, data)
       })
     })
@@ -17,7 +17,7 @@ export default class AttributeApi {
   // search attributes
   searchAttributes = (opts) => {
     return new Promise((resolve, reject) => {
-      this.api.getAttributes(opts, (error, data) => {
+      this.api.getAllAttribute(opts, (error, data) => {
         handleResponse(error, reject, resolve, data)
       })
     })

diff --git a/admin-ui/plugins/schema/redux/reducers/AttributeReducer.js b/admin-ui/plugins/schema/redux/reducers/AttributeReducer.js
@@ -16,9 +16,11 @@ const INIT_STATE = {
   items: [],
   item: {},
   loading: false,
+  totalItems: 0,
+  entriesCount: 0,
 }
 
-const reducerName = 'attributeReducer';
+const reducerName = 'attributeReducer'
 
 export default function attributeReducer(state = INIT_STATE, action) {
   switch (action.type) {
@@ -36,7 +38,9 @@ export default function attributeReducer(state = INIT_STATE, action) {
       if (action.payload.data) {
         return {
           ...state,
-          items: action.payload.data,
+          items: action.payload.data.data,
+          totalItems: action.payload.data.totalItems,
+          entriesCount: action.payload.data.entriesCount,
           loading: false,
         }
       } else {

diff --git a/admin-ui/plugins/schema/redux/sagas/AttributeSaga.js b/admin-ui/plugins/schema/redux/sagas/AttributeSaga.js
@@ -1,8 +1,5 @@
 import { call, all, put, fork, takeLatest, select } from 'redux-saga/effects'
-import {
-  isFourZeroOneError,
-  addAdditionalData,
-} from 'Utils/TokenController'
+import { isFourZeroOneError, addAdditionalData } from 'Utils/TokenController'
 import {
   getAttributesResponse,
   addAttributeResponse,

diff --git a/admin-ui/plugins/user-management/components/UserManagement/UserList.js b/admin-ui/plugins/user-management/components/UserManagement/UserList.js
@@ -35,7 +35,7 @@ function UserList(props) {
   const dispatch = useDispatch()
   const opt = {}
   useEffect(() => {
-    opt['limit'] = 0
+    opt['limit'] = 100
     dispatch(getUsers({}))
     dispatch(getAttributes(opt))
     dispatch(getRoles())