faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-11 01:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display function creation error in UI

Browse Source 
Signed-off-by: Alex Young <alex@heuris.io>
This commit is contained in:
Alex Young 2017-09-20 20:47:24 +01:00 committed by Alex Ellis
parent e69e8eaa3b
commit eed9641254
5 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gateway/assets/index.html
View File

@ -1,13 +1,9 @@
<html ng-app="faasGateway">
<head>
<head>
<link href="https://fonts.googleapis.com/css?family=Rationale|Roboto+Mono|Roboto:300,400,400i,500,700" rel="stylesheet">
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.0/angular-material.min.css">
<!-- Angular Material CSS now available via Google CDN; version 1.0.7 used here -->
<link rel="stylesheet" href="style/angular-material.min.css">
<link rel="stylesheet" href="style/bootstrap.css">
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">

4
gateway/assets/newfunction.html
View File

@ -26,7 +26,9 @@
<input name="network" ng-model="item.network" required md-maxlength="200" minlength="4">
</md-input-container>
</div>
<div class="validation-error" layout-gt-xs="row" layout-align="start end">
<span ng-show="validationError">{{ validationError }}</span>
</div>
</form>
</md-dialog-content>
<md-dialog-actions>

37
gateway/assets/script/bootstrap.js vendored
View File

@ -31,12 +31,12 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
refreshData();
}, 1000);
$scope.showPostInvokedToast = function(val) {
var showPostInvokedToast = function(message, duration) {
$mdToast.show(
$mdToast.simple()
.textContent(val)
.textContent(message)
.position("top right")
.hideDelay(500)
.hideDelay(duration || 500)
);
};
@ -56,17 +56,16 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
.then(function(response) {
if($scope.invocation && $scope.invocation.contentType == "json") {
$scope.invocationResponse = JSON.stringify(response.data, -1, " ");
} else {
$scope.invocationResponse = response.data;
}
$scope.invocationStatus = response.status;
$scope.showPostInvokedToast("Success");
showPostInvokedToast("Success");
}).catch(function(error1) {
$scope.invocationResponse = error1.statusText + "\n" + error1.data;
$scope.invocationStatus = error1.status;
$scope.showPostInvokedToast("Error");
showPostInvokedToast("Error");
});
};
@ -110,7 +109,7 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
}
};
var showDialog=function($event) {
var showDialog = function($event) {
var parentEl = angular.element(document.body);
$mdDialog.show({
parent: parentEl,
@ -134,20 +133,22 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
url: "/system/functions",
data: $scope.item,
method: "POST",
headers: { "Content-Type": "application/json"},
responseType: "json"
headers: { "Content-Type": "application/json" },
responseType: "text"
};
$http(options)
.then(function(response) {
$scope.invocationResponse = response.data;
$scope.invocationStatus = response.status;
}).catch(function(error1) {
$scope.invocationResponse = error1;
$scope.invocationStatus = null;
});
console.log($scope.item);
item.image = "";
item.service = "";
item.envProcess = "";
item.network = "";
$scope.validationError = "";
$scope.closeDialog();
showPostInvokedToast("Function created");
}).catch(function(error1) {
$scope.validationError = error1.data;
});
};
};
@ -178,12 +179,12 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
return $http(options);
}).then(function(){
$scope.showPostInvokedToast("Success");
showPostInvokedToast("Success");
}).catch(function(err) {
if (err) {
// show error toast only if there actually is an err.
// because hitting 'Cancel' also rejects the promise.
$scope.showPostInvokedToast("Error");
showPostInvokedToast("Error");
}
});
};

5
gateway/assets/style/bootstrap.css vendored
View File

@ -49,3 +49,8 @@ md-input-container .md-errors-spacer {
.monospace {
font-family: 'Roboto Mono', monospace;
}
.validation-error {
color: red;
height: 52px;
}