Skip to content

Commit 9cc3cde

Browse files
prabhjyotsinghprabhjyotsingh
committed
resove merge errors
1 parent a274efa commit 9cc3cde

File tree

6 files changed

+217
-226
lines changed

6 files changed

+217
-226
lines changed

‎zeppelin-web/src/app/app.js‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,44 @@
4747
$httpProvider.defaults.withCredentials = true;
4848

4949
$routeProvider
50-
.when('/', {
51-
templateUrl: 'app/home/home.html'
52-
})
53-
.when('/notebook/:noteId', {
54-
templateUrl: 'app/notebook/notebook.html',
55-
controller: 'NotebookCtrl'
56-
})
57-
.when('/notebook/:noteId/paragraph?=:paragraphId', {
58-
templateUrl: 'app/notebook/notebook.html',
59-
controller: 'NotebookCtrl'
60-
})
61-
.when('/notebook/:noteId/paragraph/:paragraphId?', {
62-
templateUrl: 'app/notebook/notebook.html',
63-
controller: 'NotebookCtrl'
64-
})
65-
.when('/jobmanager', {
66-
templateUrl: 'app/jobmanager/jobmanager.html',
67-
controller: 'JobmanagerCtrl'
68-
})
69-
.when('/interpreter', {
70-
templateUrl: 'app/interpreter/interpreter.html',
71-
controller: 'InterpreterCtrl'
72-
})
73-
.when('/credential', {
74-
templateUrl: 'app/credential/credential.html',
75-
controller: 'CredentialCtrl'
76-
})
77-
.when('/configuration', {
78-
templateUrl: 'app/configuration/configuration.html',
79-
controller: 'ConfigurationCtrl'
80-
})
81-
.when('/search/:searchTerm', {
82-
templateUrl: 'app/search/result-list.html',
83-
controller: 'SearchResultCtrl'
84-
})
85-
.otherwise({
86-
redirectTo: '/'
87-
});
50+
.when('/', {
51+
templateUrl: 'app/home/home.html'
52+
})
53+
.when('/notebook/:noteId', {
54+
templateUrl: 'app/notebook/notebook.html',
55+
controller: 'NotebookCtrl'
56+
})
57+
.when('/notebook/:noteId/paragraph?=:paragraphId', {
58+
templateUrl: 'app/notebook/notebook.html',
59+
controller: 'NotebookCtrl'
60+
})
61+
.when('/notebook/:noteId/paragraph/:paragraphId?', {
62+
templateUrl: 'app/notebook/notebook.html',
63+
controller: 'NotebookCtrl'
64+
})
65+
.when('/jobmanager', {
66+
templateUrl: 'app/jobmanager/jobmanager.html',
67+
controller: 'JobmanagerCtrl'
68+
})
69+
.when('/interpreter', {
70+
templateUrl: 'app/interpreter/interpreter.html',
71+
controller: 'InterpreterCtrl'
72+
})
73+
.when('/credential', {
74+
templateUrl: 'app/credential/credential.html',
75+
controller: 'CredentialCtrl'
76+
})
77+
.when('/configuration', {
78+
templateUrl: 'app/configuration/configuration.html',
79+
controller: 'ConfigurationCtrl'
80+
})
81+
.when('/search/:searchTerm', {
82+
templateUrl: 'app/search/result-list.html',
83+
controller: 'SearchResultCtrl'
84+
})
85+
.otherwise({
86+
redirectTo: '/'
87+
});
8888

8989
ngToastProvider.configure({
9090
dismissButton: true,
@@ -117,4 +117,3 @@
117117
});
118118

119119
}());
120-

‎zeppelin-web/src/app/jobmanager/jobmanager.controller.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ angular.module('zeppelinWebApp')
2222
$scope.$on('setNotebookJobs', function(event, responseData) {
2323
$scope.lastJobServerUnixTime = responseData.lastResponseUnixTime;
2424
$scope.jobInfomations = responseData.jobs;
25-
$scope.jobInfomationsIndexs = $scope.jobInfomations? _.indexBy($scope.jobInfomations, 'notebookId') : {};
25+
$scope.jobInfomationsIndexs = $scope.jobInfomations ? _.indexBy($scope.jobInfomations, 'notebookId') : {};
2626
});
2727

2828
$scope.$on('setUpdateNotebookJobs', function(event, responseData) {
2929
var jobInfomations = $scope.jobInfomations;
3030
var indexStore = $scope.jobInfomationsIndexs;
3131
$scope.lastJobServerUnixTime = responseData.lastResponseUnixTime;
3232
var notes = responseData.jobs;
33-
notes.map(function (changedItem) {
33+
notes.map(function(changedItem) {
3434
if (indexStore[changedItem.notebookId] === undefined) {
3535
var newItem = angular.copy(changedItem);
3636
jobInfomations.push(newItem);
@@ -46,7 +46,7 @@ angular.module('zeppelinWebApp')
4646
indexStore.splice(removeIndex, 1);
4747
}
4848

49-
removeIndex = _.findIndex(jobInfomations, { 'notebookId' : changedItem.notebookId});
49+
removeIndex = _.findIndex(jobInfomations, {'notebookId': changedItem.notebookId});
5050
if (removeIndex) {
5151
jobInfomations.splice(removeIndex, 1);
5252
}
@@ -64,8 +64,8 @@ angular.module('zeppelinWebApp')
6464
});
6565
});
6666

67-
$scope.filterValueToName = function (filterValue) {
68-
var index = _.findIndex($scope.ACTIVE_INTERPRETERS, {value : filterValue});
67+
$scope.filterValueToName = function(filterValue) {
68+
var index = _.findIndex($scope.ACTIVE_INTERPRETERS, {value: filterValue});
6969

7070
if ($scope.ACTIVE_INTERPRETERS[index].name !== undefined) {
7171
return $scope.ACTIVE_INTERPRETERS[index].name;
@@ -74,12 +74,12 @@ angular.module('zeppelinWebApp')
7474
}
7575
};
7676

77-
$scope.init = function () {
77+
$scope.init = function() {
7878
$scope.jobInfomations = [];
7979
$scope.JobInfomationsByFilter = $scope.jobInfomations;
8080

8181
websocketMsgSrv.getNotebookJobsList();
82-
var refreshObj = $interval(function () {
82+
var refreshObj = $interval(function() {
8383
if ($scope.lastJobServerUnixTime !== undefined) {
8484
websocketMsgSrv.getUpdateNotebookJobsList($scope.lastJobServerUnixTime);
8585
}
@@ -90,4 +90,4 @@ angular.module('zeppelinWebApp')
9090
websocketMsgSrv.unsubscribeJobManager();
9191
});
9292
};
93-
});
93+
});

‎zeppelin-web/src/app/jobmanager/jobs/job.controller.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
'use strict';
1616

1717
angular.module('zeppelinWebApp')
18-
.controller('JobCtrl', function($scope,$rootScope, $http, baseUrlSrv) {
18+
.controller('JobCtrl', function($scope, $rootScope, $http, baseUrlSrv) {
1919

20-
$scope.init = function (jobInformation) {
20+
$scope.init = function(jobInformation) {
2121
$scope.progressValue = 0;
2222
};
2323

24-
$scope.getProgress = function () {
24+
$scope.getProgress = function() {
2525
var statusList = _.pluck($scope.notebookJob.paragraphs, 'status');
26-
var runningJob = _.countBy(statusList, function (status) {
26+
var runningJob = _.countBy(statusList, function(status) {
2727
if (status === 'FINISHED' || status === 'RUNNING') {
2828
return 'matchCount';
2929
} else {
@@ -33,7 +33,7 @@ angular.module('zeppelinWebApp')
3333
var totalCount = statusList.length;
3434
var runningJobCount = runningJob.matchCount;
3535
var result = Math.ceil(runningJobCount / totalCount * 100);
36-
return isNaN(result)? 0 : result;
36+
return isNaN(result) ? 0 : result;
3737
};
3838

39-
});
39+
});

0 commit comments

Comments
 (0)