refactor: 调整生成数据请求发送方式支持错误处理 #21

BUAANameNotFound · Apr 19, 2020 · 7c44e79 · 7c44e79
1 parent 514a235
commit 7c44e79
Showing 1 changed file with 16 additions and 28 deletions.
diff --git a/src/react/components/pages/datasPage/datasPage.tsx b/src/react/components/pages/datasPage/datasPage.tsx
@@ -324,7 +324,19 @@ export default class DatasPage extends React.Component<IDatasPageProps, IDatasPa
 
     private handleGenerateClick = () => {
         this.setState({dataGenerateLoaded: false, isGenerating: true,});
-        this.getDatasGenerate()
+        const endpointURL = url.resolve(
+            this.props.project.apiUriBase,
+            `/generate/pdf`,
+        );
+
+        const headers = {"Content-Type": "json", "cache-control": "no-cache" };
+        let jsonforsend = "";
+        let response;
+
+        try {
+            this.poll(() =>
+            ServiceHelper.postWithAutoRetry(
+                endpointURL, jsonforsend, { headers }, this.props.project.apiKey as string), 120000, 500)
             .then((result) => {
                 let lastQuantity = this.state.dataQuantity;
                 this.setState({
@@ -361,6 +373,9 @@ export default class DatasPage extends React.Component<IDatasPageProps, IDatasPa
                 });
 
             });
+        } catch (err) {
+            ServiceHelper.handleServiceError(err);
+        }
     }
 
     private handleDownloadClick = () => {
@@ -402,33 +417,6 @@ export default class DatasPage extends React.Component<IDatasPageProps, IDatasPa
 
     }
 
-    private async getDatasGenerate(): Promise<any> {
-
-        const endpointURL = url.resolve(
-            this.props.project.apiUriBase,
-            `/generate/pdf`,
-        );
-
-        const headers = {"Content-Type": "json", "cache-control": "no-cache" };
-        let jsonforsend = "";
-        let response;
-        try {
-            response = await ServiceHelper.postWithAutoRetry(
-                endpointURL, jsonforsend, { headers }, this.props.project.apiKey as string);
-        } catch (err) {
-            ServiceHelper.handleServiceError(err);
-        }
-
-        const operationLocation = response.headers["operation-location"];
-
-        // Make the second REST API call and get the response.
-        return this.poll(() =>
-            ServiceHelper.getWithAutoRetry(
-                operationLocation, { headers }, this.props.project.apiKey as string), 120000, 500);
-
-    }
-
-
     /**
      * Poll function to repeatly check if request succeeded
      * @param func - function that will be called repeatly