@trimblemaps/webtools-common - npm Package Compare versions

Comparing version 0.5.7 to 0.5.8

javascript/AngularJS/alk-import/alkImport.service.js

@@ -21,3 +21,10 @@ /*
     const BATCH_SIZE = 5000;
+    const progressListeners = new Set();
 
+    function alertProgressListeners(value) {
+      for (const listener of progressListeners) {
+        listener(value);
+      }
+    }
+
     //The base import field ES6 class. It holds metadata for an import field (i.e. place name, latitude).
@@ -815,3 +822,3 @@ //All import fields will extend from this class.
       return deferred.promise;
-      
+
       function processBatch(index) {
@@ -839,2 +846,3 @@ if (index >= placesWithoutYards.length) {
           }
+          alertProgressListeners(batch.length);
           processBatch(index);
@@ -874,2 +882,3 @@ });
           yardId = response.SiteID;
+          alertProgressListeners(1);
           //Add place to yard
@@ -1362,2 +1371,5 @@ return placeCloudService.addPlaceToYard(yardId, place.Id, true);
       LatestArrivalTimeField: new LatestArrivalTimeField(),
+
+      //Listeners
+      progressListeners: progressListeners
     };
@@ -1364,0 +1376,0 @@

javascript/AngularJS/alk-import/importDetailsModal.controller.js

@@ -217,8 +217,27 @@ (function () {
       vm.inputRowsToCreate.categoryIcon = vm.selectedCategory;
+
+      const targetNumImports = vm.inputRowsToCreate.length;
+      vm.progressMessage = $translate.instant("common.import.importProgress", {
+        progressString: targetNumImports
+      });
+
+      var numImported = 0;
+      //Manipulate element directly because angular was slow to update DOM
+      var importedEl = document.getElementById("num-imports")
+      importedEl.textContent = 0;
+      var progressCallback = function (numCompleted) {
+        numImported += numCompleted;
+        importedEl.textContent = numImported;
+      };
+
+      alkImportService.progressListeners.add(progressCallback)
+
       vm.importFunction(vm.inputRowsToCreate, vm.importType).then(function (response) {
         alkModalService.clearWizardData();
         $uibModalInstance.close(response);
+        alkImportService.progressListeners.delete(progressCallback)
       }, function (error) {
         vm.errors.push(error);
         vm.submitted = false;
+        alkImportService.progressListeners.delete(progressCallback)
       });
@@ -228,3 +247,3 @@
 
-
+    
     function updateSetNameFromFileName() {
@@ -231,0 +250,0 @@ if (!vm.showSetName()) {

package.json

 {
   "name": "@trimblemaps/webtools-common",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "",
@@ -5,0 +5,0 @@ "scripts": {

translation/en_US.json

@@ -86,2 +86,3 @@ {
   "common.import.geocodingProgessBar": "Geocoding addresses ({{progressString}}% completed)",
+  "common.import.importProgress": "of {{progressString}} imports completed",
   "common.import.addressResultTitle": "Import Match Results",
@@ -88,0 +89,0 @@ "common.import.addressExact": "Exact Matches",

No alert changes

Improved metrics

Total package byte prevSize

4281212

increased by0.04%

Lines of code

72856

increased by0.04%

No dependency changes