From 2dc19812d109de2e055cc40c3034c756a232e9e7 Mon Sep 17 00:00:00 2001
From: yumiguan <41277086+yumiguan@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:36:34 +0800
Subject: [PATCH] bugfix/frontend-width-overflow (#29)

* Fix frontend width overflow; Add error log when load base failure

* add pytest
---
 .github/workflows/unittest.yml                  |  4 +++-
 frontend/src/App.vue                            |  2 +-
 frontend/src/components/apiList.vue             |  5 ++---
 frontend/src/components/banner.vue              |  8 +++-----
 .../handlers/base_source_handler.py             | 17 +++++++++++++----
 lyrebird_api_coverage/version.py                |  2 +-
 requirements.txt                                |  3 +--
 setup.py                                        | 10 ++++++++--
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 755ab397..6181f32c 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -18,4 +18,6 @@ jobs:
         pip install -r requirements.txt
         pip install .
     - name: Unit Test
-      run: pytest
+      run: |
+        cd tests
+        python -m pytest .
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 7945915b..e14b369a 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -65,6 +65,6 @@ export default {
 
 <style scoped>
 #app {
-  min-width: 1500px;
+  min-width: 1390px;
 }
 </style>
diff --git a/frontend/src/components/apiList.vue b/frontend/src/components/apiList.vue
index 8ec43f07..c760b61d 100644
--- a/frontend/src/components/apiList.vue
+++ b/frontend/src/components/apiList.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="tab" class="box box-solid">
-    <div class="box-body" style="height:80vh; overflow:auto">
-      <i-table height="1000" stripe :columns="columns" :data="showedAPIData" ></i-table>
+    <div class="box-body" style="max-height:calc(100vh - 100px); overflow:auto">
+      <i-table stripe :columns="columns" :data="showedAPIData" ></i-table>
       <Modal
         v-model="isApiDetailModalShow"
         title="Flow Detail"
@@ -134,7 +134,6 @@ export default {
 
 <style  scoped>
 #tab {
-  background-color: pink;
   width: 100%;
   height: 100%;
   margin-top: 30px;
diff --git a/frontend/src/components/banner.vue b/frontend/src/components/banner.vue
index 21fefdd7..b375ed27 100644
--- a/frontend/src/components/banner.vue
+++ b/frontend/src/components/banner.vue
@@ -1,6 +1,6 @@
 <template>
   <Row>
-    <i-col span="18" class="colLeft">
+    <i-col span="24" class="colLeft">
       <Button
         class="btn"
         :size="buttonSize"
@@ -77,8 +77,6 @@
           </div>
         </form>
       </modal>
-    </i-col>
-    <i-col span="6" class="colRight">
       <Input
         class="searchInput"
         v-model="targetContext"
@@ -318,9 +316,9 @@ export default {
 .colLeft .btn {
   margin: 10px 5px 10px 5px;
 }
-.colRight .searchInput {
+.colLeft .searchInput {
   margin: 10px 5px 10px 5px;
   width: 300px;
-  min-width: 350px;
+  float: right;
 }
 </style>
diff --git a/lyrebird_api_coverage/handlers/base_source_handler.py b/lyrebird_api_coverage/handlers/base_source_handler.py
index d19962db..ce976171 100644
--- a/lyrebird_api_coverage/handlers/base_source_handler.py
+++ b/lyrebird_api_coverage/handlers/base_source_handler.py
@@ -2,6 +2,7 @@
 
 import lyrebird
 from lyrebird.mock import context
+from lyrebird.log import get_logger
 
 from lyrebird_api_coverage.client.context import app_context
 from lyrebird_api_coverage.client.jsonscheme import check_schema, check_url_redundant
@@ -17,6 +18,8 @@
 # 默认base 文件
 DEFAULT_BASE = os.path.join(PLUGINS_CONF_DIR, 'base.json')
 
+logger = get_logger()
+
 '''
 Base 处理器
 '''
@@ -31,9 +34,10 @@ def get_base_source(self):
             json_obj = context.make_fail_response('暂无默认文件,需手动导入base文件')
         # 检查不为空的base文件是否符合标准,符合标准check_base返回0
         else:
-            if self.check_base(json_obj):
+            error_response = self.check_base(json_obj)
+            if error_response:
                 # 遇到异常就返回
-                return self.check_base(json_obj)
+                return error_response
         return json_obj
 
     '''
@@ -46,6 +50,12 @@ def check_base(self, obj):
             # 检查url是否有重复项存在
             redundant_items = check_url_redundant(obj)
             if redundant_items:
+                redundant_items_str = '\n'.join(redundant_items)
+                logger.error(
+                    f'API-Coverage import API file error: Duplicated API\n'
+                    f'{len(redundant_items)} duplicated API:\n'
+                    f'{redundant_items_str}\n'
+                )
                 resp = context.make_fail_response('导入API有重复项' + str(redundant_items))
                 lyrebird.publish('api_coverage', 'error', name='import_base')
                 return resp
@@ -57,7 +67,6 @@ def check_base(self, obj):
             app_context.version_code = obj.get('version_code')
             return
         except Exception as e:
-            resp = context.make_fail_response(
-                '导入文件有误:' + '\n' + e.__getattribute__('message') + '\n' + '！请重新import base')
+            resp = context.make_fail_response(f'导入文件有误: {e}\n请重新import base')
 
         return resp
diff --git a/lyrebird_api_coverage/version.py b/lyrebird_api_coverage/version.py
index 162e6fff..a6106e84 100644
--- a/lyrebird_api_coverage/version.py
+++ b/lyrebird_api_coverage/version.py
@@ -1,2 +1,2 @@
-IVERSION = (0, 3, 0)
+IVERSION = (0, 3, 1)
 VERSION = ".".join(str(i) for i in IVERSION)
diff --git a/requirements.txt b/requirements.txt
index 52113799..aefbcb6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-lyrebird
-jsonschema
\ No newline at end of file
+-e .[dev]
diff --git a/setup.py b/setup.py
index aa7d1429..2ab22317 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,12 @@
     install_requires=[
         'lyrebird',
         'jsonschema'
-    ]
-
+    ],
+    extras_require={
+        'dev': [
+            "autopep8",
+            "pylint",
+            "pytest"
+        ]
+    }
 )