Pārlūkot izejas kodu

Merge pull request #13891 from miguelvazq/HPCC-24257

HPCC-24257 Packagemap validation timeout extension

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 gadi atpakaļ
vecāks
revīzija
cf3fd900a3

+ 6 - 3
esp/src/eclwatch/PackageMapValidateContentWidget.js

@@ -188,13 +188,16 @@ define([
                 alert(this.i18n.PackageContentNotSet);
                 return;
             }
-            var request = { Target: this.targetSelectControl.getValue() };
-            request['content'] = content;
 
             var context = this;
             this.resultControl.setText(this.i18n.Validating);
             this.validateButton.set("disabled", true);
-            WsPackageMaps.validatePackage(request).then(function (response) {
+            WsPackageMaps.validatePackage({
+                request: {
+                    Target: context.targetSelectControl.getValue(),
+                    Info: content
+                }
+            }).then(function (response) {
                 if (lang.exists("ValidatePackageResponse", response)) {
                     var responseText = context.validateResponseToText(response.ValidatePackageResponse);
                     if (responseText === '') {

+ 6 - 5
esp/src/eclwatch/PackageMapValidateWidget.js

@@ -199,14 +199,15 @@ define([
                 alert(this.i18n.PackageContentNotSet);
                 return;
             }
-            var request = {
-                Target: this.targetSelectControl.getValue()
-            };
-            request['content'] = content;
 
             this.resultControl.setText(this.i18n.Validating);
             this.validateButton.set("disabled", true);
-            WsPackageMaps.validatePackage(request).then(function (response) {
+            WsPackageMaps.validatePackage({
+                request: {
+                    Target: context.targetSelectControl.getValue(),
+                    Info: content
+                }
+            }).then(function (response) {
                 if (lang.exists("ValidatePackageResponse", response)) {
                     var responseText = context.validateResponseToText(response.ValidatePackageResponse);
                     if (responseText === '') {

+ 18 - 13
esp/src/src/WsPackageMaps.ts

@@ -96,19 +96,24 @@ export function listProcessFilters(callback) {
 }
 
 export function validatePackage(params) {
-    const request = { Target: params.Target };
-    if (params.packageMap)
-        request["PMID"] = params.packageMap;
-    if (params.process)
-        request["Process"] = params.process;
-    if (params.content)
-        request["Info"] = params.content;
-    if (params.active)
-        request["Active"] = params.active;
-
-    return ESPRequest.send("WsPackageProcess", "ValidatePackage", {
-        request
-    });
+    const request = { Target: params.request.Target };
+    if (params.request) {
+        params.request.timeOutSeconds = 300;
+    }
+    if (params.request.packageMap) {
+        request["PMID"] = params.request.packageMap;
+    }
+    if (params.request.process) {
+        request["Process"] = params.request.process;
+    }
+    if (params.request.content) {
+        request["Info"] = params.request.content;
+    }
+    if (params.request.active) {
+        request["Active"] = params.request.active;
+    }
+
+    return ESPRequest.send("WsPackageProcess", "ValidatePackage", params);
 }
 
 export function activatePackageMap(params) {