Fixed some issues with incomming data from mc

Author: Benjamin Perez

portal-ui/bindata_assetfs.go

@@ -120,8 +120,8 @@ class ListBuckets extends React.Component<
         .then((res: BucketList) => {
           this.setState({
             loading: false,
-            records: res.buckets,
-            totalRecords: res.total,
+            records: res.buckets || [],
+            totalRecords: !res.buckets ? 0 : res.total,
             error: ""
           });
           // if we get 0 results, and page > 0 , go down 1 page

portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx

@@ -67,6 +67,7 @@ class DeleteEvent extends React.Component<
     if (bucketEvent == null) {
       return;
     }
+
     this.setState({ deleteLoading: true }, () => {
       api
         .invoke(

portal-ui/src/screens/Console/Buckets/ViewBucket/DeleteEvent.tsx

@@ -123,19 +123,16 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
       api
         .invoke("GET", `/api/v1/buckets/${bucketName}/events`)
         .then((res: BucketEventList) => {
+          const events = res.events;
+
           this.setState({
             loading: false,
-            records: res.events,
+            records: events || [],
             totalRecords: res.total,
             error: ""
           });
           // if we get 0 results, and page > 0 , go down 1 page
-          if (
-            (res.events === undefined ||
-              res.events == null ||
-              res.events.length === 0) &&
-            page > 0
-          ) {
+          if ((!events || res.events.length === 0) && page > 0) {
             const newPage = page - 1;
             this.setState({ page: newPage }, () => {
               this.fetchEvents();

portal-ui/src/screens/Console/Buckets/ViewBucket/ViewBucket.tsx

@@ -129,10 +129,7 @@ const Groups = ({ classes }: IGroupsProps) => {
               resGroups = res.groups.sort(groupsSort);
             }
             setRecords(resGroups);
-            let total = 0;
-            if (res.total !== null) {
-              total = res.total;
-            }
+            const total = !res.total ? 0 : res.total;
             setTotalRecords(total);
             setError("");
             isLoading(false);

portal-ui/src/screens/Console/Groups/Groups.tsx

@@ -164,7 +164,7 @@ class AddUserContent extends React.Component<
           addLoading: false,
           addError: "",
           accessKey: res.accessKey,
-          selectedGroups: res.memberOf,
+          selectedGroups: res.memberOf || [],
           enabled: res.status
         });
       })

portal-ui/src/screens/Console/Users/AddUser.tsx

@@ -128,19 +128,15 @@ class Users extends React.Component<IUsersProps, IUsersState> {
       api
         .invoke("GET", `/api/v1/users?offset=${offset}&limit=${rowsPerPage}`)
         .then((res: UsersList) => {
+          const usersList = !res.users ? [] : res.users;
           this.setState({
             loading: false,
-            records: res.users.sort(usersSort),
+            records: usersList.sort(usersSort),
             totalRecords: res.users.length,
             error: ""
           });
           // if we get 0 results, and page > 0 , go down 1 page
-          if (
-            (res.users === undefined ||
-              res.users == null ||
-              res.users.length === 0) &&
-            page > 0
-          ) {
+          if ((!usersList || res.users.length === 0) && page > 0) {
             const newPage = page - 1;
             this.setState({ page: newPage }, () => {
               this.fetchRecords();