From: kashalkar <kiran.kashalkar@riftio.com>
Date: Wed, 25 Jan 2017 15:10:54 +0000 (+0100)
Subject: Merge "Assets tab hidden by default" into v1.1
X-Git-Tag: v1.1.0~13
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=64b803dbd876e15a0a2d4ca46d8ce81ac18915f6;hp=-c

Merge "Assets tab hidden by default" into v1.1
---

64b803dbd876e15a0a2d4ca46d8ce81ac18915f6
diff --combined skyquake/plugins/composer/api/composer.js
index 13fd0ddba,864f2b06e..801873a36
--- a/skyquake/plugins/composer/api/composer.js
+++ b/skyquake/plugins/composer/api/composer.js
@@@ -272,36 -272,36 +272,36 @@@ Composer.create = function(req) 
          });
      });
  };
 -// Composer.update = function(req) {
 -//     var api_server = req.query['api_server'];
 -//     var catalogType = req.params.catalogType;
 -//     var id = req.params.id;
 -//     var data = req.body;
 -//     console.log('Updating', catalogType, 'id', id, 'on', api_server);
 -//     var jsonData = {};
 -//     jsonData[catalogType] = {};
 -//     jsonData[catalogType] = data;
 -//     return new Promise(function(resolve, reject) {
 -//         var requestHeaders = {};
 -//         _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
 -//             'Authorization': req.get('Authorization')
 -//         });
 -//         request({
 -//             uri: utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id,
 -//             method: 'PUT',
 -//             headers: requestHeaders,
 -//             forever: constants.FOREVER_ON,
 -//             rejectUnauthorized: false,
 -//             json: jsonData
 -//         }, function(error, response, body) {
 -//             if (utils.validateResponse('Composer.update', error, response, body, resolve, reject)) {
 -//                 resolve({
 -//                     statusCode: response.statusCode
 -//                 });
 -//             }
 -//         });
 -//     });
 -//
 +Composer.updateSave = function(req) {
 +    var api_server = req.query['api_server'];
 +    var catalogType = req.params.catalogType;
 +    var id = req.params.id;
 +    var data = req.body;
 +    console.log('Updating', catalogType, 'id', id, 'on', api_server);
 +    var jsonData = {};
 +    jsonData[catalogType] = {};
 +    jsonData[catalogType] = data;
 +    return new Promise(function(resolve, reject) {
 +        var requestHeaders = {};
 +        _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
 +            'Authorization': req.get('Authorization')
 +        });
 +        request({
 +            uri: utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id,
 +            method: 'PUT',
 +            headers: requestHeaders,
 +            forever: constants.FOREVER_ON,
 +            rejectUnauthorized: false,
 +            json: jsonData
 +        }, function(error, response, body) {
 +            if (utils.validateResponse('Composer.update', error, response, body, resolve, reject)) {
 +                resolve({
 +                    statusCode: response.statusCode
 +                });
 +            }
 +        });
 +    });
 +}
  
  Composer.update = function(req) {
      console.log(' Updating file', req.file.originalname, 'as', req.file.filename);
@@@ -312,7 -312,7 +312,7 @@@
      var download_host = req.query['dev_download_server'];
  
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
      var input = {
          'external-url': download_host + '/composer/update/' + req.file.filename,
@@@ -368,7 -368,7 +368,7 @@@ Composer.upload = function(req) 
      var download_host = req.query['dev_download_server'];
  
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
  
      return new Promise(function(resolve, reject) {
@@@ -425,7 -425,7 +425,7 @@@ Composer.addFile = function(req) 
      var package_type = req.query['package_type'].toUpperCase();
      var package_path = req.query['package_path'];
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
  
      return new Promise(function(resolve, reject) {
@@@ -612,6 -612,9 +612,9 @@@ FileManager.get = function(req) 
                                  data: data.body
                              });
                          }
+                     }).catch(function(err) {
+                         console.log('Failed to retrieve FileManager.list')
+                         resolve(err);
                      })
                  }
              })