Web: Files: Fixed integration configuration checking
This commit is contained in:
parent
746af6156a
commit
e84fd4b3ff
@ -56,6 +56,8 @@ class PureHome extends React.Component {
|
|||||||
localStorage.removeItem("isFirstUrl");
|
localStorage.removeItem("isFirstUrl");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.frameConfig = JSON.parse(localStorage.getItem("dsFrameConfig"));
|
||||||
|
|
||||||
const reg = new RegExp(`${homepage}((/?)$|/filter)`, "gmi"); //TODO: Always find?
|
const reg = new RegExp(`${homepage}((/?)$|/filter)`, "gmi"); //TODO: Always find?
|
||||||
const match = window.location.pathname.match(reg);
|
const match = window.location.pathname.match(reg);
|
||||||
let filterObj = null;
|
let filterObj = null;
|
||||||
@ -313,11 +315,11 @@ class PureHome extends React.Component {
|
|||||||
snackbarExist,
|
snackbarExist,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
const frameConfig = JSON.parse(localStorage.getItem("dsFrameConfig"));
|
const isFrame = this.frameConfig && window.name === this.frameConfig.name;
|
||||||
|
const showTitle =
|
||||||
const isFrame = frameConfig && window.name === frameConfig.name;
|
this.frameConfig && JSON.parse(this.frameConfig.showTitle);
|
||||||
const showTitle = frameConfig && JSON.parse(frameConfig.showTitle);
|
const showFilter =
|
||||||
const showFilter = frameConfig && JSON.parse(frameConfig.showFilter);
|
this.frameConfig && JSON.parse(this.frameConfig.showFilter);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -435,6 +437,7 @@ export default inject(
|
|||||||
getFileInfo,
|
getFileInfo,
|
||||||
gallerySelected,
|
gallerySelected,
|
||||||
setIsUpdatingRowItem,
|
setIsUpdatingRowItem,
|
||||||
|
filesList,
|
||||||
} = filesStore;
|
} = filesStore;
|
||||||
|
|
||||||
const { id, setAction } = fileActionStore;
|
const { id, setAction } = fileActionStore;
|
||||||
@ -541,6 +544,8 @@ export default inject(
|
|||||||
gallerySelected,
|
gallerySelected,
|
||||||
setAction,
|
setAction,
|
||||||
setIsUpdatingRowItem,
|
setIsUpdatingRowItem,
|
||||||
|
|
||||||
|
filesList,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)(withRouter(observer(Home)));
|
)(withRouter(observer(Home)));
|
||||||
|
Loading…
Reference in New Issue
Block a user