From bd07885ffd2624892d41c4ac8ac8d0e379c21ed7 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 13 Apr 2022 17:21:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(webhooks):=20=E5=9C=A8=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=8F=8B=E5=A5=BD?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SendAttemptModal.vue           | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue b/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
index b4f6f8892..1c6393a8c 100644
--- a/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
+++ b/apps/vue/src/views/webhooks/send-attempts/components/SendAttemptModal.vue
@@ -17,7 +17,7 @@
       <Tabs v-model:activeKey="activeKey">
         <TabPane key="basic" :tab="L('BasicInfo')">
           <FormItem :label="L('DisplayName:TenantId')">
-            <Input readonly :value="modelRef.tenantId" />
+            <Input readonly :value="getTenant" />
           </FormItem>
           <FormItem :label="L('DisplayName:CreationTime')">
             <Input readonly :value="getDateTime(modelRef.creationTime)" />
@@ -32,7 +32,7 @@
 
         <TabPane v-if="modelRef.webhookEvent" key="event" :tab="L('WebhookEvent')">
           <FormItem :label="L('DisplayName:TenantId')">
-            <Input readonly :value="modelRef.webhookEvent.tenantId" />
+            <Input readonly :value="getTenant" />
           </FormItem>
           <FormItem :label="L('DisplayName:WebhookEventId')">
             <Input readonly :value="modelRef.webhookEventId" />
@@ -53,7 +53,7 @@
             <Checkbox disabled v-model:checked="subscriptionRef.isActive">{{ L('DisplayName:IsActive') }}</Checkbox>
           </FormItem>
           <FormItem :label="L('DisplayName:TenantId')">
-            <Input readonly :value="subscriptionRef.tenantId" />
+            <Input readonly :value="getTenant" />
           </FormItem>
           <FormItem :label="L('DisplayName:WebhookSubscriptionId')">
             <Input readonly :value="modelRef.webhookSubscriptionId" />
@@ -80,7 +80,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed } from 'vue';
+  import { ref, computed, watch } from 'vue';
   import { useLocalization } from '/@/hooks/abp/useLocalization';
   import {
     Checkbox,
@@ -92,6 +92,7 @@
   } from 'ant-design-vue';
   import { CodeEditor, MODE } from '/@/components/CodeEditor';
   import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { findTenantById } from '/@/api/multi-tenancy/tenants';
   import { getById } from '/@/api/webhooks/send-attempts';
   import { getById as getSubscription } from '/@/api/webhooks/subscriptions';
   import { WebhookSendAttempt } from '/@/api/webhooks/model/sendAttemptsModel';
@@ -106,6 +107,7 @@
   const { L } = useLocalization('WebhooksManagement');
   const formElRef = ref<any>();
   const activeKey = ref('basic');
+  const tenantName = ref('');
   const modelRef = ref<WebhookSendAttempt>(getDefaultModel());
   const subscriptionRef = ref<WebhookSubscription>(getDefaultSubscription());
   const [registerModal] = useModalInner((model) => {
@@ -122,6 +124,22 @@
       return webhooks.reduce((hook, p) => hook + p + '\n', '');
     }
   })
+  const getTenant = computed(() => {
+    return tenantName.value ?? modelRef.value.tenantId;
+  })
+
+  watch(
+    () => modelRef.value.tenantId,
+    (sentTenant) => {
+      if (sentTenant) {
+        findTenantById(sentTenant).then((res) => {
+          if (res.success) {
+            tenantName.value = res.name;
+          }
+        });
+      }
+    }
+  )
 
   function fetchModel(id: string) {
     if (!id) {