Merge branch 'feat/global-plugin-add-tab' of https://github.com/Morak…

…es/apisix-dashboard into feat/global-plugin-add-tab
apache · Aug 15, 2022 · 261579f · 261579f
2 parents 353328a + 3316c41
commit 261579f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js b/web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js
@@ -111,8 +111,6 @@ context('Delete Plugin List with the Drawer', () => {
     cy.contains('button', 'Confirm').click({
       force: true,
     });
-    cy.get(selector.notification).should('contain', 'Delete Plugin Successfully');
-    cy.get(selector.notificationCloseIcon).click({ multiple: true });
     cy.get(selector.empty).should('be.visible');
   });
 

diff --git a/web/src/locales/en-US/component.ts b/web/src/locales/en-US/component.ts
@@ -53,7 +53,7 @@ export default {
   'component.global.notification.success.message.deleteSuccess': 'Deleted Successfully',
   'component.global.create.consumer.success': 'Create Consumer Successfully',
   'component.global.delete.consumer.success': 'Delete Consumer Successfully',
-  'component.global.delete.routes.success':'Delete Route Successfully',
+  'component.global.delete.routes.success': 'Delete Route Successfully',
   'component.global.edit.consumer.success': 'Edit Consumer Successfully',
 
   'component.global.steps.stepTitle.basicInformation': 'Basic Information',

diff --git a/web/src/locales/tr-TR/component.ts b/web/src/locales/tr-TR/component.ts
@@ -53,7 +53,7 @@ export default {
   'component.global.notification.success.message.deleteSuccess': 'Başarıyla silindi',
   'component.global.create.consumer.success': 'Başarıyla oluşturuldu',
   'component.global.delete.consumer.success': 'Başarıyla silindi',
-  'component.global.delete.routes.success':'Sil Yöneltmeler Başarılı',
+  'component.global.delete.routes.success': 'Sil Yöneltmeler Başarılı',
   'component.global.edit.consumer.success': 'Başarıyla güncellendi',
 
   'component.global.steps.stepTitle.basicInformation': 'Temel Bilgiler',
@@ -73,9 +73,9 @@ export default {
   'component.global.name': 'Ad',
   'component.global.id': 'ID',
   'component.global.updateTime': 'Zamanı Güncelle',
-  'component.global.form.itemExtraMessage.nameGloballyUnique': 'İsim global olarak benzersiz olmalıdır',
-  'component.global.input.placeholder.description':
-    'Açıklama girin, max 256 karakter',
+  'component.global.form.itemExtraMessage.nameGloballyUnique':
+    'İsim global olarak benzersiz olmalıdır',
+  'component.global.input.placeholder.description': 'Açıklama girin, max 256 karakter',
   // User component
   'component.user.loginByPassword': 'Kullanıcı adı ve şifre',
   'component.user.login': 'Giriş',

diff --git a/web/src/locales/zh-CN/component.ts b/web/src/locales/zh-CN/component.ts
@@ -60,7 +60,7 @@ export default {
   'component.global.updateTime': '更新时间',
   'component.global.create.consumer.success': '创建消费者成功',
   'component.global.delete.consumer.success': '删除消费者成功',
-  'component.global.delete.routes.success':'删除路由成功',
+  'component.global.delete.routes.success': '删除路由成功',
   'component.global.edit.consumer.success': '配置消费者成功',
 
   'component.global.popconfirm.title.delete': '确定删除该条记录吗？',

diff --git a/web/src/pages/Route/List.tsx b/web/src/pages/Route/List.tsx
@@ -549,24 +549,26 @@ const Page: React.FC = () => {
         tableAlertRender={() => (
           <Space size={24}>
             <span>
-            {formatMessage({ id: 'page.route.chosen' })} {selectedRowKeys.length} {formatMessage({ id: 'page.route.item' })}
+              {formatMessage({ id: 'page.route.chosen' })} {selectedRowKeys.length}{' '}
+              {formatMessage({ id: 'page.route.item' })}
             </span>
           </Space>
         )}
         tableAlertOptionRender={() => {
           return (
             <Space size={16}>
               <Button
-               onClick={async () => {
-               await remove(selectedRowKeys).then(() => {
-                handleTableActionSuccessResponse(
-                  `${formatMessage({ id: 'component.global.delete.routes.success' })}`,
-                );
-               });
-               ref.current?.reloadAndRest?.();
-             }}>
-             {formatMessage({ id: 'page.route.batchDeletion' })}
-             </Button>
+                onClick={async () => {
+                  await remove(selectedRowKeys).then(() => {
+                    handleTableActionSuccessResponse(
+                      `${formatMessage({ id: 'component.global.delete.routes.success' })}`,
+                    );
+                  });
+                  ref.current?.reloadAndRest?.();
+                }}
+              >
+                {formatMessage({ id: 'page.route.batchDeletion' })}
+              </Button>
             </Space>
           );
         }}

diff --git a/web/src/pages/Route/locales/en-US.ts b/web/src/pages/Route/locales/en-US.ts
@@ -46,7 +46,7 @@ export default {
   'page.route.batchDeletion': 'BatchDeletion Routes',
   'page.route.unSelect': 'Unselect',
   'page.route.item': 'items',
-  'page.route.chosen':'chosen',
+  'page.route.chosen': 'chosen',
 
   'page.route.input.placeholder.parameterNameHttpHeader': 'Request header name, for example: HOST',
   'page.route.input.placeholder.parameterNameRequestParameter': 'Parameter name, for example: id',

diff --git a/web/src/pages/Route/locales/tr-TR.ts b/web/src/pages/Route/locales/tr-TR.ts
@@ -46,7 +46,7 @@ export default {
   'page.route.batchDeletion': 'Toplu yolu sil',
   'page.route.unSelect': 'Seçilme',
   'page.route.item': 'term',
-  'page.route.chosen':'Seçili',
+  'page.route.chosen': 'Seçili',
 
   'page.route.input.placeholder.parameterNameHttpHeader': 'Request header adı örn :HOST',
   'page.route.input.placeholder.parameterNameRequestParameter': 'Parameter adı örn :userId',

diff --git a/web/src/pages/Route/locales/zh-CN.ts b/web/src/pages/Route/locales/zh-CN.ts
@@ -54,7 +54,7 @@ export default {
   'page.route.batchDeletion': '批量删除路由',
   'page.route.unSelect': '取消选择',
   'page.route.item': '项',
-  'page.route.chosen':'已选择',
+  'page.route.chosen': '已选择',
 
   // button
   'page.route.button.returnList': '返回路由列表',