/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
*/
'use strict';
-import _ from 'lodash'
+import _delay from 'lodash/delay'
+import _pick from 'lodash/pick'
import alt from '../alt'
import guid from '../libraries/guid'
import numeral from 'numeral'
delete catalogPackage.checkStatusTimeoutId;
statusCheckFunction(catalogPackage).catch(exception);
};
- catalogPackage.checkStatusTimeoutId = _.delay(delayCallback, defaults.checkStatusDelayInSeconds * 1000);
+ catalogPackage.checkStatusTimeoutId = _delay(delayCallback, defaults.checkStatusDelayInSeconds * 1000);
}
}
uploadCatalogPackage(file) {
file.id = file.id || guid();
- const catalogPackage = _.pick(file, packagePropertyNames);
+ const catalogPackage = _pick(file, packagePropertyNames);
catalogPackage.icon = file.riftAction === 'onboard' ? imgOnboard : imgUpdate;
catalogPackage.type = 'upload';
this.addPackage(catalogPackage);
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')
}
}
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;
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);
}
}
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;
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;
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;