Skip to content
This repository was archived by the owner on Jul 12, 2023. It is now read-only.

Use the new batch API for the bulk uploader #1277

Merged
merged 3 commits into from
Dec 5, 2020
Merged

Use the new batch API for the bulk uploader #1277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c77bd20
change endpoint, set batch size
whaught Dec 4, 2020
15d3d78
index start-at at 1 instead of 0
whaught Dec 5, 2020
cae6d5e
data from response
whaught Dec 5, 2020
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
68 changes: 42 additions & 26 deletions cmd/server/assets/codes/bulk-issue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@

<div class="form-label-group">
<input type="number" class="form-control text-monospace" id="start-at"
placeholder="Start at line" value="0" min="0">
placeholder="Start at line" value="1" min="1">
<label for="start-at">Start at line</label>
<small class="form-text text-muted">
Parsing the CSV will start at this line. Begin at 0 for a new file.
Parsing the CSV will start at this line. Begin at 1 for a new file.
This can be used to resume a canceled or partial upload.
</small>
</div>
Expand Down Expand Up @@ -116,9 +116,9 @@
<table class="table table-bordered table-striped table-fixed table-inner-border-only border-top mb-0">
<thead>
<tr>
<th>Line</th>
<th>Phone number</th>
<th>Test date</th>
<th width="60">Line</th>
<th width="150">Phone#</th>
<th width="130">Test date</th>
<th>Error message</th>
</tr>
</thead>
Expand All @@ -128,6 +128,7 @@
</main>

<script type="text/javascript">
const batchSize = 10;
let total = 0;
let totalErrs = 0;

Expand Down Expand Up @@ -170,7 +171,7 @@
$csv.change(function(file) {
let fileName = file.target.files[0].name;
$fileLabel.html(fileName);
$startAt.val(0);
$startAt.val(1);
$import.prop('disabled', false);
});

Expand Down Expand Up @@ -207,8 +208,6 @@
reader.readAsText($csv[0].files[0]);
});

const batchSize = 1;

function readFile() {
// State for managing cleanup and canceling
let cancelUpload = false;
Expand All @@ -224,7 +223,7 @@
totalErrs = 0;
$tableBody.empty();

for (let i = parseInt($startAt.val()); i < rows.length && !cancelUpload; i++) {
for (let i = parseInt($startAt.val() - 1); i < rows.length && !cancelUpload; i++) {
// Clear batch that was just uploaded.
if (batch.length >= batchSize) {
batch = [];
Expand Down Expand Up @@ -254,7 +253,7 @@
}
break;
}
$startAt.val(i + 1);
$startAt.val(i + 2);
let percent = Math.floor((i + 1) * 100 / rows.length) + "%";
$progress.width(percent);
$progress.html(percent);
Expand Down Expand Up @@ -313,35 +312,52 @@
return request
}

function uploadBatch(data, i) {
function uploadBatch(data, lastRow) {
return $.ajax({
url: '/codes/issue',
url: '/codes/batch-issue',
type: 'POST',
dataType: 'json',
cache: false,
contentType: 'application/json',
headers: { 'X-CSRF-Token': '{{.csrfToken}}' },
// TODO: at the moment we only support one-at-a-time
data: JSON.stringify(data[0]),
data: JSON.stringify({'codes':data}),
success: function(result) {
total++;
total += data.length;
if (result.error) {
flash.error(result.error);
}
},
error: function(xhr, resp, text) {
totalErrs++;
let message = resp;
if (xhr && xhr.responseJSON && xhr.responseJSON.error) {
message = message + ": " + xhr.responseJSON.error;
if (!xhr || !xhr.responseJSON) {
return
}

if (!xhr.responseJSON.codes) {
let message = resp;
if (xhr.responseJSON.error) {
message = message + ": " + xhr.responseJSON.error;
}
flash.error(message);
return
}


let l = xhr.responseJSON.codes.length;
for(let i = 0; i < l; i++) {
let code = xhr.responseJSON.codes[i]
if (code.error) {
totalErrs++;
$errorDiv.removeClass('d-none');
let $row = $('<tr/>');
$row.append($('<td/>').text(lastRow - l + i + 1));
$row.append($('<td/>').text(data[i]["phone"]));
$row.append($('<td/>').text(data[i]["testDate"]));
$row.append($('<td/>').text(code.error));
$errorTable.append($row);
} else {
total++;
}
}
$errorDiv.removeClass('d-none');
let $row = $('<tr/>');
$row.append($('<td/>').text(i));
$row.append($('<td/>').text(data[0]["phone"]));
$row.append($('<td/>').text(data[0]["testDate"]));
$row.append($('<td/>').text(message));
$errorTable.append($row);
},
});
}
Expand Down