Skip to content

weko#43261 Fix author merge issue #33

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.

Sign up for GitHub

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

Open
ivis-nakagawa wants to merge 1 commit into
base: release
Choose a base branch
from
Open

weko#43261 Fix author merge issue #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 31 additions & 13 deletions app-author-search/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ export class AppComponent implements OnInit {
public cntOfpage:number = 25;

public mergeDisabled:boolean = true;

//著者統合タスク実行チェック
public isCheckUpdateIntervalRunning:boolean = false;

constructor(private http: Http,
) { }
Expand Down Expand Up @@ -189,11 +190,7 @@ export class AppComponent implements OnInit {
originAuthors.push(data.id);
}
}
if (originAuthors.length !== 0) {
this.checkUpdateItemTask();
} else {
this.mergeDisabled = true;
}
this.mergeDisabled = originAuthors.length === 0;
}
/**
*著者追加
Expand Down Expand Up @@ -345,12 +342,25 @@ export class AppComponent implements OnInit {
jsonData.idTo = this.gatherId;
this.downloadDisabled = false;
this.mergeDisabled = true;
this.gatherApi(jsonData).then(res => {
$('#back_modal').click();
$('div').removeClass('modal-backdrop');
this.search(1);
}).catch(this.handleError)
if (!this.checkUpdateItemTask()){
this.gatherApi(jsonData).then(res => {
$('#back_modal').click();
$('div').removeClass('modal-backdrop');
this.search(1);
}).catch(this.handleError)

//5秒ごとにタスク実行チェック
if (!this.isCheckUpdateIntervalRunning){
this.isCheckUpdateIntervalRunning = true;
const checkUpdateIntervalId = setInterval(() =>{
if (!this.checkUpdateItemTask(-1)){
this.isCheckUpdateIntervalRunning = false;
this.search(1);
clearInterval(checkUpdateIntervalId);
}
}, 5000);
}
}
}
/**
*ページをクリック
Expand Down Expand Up @@ -441,15 +451,15 @@ export class AppComponent implements OnInit {
}
this.mergeDisabled = true;
} else {
this.errMsgHide = true;
this.hideAlert();
if (flag === 0) {
this.mergeDisabled = false;
}
}
this.downloadDisabled = !this.checkUpdateTaskJson.has_file && !this.checkUpdateTaskJson.is_running;
if (flag === 1) {
if (this.checkUpdateTaskJson.has_file) {
this.errMsgHide = true;
this.hideAlert();
} else {
this.errMsgHide = false;
if (this.checkUpdateTaskJson.is_running) {
Expand All @@ -460,6 +470,7 @@ export class AppComponent implements OnInit {
}
}
}).catch();
return this.checkUpdateTaskJson.is_running;
}
/**
* download update item status
Expand Down Expand Up @@ -529,4 +540,11 @@ export class AppComponent implements OnInit {
'<button type="button" class="close" data-dismiss="alert">' +
'&times;</button>' + message + '</div>');
}
/**
* Hide alert
*/
hideAlert() {
$('#alerts').empty();
this.errMsgHide = true;
}
}