Merge pull request TheThingsNetwork#2328 from TheThingsNetwork/fix/device-bulk-error-display

Bogdans · web-flow · commit a4bc40ff759c · 2020-04-10T10:33:09.000+03:00
Fix error display in device import
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - End device claim display bug when claim dates not set.
 - DeviceModeInd handling for LoRaWAN 1.1 devices.
 - Do not perform unnecessary gateway location updates.
+- Error display on failed end device import in the Console.
 
 ### Security
 
diff --git a/pkg/webui/console/containers/device-importer/index.js b/pkg/webui/console/containers/device-importer/index.js
@@ -25,7 +25,7 @@ import { selectNsConfig, selectJsConfig, selectAsConfig } from '../../../lib/sel
 import DeviceImportForm from '../../components/device-import-form'
 import SubmitBar from '../../../components/submit-bar'
 import Button from '../../../components/button'
-import Notification from '../../../components/notification'
+import ErrorNotification from '../../../components/error-notification'
 import api from '../../api'
 import PropTypes from '../../../lib/prop-types'
 import Message from '../../../lib/components/message'
@@ -210,6 +210,7 @@ export default class DeviceImporter extends Component {
     } else if (status === 'finished') {
       statusMessage = m.operationFinished
     }
+
     return (
       <div>
         <Message className={style.title} component="h4" content={operationMessage} />
@@ -229,7 +230,7 @@ export default class DeviceImporter extends Component {
             />
           </React.Fragment>
         ) : (
-          <Notification small error={error} title={m.errorTitle} />
+          <ErrorNotification small content={error} title={m.errorTitle} />
         )}
         <CodeEditor
           className={style.logOutput}
