Merge branch 'develop' into feature/bar-quotas
This commit is contained in:
commit
43922a19d5
@ -164,7 +164,12 @@ const Items = ({
|
||||
if (pathParts && pathParts.includes(item.id) && !isMainFolder)
|
||||
return true;
|
||||
|
||||
if (selectedTreeNode[0] === "@my" && item.key === "0-0") return true;
|
||||
if (
|
||||
(selectedTreeNode[0] === "@my" || selectedTreeNode[0] === "@rooms") &&
|
||||
item.key === "0-0"
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return `${item.id}` === selectedTreeNode[0];
|
||||
}
|
||||
},
|
||||
|
@ -266,7 +266,7 @@ class TileContainer extends React.PureComponent {
|
||||
return (
|
||||
<StyledTileContainer
|
||||
id={id}
|
||||
className={className}
|
||||
className={`${className} files-tile-container`}
|
||||
style={style}
|
||||
useReactWindow={useReactWindow}
|
||||
isDesc={selectedFilterData.sortDirection === "desc"}
|
||||
|
@ -21,13 +21,18 @@ class Profile extends React.Component {
|
||||
setIsLoading,
|
||||
setIsEditTargetUser,
|
||||
setLoadedProfile,
|
||||
isVisitor,
|
||||
selectedTreeNode,
|
||||
setSelectedNode,
|
||||
} = this.props;
|
||||
const userId = "@self";
|
||||
|
||||
setFirstLoad(false);
|
||||
setIsEditTargetUser(false);
|
||||
setSelectedNode(["accounts"]);
|
||||
|
||||
isVisitor
|
||||
? !selectedTreeNode.length && setSelectedNode(["@rooms"])
|
||||
: setSelectedNode(["accounts"]);
|
||||
|
||||
setDocumentTitle(t("Common:Profile"));
|
||||
this.documentElement = document.getElementsByClassName("hidingHeader");
|
||||
@ -77,7 +82,7 @@ class Profile extends React.Component {
|
||||
render() {
|
||||
//console.log("Profile render");
|
||||
|
||||
const { profile, showCatalog, isAdmin } = this.props;
|
||||
const { profile, showCatalog } = this.props;
|
||||
|
||||
return (
|
||||
<Section withBodyAutoFocus viewAs="profile">
|
||||
@ -98,13 +103,12 @@ Profile.propTypes = {
|
||||
history: PropTypes.object.isRequired,
|
||||
match: PropTypes.object.isRequired,
|
||||
profile: PropTypes.object,
|
||||
isAdmin: PropTypes.bool,
|
||||
language: PropTypes.string,
|
||||
};
|
||||
|
||||
export default withRouter(
|
||||
inject(({ auth, peopleStore, treeFoldersStore }) => {
|
||||
const { setDocumentTitle, isAdmin, language } = auth;
|
||||
const { setDocumentTitle, language } = auth;
|
||||
const { targetUserStore, loadingStore } = peopleStore;
|
||||
const {
|
||||
getTargetUser: fetchProfile,
|
||||
@ -113,10 +117,9 @@ export default withRouter(
|
||||
setIsEditTargetUser,
|
||||
} = targetUserStore;
|
||||
const { setFirstLoad, setIsLoading, setLoadedProfile } = loadingStore;
|
||||
const { setSelectedNode } = treeFoldersStore;
|
||||
const { selectedTreeNode, setSelectedNode } = treeFoldersStore;
|
||||
return {
|
||||
setDocumentTitle,
|
||||
isAdmin,
|
||||
language,
|
||||
fetchProfile,
|
||||
profile,
|
||||
@ -126,7 +129,9 @@ export default withRouter(
|
||||
setIsEditTargetUser,
|
||||
setLoadedProfile,
|
||||
showCatalog: auth.settingsStore.showCatalog,
|
||||
selectedTreeNode,
|
||||
setSelectedNode,
|
||||
isVisitor: auth.userStore.user.isVisitor,
|
||||
};
|
||||
})(
|
||||
observer(withTranslation(["Profile", "Common"])(withCultureNames(Profile)))
|
||||
|
@ -106,6 +106,10 @@ const commonStyles = css`
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.files-tile-container {
|
||||
margin-top: ${isMobile ? "-12px" : "0px"};
|
||||
}
|
||||
|
||||
.people-row-container,
|
||||
.files-row-container {
|
||||
margin-top: -22px;
|
||||
|
@ -33,8 +33,7 @@ const tabletProps = css`
|
||||
}
|
||||
.section-body_filter {
|
||||
display: block;
|
||||
margin: ${(props) =>
|
||||
props.viewAs === "tile" ? "4px 0 18px" : "4px 0 30px"};
|
||||
margin: 4px 0 30px;
|
||||
}
|
||||
`;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user