mirror of
https://github.com/openfaas/faas.git
synced 2025-06-08 16:26:47 +00:00
Display function creation error in UI
Signed-off-by: Alex Young <alex@heuris.io>
This commit is contained in:
Alex Young
Alex Ellis
parent
e69e8eaa3b
commit
eed9641254
@ -71,7 +71,7 @@ services:
|
||||
|
||||
# Pass a username as an argument to find how many images user has pushed to Docker Hub.
|
||||
hubstats:
|
||||
image: functions/hubstats:latest
|
||||
image: functions/hubstats:latest
|
||||
labels:
|
||||
function: "true"
|
||||
depends_on:
|
||||
|
||||
@ -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">
|
||||
@ -115,13 +111,13 @@
|
||||
<md-card-title-text>
|
||||
|
||||
<span class="md-headline">
|
||||
Invoke function
|
||||
</span>
|
||||
Invoke function
|
||||
</span>
|
||||
<div layout-gt-sm="row">
|
||||
<md-input-container class="md-block" flex-gt-sm>
|
||||
<button ng-click="fireRequest()" class="md-raised md-button md-ink-ripple" type="button">
|
||||
<span class="ng-scope">Invoke</span><div class="md-ripple-container"></div>
|
||||
</button>
|
||||
<span class="ng-scope">Invoke</span><div class="md-ripple-container"></div>
|
||||
</button>
|
||||
</md-input-container>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,40 +1,42 @@
|
||||
<md-dialog aria-label="List dialog" layout="column" flex="70">
|
||||
<md-dialog aria-label="List dialog" layout="column" flex="70">
|
||||
<md-dialog-content class="md-padding">
|
||||
<label>Define a function:</label>
|
||||
<form name="userForm">
|
||||
<div layout-gt-xs="row">
|
||||
<md-input-container class="md-block" flex-gt-sm>
|
||||
<label>Image:</label>
|
||||
<input name="dockerImage" ng-model="item.image" required md-maxlength="200" minlength="4">
|
||||
<label>Image:</label>
|
||||
<input name="dockerImage" ng-model="item.image" required md-maxlength="200" minlength="4">
|
||||
</md-input-container>
|
||||
</div>
|
||||
<div layout-gt-xs="row">
|
||||
<md-input-container class="md-block" flex-gt-sm>
|
||||
<label>Service name:</label>
|
||||
<input name="serviceName" ng-model="item.service" required md-maxlength="200" minlength="4">
|
||||
<label>Service name:</label>
|
||||
<input name="serviceName" ng-model="item.service" required md-maxlength="200" minlength="4">
|
||||
</md-input-container>
|
||||
</div>
|
||||
<div layout-gt-xs="row">
|
||||
<md-input-container class="md-block" flex-gt-sm>
|
||||
<label>fProcess:</label>
|
||||
<input name="envProcess" ng-model="item.envProcess" required md-maxlength="200" minlength="1">
|
||||
<label>fProcess:</label>
|
||||
<input name="envProcess" ng-model="item.envProcess" required md-maxlength="200" minlength="1">
|
||||
</md-input-container>
|
||||
</div>
|
||||
<div layout-gt-xs="row">
|
||||
<md-input-container class="md-block" flex-gt-sm>
|
||||
<label>Network:</label>
|
||||
<input name="network" ng-model="item.network" required md-maxlength="200" minlength="4">
|
||||
<label>Network:</label>
|
||||
<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>
|
||||
<md-button ng-click="closeDialog()" class="md-secondary">
|
||||
Close Dialog
|
||||
</md-button>
|
||||
<md-button ng-click="createFunc()" class="md-primary">
|
||||
Create
|
||||
</md-button>
|
||||
</md-dialog-actions>
|
||||
</md-dialog-content>
|
||||
<md-dialog-actions>
|
||||
<md-button ng-click="closeDialog()" class="md-secondary">
|
||||
Close Dialog
|
||||
</md-button>
|
||||
<md-button ng-click="createFunc()" class="md-primary">
|
||||
Create
|
||||
</md-button>
|
||||
</md-dialog-actions>
|
||||
</md-dialog>
|
||||
|
||||
57
gateway/assets/script/bootstrap.js
vendored
57
gateway/assets/script/bootstrap.js
vendored
@ -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.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,17 +109,17 @@ app.controller("home", ['$scope', '$log', '$http', '$location', '$timeout', '$md
|
||||
}
|
||||
};
|
||||
|
||||
var showDialog=function($event) {
|
||||
var parentEl = angular.element(document.body);
|
||||
$mdDialog.show({
|
||||
parent: parentEl,
|
||||
targetEvent: $event,
|
||||
templateUrl: "newfunction.html",
|
||||
locals: {
|
||||
item: $scope.functionTemplate
|
||||
},
|
||||
controller: DialogController
|
||||
});
|
||||
var showDialog = function($event) {
|
||||
var parentEl = angular.element(document.body);
|
||||
$mdDialog.show({
|
||||
parent: parentEl,
|
||||
targetEvent: $event,
|
||||
templateUrl: "newfunction.html",
|
||||
locals: {
|
||||
item: $scope.functionTemplate
|
||||
},
|
||||
controller: DialogController
|
||||
});
|
||||
};
|
||||
|
||||
var DialogController = function($scope, $mdDialog, item) {
|
||||
@ -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;
|
||||
item.image = "";
|
||||
item.service = "";
|
||||
item.envProcess = "";
|
||||
item.network = "";
|
||||
$scope.validationError = "";
|
||||
$scope.closeDialog();
|
||||
showPostInvokedToast("Function created");
|
||||
}).catch(function(error1) {
|
||||
$scope.invocationResponse = error1;
|
||||
$scope.invocationStatus = null;
|
||||
$scope.validationError = error1.data;
|
||||
});
|
||||
console.log($scope.item);
|
||||
$scope.closeDialog();
|
||||
};
|
||||
};
|
||||
|
||||
@ -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
5
gateway/assets/style/bootstrap.css
vendored
@ -49,3 +49,8 @@ md-input-container .md-errors-spacer {
|
||||
.monospace {
|
||||
font-family: 'Roboto Mono', monospace;
|
||||
}
|
||||
|
||||
.validation-error {
|
||||
color: red;
|
||||
height: 52px;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user