Web: Files: added loader to row
This commit is contained in:
parent
cb71beb888
commit
79771f9d56
@ -39,7 +39,7 @@ height: 56px;
|
||||
`;
|
||||
|
||||
const EditingWrapperComponent = props => {
|
||||
const { /*loading,*/ itemTitle, okIcon, cancelIcon, renameTitle, onKeyUpUpdateItem, onClickUpdateItem, cancelUpdateItem } = props;
|
||||
const { isLoading, itemTitle, okIcon, cancelIcon, renameTitle, onKeyUpUpdateItem, onClickUpdateItem, cancelUpdateItem } = props;
|
||||
|
||||
return(
|
||||
<EditingWrapper>
|
||||
@ -52,19 +52,19 @@ const EditingWrapperComponent = props => {
|
||||
isAutoFocussed={true}
|
||||
onChange={renameTitle}
|
||||
onKeyUp={onKeyUpUpdateItem}
|
||||
//isDisabled={loading}
|
||||
isDisabled={isLoading}
|
||||
/>
|
||||
<Button
|
||||
className='edit-button'
|
||||
size='medium'
|
||||
//isDisabled={loading}
|
||||
isDisabled={isLoading}
|
||||
onClick={onClickUpdateItem}
|
||||
icon={okIcon}
|
||||
/>
|
||||
<Button
|
||||
className='edit-button'
|
||||
size='medium'
|
||||
//isDisabled={loading}
|
||||
isDisabled={isLoading}
|
||||
onClick={cancelUpdateItem}
|
||||
icon={cancelIcon}
|
||||
/>
|
||||
|
@ -36,20 +36,20 @@ class FilesRowContent extends React.PureComponent {
|
||||
}
|
||||
|
||||
updateItem = () => {
|
||||
const { fileAction, updateFile, renameFolder, item } = this.props;
|
||||
const { fileAction, updateFile, renameFolder, item, onLoading } = this.props;
|
||||
|
||||
const { itemTitle } = this.state;
|
||||
const originalTitle = getTitleWithoutExst(item);
|
||||
|
||||
//this.setState({ loading: true });
|
||||
|
||||
onLoading(true);
|
||||
if (originalTitle === itemTitle)
|
||||
return this.completeAction();
|
||||
|
||||
item.fileExst
|
||||
? updateFile(fileAction.id, itemTitle)
|
||||
.then(() => this.completeAction())
|
||||
.then(() => this.completeAction()).finally(() => onLoading(false))
|
||||
: renameFolder(fileAction.id, itemTitle)
|
||||
.then(() => this.completeAction());
|
||||
.then(() => this.completeAction().finally(() => onLoading(false)));
|
||||
};
|
||||
|
||||
createItem = () => {
|
||||
@ -161,7 +161,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { t, item, fileAction } = this.props;
|
||||
const { t, item, fileAction, isLoading } = this.props;
|
||||
const { itemTitle, editingId/*, loading*/ } = this.state;
|
||||
const {
|
||||
contentLength,
|
||||
@ -220,7 +220,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
|
||||
return isEdit
|
||||
? <EditingWrapperComponent
|
||||
//loading={loading}
|
||||
isLoading={isLoading}
|
||||
itemTitle={itemTitle}
|
||||
okIcon={okIcon}
|
||||
cancelIcon={cancelIcon}
|
||||
|
@ -520,6 +520,7 @@ class SectionBodyContent extends React.PureComponent {
|
||||
selection,
|
||||
fileAction,
|
||||
onLoading,
|
||||
isLoading,
|
||||
currentFolderCount,
|
||||
} = this.props;
|
||||
const { editingId } = this.state;
|
||||
@ -587,6 +588,7 @@ class SectionBodyContent extends React.PureComponent {
|
||||
culture={settings.culture}
|
||||
onEditComplete={this.onEditComplete.bind(this, item)}
|
||||
onLoading={onLoading}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
</SimpleFilesRow>
|
||||
);
|
||||
|
@ -141,6 +141,7 @@ class PureHome extends React.Component {
|
||||
sectionBodyContent={
|
||||
<SectionBodyContent
|
||||
selected={selected}
|
||||
isLoading={isLoading}
|
||||
onLoading={this.onLoading}
|
||||
onChange={this.onRowChange}
|
||||
/>
|
||||
|
Loading…
Reference in New Issue
Block a user