Upload and Update status and endpoints updated

[osm/UI.git] / skyquake / plugins / composer / src / src / stores / CatalogPackageManagerStore.js

diff --git a/skyquake/plugins/composer/src/src/stores/CatalogPackageManagerStore.js b/skyquake/plugins/composer/src/src/stores/CatalogPackageManagerStore.js
index 733e938..3a82114 100644 (file)
--- a/skyquake/plugins/composer/src/src/stores/CatalogPackageManagerStore.js
+++ b/skyquake/plugins/composer/src/src/stores/CatalogPackageManagerStore.js
@@ -1,6 +1,6 @@
 
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -119,12 +119,15 @@ class CatalogPackageManagerStore {
        onUploadCatalogPackageStatusUpdated(response) {
                const upload = updateStatusInfo(response);
                this.updatePackage(upload);
+               console.log('updating package upload')
                // if pending with no transaction id - do nothing
                // bc DropZone.js will notify upload progress
                if (upload.pending && upload.transactionId) {
+                       console.log('checking status')
                        delayStatusCheck(this.getInstance().requestCatalogPackageUploadStatus, upload);
                } else if (upload.success) {
                        this.getInstance().loadCatalogs();
+                       console.log('finished uploading to node, requesting status from rest')
                }
        }
 
@@ -136,8 +139,9 @@ class CatalogPackageManagerStore {
 
        downloadCatalogPackage(data) {
                let catalogItems = data['selectedItems'] || [];
-               let format = data['selectedFormat'] || 'mano';
+               let schema = data['selectedFormat'] || 'mano';
                let grammar = data['selectedGrammar'] || 'osm';
+               let format = "YAML";
                if (catalogItems.length) {
                        const catalogPackage = Object.assign({}, defaults.downloadPackage, {id: guid()});
                        catalogPackage.name = catalogItems[0].name;
@@ -148,7 +152,7 @@ class CatalogPackageManagerStore {
                        catalogPackage.ids = catalogItems.map(d => d.id).sort().toString();
                        catalogPackage.catalogItems = catalogItems;
                        this.addPackage(catalogPackage);
-                       this.getInstance().requestCatalogPackageDownload(catalogPackage, format, grammar).catch(exception);
+                       this.getInstance().requestCatalogPackageDownload(catalogPackage, format, grammar, schema).catch(exception);
                }
        }
 
@@ -189,9 +193,9 @@ function updateStatusInfo(response) {
                success: false,
                error: false
        };
-       const responseData = response.data;
+       const responseData = (response.data.output) ? response.data.output :  response.data;
        const catalogPackage = response.state;
-       switch(responseData.status) {
+       switch(response.data.status) {
        case 'upload-progress':
                statusInfo.pending = true;
                statusInfo.progress = parseFloat(responseData.progress) || 0;
@@ -201,7 +205,7 @@ function updateStatusInfo(response) {
                statusInfo.pending = true;
                statusInfo.progress = 100;
                statusInfo.message = 'Upload completed.';
-               statusInfo.transactionId = responseData.transaction_id;
+               statusInfo.transactionId = responseData['transaction_id'] || responseData['transaction-id'] || catalogPackage.transactionId;
                break;
        case 'upload-error':
                statusInfo.error = true;
@@ -210,7 +214,7 @@ function updateStatusInfo(response) {
        case 'download-requested':
                statusInfo.pending = true;
                statusInfo.progress = 25;
-               statusInfo.transactionId = responseData.transaction_id;
+               statusInfo.transactionId = responseData['transaction_id'] || responseData['transaction-id']  || catalogPackage.transactionId;
                break;
        case 'pending':
                statusInfo.pending = true;