IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: FilesTile: moved Tiles in FilesTile dir

Browse Source
This commit is contained in:
Artem Tarasov 2021-03-24 14:53:08 +03:00
parent 848e5dc500
commit a6d31cb1de
9 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js
View File

@ -27,7 +27,7 @@ import { TIMEOUT } from "../../../../../../helpers/constants";
import { getTitleWithoutExst } from "../../../../../../helpers/files-helpers";
import { NewFilesPanel } from "../../../../../panels";
import { ConvertDialog } from "../../../../../dialogs";
import EditingWrapperComponent from "../EditingWrapperComponent";
import EditingWrapperComponent from "../FilesTile/EditingWrapperComponent";
import { isMobile } from "react-device-detect";
import { observer, inject } from "mobx-react";
import config from "../../../../../../../package.json";

8
products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/BadgesFileTile.js
View File

@ -3,10 +3,10 @@ import { withRouter } from "react-router";
import styled from "styled-components";
import Badge from "@appserver/components/badge";
import { inject, observer } from "mobx-react";
import FileActionsConvertEditDocIcon from "../../../../../../public/images/file.actions.convert.edit.doc.react.svg";
import FileActionsLockedIcon from "../../../../../../public/images/file.actions.locked.react.svg";
import AccessEditIcon from "../../../../../../public/images/access.edit.react.svg";
import FileActionsConvertIcon from "../../../../../../public/images/access.edit.react.svg";
import FileActionsConvertEditDocIcon from "../../../../../../../public/images/file.actions.convert.edit.doc.react.svg";
import FileActionsLockedIcon from "../../../../../../../public/images/file.actions.locked.react.svg";
import AccessEditIcon from "../../../../../../../public/images/access.edit.react.svg";
import FileActionsConvertIcon from "../../../../../../../public/images/access.edit.react.svg";
import commonIconsStyles from "@appserver/components/utils/common-icons-style";
const StyledBadgesFileTile = styled.div`

0
products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/EditingWrapperComponent.js
View File

132
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
View File

@ -1,77 +1,79 @@
import React from "react";
import TileContainer from "./TileContainer";
const FilesTileContainer = (props) => {
return;
<>
{/*<TileContainer
className="tileContainer"
draggable
useReactWindow={false}
headingFolders={t("Folders")}
headingFiles={t("Files")}
>
{items.map((item) => {
const { checked, isFolder, value, contextOptions } = item;
const isEdit =
!!fileActionType &&
editingId === item.id &&
item.fileExst === fileActionExtension;
const contextOptionsProps =
!isEdit && contextOptions && contextOptions.length > 0
? {
contextOptions: this.getFilesContextOptions(
contextOptions,
item
),
}
: {};
const checkedProps = isEdit || item.id <= 0 ? {} : { checked };
const element = this.getItemIcon(item, isEdit || item.id <= 0);
return (
<>
<TileContainer
className="tileContainer"
draggable
useReactWindow={false}
headingFolders={t("Folders")}
headingFiles={t("Files")}
>
{items.map((item) => {
const { checked, isFolder, value, contextOptions } = item;
const isEdit =
!!fileActionType &&
editingId === item.id &&
item.fileExst === fileActionExtension;
const contextOptionsProps =
!isEdit && contextOptions && contextOptions.length > 0
? {
contextOptions: this.getFilesContextOptions(
contextOptions,
item
),
}
: {};
const checkedProps = isEdit || item.id <= 0 ? {} : { checked };
const element = this.getItemIcon(item, isEdit || item.id <= 0);
let classNameProp =
isFolder && item.access < 2 && !isRecycleBin
? { className: " dropable" }
: {};
let classNameProp =
isFolder && item.access < 2 && !isRecycleBin
? { className: " dropable" }
: {};
if (item.draggable) classNameProp.className += " draggable";
if (item.draggable) classNameProp.className += " draggable";
return (
<DragAndDrop
{...classNameProp}
onDrop={this.onDrop.bind(this, item)}
onMouseDown={this.onMouseDown}
dragging={dragging && isFolder && item.access < 2}
key={`dnd-key_${item.id}`}
{...contextOptionsProps}
value={value}
isFolder={isFolder}
>
<Tile
key={item.id}
item={item}
isFolder={!item.fileExst}
element={element}
onSelect={this.onContentRowSelect}
editing={editingId}
viewAs={viewAs}
{...checkedProps}
return (
<DragAndDrop
{...classNameProp}
onDrop={this.onDrop.bind(this, item)}
onMouseDown={this.onMouseDown}
dragging={dragging && isFolder && item.access < 2}
key={`dnd-key_${item.id}`}
{...contextOptionsProps}
//needForUpdate={this.needForUpdate}
value={value}
isFolder={isFolder}
>
<FilesTileContent
<Tile
key={item.id}
item={item}
viewer={viewer}
culture={culture}
onEditComplete={this.onEditComplete}
onMediaFileClick={this.onMediaFileClick}
openDocEditor={this.openDocEditor}
/>
</Tile>
</DragAndDrop>
);
})}
</TileContainer>*/}
</>;
isFolder={!item.fileExst}
element={element}
onSelect={this.onContentRowSelect}
editing={editingId}
viewAs={viewAs}
{...checkedProps}
{...contextOptionsProps}
//needForUpdate={this.needForUpdate}
>
<FilesTileContent
item={item}
viewer={viewer}
culture={culture}
onEditComplete={this.onEditComplete}
onMediaFileClick={this.onMediaFileClick}
openDocEditor={this.openDocEditor}
/>
</Tile>
</DragAndDrop>
);
})}
</TileContainer>
</>
);
};
export default FilesTileContainer;

10
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContent.js
View File

@ -8,15 +8,15 @@ import Text from "@appserver/components/text";
import { markAsRead } from "@appserver/common/api/files";
import { FileAction, AppServerConfig } from "@appserver/common/constants";
import toastr from "studio/toastr";
import { getTitleWithoutExst } from "../../../../../helpers/files-helpers";
import { NewFilesPanel } from "../../../../panels";
import { getTitleWithoutExst } from "../../../../../../helpers/files-helpers";
import { NewFilesPanel } from "../../../../../panels";
import EditingWrapperComponent from "./EditingWrapperComponent";
import TileContent from "./TileContent";
import { isMobile } from "react-device-detect";
import { inject, observer } from "mobx-react";
import CheckIcon from "../../../../../../public/images/check.react.svg";
import CrossIcon from "../../../../../../../../../public/images/cross.react.svg";
import config from "../../../../../../package.json";
import CheckIcon from "../../../../../../../public/images/check.react.svg";
import CrossIcon from "../../../../../../../public/images/cross.react.svg";
import config from "../../../../../../../package.json";
import { combineUrl } from "@appserver/common/utils";
const SimpleFilesTileContent = styled(TileContent)`

0
products/ASC.Files/Client/src/components/pages/Home/Section/Body/Tile.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/Tile.js
View File

0
products/ASC.Files/Client/src/components/pages/Home/Section/Body/TileContainer.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/TileContainer.js
View File

0
products/ASC.Files/Client/src/components/pages/Home/Section/Body/TileContent.js → products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/TileContent.js
View File

2
products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
View File

@ -293,7 +293,7 @@ class SectionFilterContent extends React.Component {
selectedFilterData={selectedFilterData}
onFilter={this.onFilter}
onChangeViewAs={this.onChangeViewAs}
viewAs={false} // TODO: include viewSelector after adding method getThumbnail - this.props.viewAs
viewAs={true} // TODO: include viewSelector after adding method getThumbnail - this.props.viewAs
directionAscLabel={t("DirectionAscLabel")}
directionDescLabel={t("DirectionDescLabel")}
placeholder={t("Search")}