From 424e74ffc3d296b399bf3303bf391fc98fb8e8fe Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Mon, 5 Aug 2024 09:33:16 +0800
Subject: [PATCH] feat: add thirdPartySchemeSelect clearable

---
 src/Services/Masa.Mc.Service/Services/ChannelService.cs   | 8 +-------
 .../Pages/Channels/Modules/ChannelCreateModal.razor       | 2 +-
 .../Pages/Channels/Modules/ChannelEditModal.razor         | 2 +-
 src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/en-US.json         | 2 +-
 src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/zh-CN.json         | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Services/Masa.Mc.Service/Services/ChannelService.cs b/src/Services/Masa.Mc.Service/Services/ChannelService.cs
index 3404d1cf..c7a0488d 100644
--- a/src/Services/Masa.Mc.Service/Services/ChannelService.cs
+++ b/src/Services/Masa.Mc.Service/Services/ChannelService.cs
@@ -21,13 +21,6 @@ public async Task<PaginatedListDto<ChannelDto>> GetListAsync(IEventBus eventbus,
         return query.Result;
     }
 
-    //public async Task<PaginatedListDto<ChannelDto>> GetListAsync([FromServices] IEventBus eventBus, GetChannelInput inputDto)
-    //{
-    //    var query = new GetListChannelQuery(inputDto);
-    //    await eventBus.PublishAsync(query);
-    //    return query.Result;
-    //}
-
     public async Task<ChannelDto> GetAsync(IEventBus eventBus, Guid id)
     {
         var query = new GetChannelQuery(id);
@@ -43,6 +36,7 @@ public async Task CreateAsync(IEventBus eventBus, [FromBody] ChannelUpsertDto in
 
     public async Task UpdateAsync(IEventBus eventBus, Guid id, [FromBody] ChannelUpsertDto inputDto)
     {
+        inputDto.Scheme ??= string.Empty;
         var command = new UpdateChannelCommand(id, inputDto);
         await eventBus.PublishAsync(command);
     }
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelCreateModal.razor b/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelCreateModal.razor
index 222381b2..6bf22998 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelCreateModal.razor
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelCreateModal.razor
@@ -78,7 +78,7 @@
                             <ChannelExtraProperties @ref="_channelExtraPropertiesRef" @bind-Value="_model.ExtraProperties" @bind-Type="_model.Type" PasswordView IsAdd />
                             <MRow Class="row-box">
                                 <MCol Md="6">
-                                    <SThirdPartySchemeSelect @bind-Value="@_model.Scheme" FillBackground="false" Label="@T("DisplayName.Scheme")">
+                                    <SThirdPartySchemeSelect @bind-Value="@_model.Scheme" Clearable FillBackground="false" Label="@T("DisplayName.Scheme")" Tooltip="@T("SchemeTooltip")">
                                     </SThirdPartySchemeSelect>
                                 </MCol>
                                 <MCol Md="6">
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelEditModal.razor b/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelEditModal.razor
index f686d1d1..eeffd675 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelEditModal.razor
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/Channels/Modules/ChannelEditModal.razor
@@ -29,7 +29,7 @@
                 <ChannelExtraProperties @ref="_channelExtraPropertiesRef" @bind-Value="_model.ExtraProperties" @bind-Type="_model.Type" />
                 <MRow Class="row-box">
                     <MCol Md="6">
-                        <SThirdPartySchemeSelect @bind-Value="@_model.Scheme" FillBackground="false" Label="@T("DisplayName.Scheme")">
+                        <SThirdPartySchemeSelect @bind-Value="@_model.Scheme" Clearable FillBackground="false" Label="@T("DisplayName.Scheme")" Tooltip="@T("SchemeTooltip")">
                         </SThirdPartySchemeSelect>
                     </MCol>
                     <MCol Md="6">
diff --git a/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/en-US.json b/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/en-US.json
index a954060d..94f12f93 100644
--- a/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/en-US.json
+++ b/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/en-US.json
@@ -208,7 +208,7 @@
   "CronExpressionNotHasNextRunTime": "Cannot calculate the next run time from this expression",
   "ChannelBlock": {
     "Title": "Channel",
-    "SchemeTooltip": "Select third-party users as the data source for pushing user IDs",
+    "SchemeTooltip": "Select third-party-idp as the data source for pushing user IDs",
     "SchemeFieldTooltip": "Do not use thridPartyIdentity"
   },
   "MessageTaskBlock": {
diff --git a/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/zh-CN.json
index 869acf82..0c07cc5f 100644
--- a/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/zh-CN.json
+++ b/src/Web/Masa.Mc.Web.Admin/wwwroot/i18n/zh-CN.json
@@ -327,7 +327,7 @@
   "CronExpressionNotHasNextRunTime": "您的表达式计算不出下一次运行时间",
   "ChannelBlock": {
     "Title": "渠道",
-    "SchemeTooltip": "选择三方用户作为推送用户标识的数据来源",
+    "SchemeTooltip": "选择三方平台作为推送用户标识的数据来源",
     "SchemeFieldTooltip": "不填使用三方身份标识"
   },
   "MessageTaskBlock": {