You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/10/24 03:05:18 UTC
[incubator-dubbo-ops] branch develop updated: empty check for
serviceID
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new c4b7fbb empty check for serviceID
c4b7fbb is described below
commit c4b7fbb8aa63bd9af05d53ffc99c08cdab482c93
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Wed Oct 24 11:05:05 2018 +0800
empty check for serviceID
---
dubbo-admin-frontend/src/components/governance/AccessControl.vue | 6 +++++-
dubbo-admin-frontend/src/components/governance/LoadBalance.vue | 6 +++++-
dubbo-admin-frontend/src/components/governance/Overrides.vue | 6 +++++-
dubbo-admin-frontend/src/components/governance/RoutingRule.vue | 7 +++++--
dubbo-admin-frontend/src/components/governance/WeightAdjust.vue | 6 +++++-
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
index f8e2c3c..73e5759 100644
--- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
@@ -87,7 +87,7 @@
<v-form ref="modalForm">
<v-text-field label="Service Unique ID"
hint="A service ID in form of service"
- required
+ :rules="[required]"
:readonly="modal.id != null"
v-model="modal.service" />
<v-subheader class="pa-0 mt-3">BLACK/WHITE LIST CONTENT</v-subheader>
@@ -152,6 +152,7 @@ export default {
}
],
accesses: [],
+ required: value => !!value || 'Service Id is required',
modal: {
enable: false,
title: 'Create New',
@@ -219,6 +220,9 @@ export default {
createItem () {
let doc = yaml.load(this.modal.content)
this.filter = ''
+ if (this.modal.service === '' || this.modal.service === null) {
+ return
+ }
AXIOS.post('/rules/access', {
service: this.modal.service,
whitelist: doc.whitelist,
diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index 0f90d30..dc1cd63 100644
--- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -70,7 +70,7 @@
<v-text-field
label="Service Unique ID"
hint="A service ID is service name"
- required
+ :rules="[required]"
v-model="service"
></v-text-field>
<v-subheader class="pa-0 mt-3">RULE CONTENT</v-subheader>
@@ -131,6 +131,7 @@
],
loadBalances: [
],
+ required: value => !!value || 'Service ID is required',
template:
'methodName: sayHello # 0 for all methods\n' +
'strategy: # leastactive, random, roundrobin',
@@ -193,6 +194,9 @@
},
saveItem: function () {
let balancing = yaml.safeLoad(this.ruleText)
+ if (this.service === '') {
+ return
+ }
balancing.service = this.service
if (this.updateId !== '') {
if (this.updateId === 'close') {
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index f8df9dc..b28ef77 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -68,7 +68,7 @@
<v-text-field
label="Service Unique ID"
hint="A service ID is service name"
- required
+ :rules="[required]"
v-model="service"
></v-text-field>
<v-subheader class="pa-0 mt-3">RULE CONTENT</v-subheader>
@@ -125,6 +125,7 @@
operations: operations,
configs: [
],
+ required: value => !!value || 'Service ID is Required.',
template:
'application: # consumer\'s application name, empty for all \n' +
'address: 192.168.0.1 # consumer\'s ip address, empty for all consumers\n' +
@@ -190,6 +191,9 @@
},
saveItem: function () {
let override = yaml.safeLoad(this.ruleText)
+ if (this.service === '') {
+ return
+ }
override.service = this.service
if (this.updateId !== '') {
if (this.updateId === 'close') {
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index 418a96d..c5d7a5e 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -71,13 +71,12 @@
<v-text-field
label="Service Unique ID"
hint="A service ID in form of service:version, version is optional"
- required
+ :rules="[required]"
v-model="service"
></v-text-field>
<v-text-field
label="Application Name"
hint="Application name the service belongs to"
- required
v-model="application"
></v-text-field>
@@ -136,6 +135,7 @@
operations: operations,
routingRules: [
],
+ required: value => !!value || 'Service ID is required',
template:
'enabled: true/false\n' +
'priority:\n' +
@@ -218,6 +218,9 @@
},
saveItem: function () {
let rule = yaml.safeLoad(this.ruleText)
+ if (rule.service === '') {
+ return
+ }
rule.service = this.service
if (this.updateId !== '') {
if (this.updateId === 'close') {
diff --git a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
index 92220fc..6ce6fe6 100644
--- a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
@@ -70,7 +70,7 @@
<v-text-field
label="Service Unique ID"
hint="A service ID is service name"
- required
+ :rules="[required]"
v-model="service"
></v-text-field>
<v-subheader class="pa-0 mt-3">RULE CONTENT</v-subheader>
@@ -132,6 +132,7 @@
],
weights: [
],
+ required: value => !!value || 'Service ID is required',
template:
'weight: 100 # 100 for default\n' +
'provider: # provider\'s ip\n' +
@@ -195,6 +196,9 @@
},
saveItem: function () {
let weight = yaml.safeLoad(this.ruleText)
+ if (this.service === '') {
+ return
+ }
weight.service = this.service
if (this.updateId !== '') {
if (this.updateId === 'close') {