Merge remote-tracking branch 'origin/v1.1' into v1.1

backend/src/main/java/io/metersphere/api/controller/APITestController.java

@@ -95,7 +95,7 @@ public class APITestController {
 
     @PostMapping(value = "/import", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public ApiTest testCaseImport(@RequestPart(value = "file") MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
+    public ApiTest testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request")  ApiTestImportRequest request) {
         return apiTestService.apiTestImport(file, request);
     }
 

backend/src/main/java/io/metersphere/api/service/APITestService.java

@@ -35,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -263,7 +264,7 @@ public class APITestService {
         ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(request.getPlatform());
         ApiImport apiImport = null;
         try {
-            apiImport = apiImportParser.parse(file.getInputStream(), request);
+            apiImport = apiImportParser.parse(file == null ? null : file.getInputStream(), request);
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("parse_data_error"));

backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java

@@ -5,6 +5,7 @@ import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.i18n.Translator;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,6 +35,7 @@ public class ApiTestEnvironmentService {
     }
 
     public void update(ApiTestEnvironmentWithBLOBs apiTestEnvironment) {
+        checkEnvironmentExist(apiTestEnvironment);
         apiTestEnvironmentMapper.updateByPrimaryKeyWithBLOBs(apiTestEnvironment);
     }
 
@@ -47,9 +49,12 @@ public class ApiTestEnvironmentService {
     private void checkEnvironmentExist (ApiTestEnvironmentWithBLOBs environment) {
         if (environment.getName() != null) {
             ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
-            example.createCriteria()
+            ApiTestEnvironmentExample.Criteria criteria = example.createCriteria();
-                    .andNameEqualTo(environment.getName())
+            criteria.andNameEqualTo(environment.getName())
                     .andProjectIdEqualTo(environment.getProjectId());
+            if (StringUtils.isNotBlank(environment.getId())) {
+                criteria.andIdNotEqualTo(environment.getId());
+            }
             if (apiTestEnvironmentMapper.selectByExample(example).size() > 0) {
                 MSException.throwException(Translator.get("api_test_environment_already_exists"));
             }

frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue

@@ -49,13 +49,16 @@
           this.projectId = projectId;
           this.getEnvironments();
         },
-        deleteEnvironment(environment) {
+        deleteEnvironment(environment, index) {
           if (environment.id) {
             this.result = this.$get('/api/environment/delete/' + environment.id, () => {
               this.$success(this.$t('commons.delete_success'));
               this.getEnvironments();
             });
           }
+          else {
+            this.environments.splice(index, 1);
+          }
         },
         copyEnvironment(environment) {
           if (!environment.id) {
@@ -149,4 +152,5 @@
     height: 100%;
     position: absolute;
   }
+
 </style>

frontend/src/business/components/api/test/components/import/ApiImport.vue

@@ -29,7 +29,7 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="(selectedPlatformValue != 'Postman' && useEnvironment) || selectedPlatformValue == 'Swagger2'" :label="$t('api_test.environment.environment_config')" prop="environmentId">
-            <el-select size="small"  v-model="formData.environmentId" class="environment-select" clearable>
+            <el-select v-if="showEnvironmentSelect" size="small"  v-model="formData.environmentId" class="environment-select" clearable>
               <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name + ': ' + environment.protocol + '://' + environment.socket" :value="environment.id"/>
               <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">{{$t('api_test.environment.environment_config')}}</el-button>
               <template v-slot:empty>
@@ -42,11 +42,23 @@
           <el-form-item v-if="selectedPlatformValue == 'Metersphere'" prop="useEnvironment">
             <el-checkbox v-model="useEnvironment">{{$t('api_test.environment.config_environment')}}</el-checkbox>
           </el-form-item>
+
+          <el-form-item :label="'Swagger URL'" prop="wgerUrl" v-if="selectedPlatformValue == 'Swagger2' && swaggerUrlEable">
+            <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit />
+          </el-form-item>
+
+          <el-form-item  v-if="selectedPlatformValue == 'Swagger2'">
+            <el-switch
+              v-model="swaggerUrlEable"
+              :active-text="$t('api_test.api_import.swagger_url_import')">
+            </el-switch>
+          </el-form-item>
         </el-col>
-        <el-col :span="1">
+
+        <el-col :span="1" v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
           <el-divider direction="vertical"/>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
             <el-upload
               class="api-upload"
               drag
@@ -89,6 +101,8 @@
       data() {
         return {
           visible: false,
+          swaggerUrlEable: false,
+          showEnvironmentSelect: true,
           platforms: [
             {
               name: 'Metersphere',
@@ -122,7 +136,8 @@
             name: '',
             environmentId: '',
             projectId: '',
-            file: undefined
+            file: undefined,
+            swaggerUrl: ''
           },
           rules: {
             name: [
@@ -202,7 +217,9 @@
             this.$error(this.$t('api_test.select_project'));
             return;
           }
+          this.showEnvironmentSelect = false;
           this.$refs.environmentConfig.open(this.formData.projectId);
+          this.showEnvironmentSelect = true;
         },
         save() {
           this.$refs.form.validate(valid => {
@@ -211,10 +228,13 @@
               Object.assign(param, this.formData);
               param.platform = this.selectedPlatformValue;
               param.useEnvironment = this.useEnvironment;
-              if (!this.formData.file) {
+              if ((this.selectedPlatformValue != 'Swagger2' || (this.selectedPlatformValue == 'Swagger2' && !this.swaggerUrlEable)) && !this.formData.file) {
                 this.$warning(this.$t('commons.please_upload'));
                 return ;
               }
+              if (!this.swaggerUrlEable) {
+                param.swaggerUrl = undefined;
+              }
               this.result = this.$fileUpload('/api/import', param.file, param,response => {
                 let res = response.data;
                 this.$success(this.$t('test_track.case.import.success'));
@@ -231,7 +251,8 @@
             name: '',
             environmentId: '',
             projectId: '',
-            file: undefined
+            file: undefined,
+            swaggerUrl: ''
           };
           this.fileList = [];
         }
@@ -252,6 +273,7 @@
 
   .api-upload >>> .el-upload {
     width: 100%;
+    max-width: 350px;
   }
 
   .api-upload  >>> .el-upload-dragger {

frontend/src/business/components/common/components/MsAsideItem.vue

@@ -13,7 +13,7 @@
     <div :style="{'height': itemBarHeight + 'px'}" v-for="(item, index) in data" :key="index" class="item-bar" @click="itemSelected(index, item)" :class="{'item-selected' : index == selectIndex}">
       <input class="item-input" :style="{'height': itemBarHeight - 12 + 'px', 'line-height': itemBarHeight - 12 + 'px', 'width': width - 90 + 'px'}" v-model="item.name" :placeholder="$t('commons.input_content')"/>
       <span :style="{'line-height': itemBarHeight - 10 + 'px'}" class="item-right">
-        <i v-for="(operator, index) in itemOperators" :key="index" :class="operator.icon" @click.stop="operator.func(item)"/>
+        <i v-for="(operator, operatorIndex) in itemOperators" :key="operatorIndex" :class="operator.icon" @click.stop="operator.func(item, index)"/>
       </span>
     </div>
   </ms-aside-container>

frontend/src/business/components/settings/system/User.vue

@@ -32,6 +32,7 @@
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="source" :label="$t('user.source')"/>
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
             <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)">

frontend/src/i18n/en-US.js

@@ -224,7 +224,8 @@ export default {
     email_format_is_incorrect: 'Email format is incorrect',
     delete_confirm: 'Are you sure you want to delete this User?',
     apikey_delete_confirm: 'Are you sure you want to delete this API Key?',
-    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)'
+    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)',
+    source: 'Source'
   },
   role: {
     please_choose_role: 'Please Choose Role',
@@ -435,6 +436,7 @@ export default {
       postman_export_tip: "Export the test collection by Postman",
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
       suffixFormatErr: "The file format does not meet the requirements",
+      swagger_url_import: "Import using URL",
     }
   },
   api_report: {

frontend/src/i18n/zh-CN.js

@@ -222,7 +222,8 @@ export default {
     email_format_is_incorrect: '邮箱格式不正确',
     delete_confirm: '这个用户确定要删除吗?',
     apikey_delete_confirm: '这个 API Key 确定要删除吗?',
-    input_id_placeholder: '请输入ID (只支持数字、英文字母)'
+    input_id_placeholder: '请输入ID (只支持数字、英文字母)',
+    source: '用户来源'
   },
   role: {
     please_choose_role: '请选择角色',
@@ -435,6 +436,7 @@ export default {
       post_export_tip: "通过 Postman 导出测试集合",
       swagger_export_tip: "通过 Swagger 页面导出",
       suffixFormatErr: "文件格式不符合要求",
+      swagger_url_import: "使用URL导入",
     }
   },
   api_report: {

frontend/src/i18n/zh-TW.js

@@ -221,7 +221,8 @@ export default {
     email_format_is_incorrect: '郵箱格式不正確',
     delete_confirm: '這個用戶確定要刪除嗎?',
     apikey_delete_confirm: '這個 API Key 確定要刪除嗎?',
-    input_id_placeholder: '請輸入ID (只支持數字、英文字母)'
+    input_id_placeholder: '請輸入ID (只支持數字、英文字母)',
+    source: '用戶來源'
   },
   role: {
     please_choose_role: '請選擇角色',
@@ -434,6 +435,7 @@ export default {
       post_export_tip: "通過 Postman 導出測試集合",
       swagger_export_tip: "通過 Swagger 頁面導出",
       suffixFormatErr: "文件格式不符合要求",
+      swagger_url_import: "使用URL導入",
     }
   },
   api_report: {