fix: test restore from history error

Postcatlab · Feb 9, 2023 · 7a2f05d · 7a2f05d
1 parent 3cfbeb5
commit 7a2f05d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/...kbench/browser/src/app/pages/workspace/project/api/env/env-select/env-select.component.ts b/...kbench/browser/src/app/pages/workspace/project/api/env/env-select/env-select.component.ts
@@ -23,6 +23,7 @@ import { ApiStoreService } from '../../service/store/api-state.service';
         nz-popover
         nzPopoverOverlayClassName="background-popover preview-env"
         [nzPopoverContent]="envParams"
+        (nzTooltipVisibleChange)="onVisibleChange($event)"
         nzTooltipPlacement="left"
         nzPopoverPlacement="bottomRight"
         nzPopoverTrigger="click"
@@ -100,10 +101,14 @@ export class EnvSelectComponent implements OnInit {
     private effect: ApiEffectService,
     private testUtils: ApiTestUtilService
   ) {}
+  onVisibleChange($event) {
+    if ($event) {
+      this.gloablParams = this.getGlobalParams();
+    }
+  }
   ngOnInit() {
     makeObservable(this);
     this.effect.updateEnvList();
-    this.gloablParams = this.getGlobalParams();
 
     autorun(() => {
       this.renderEnvList = this.store.getEnvList.map(it => ({ label: it.name, value: it.id }));

diff --git a/src/workbench/browser/src/app/pages/workspace/project/api/http/test/api-test.component.ts b/src/workbench/browser/src/app/pages/workspace/project/api/http/test/api-test.component.ts
@@ -14,6 +14,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { LanguageService } from 'eo/workbench/browser/src/app/core/services/language/language.service';
 import { TabViewComponent } from 'eo/workbench/browser/src/app/modules/eo-ui/tab/tab.model';
+import { ApiEditUtilService } from 'eo/workbench/browser/src/app/pages/workspace/project/api/http/edit/api-edit-util.service';
 import {
   BEFORE_DATA,
   AFTER_DATA,
@@ -136,7 +137,8 @@ export class ApiTestComponent implements OnInit, AfterViewInit, OnDestroy, TabVi
     private testServer: TestServerService,
     private projectApi: ProjectApiService,
     private lang: LanguageService,
-    private elementRef: ElementRef
+    private elementRef: ElementRef,
+    private apiEdit: ApiEditUtilService
   ) {
     this.initBasicForm();
     this.testServer.init(message => {
@@ -387,7 +389,7 @@ export class ApiTestComponent implements OnInit, AfterViewInit, OnDestroy, TabVi
     //Add test history
     this.apiTest.addHistory({
       apiUuid: this.model.request.apiUuid || '-1',
-      request: this.model.request,
+      request: this.apiEdit.formatUIApiDataToStorage(this.model.request),
       response: message.response
     });
   }

diff --git a/src/workbench/browser/src/app/pages/workspace/project/api/service/api-test-util.service.ts b/src/workbench/browser/src/app/pages/workspace/project/api/service/api-test-util.service.ts
@@ -137,7 +137,7 @@ export class ApiTestUtilService {
       if (!(val.isRequired && val.name)) {
         return acc;
       }
-      return { ...acc, [val.name]: val.paramAttr?.example || '' };
+      return { ...acc, [val.name]: val['paramAttr.example'] || val.paramAttr?.example || '' };
     }, {});
     Object.keys(restByName).forEach(restName => {
       try {
@@ -189,6 +189,10 @@ export class ApiTestUtilService {
         });
         break;
       }
+      case ApiBodyType.Raw: {
+        binaryRawData = result.requestParams.bodyParams?.[0]?.binaryRawData;
+        break;
+      }
       case ApiBodyType.Binary: {
         binaryRawData = '';
         break;

diff --git a/...ch/browser/src/app/pages/workspace/project/api/service/test-server/test-server.service.ts b/...ch/browser/src/app/pages/workspace/project/api/service/test-server/test-server.service.ts
@@ -47,7 +47,7 @@ export abstract class TestServerService implements TestServer {
               //@ts-ignore
               files: val.files?.map(file => file.content),
               paramType: val.dataType === ApiParamsType.file ? '1' : '0',
-              paramInfo: val.paramAttr?.example
+              paramInfo: val['paramAttr.example'] || val.paramAttr?.example
             }));
         }
       }