Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix refresh during task pending #246

Merged
merged 1 commit into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/config/locale/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
"importStopped": "Import stopped",
"importFailed": "Failed",
"importRunning": "Running",
"importPending": "Pending",
"notImported": "{total} lines not imported",
"readFailed": "{total} lines read failed",
"selectFile": "Select bind source file",
Expand Down
1 change: 1 addition & 0 deletions app/config/locale/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
"importStopped": "导入中止",
"importFailed": "导入失败",
"importRunning": "导入中",
"importPending": "等待导入",
"notImported": "{total}行未导入",
"readFailed": "{total}行读取失败",
"selectFile": "选择绑定文件",
Expand Down
5 changes: 4 additions & 1 deletion app/pages/Import/TaskCreate/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const TaskCreate = (props: IProps) => {
const [modalVisible, setVisible] = useState(false);
const history = useHistory();
const { needPwdConfirm = true } = props;
const [loading, setLoading] = useState(false);
const routes = [
{
path: '/import/tasks',
Expand All @@ -55,10 +56,12 @@ const TaskCreate = (props: IProps) => {
};
const handleStartImport = async (password?: string) => {
setVisible(false);
setLoading(true);
const code = await importTask({
name: basicConfig.taskName,
password
});
setLoading(false);
if(code === 0) {
message.success(intl.get('import.startImporting'));
history.push('/import/tasks');
Expand Down Expand Up @@ -193,7 +196,7 @@ const TaskCreate = (props: IProps) => {
<Button type="primary" disabled={
basicConfig.taskName === ''
|| (!verticesConfig.length && !edgesConfig.length)
} onClick={checkConfig}>{intl.get('import.runImport')}</Button>
} onClick={checkConfig} loading={!needPwdConfirm && loading}>{intl.get('import.runImport')}</Button>
</div>
{needPwdConfirm && <PasswordInputModal
visible={modalVisible}
Expand Down
4 changes: 2 additions & 2 deletions app/pages/Import/TaskList/TaskItem/LogModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const LogModal = (props: IProps) => {
if(isMounted) {
timer.current = setTimeout(readLog, 2000);
}
} else if (_status.current === ITaskStatus.StatusProcessing) {
} else if ([ITaskStatus.StatusProcessing, ITaskStatus.StatusPending].includes(_status.current)) {
if(isMounted) {
timer.current = setTimeout(readLog, 2000);
}
Expand Down Expand Up @@ -123,7 +123,7 @@ const LogModal = (props: IProps) => {
title={<>
<div className={styles.importModalTitle}>
<span>{`${space} ${intl.get('import.task')} - ${intl.get('common.log')}`}</span>
{(loading || status === ITaskStatus.StatusProcessing) && <Button type="text" loading={true} />}
{(loading || [ITaskStatus.StatusProcessing, ITaskStatus.StatusPending].includes(status)) && <Button type="text" loading={true} />}
</div>
{showLogDownload && <Button className="studioAddBtn primaryBtn" onClick={handleLogDownload}>
<Icon type="icon-studio-btn-download" />
Expand Down
8 changes: 6 additions & 2 deletions app/pages/Import/TaskList/TaskItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const COLOR_MAP = {
to: '#2F80ED',
},
};
const loadingStatus = [ITaskStatus.StatusPending, ITaskStatus.StatusProcessing]
const TaskItem = (props: IProps) => {
const {
data: {
Expand Down Expand Up @@ -74,7 +75,7 @@ const TaskItem = (props: IProps) => {
if(status === ITaskStatus.StatusFinished) {
setStatus('success');
addMsg();
} else if(status === ITaskStatus.StatusProcessing) {
} else if(loadingStatus.includes(status)) {
setStatus('active');
addMsg();
} else {
Expand Down Expand Up @@ -114,6 +115,9 @@ const TaskItem = (props: IProps) => {
{intl.get('import.importCompleted')}
<span className={styles.red}>{extraMsg && ` (${extraMsg})`}</span>
</span>}
{!stats && status === ITaskStatus.StatusPending && <span className={styles.completeInfo}>
{intl.get('import.importPending')}
</span>}
{!stats && status === ITaskStatus.StatusProcessing && <span className={styles.completeInfo}>
{intl.get('import.importRunning')}
</span>}
Expand Down Expand Up @@ -151,7 +155,7 @@ const TaskItem = (props: IProps) => {
>
<Button className="cancelBtn">{intl.get('import.endImport')}</Button>
</Popconfirm>}
{status !== ITaskStatus.StatusProcessing &&
{!loadingStatus.includes(status) &&
<Popconfirm
placement="left"
title={intl.get('common.ask')}
Expand Down
7 changes: 4 additions & 3 deletions app/pages/Import/TaskList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ const TaskList = (props: IProps) => {
};
}, []);
useEffect(() => {
const needRefresh = taskList.filter(item => item.status === ITaskStatus.StatusProcessing).length > 0;
if(logDimension.id !== undefined && logDimension.status === ITaskStatus.StatusProcessing) {
const loadingStatus = [ITaskStatus.StatusProcessing, ITaskStatus.StatusPending]
const needRefresh = taskList.filter(item => loadingStatus.includes(item.status)).length > 0;
Copy link
Contributor

@huaxiabuluo huaxiabuluo Jun 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const needRefresh = taskList.some(task => loadingStatus.includes(task.status));

if(logDimension.id !== undefined && loadingStatus.includes(logDimension.status)) {
const status = taskList.filter(item => item.id === logDimension.id)[0].status;
if(status !== ITaskStatus.StatusProcessing) {
if(!loadingStatus.includes(status)) {
setLogDimension({
id: logDimension.id,
space: logDimension.space,
Expand Down