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

Jump to bottom

Crash in ZoneStatusRetrieveAjaxView views from getlist() #1754

Merged
merged 3 commits into from
Aug 21, 2023
Merged

Crash in ZoneStatusRetrieveAjaxView views from getlist() #1754

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b6340
fix: getList() on empty lists
gromdimon Aug 18, 2023
5c89266
wip
gromdimon Aug 18, 2023
1d48608
fix
gromdimon Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
179 changes: 90 additions & 89 deletions landingzones/static/landingzones/js/landingzones.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,117 +6,118 @@ var isSuperuser = false;
*****************************/
var updateZoneStatus = function() {
window.zoneStatusUpdated = false;
var zoneUuids = [];
var zoneUuids = '';

$('.sodar-lz-zone-tr-existing').each(function() {
var trId = $(this).attr('id');
var zoneTr = $('#' + trId);
var zoneUuid = $(this).attr('data-zone-uuid');
var sampleUrl = $(this).attr('data-sample-url');
var statusTd = zoneTr.find('td#sodar-lz-zone-status-' + zoneUuid);

if (statusTd.text() !== 'MOVED' && statusTd.text() !== 'DELETED') {
zoneUuids.push(zoneUuid);
zoneUuids += zoneUuid + ',';
mikkonie marked this conversation as resolved.
Show resolved Hide resolved
}
});

// Make the POST request to retrieve zone statuses
$.ajax({
url: zoneStatusUrl,
method: 'POST',
dataType: 'json',
data: {
zone_uuids: zoneUuids
}
}).done(function(data) {
$('.sodar-lz-zone-tr-existing').each(function() {
var zoneUuid = $(this).attr('data-zone-uuid');
var zoneTr = $('#' + $(this).attr('id'));
var statusTd = zoneTr.find('td#sodar-lz-zone-status-' + zoneUuid);
var statusInfoSpan = zoneTr.find('span#sodar-lz-zone-status-info-' + zoneUuid);
var statusStyles = {
'CREATING': 'bg-warning',
'NOT CREATED': 'bg-danger',
'ACTIVE': 'bg-info',
'PREPARING': 'bg-warning',
'VALIDATING': 'bg-warning',
'MOVING': 'bg-warning',
'MOVED': 'bg-success',
'FAILED': 'bg-danger',
'DELETING': 'bg-warning',
'DELETED': 'bg-secondary'
};

if (data[zoneUuid]) {
var zoneStatus = data[zoneUuid].status;
var zoneStatusInfo = data[zoneUuid].status_info;

if (
statusTd.text() !== zoneStatus ||
statusInfoSpan.text() !== zoneStatusInfo
) {
statusTd.text(zoneStatus);
statusTd.removeClass();
statusTd.addClass(statusStyles[zoneStatus] + ' text-white');
statusInfoSpan.text(zoneStatusInfo);
if (zoneUuids.length > 0) {
$.ajax({
url: zoneStatusUrl,
method: 'POST',
dataType: 'JSON',
data: {
zone_uuids: zoneUuids
}
}).done(function(data) {
$('.sodar-lz-zone-tr-existing').each(function() {
var zoneUuid = $(this).attr('data-zone-uuid');
var zoneTr = $('#' + $(this).attr('id'));
var statusTd = zoneTr.find('td#sodar-lz-zone-status-' + zoneUuid);
var statusInfoSpan = zoneTr.find('span#sodar-lz-zone-status-info-' + zoneUuid);
var statusStyles = {
'CREATING': 'bg-warning',
'NOT CREATED': 'bg-danger',
'ACTIVE': 'bg-info',
'PREPARING': 'bg-warning',
'VALIDATING': 'bg-warning',
'MOVING': 'bg-warning',
'MOVED': 'bg-success',
'FAILED': 'bg-danger',
'DELETING': 'bg-warning',
'DELETED': 'bg-secondary'
};

if (['PREPARING', 'VALIDATING', 'MOVING', 'DELETING'].includes(zoneStatus)) {
statusTd.append(
'<span class="pull-right"><i class="iconify" data-icon="mdi:lock"></i></span>'
);
}
if (data[zoneUuid]) {
var zoneStatus = data[zoneUuid].status;
var zoneStatusInfo = data[zoneUuid].status_info;

if (['CREATING', 'NOT CREATED', 'MOVED', 'DELETED'].includes(zoneStatus)) {
zoneTr.find('p#sodar-lz-zone-stats-container-' + zoneUuid).hide();
if (
statusTd.text() !== zoneStatus ||
statusInfoSpan.text() !== zoneStatusInfo
) {
statusTd.text(zoneStatus);
statusTd.removeClass();
statusTd.addClass(statusStyles[zoneStatus] + ' text-white');
statusInfoSpan.text(zoneStatusInfo);

if (zoneStatus === 'MOVED') {
var statusMovedSpan = zoneTr.find(
'span#sodar-lz-zone-status-moved-' + zoneUuid
);
statusMovedSpan.html(
'<p class="mb-0"><a href="' +
sampleUrl +
'">' +
'<i class="iconify" data-icon="mdi:arrow-right-circle"></i> ' +
'Browse files in sample sheet</a></p>'
if (['PREPARING', 'VALIDATING', 'MOVING', 'DELETING'].includes(zoneStatus)) {
statusTd.append(
'<span class="pull-right"><i class="iconify" data-icon="mdi:lock"></i></span>'
);
}
}

// Button modification
if (zoneStatus !== 'ACTIVE' && zoneStatus !== 'FAILED' && isSuperuser) {}
else if (zoneStatus !== 'ACTIVE' && zoneStatus !== 'FAILED') {
zoneTr.find('td.sodar-lz-zone-title').addClass('text-muted');
zoneTr.find('td.sodar-lz-zone-assay').addClass('text-muted');
zoneTr.find('td.sodar-lz-zone-status-info').addClass('text-muted');
zoneTr.find('.btn').each(function() {
if ($(this).is('button')) {
$(this).attr('disabled', 'disabled');
} else if ($(this).is('a')) {
$(this).addClass('disabled');
}
$(this).tooltip('disable');
});
zoneTr.find('.sodar-list-dropdown').addClass('disabled');
} else {
zoneTr.find('td.sodar-lz-zone-title').removeClass('text-muted');
zoneTr.find('td.sodar-lz-zone-assay').removeClass('text-muted');
zoneTr.find('td.sodar-lz-zone-status-info').removeClass('text-muted');
zoneTr.find('p#sodar-lz-zone-stats-container-' + zoneUuid).show();
zoneTr.find('.btn').each(function() {
if ($(this).is('button')) {
$(this).removeAttr('disabled');
if (['CREATING', 'NOT CREATED', 'MOVED', 'DELETED'].includes(zoneStatus)) {
zoneTr.find('p#sodar-lz-zone-stats-container-' + zoneUuid).hide();

if (zoneStatus === 'MOVED') {
var statusMovedSpan = zoneTr.find(
'span#sodar-lz-zone-status-moved-' + zoneUuid
);
statusMovedSpan.html(
'<p class="mb-0"><a href="' +
sampleUrl +
'">' +
'<i class="iconify" data-icon="mdi:arrow-right-circle"></i> ' +
'Browse files in sample sheet</a></p>'
);
}
$(this).removeClass('disabled');
$(this).tooltip('enable');
});
zoneTr.find('.sodar-list-dropdown').removeClass('disabled');
}

// Button modification
if (zoneStatus !== 'ACTIVE' && zoneStatus !== 'FAILED' && isSuperuser) {}
else if (zoneStatus !== 'ACTIVE' && zoneStatus !== 'FAILED') {
zoneTr.find('td.sodar-lz-zone-title').addClass('text-muted');
zoneTr.find('td.sodar-lz-zone-assay').addClass('text-muted');
zoneTr.find('td.sodar-lz-zone-status-info').addClass('text-muted');
zoneTr.find('.btn').each(function() {
if ($(this).is('button')) {
$(this).attr('disabled', 'disabled');
} else if ($(this).is('a')) {
$(this).addClass('disabled');
}
$(this).tooltip('disable');
});
zoneTr.find('.sodar-list-dropdown').addClass('disabled');
} else {
zoneTr.find('td.sodar-lz-zone-title').removeClass('text-muted');
zoneTr.find('td.sodar-lz-zone-assay').removeClass('text-muted');
zoneTr.find('td.sodar-lz-zone-status-info').removeClass('text-muted');
zoneTr.find('p#sodar-lz-zone-stats-container-' + zoneUuid).show();
zoneTr.find('.btn').each(function() {
if ($(this).is('button')) {
$(this).removeAttr('disabled');
}
$(this).removeClass('disabled');
$(this).tooltip('enable');
});
zoneTr.find('.sodar-list-dropdown').removeClass('disabled');
}
}
}
}
});
window.zoneStatusUpdated = true;
});
window.zoneStatusUpdated = true;
});
}
};

$(document).ready(function() {
Expand Down
2 changes: 1 addition & 1 deletion landingzones/tests/test_permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def setUp(self):
config_data={},
)
# Data for post requests
self.post_data = {'zone_uuids': [str(self.landing_zone.sodar_uuid)]}
self.post_data = {'zone_uuids': str(self.landing_zone.sodar_uuid) + ','}


class TestLandingZonePermissions(TestLandingZonePermissionsBase):
Expand Down
15 changes: 14 additions & 1 deletion landingzones/tests/test_views_ajax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_post(self):
'landingzones:ajax_status',
kwargs={'project': self.project.sodar_uuid},
),
data={'zone_uuids[]': [str(self.landing_zone.sodar_uuid)]},
data={'zone_uuids': str(self.landing_zone.sodar_uuid) + ','},
)
self.assertEqual(response.status_code, 200)
expected = {
Expand All @@ -26,3 +26,16 @@ def test_post(self):
}
}
self.assertEquals(response.data, expected)

def test_post_no_zone(self):
"""Test POST request for getting a landing zone status with no zones"""
with self.login(self.user):
response = self.client.post(
reverse(
'landingzones:ajax_status',
kwargs={'project': self.project.sodar_uuid},
),
data={'zone_uuids': ''},
)
self.assertEqual(response.status_code, 200)
self.assertEquals(response.data, {})
3 changes: 2 additions & 1 deletion landingzones/views_ajax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def check_zone_permission(self, zone, user):
return user.has_perm(permission, obj=zone.project)

def post(self, request, *args, **kwargs):
zone_uuids = request.data.getlist('zone_uuids[]')
zone_uuids_string = request.data.get('zone_uuids')
zone_uuids = zone_uuids_string.split(',')[:-1]
mikkonie marked this conversation as resolved.
Show resolved Hide resolved
project = self.get_project()

# Filter landing zones based on UUIDs and project
Expand Down