Merge branch 'faisal' into 'master'

issue dashboard cat

See merge request !1240

src/container/Laporan/DashboardCAT.js

@@ -41,7 +41,7 @@ export default class DashboardCAT extends Component {
         this.props.selectIndex('CAT Dashboard')
         let dataStorageCAT = localStorage.getItem(Constant.DATACAT)
         console.log(dataStorageCAT)
-        if (dataStorageCAT != 'datacat') {
+        if (dataStorageCAT != 'datacat' && dataStorageCAT != null) {
             this.setState({selectedKPI: JSON.parse(dataStorageCAT).listKPI})
             console.log(dataStorageCAT)
         }