commit b694d95b5143e63afa03b64287f3046a2951e64a
author sj108s <sj108s@us.att.com> Wed Mar 21 21:25:39 2018 +0530
committer sj108s <sj108s@us.att.com> Thu Mar 22 15:21:26 2018 +0530
tree fd2c0e5203efbbb48c3bce5e92c3624743335933
parent 36e91d5f969f22424509c112e154bdcdffa99521

Fixed couple more defects related to test screen

Fixed poll status button alignment and fixed minore defect in test
screen and updated test cases as per code change

Issue-ID: APPC-713
Change-Id: I530739fda78d6ca05fba4cbfaacef8ead3b7c23d
Signed-off-by: sj108s <sj108s@us.att.com>

src/app/test/test.component.ts

diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts
index a7516ec..2fd8525 100644
--- a/src/app/test/test.component.ts
+++ b/src/app/test/test.component.ts
@@ -17,7 +17,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============LICENSE_END============================================
 */
 
@@ -194,7 +193,7 @@
                 this.showStatusResponseDiv = false;
                 this.errorResponse = '';
                 this.statusResponse = '';
-                this.enableDownload=true;
+                this.enableDownload = true;
                 let arrData = (<AOA>(XLSX.utils.sheet_to_json(ws, { blankrows: false })));
 
 
@@ -210,10 +209,10 @@
                 // Refactor
                 this.payload = this.processUploadedFile(arrData);
                 this.uploadedFileResult();
-              };
+            };
 
             reader.readAsBinaryString(target.files[0]);
-            
+
 
         }
         else {
@@ -236,7 +235,7 @@
         }
     }
 
-processUploadedFile(arrData) {
+    processUploadedFile(arrData) {
         let tempPayload = {};
         for (var i = 0; i < arrData.length; i++) {
             var element = arrData[i];
@@ -252,7 +251,7 @@
 
                 }
             }
-          
+
             if (element['List Name'] === 'payload') {
                 var listName1 = element['List Name_1'];
                 var listName2 = element['List Name_2'];
@@ -280,7 +279,7 @@
         return tempPayload;
     }
 
-      uploadedFileResult() {
+    uploadedFileResult() {
         if (this.action && this.actionIdentifiers['vnf-id']) {
             this.nService.success('Success', 'SpreadSheet uploaded successfully');
         }
@@ -459,23 +458,29 @@
                     }
                     else {
                         this.showStatusResponseDiv = false;
+                        if (this.subscribe && this.subscribe != undefined) {
+                            this.subscribe.unsubscribe();
+                            this.enablePollButton = true;
+                        }
+
                     }
 
-                    
                 },
                 error => {
                     this.statusResponse = null;
                     this.showStatusResponseDiv = false;
                     this.errorResponse = 'Error Connecting to APPC server';
                     this.enableCounterDiv = false;
-                    if (this.subscribe && this.subscribe != undefined) this.subscribe.unsubscribe();
+                    if (this.subscribe && this.subscribe != undefined) {
+                        this.subscribe.unsubscribe();
+                        this.enablePollButton = true;
+                    }
                 });
-
         }
         else {
             this.nService.error("Error", "Please enter vnf Id & request Id");
         }
-        
+
     }
 
     getUrlEndPoint(action) {