yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing a console.log.

Browse Source 
whitespace and some formatting.
This commit is contained in:
Claus
2016-07-27 13:59:10 +02:00
parent b1f13cdbb2
commit 9ae339f17b
4 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js
View File

@@ -1,4 +1,4 @@
function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeout) {
function ExamineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeout) {
$scope.indexerDetails = [];
$scope.searcherDetails = [];
@@ -6,7 +6,9 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
function checkProcessing(indexer, checkActionName) {
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", checkActionName, { indexerName: indexer.name })),
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
checkActionName,
{ indexerName: indexer.name })),
'Failed to check index processing')
.then(function(data) {
@@ -17,70 +19,73 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
indexer[k] = data[k];
}
indexer.isProcessing = false;
}
else {
$timeout(function () {
//don't continue if we've tried 100 times
if (indexer.processingAttempts < 100) {
checkProcessing(indexer, checkActionName);
//add an attempt
indexer.processingAttempts++;
}
else {
//we've exceeded 100 attempts, stop processing
indexer.isProcessing = false;
}
}, 1000);
} else {
$timeout(function() {
//don't continue if we've tried 100 times
if (indexer.processingAttempts < 100) {
checkProcessing(indexer, checkActionName);
//add an attempt
indexer.processingAttempts++;
} else {
//we've exceeded 100 attempts, stop processing
indexer.isProcessing = false;
}
},
1000);
}
});
}
$scope.search = function (searcher, e) {
$scope.search = function(searcher, e) {
if (e && e.keyCode !== 13) {
return;
}
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearchResults", {
searcherName: searcher.name,
query: encodeURIComponent(searcher.searchText),
queryType: searcher.searchType
})),
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
"GetSearchResults",
{
searcherName: searcher.name,
query: encodeURIComponent(searcher.searchText),
queryType: searcher.searchType
})),
'Failed to search')
.then(function(searchResults) {
searcher.isSearching = true;
searcher.searchResults = searchResults;
});
}
$scope.toggle = function(provider, propName) {
if (provider[propName] !== undefined) {
provider[propName] = !provider[propName];
}
else {
} else {
provider[propName] = true;
}
}
$scope.rebuildIndex = function(indexer) {
if (confirm("This will cause the index to be rebuilt. " +
"Depending on how much content there is in your site this could take a while. " +
"It is not recommended to rebuild an index during times of high website traffic " +
"or when editors are editing content.")) {
"Depending on how much content there is in your site this could take a while. " +
"It is not recommended to rebuild an index during times of high website traffic " +
"or when editors are editing content.")) {
indexer.isProcessing = true;
indexer.processingAttempts = 0;
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "PostRebuildIndex", { indexerName: indexer.name })),
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
"PostRebuildIndex",
{ indexerName: indexer.name })),
'Failed to rebuild index')
.then(function () {
.then(function() {
//rebuilding has started, nothing is returned accept a 200 status code.
//lets poll to see if it is done.
$timeout(function () {
checkProcessing(indexer, "PostCheckRebuildIndex");
}, 1000);
$timeout(function() {
checkProcessing(indexer, "PostCheckRebuildIndex");
},
1000);
});
}
@@ -88,20 +93,23 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
$scope.optimizeIndex = function(indexer) {
if (confirm("This will cause the index to be optimized which will improve its performance. " +
"It is not recommended to optimize an index during times of high website traffic " +
"or when editors are editing content.")) {
"It is not recommended to optimize an index during times of high website traffic " +
"or when editors are editing content.")) {
indexer.isProcessing = true;
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "PostOptimizeIndex", { indexerName: indexer.name })),
$http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
"PostOptimizeIndex",
{ indexerName: indexer.name })),
'Failed to optimize index')
.then(function () {
.then(function() {
//optimizing has started, nothing is returned accept a 200 status code.
//lets poll to see if it is done.
$timeout(function () {
checkProcessing(indexer, "PostCheckOptimizeIndex");
}, 1000);
$timeout(function() {
checkProcessing(indexer, "PostCheckOptimizeIndex");
},
1000);
});
}
@@ -111,36 +119,34 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
searcher.isSearching = true;
}
//go get the data
//combine two promises and execute when they are both done
$q.all([
//get the indexer details
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetIndexerDetails")),
'Failed to retrieve indexer details')
.then(function(data) {
$scope.indexerDetails = data;
}),
//get the searcher details
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearcherDetails")),
'Failed to retrieve searcher details')
.then(function(data) {
$scope.searcherDetails = data;
for (var s in $scope.searcherDetails) {
$scope.searcherDetails[s].searchType = "text";
}
})
]).then(function () {
//all init loading is complete
$scope.loading = false;
});
//get the indexer details
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetIndexerDetails")),
'Failed to retrieve indexer details')
.then(function(data) {
$scope.indexerDetails = data;
}),
//get the searcher details
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearcherDetails")),
'Failed to retrieve searcher details')
.then(function(data) {
$scope.searcherDetails = data;
for (var s in $scope.searcherDetails) {
$scope.searcherDetails[s].searchType = "text";
}
})
])
.then(function() {
//all init loading is complete
$scope.loading = false;
});
}
angular.module("umbraco").controller("Umbraco.Dashboard.ExamineMgmtController", examineMgmtController);
angular.module("umbraco").controller("Umbraco.Dashboard.ExamineMgmtController", ExamineMgmtController);

130
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.controller.js
View File

@@ -1,8 +1,7 @@
(function () {
(function() {
"use strict";
function HealthCheckController($scope, healthCheckResource) {
var SUCCESS = 0;
var WARNING = 1;
var ERROR = 2;
@@ -11,49 +10,49 @@
var vm = this;
vm.viewState = "list";
vm.groups = [];
vm.groups = [];
vm.selectedGroup = {};
vm.getStatus = getStatus;
vm.executeAction = executeAction;
vm.getStatus = getStatus;
vm.executeAction = executeAction;
vm.checkAllGroups = checkAllGroups;
vm.checkAllInGroup = checkAllInGroup;
vm.checkAllInGroup = checkAllInGroup;
vm.openGroup = openGroup;
vm.setViewState = setViewState;
// Get a (grouped) list of all health checks
healthCheckResource.getAllChecks().then(
function(response) {
vm.groups = response;
}
);
// Get a (grouped) list of all health checks
healthCheckResource.getAllChecks()
.then(function(response) {
vm.groups = response;
});
function setGroupGlobalResultType(group) {
var totalSuccess = 0;
var totalError = 0;
var totalWarning = 0;
var totalInfo = 0;
// count total number of statusses
angular.forEach(group.checks, function(check){
angular.forEach(check.status, function(status){
switch(status.resultType) {
case SUCCESS:
totalSuccess = totalSuccess + 1;
break;
case WARNING:
totalWarning = totalWarning + 1;
break;
case ERROR:
totalError = totalError + 1;
break;
case INFO:
totalInfo = totalInfo + 1;
break;
}
angular.forEach(group.checks,
function(check) {
angular.forEach(check.status,
function(status) {
switch (status.resultType) {
case SUCCESS:
totalSuccess = totalSuccess + 1;
break;
case WARNING:
totalWarning = totalWarning + 1;
break;
case ERROR:
totalError = totalError + 1;
break;
case INFO:
totalInfo = totalInfo + 1;
break;
}
});
});
});
group.totalSuccess = totalSuccess;
group.totalError = totalError;
@@ -62,56 +61,56 @@
}
// Get the status of an individual check
function getStatus(check) {
check.loading = true;
check.status = null;
healthCheckResource.getStatus(check.id).then(function(response) {
check.loading = false;
check.status = response;
});
}
// Get the status of an individual check
function getStatus(check) {
check.loading = true;
check.status = null;
healthCheckResource.getStatus(check.id)
.then(function(response) {
check.loading = false;
check.status = response;
});
}
function executeAction(check, index, action) {
healthCheckResource.executeAction(action).then(function (response) {
check.status[index] = response;
});
}
function executeAction(check, index, action) {
healthCheckResource.executeAction(action)
.then(function(response) {
check.status[index] = response;
});
}
function checkAllGroups(groups) {
// set number of checks which has been executed
for (var i = 0; i < groups.length; i++) {
var group = groups[i];
console.log(group);
checkAllInGroup(group, group.checks);
}
vm.groups = groups;
}
function checkAllInGroup(group, checks) {
function checkAllInGroup(group, checks) {
group.checkCounter = 0;
group.loading = true;
angular.forEach(checks, function(check) {
angular.forEach(checks,
function(check) {
check.loading = true;
check.loading = true;
healthCheckResource.getStatus(check.id).then(function(response) {
check.status = response;
group.checkCounter = group.checkCounter + 1;
check.loading = false;
healthCheckResource.getStatus(check.id)
.then(function(response) {
check.status = response;
group.checkCounter = group.checkCounter + 1;
check.loading = false;
// when all checks are done, set global group result
if (group.checkCounter === checks.length) {
setGroupGlobalResultType(group);
group.loading = false;
}
});
});
}
// when all checks are done, set global group result
if (group.checkCounter === checks.length) {
setGroupGlobalResultType(group);
group.loading = false;
}
});
});
}
function openGroup(group) {
vm.selectedGroup = group;
@@ -121,17 +120,14 @@
function setViewState(state) {
vm.viewState = state;
if(state === 'list') {
if (state === 'list') {
for (var i = 0; i < vm.groups.length; i++) {
var group = vm.groups[i];
setGroupGlobalResultType(group);
}
}
}
}
angular.module("umbraco").controller("Umbraco.Dashboard.HealthCheckController", HealthCheckController);

18
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.controller.js
View File

@@ -1,4 +1,4 @@
function xmlDataIntegrityReportController($scope, umbRequestHelper, $log, $http, $q, $timeout) {
function XmlDataIntegrityReportController($scope, umbRequestHelper, $log, $http) {
function check(item) {
var action = item.check;
@@ -20,12 +20,12 @@ function xmlDataIntegrityReportController($scope, umbRequestHelper, $log, $http,
"or when editors are editing content.")) {
item.fixing = true;
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("xmlDataIntegrityBaseUrl", action)),
'Failed to retrieve data integrity status')
.then(function (result) {
item.fixing = false;
item.invalid = result === "false";
});
$http.post(umbRequestHelper.getApiUrl("xmlDataIntegrityBaseUrl", action)),
'Failed to retrieve data integrity status')
.then(function(result) {
item.fixing = false;
item.invalid = result === "false";
});
}
}
}
@@ -57,6 +57,6 @@ function xmlDataIntegrityReportController($scope, umbRequestHelper, $log, $http,
for (var i in $scope.items) {
check($scope.items[i]);
}
}
angular.module("umbraco").controller("Umbraco.Dashboard.XmlDataIntegrityReportController", xmlDataIntegrityReportController);
angular.module("umbraco").controller("Umbraco.Dashboard.XmlDataIntegrityReportController", XmlDataIntegrityReportController);

2
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.html
View File

@@ -26,6 +26,4 @@
</div>
</div>
</div>