AtlasOfLivingAustralia/biocollect#1593

- species download fix

Author: temi

grails-app/assets/javascripts/entities.js

@@ -377,7 +377,7 @@ var entities = (function () {
     function saveSpecies(data, dataFieldName, outputName, projectActivityId) {
         console.log("in addSpecies");
         if (data.length === 0) {
-            return;
+            return data;
         }
 
         data.forEach(function (item) {
@@ -534,8 +534,7 @@ var entities = (function () {
         var offset = 0, deferred = $.Deferred(), counter = 1, total = 100;
 
         function fetchNext(data) {
-            data = data || [];
-            if (data.length == SPECIES_MAX_FETCH) {
+            if (!data || (data.length == SPECIES_MAX_FETCH)) {
                 onlineGetSpeciesForProjectActivityAndFieldInOutput(offset, projectActivityId, dataFieldName, outputName, SPECIES_MAX_FETCH).then(function (result) {
                     callback(total, counter);
                     counter = (counter + 1) % total;

package-lock.json

@@ -21,7 +21,7 @@
     "@turf/convex": "^6.0.2",
     "@turf/length": "^6.0.2",
     "@turf/simplify": "^5.1.5",
-    "chromedriver": "123.0.1",
+    "chromedriver": "^125.0.3",
     "geojson2svg": "^1.2.3",
     "handlebars": "^4.7.7",
     "jasmine-ajax": "^4.0.0",

package.json

@@ -634,7 +634,7 @@ describe("Entities", function () {
             };
 
             jasmine.Ajax.stubRequest(fcConfig.fetchSpeciesUrl + "?projectActivityId=1&dataFieldName=species1&output=output1&limit=20&q=&offset=0").andReturn({
-                "responseText": '{"autoCompleteList": [{"commonName": "species1", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}]}',
+                "responseText": '{"autoCompleteList": [{"commonName": "species1", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"},{"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"} ,{"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"} , {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"},{"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}, {"commonName": "species2", "scientificName": "sc1", "name": "sc1", "listId": "123", "projectActivityId": "1", "dataFieldName": "species1", "outputName": "output1"}]}',
                 "status": 200,
                 "contentType": "application/json"
             });
@@ -656,7 +656,7 @@ describe("Entities", function () {
                     entities.searchSpecies(1, "species1", "output1", {q: ""}, 20).then(resolve, reject);
                 });
             });
-            expect(result.autoCompleteList.length).toBe(2);
+            expect(result.autoCompleteList.length).toBe(20);
         }, 10000);
 
         it("should search all species if species from species list is empty", async function () {