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.

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

[ELI_72] Refactoring job status message. #73

Merged
merged 3 commits into from
Dec 13, 2024
Merged

[ELI_72] Refactoring job status message. #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1c247b
[ELI_72] Refactoring job status message.
Dec 13, 2024
eead5d1
[ELI_72] Code refactoring .
Dec 13, 2024
6334805
[ELI_72] Redundant сode.
Dec 13, 2024
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
37 changes: 16 additions & 21 deletions ...t/jcr_root/apps/etoolbox-link-inspector/clientlibs/link-inspector-ui/js/console-ui.run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@

const TRIGGER_DATA_FEED_GENERATION = '/content/etoolbox-link-inspector/servlet/triggerDataFeedGeneration';
const CHECK_JOB_STATUS = '/content/etoolbox-link-inspector/servlet/jobStatus';
let $jobStatusContainer = null;

function jobIsActive() {
let isActive = false;
function jobIsActive(callback) {
$.ajax({
url: CHECK_JOB_STATUS,
type: 'GET',
async: false,
success: function (data) {
isActive = data && data.status && data.status == 'ACTIVE' | 'QUEUED' | 'GIVEN_UP';
if (data && $.inArray(data.status ,['ACTIVE','QUEUED','GIVEN_UP']) !== -1) {
callback();
}
}
});
return isActive;
}

function onRunAction(callback) {
Expand All @@ -43,12 +44,12 @@
});
}

function createInProgressMessage($popover) {
const $container = $('<p class="u-coral-margin"></p>').text('Job status: ');
$('<b>...in progress</b>').appendTo($container);
$('<br/>').appendTo($container);
$('<span>scan may take some time to complete</span>').appendTo($container);;
$popover.find('coral-popover-content').append($container);
function addJobStatusMessage($popover) {
$jobStatusContainer = $('<p class="u-coral-margin"></p>').text('Job status: ');
$('<b>...in progress</b>').appendTo($jobStatusContainer);
$('<br/>').appendTo($jobStatusContainer);
$('<span>scan may take some time to complete</span>').appendTo($jobStatusContainer);;
$popover.find('coral-popover-content').append($jobStatusContainer);
}

function createRunJobMessage($popover) {
Expand All @@ -58,16 +59,15 @@
}

function beforeOpenPopover(e) {
jobIsActive() ? createInProgressMessage($(e.currentTarget)) : createRunJobMessage($(e.currentTarget));
!$jobStatusContainer && jobIsActive(function () {addJobStatusMessage($(e.currentTarget));});
}

function beforeClosePopover(e) {
removeLastChild($(e.currentTarget));
removeJobStatusMessage();
}

function removeLastChild($popover){
const $popoverContent = $popover.find('coral-popover-content');
$popoverContent.children().last().remove();
function removeJobStatusMessage() {
$jobStatusContainer && $jobStatusContainer.remove() && ($jobStatusContainer = null);
}

$(document).on('coral-overlay:beforeopen', '.elc-coral-popover', beforeOpenPopover);
Expand All @@ -81,12 +81,7 @@
formData.append('exclusive', 'true');
$.ajax({
url: TRIGGER_DATA_FEED_GENERATION,
type: 'GET',
success: function () {
const $popover = $('.elc-coral-popover');
removeLastChild($popover);
createInProgressMessage($popover);
}
type: 'GET'
}).error(function (e) {
ui.notify('Error', e.responseText || e.statusText, 'error');
});
Expand Down