Change popup delay time and rename it's "cancel" to "OK" button.

Issue-ID: SDC-3390
Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com>
Change-Id: I158b85212140212a47079a1928c9f0d192fa836c

diff --git a/catalog-ui/configurations/dev.js b/catalog-ui/configurations/dev.js
index 26c98d2..309a63b 100644 (file)
--- a/catalog-ui/configurations/dev.js
+++ b/catalog-ui/configurations/dev.js
@@ -430,7 +430,7 @@ const SDC_CONFIG = {
 
                ]
        },
-       "displayAlertValidationAfterMilisec": 3000
+       "displayAlertValidationAfterMilisec": 10000
 };
 
 module.exports = SDC_CONFIG;

diff --git a/catalog-ui/configurations/prod.js b/catalog-ui/configurations/prod.js
index 028c44c..715b9a9 100644 (file)
--- a/catalog-ui/configurations/prod.js
+++ b/catalog-ui/configurations/prod.js
@@ -430,7 +430,7 @@ const SDC_CONFIG = {
 
                ]
        },
-       "displayAlertValidationAfterMilisec": 3000
+       "displayAlertValidationAfterMilisec": 10000
 };
 
 module.exports = SDC_CONFIG;

diff --git a/catalog-ui/src/app/ng2/components/forms/artifacts-form/artifacts.service.ts b/catalog-ui/src/app/ng2/components/forms/artifacts-form/artifacts.service.ts
index 8c5280d..6a9b328 100644 (file)
--- a/catalog-ui/src/app/ng2/components/forms/artifacts-form/artifacts.service.ts
+++ b/catalog-ui/src/app/ng2/components/forms/artifacts-form/artifacts.service.ts
@@ -58,7 +58,7 @@ export class ArtifactsService {
         const onOkPressed = () => {
             const updatedArtifact = modalInstance.innerModalContent.instance.artifact;
             this.serviceLoader.activate();
-            this.modalAlertservice.openDelayedAlertModal('Please be patient', 'Large files processing may take up to several minutes.', 'Cancel');
+            this.modalAlertservice.openDelayedAlertModal('Please be patient', 'Large files processing may take up to several minutes.', 'OK');
             this.dispatchArtifactAction(componentId, componentType, updatedArtifact, artifactType, instanceId, resourceType)
                 .subscribe().add(() => {
                 this.serviceLoader.deactivate();

diff --git a/openecomp-ui/src/sdc-app/config/config.json b/openecomp-ui/src/sdc-app/config/config.json
index b79adf2..1944b4c 100644 (file)
--- a/openecomp-ui/src/sdc-app/config/config.json
+++ b/openecomp-ui/src/sdc-app/config/config.json
@@ -13,5 +13,5 @@
     "defaultNotificationsWorkerUpdateMillisecond": 10000,
     "showBrowseVNF": true,
     "allTestScenario": "onap-dublin",
-    "displayAlertValidationAfterMilisec": 3000
+    "displayAlertValidationAfterMilisec": 10000
 }

diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
index 4e31332..a067fd4 100644 (file)
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -75,7 +75,7 @@ function getTimingInfoWarning() {
         data: {
             title: 'Please be patient',
             msg: 'Large files processing may take up to several minutes.',
-            cancelButtonText: i18n('Cancel')
+            cancelButtonText: 'OK'
         }
     };
 }