Browse Source

fix(gui-v2): v-model values in webhook form

pull/2838/head
Wing-Kam Wong 2 years ago
parent
commit
d5de4b6980
  1. 23
      packages/nc-gui-v2/components/webhook/Editor.vue

23
packages/nc-gui-v2/components/webhook/Editor.vue

@ -491,30 +491,30 @@ onMounted(() => {
</a-row> </a-row>
<a-row v-if="hook.notification.type === 'URL'" class="mb-5" type="flex" :gutter="[16, 0]"> <a-row v-if="hook.notification.type === 'URL'" class="mb-5" type="flex" :gutter="[16, 0]">
<a-col :span="6"> <a-col :span="6">
<a-select v-model:value="hook.api.method" size="large"> <a-select v-model:value="hook.notification.payload.method" size="large">
<a-select-option v-for="(method, i) in methodList" :key="i" :value="method.title">{{ method.title }}</a-select-option> <a-select-option v-for="(method, i) in methodList" :key="i" :value="method.title">{{ method.title }}</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="18"> <a-col :span="18">
<a-form-item v-bind="validateInfos['notification.api.path']"> <a-form-item v-bind="validateInfos['notification.payload.path']">
<a-input v-model:value="hook.api.path" size="large" placeholder="http://example.com" /> <a-input v-model:value="hook.notification.payload.path" size="large" placeholder="http://example.com" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-tabs v-model:activeKey="urlTabKey" centered> <a-tabs v-model:activeKey="urlTabKey" centered>
<a-tab-pane key="body" tab="Body"> <a-tab-pane key="body" tab="Body">
<!-- TODO: set lang --> <!-- TODO: set lang -->
<MonacoEditor v-model="hook.api.body" class="min-h-60 max-h-80" /> <MonacoEditor v-model="hook.notification.payload.body" class="min-h-60 max-h-80" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="params" tab="Params" force-render> <a-tab-pane key="params" tab="Params" force-render>
<ApiClientParams v-model="hook.api.parameters" /> <ApiClientParams v-model="hook.notification.payload.parameters" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="headers" tab="Headers"> <a-tab-pane key="headers" tab="Headers">
<ApiClientHeaders v-model="hook.api.headers" /> <ApiClientHeaders v-model="hook.notification.payload.headers" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="auth" tab="Auth"> <a-tab-pane key="auth" tab="Auth">
<!-- TODO: set lang --> <!-- TODO: set lang -->
<MonacoEditor v-model="hook.api.auth" class="min-h-60 max-h-80" /> <MonacoEditor v-model="hook.notification.payload.auth" class="min-h-60 max-h-80" />
<span class="text-gray-600 prose-sm"> <span class="text-gray-600 prose-sm">
For more about auth option refer For more about auth option refer
<a class="prose-sm" href="https://github.com/axios/axios#request-config" target="_blank">axios docs</a>. <a class="prose-sm" href="https://github.com/axios/axios#request-config" target="_blank">axios docs</a>.
@ -527,7 +527,7 @@ onMounted(() => {
<a-col :span="24"> <a-col :span="24">
<a-form-item v-bind="validateInfos['notification.channels']"> <a-form-item v-bind="validateInfos['notification.channels']">
<a-auto-complete <a-auto-complete
v-model:value="hook.notification.channels" v-model:value="hook.notification.payload.channels"
size="large" size="large"
:options="slackChannels" :options="slackChannels"
placeholder="Select Slack channels" placeholder="Select Slack channels"
@ -540,7 +540,7 @@ onMounted(() => {
<a-col :span="24"> <a-col :span="24">
<a-form-item v-bind="validateInfos['notification.channels']"> <a-form-item v-bind="validateInfos['notification.channels']">
<a-auto-complete <a-auto-complete
v-model:value="hook.notification.channels" v-model:value="hook.notification.payload.channels"
size="large" size="large"
:options="teamsChannels" :options="teamsChannels"
placeholder="Select Microsoft Teams channels" placeholder="Select Microsoft Teams channels"
@ -553,7 +553,7 @@ onMounted(() => {
<a-col :span="24"> <a-col :span="24">
<a-form-item v-bind="validateInfos['notification.channels']"> <a-form-item v-bind="validateInfos['notification.channels']">
<a-auto-complete <a-auto-complete
v-model:value="hook.notification.channels" v-model:value="hook.notification.payload.channels"
size="large" size="large"
:options="discordChannels" :options="discordChannels"
placeholder="Select Discord channels" placeholder="Select Discord channels"
@ -566,7 +566,7 @@ onMounted(() => {
<a-col :span="24"> <a-col :span="24">
<a-form-item v-bind="validateInfos['notification.channels']"> <a-form-item v-bind="validateInfos['notification.channels']">
<a-auto-complete <a-auto-complete
v-model:value="hook.notification.channels" v-model:value="hook.notification.payload.channels"
size="large" size="large"
:options="mattermostChannels" :options="mattermostChannels"
placeholder="Select Mattermost channels" placeholder="Select Mattermost channels"
@ -636,6 +636,7 @@ onMounted(() => {
filters, filters,
notification: { notification: {
...hook.notification, ...hook.notification,
// FIXME: this should be wrong
payload: notification, payload: notification,
}, },
}" }"

Loading…
Cancel
Save