WIP - still need file property on layer

web-app/src/ng1/admin/layers/layer.component.js

@@ -57,7 +57,6 @@ class AdminLayerController {
   $onInit() {
     this.Layer.get({ id: this.$stateParams.layerId }, (layer) => {
       this.layer = layer;
-      this.layer.isFileBased = !['WMS', 'XYZ'].includes(this.layer.type);
 
       if (this.layer.state !== 'available') {
         this.$timeout(this.checkLayerProcessingStatus.bind(this), 1000);
@@ -97,6 +96,10 @@ class AdminLayerController {
     });
   }
 
+  isLayerFileBased() {
+    return this.layer && !!this.layer.file;
+  }
+
   $postLink() {
     this.uploadSnackbar = new snackbar.MDCSnackbar(
       document.querySelector('#upload-snackbar')
@@ -178,26 +181,34 @@ class AdminLayerController {
   }
 
   handleLayerDownloadResponse(response) {
-    if (response.type === 'application/json') {
+    if (response && response.filePath) {
+      const desiredFileName = this.layer.fileName;
+      this.triggerFileDownload(response.filePath, desiredFileName);
+    } else {
       this.handleJSONDownloadError(response);
-      return;
     }
+  }
 
-    this.triggerFileDownload(response);
+  triggerFileDownload(filePath, fileName) {
+    const a = document.createElement('a');
+    a.href = filePath;
+    a.download = fileName;
+    a.style.display = 'none';
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
   }
 
   handleLayerDownloadError(err) {
     console.error('Error downloading the layer', err);
   }
 
   handleJSONDownloadError(response) {
-    response.text().then((text) => {
-      const errorObj = JSON.parse(text);
-      console.error(
-        'Error downloading the layer',
-        errorObj.message || errorObj
-      );
-    });
+    if (response && response.message) {
+      console.error('Error downloading the layer', response.message);
+    } else {
+      console.error('Error downloading the layer', response);
+    }
   }
 
   triggerFileDownload(response) {

web-app/src/ng1/admin/layers/layer.html

@@ -20,7 +20,7 @@ <h2>
             <button class="btn btn-default pull-right" ng-click="$ctrl.editLayer($ctrl.layer)"><i class="fa fa-edit"></i> Edit</button>
           </h2>
           <h2>
-            <button ng-if="layer.isFileBased" (click)="downloadLayer()">Download</button>
+            <button ng-if="$ctrl.isLayerFileBased()" (click)="downloadLayer()">Download</button>
           </h2>
         </div>
       </div>

web-app/src/ng1/factories/layer.resource.js

@@ -59,7 +59,7 @@ function Layer($resource) {
       download: {
         method: 'GET',
         url: '/api/layers/:layerId',
-        responseType: 'blob'
+        responseType: 'json'
       },
     }
   );