console: Fix app collaborators error handling

Author: Bogdans Afonins

pkg/webui/console/views/application-collaborator-add/index.js

@@ -18,13 +18,13 @@ import bind from 'autobind-decorator'
 import { connect } from 'react-redux'
 import { push } from 'connected-react-router'
 
-import Spinner from '../../../components/spinner'
 import Breadcrumb from '../../../components/breadcrumbs/breadcrumb'
 import { withBreadcrumb } from '../../../components/breadcrumbs/context'
 import sharedMessages from '../../../lib/shared-messages'
 import CollaboratorForm from '../../components/collaborator-form'
 import Message from '../../../lib/components/message'
 import IntlHelmet from '../../../lib/components/intl-helmet'
+import withRequest from '../../../lib/components/with-request'
 
 import { getApplicationsRightsList } from '../../store/actions/applications'
 import {
@@ -54,6 +54,10 @@ import api from '../../api'
   redirectToList: () => dispatchProps.redirectToList(stateProps.appId),
   getApplicationsRightsList: () => dispatchProps.getApplicationsRightsList(stateProps.appId),
 }))
+@withRequest(
+  ({ getApplicationsRightsList }) => getApplicationsRightsList(),
+  ({ fetching, rights }) => fetching || !Boolean(rights.length)
+)
 @withBreadcrumb('apps.single.collaborators.add', function (props) {
   const appId = props.appId
   return (
@@ -71,39 +75,19 @@ export default class ApplicationCollaboratorAdd extends React.Component {
     error: '',
   }
 
-  componentDidMount () {
-    const { getApplicationsRightsList } = this.props
-
-    getApplicationsRightsList()
-  }
-
-  componentDidUpdate (prevProps) {
-    const { error } = this.props
-
-    if (Boolean(error) && prevProps.error !== error) {
-      throw error
-    }
-  }
-
   async handleSubmit (collaborator) {
     const { appId } = this.props
 
     await api.application.collaborators.add(appId, collaborator)
-
   }
 
   render () {
     const {
       rights,
-      fetching,
       universalRights,
       redirectToList,
     } = this.props
 
-    if (fetching && !rights.length) {
-      return <Spinner center />
-    }
-
     return (
       <Container>
         <Row>

pkg/webui/console/views/application-collaborator-edit/index.js

@@ -22,10 +22,10 @@ import { withBreadcrumb } from '../../../components/breadcrumbs/context'
 import Breadcrumb from '../../../components/breadcrumbs/breadcrumb'
 import sharedMessages from '../../../lib/shared-messages'
 import CollaboratorForm from '../../components/collaborator-form'
-import Spinner from '../../../components/spinner'
 import Message from '../../../lib/components/message'
 import IntlHelmet from '../../../lib/components/intl-helmet'
 import toast from '../../../components/toast'
+import withRequest from '../../../lib/components/with-request'
 
 import {
   getApplicationCollaborator,
@@ -84,6 +84,10 @@ import api from '../../api'
   redirectToList: () => dispatchProps.redirectToList(stateProps.appId),
 })
 )
+@withRequest(
+  ({ loadData }) => loadData(),
+  ({ fetching, collaborator }) => fetching || !Boolean(collaborator)
+)
 @withBreadcrumb('apps.single.collaborators.edit', function (props) {
   const { appId, collaboratorId, collaboratorType } = props
 
@@ -102,20 +106,6 @@ export default class ApplicationCollaboratorEdit extends React.Component {
     error: '',
   }
 
-  componentDidMount () {
-    const { loadData } = this.props
-
-    loadData()
-  }
-
-  componentDidUpdate (prevProps) {
-    const { error } = this.props
-
-    if (Boolean(error) && prevProps.error !== error) {
-      throw error
-    }
-  }
-
   async handleSubmit (updatedCollaborator) {
     const { appId } = this.props
 
@@ -158,15 +148,10 @@ export default class ApplicationCollaboratorEdit extends React.Component {
     const {
       collaborator,
       rights,
-      fetching,
       universalRights,
       redirectToList,
     } = this.props
 
-    if (fetching || !collaborator) {
-      return <Spinner center />
-    }
-
     return (
       <Container>
         <Row>