AMBARI-4618. Proxy API path has changed from /api/v1/proxy to /proxy (srimanth)

ambari-web/app/controllers/main/jobs_controller.js

@@ -62,7 +62,7 @@ App.MainJobsController = Em.ArrayController.extend({
     if (yarnService != null) {
       this.set('loading', true);
       var historyServerHostName = yarnService.get('resourceManagerNode.hostName')
-      var hiveQueriesUrl = App.testMode ? "/data/jobs/hive-queries.json" : App.apiPrefix + "/proxy?url=http://" + historyServerHostName
+      var hiveQueriesUrl = App.testMode ? "/data/jobs/hive-queries.json" : "/proxy?url=http://" + historyServerHostName
           + ":8188/ws/v1/apptimeline/HIVE_QUERY_ID?fields=events,primaryfilters";
       if (jobsLimit > 0) {
         hiveQueriesUrl += ("?limit=" + jobsLimit);

ambari-web/app/utils/ajax.js

@@ -1606,15 +1606,18 @@ var urls = {
 
   'jobs.tezDag.NametoID': {
     'real': '/proxy?url=http://{historyServerHostName}:8188/ws/v1/apptimeline/TEZ_DAG_ID?primaryFilter=dagName:{tezDagName}',
-    'mock': '/data/jobs/tezDag-name-to-id.json'
+    'mock': '/data/jobs/tezDag-name-to-id.json',
+    'apiPrefix': ''
   },
   'jobs.tezDag.tezDagId': {
     'real': '/proxy?url=http://{historyServerHostName}:8188/ws/v1/apptimeline/TEZ_DAG_ID/{tezDagId}?fields=relatedentities',
-    'mock': '/data/jobs/tezDag.json'
+    'mock': '/data/jobs/tezDag.json',
+    'apiPrefix': ''
   },
   'jobs.tezDag.tezDagVertexId': {
     'real': '/proxy?url=http://{historyServerHostName}:8188/ws/v1/apptimeline/TEZ_VERTEX_ID/{tezDagVertexId}?fields=otherinfo',
-    'mock': '/data/jobs/tezDagVertex.json'
+    'mock': '/data/jobs/tezDagVertex.json',
+    'apiPrefix': ''
   }
 };
 /**
@@ -1660,7 +1663,8 @@ var formatRequest = function (data) {
     opt.type = 'GET';
   }
   else {
-    opt.url = App.apiPrefix + formatUrl(this.real, data);
+    var prefix = this.apiPrefix != null ? this.apiPrefix : App.apiPrefix;
+    opt.url = prefix + formatUrl(this.real, data);
   }
 
   if (this.format) {

ambari-web/app/utils/jobs.js

@@ -52,7 +52,7 @@ module.exports = {
     var historyServerHostName = App.YARNService.find().objectAt(0).get('resourceManagerNode.hostName')
     var hiveJobId = hiveJob.get('id');
     // First refresh query
-    var hiveQueriesUrl = App.testMode ? "/data/jobs/hive-query-2.json" : App.apiPrefix + "/proxy?url=http://" + historyServerHostName
+    var hiveQueriesUrl = App.testMode ? "/data/jobs/hive-query-2.json" : "/proxy?url=http://" + historyServerHostName
         + ":8188/ws/v1/apptimeline/HIVE_QUERY_ID/" + hiveJob.get('id') + "?fields=otherinfo";
     App.HttpClient.get(hiveQueriesUrl, App.hiveJobMapper, {
       complete : function(jqXHR, textStatus) {