Web: Files: SelectDialog: Added files owner.

This commit is contained in:
Tatiana Lopaeva 2021-06-24 10:38:16 +03:00
parent 4dd1961914
commit 11dc59b020
2 changed files with 28 additions and 5 deletions

View File

@ -1,14 +1,14 @@
import React, { useCallback } from "react"; import React, { useCallback } from "react";
import Loader from "@appserver/components/loader"; import Loader from "@appserver/components/loader";
import Text from "@appserver/components/text"; import Text from "@appserver/components/text";
import { useTranslation } from "react-i18next"; import { useTranslation, withTranslation } from "react-i18next";
import { ReactSVG } from "react-svg"; import { ReactSVG } from "react-svg";
import config from "../../../../package.json"; import config from "../../../../package.json";
import Checkbox from "@appserver/components/checkbox";
import CustomScrollbarsVirtualList from "@appserver/components/scrollbar/custom-scrollbars-virtual-list"; import CustomScrollbarsVirtualList from "@appserver/components/scrollbar/custom-scrollbars-virtual-list";
import InfiniteLoader from "react-window-infinite-loader"; import InfiniteLoader from "react-window-infinite-loader";
import AutoSizer from "react-virtualized-auto-sizer"; import AutoSizer from "react-virtualized-auto-sizer";
import { FixedSizeList as List } from "react-window"; import { FixedSizeList as List } from "react-window";
import { inject, observer } from "mobx-react";
const FileListBody = ({ const FileListBody = ({
isLoadingData, isLoadingData,
@ -19,6 +19,7 @@ const FileListBody = ({
hasNextPage, hasNextPage,
isNextPageLoading, isNextPageLoading,
displayType, displayType,
viewer,
}) => { }) => {
const { t } = useTranslation(["SelectFile", "Common"]); const { t } = useTranslation(["SelectFile", "Common"]);
// Every row is loaded except for our loading indicator row. // Every row is loaded except for our loading indicator row.
@ -46,6 +47,13 @@ const FileListBody = ({
const Item = useCallback( const Item = useCallback(
({ index, style }) => { ({ index, style }) => {
const file = filesList[index];
const fileOwner = file
? file.createdBy &&
((viewer.id === file.createdBy.id && t("Common:MeLabel")) ||
file.createdBy.displayName)
: "";
return ( return (
<div style={style}> <div style={style}>
{!isItemLoaded(index) ? ( {!isItemLoaded(index) ? (
@ -72,14 +80,15 @@ const FileListBody = ({
src={`${config.homepage}/images/icons/24/file_archive.svg`} src={`${config.homepage}/images/icons/24/file_archive.svg`}
className="select-file-dialog_icon" className="select-file-dialog_icon"
/> />
<div className="entry-title"> <Text className="entry-title">
{filesList[index] && {filesList[index] &&
filesList[index].title.substring( filesList[index].title.substring(
0, 0,
filesList[index].title.indexOf(".gz") filesList[index].title.indexOf(".gz")
)} )}
</div> </Text>
<div className="file-exst">{".gz"}</div> <div className="file-exst">{".gz"}</div>
<Text className="files-list_file-owner">{fileOwner}</Text>
</div> </div>
)} )}
</div> </div>
@ -130,4 +139,9 @@ FileListBody.defaultProps = {
isModalView: false, isModalView: false,
isLoadingData: false, isLoadingData: false,
}; };
export default FileListBody; export default inject(({ auth }) => {
const { user } = auth.userStore;
return {
viewer: user,
};
})(observer(withTranslation("Common")(FileListBody)));

View File

@ -560,6 +560,15 @@ const StyledSelectFilePanel = styled.div`
overflow: hidden; overflow: hidden;
max-width: 250px; max-width: 250px;
} }
.files-list_file-owner {
margin-left: auto;
margin-right: 16px;
max-width: 280px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #a3a9ae;
}
.entry-title, .entry-title,
.file-exst { .file-exst {
//margin-top: 7px; //margin-top: 7px;