Merge branch 'application-mgt-new' into 'application-mgt-new'

Add tenant domain to the login form

See merge request tcdlpds/carbon-device-mgt!7
merge-requests/255/head^2
Dharmakeerthi Lasantha 5 years ago
commit 5e8f6903e5

@ -92,7 +92,6 @@ class AppDetailsDrawer extends React.Component {
componentDidMount() { componentDidMount() {
this.getCategories(); this.getCategories();
this.getTags();
} }
componentDidUpdate(prevProps, prevState, snapshot) { componentDidUpdate(prevProps, prevState, snapshot) {
@ -117,7 +116,7 @@ class AppDetailsDrawer extends React.Component {
).then(res => { ).then(res => {
if (res.status === 200) { if (res.status === 200) {
const categories = JSON.parse(res.data.data); const categories = JSON.parse(res.data.data);
this.getTags();
const globalCategories = categories.map(category => { const globalCategories = categories.map(category => {
return ( return (
<Option <Option

@ -75,8 +75,6 @@ class FiltersForm extends React.Component {
componentDidMount() { componentDidMount() {
this.getCategories(); this.getCategories();
this.getTags();
this.getDeviceTypes();
} }
getCategories = () => { getCategories = () => {
@ -86,6 +84,7 @@ class FiltersForm extends React.Component {
).then(res => { ).then(res => {
if (res.status === 200) { if (res.status === 200) {
let categories = JSON.parse(res.data.data); let categories = JSON.parse(res.data.data);
this.getTags();
this.setState({ this.setState({
categories: categories, categories: categories,
loading: false loading: false
@ -116,6 +115,7 @@ class FiltersForm extends React.Component {
).then(res => { ).then(res => {
if (res.status === 200) { if (res.status === 200) {
let tags = JSON.parse(res.data.data); let tags = JSON.parse(res.data.data);
this.getDeviceTypes();
this.setState({ this.setState({
tags: tags, tags: tags,
loading: false, loading: false,

Loading…
Cancel
Save