haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00
Code Issues Releases Wiki Activity

[dir view, toast] redesigned the 'converting' tip for md & sdoc file … (#5822)

Browse Source 
* [dir view, toast] redesigned the 'converting' tip for md & sdoc file items; added a new type of toast

* [toast] updated the loading icon of the 'notify-in-progress' toast
This commit is contained in:
llj
2023-12-11 18:19:23 +08:00
committed by GitHub
parent 7efe677798
commit 8712b7d1a6
6 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -21,7 +21,6 @@ import LibContentContainer from './lib-content-container';
import FileUploader from '../../components/file-uploader/file-uploader';
import CopyMoveDirentProgressDialog from '../../components/dialog/copy-move-dirent-progress-dialog';
import DeleteFolderDialog from '../../components/dialog/delete-folder-dialog';
import ConvertMarkdownDialog from '../../components/dialog/convert-markdown-dialog';
const propTypes = {
pathPrefix: PropTypes.array.isRequired,
@@ -81,7 +80,6 @@ class LibContentView extends React.Component {
asyncOperationType: 'move',
asyncOperationProgress: 0,
asyncOperatedFilesLength: 0,
isConvertLoading: false,
};
this.oldonpopstate = window.onpopstate;
@@ -1263,7 +1261,7 @@ class LibContentView extends React.Component {
onConvertItem = (dirent, dstType) => {
let path = Utils.joinPath(this.state.path, dirent.name);
let repoID = this.props.repoID;
this.setState({isConvertLoading: true});
toaster.notifyInProgress(gettext('Converting, please wait...'));
seafileAPI.convertFile(repoID, path, dstType).then((res) => {
let newFileName = res.data.obj_name;
let parentDir = res.data.parent_dir;
@@ -1275,13 +1273,11 @@ class LibContentView extends React.Component {
}
this.addDirent(newFileName, 'file', res.data.size);
this.setState({isConvertLoading: false});
let message = gettext('Successfully converted the file.');
toaster.success(message);
}).catch((error) => {
let errMessage = Utils.getErrorMsg(error);
this.setState({isConvertLoading: false});
if (errMessage === gettext('Error')) {
let name = Utils.getFileName(path);
errMessage = gettext('Failed to convert {name}.').replace('{name}', name);
@@ -1963,7 +1959,7 @@ class LibContentView extends React.Component {
}
let enableDirPrivateShare = false;
let { currentRepoInfo, userPerm, isCopyMoveProgressDialogShow, isDeleteFolderDialogOpen, isConvertLoading } = this.state;
let { currentRepoInfo, userPerm, isCopyMoveProgressDialogShow, isDeleteFolderDialogOpen } = this.state;
let showShareBtn = Utils.isHasPermissionToShare(currentRepoInfo, userPerm);
let isRepoOwner = currentRepoInfo.owner_email === username;
let isVirtual = currentRepoInfo.is_virtual;
@@ -2127,9 +2123,6 @@ class LibContentView extends React.Component {
toggleDialog={this.toggleDeleteFolderDialog}
/>
)}
{isConvertLoading && (
<ConvertMarkdownDialog />
)}
</Fragment>
);
}