mirror of https://github.com/rancher/dashboard.git
Resolving receiver issues
- Edit as yaml on a created resource wasn't calling the yamlSaveOverride - Erroneously set required_tls default for webhooks - camel cased a field that wasn't supposed to be
This commit is contained in:
parent
c3b8fbec3a
commit
9cb1c7d878
|
|
@ -279,6 +279,7 @@ export default {
|
||||||
:offer-preview="isEdit"
|
:offer-preview="isEdit"
|
||||||
:done-route="doneRoute"
|
:done-route="doneRoute"
|
||||||
:done-override="resource.doneOverride"
|
:done-override="resource.doneOverride"
|
||||||
|
:save-override="resource.yamlSaveOverride"
|
||||||
:errors="errors"
|
:errors="errors"
|
||||||
@apply-hooks="$emit('apply-hooks', $event)"
|
@apply-hooks="$emit('apply-hooks', $event)"
|
||||||
@error="e=>$emit('error', e)"
|
@error="e=>$emit('error', e)"
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,7 @@ export default {
|
||||||
mixins: [CreateEditView],
|
mixins: [CreateEditView],
|
||||||
asyncData(ctx) {
|
asyncData(ctx) {
|
||||||
function yamlSave(value, originalValue) {
|
function yamlSave(value, originalValue) {
|
||||||
Object.assign(originalValue, value);
|
originalValue.yamlSaveOverride(value, originalValue);
|
||||||
originalValue.save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return defaultAsyncData(ctx, null, {
|
return defaultAsyncData(ctx, null, {
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ export default {
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<LabeledInput v-model="value.smartHost" :mode="mode" label="Host" placeholder="e.g. 192.168.1.121:587" />
|
<LabeledInput v-model="value.smarthost" :mode="mode" label="Host" placeholder="e.g. 192.168.1.121:587" />
|
||||||
</div>
|
</div>
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<Checkbox v-model="value.require_tls" :mode="mode" class="mt-20" label="Use TLS" />
|
<Checkbox v-model="value.require_tls" :mode="mode" class="mt-20" label="Use TLS" />
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
this.$set(this.value, 'http_config', this.value.http_config || {});
|
this.$set(this.value, 'http_config', this.value.http_config || {});
|
||||||
this.$set(this.value, 'send_resolved', this.value.send_resolved || false);
|
this.$set(this.value, 'send_resolved', this.value.send_resolved || false);
|
||||||
this.$set(this.value, 'require_tls', this.value.require_tls || false);
|
|
||||||
|
|
||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -109,5 +109,12 @@ export default {
|
||||||
|
|
||||||
updateReceivers() {
|
updateReceivers() {
|
||||||
return fn => updateConfig(this.$dispatch, 'receivers', this.type, fn);
|
return fn => updateConfig(this.$dispatch, 'receivers', this.type, fn);
|
||||||
|
},
|
||||||
|
|
||||||
|
yamlSaveOverride() {
|
||||||
|
return (value, originalValue) => {
|
||||||
|
Object.assign(originalValue, value);
|
||||||
|
originalValue.save();
|
||||||
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue