merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 145 insertions, 38 deletions

diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
index f9d4d0661..317c046ff 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json
@@ -3,6 +3,7 @@
     "id": 8,
     "created": 1525075968000,
     "modified": 1525075971000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -11,32 +12,36 @@
     "jobId": "5c2cd8e5-27d0-42e3-85a1-85db5eaba459",
     "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e",
     "userId": "16807000",
+    "aLaCarte": false,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c",
     "jobStatus": "FAILED",
     "statusModifiedDate": 1525075968000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-    "owningEntityName": "MetroPacketCore",
-    "project": "DFW",
+    "owningEntityName": "WayneHolland",
+    "project": "WATKINS",
     "aicZoneId": "NFT1",
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
-    "tenantName": "AIN Web Tool-15-D-testgamma",
-    "regionId": "mtn6",
+    "tenantName": "AIN Web Tool-15-D-testalexandria",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": "nWUfl instance name_002",
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "action-data",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1525075968000
+    "createdBulkDate": 1525075968000,
+    "isRetryEnabled": true
   },
   {
     "id": 7,
     "created": 1525075968000,
     "modified": 1525075971000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -45,32 +50,36 @@
     "jobId": "13063a83-924e-4500-a3a1-e53d1b58450b",
     "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e",
     "userId": "16807000",
+    "aLaCarte": false,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9d",
     "jobStatus": "IN_PROGRESS",
     "statusModifiedDate": 1525075968000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-    "owningEntityName": "MetroPacketCore",
-    "project": "DFW",
+    "owningEntityName": "WayneHolland",
+    "project": "WATKINS",
     "aicZoneId": "NFT1",
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
-    "tenantName": "AIN Web Tool-15-D-testgamma",
-    "regionId": "mtn6",
+    "tenantName": "AIN Web Tool-15-D-testalexandria",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": "nWUfl instance name_001",
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "action-data",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1525075968000
+    "createdBulkDate": 1525075968000,
+    "isRetryEnabled": false
   },
   {
     "id": 6,
     "created": 1525007432000,
     "modified": 1525007434000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -79,6 +88,8 @@
     "jobId": "e1db03c3-6274-4ff7-84cf-7bd3a3946de7",
     "templateId": "cad41760-8653-4c5a-a5fd-8ee34780ae69",
     "userId": "16807000",
+    "aLaCarte": false,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d8e",
     "jobStatus": "FAILED",
     "statusModifiedDate": 1525007432000,
     "hidden": false,
@@ -99,12 +110,14 @@
     "serviceModelId": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb",
     "serviceModelName": "AIM_TRANSPORT_00004",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1525007432000
+    "createdBulkDate": 1525007432000,
+    "isRetryEnabled": false
   },
   {
     "id": 5,
     "created": 1524995555000,
     "modified": 1524995556000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -113,32 +126,36 @@
     "jobId": "9f88fdb5-bb47-4bf3-8c5f-98f1ad0ec87c",
     "templateId": "ce4ec177-cfc8-483e-8a2c-b7aea53fd740",
     "userId": "16807000",
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d91",
+    "requestId": null,
     "jobStatus": "FAILED",
     "statusModifiedDate": 1524995555000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "aaa1",
     "owningEntityName": "aaa1",
-    "project": "DFW",
+    "project": "WATKINS",
     "aicZoneId": "BAN1",
     "aicZoneName": "VSDKYUTP-BAN1",
     "tenantId": "1178612d2b394be4834ad77f567c0af2",
     "tenantName": "AIN Web Tool-15-D-SSPtestcustome",
-    "regionId": "mtn6",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": null,
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "ComplexService",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1524995555000
+    "createdBulkDate": 1524995555000,
+    "isRetryEnabled": false
   },
   {
     "id": 4,
     "created": 1524994349000,
     "modified": 1524994350000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -147,32 +164,36 @@
     "jobId": "b73b1543-fa12-4ad5-8ef5-49f02eb33698",
     "templateId": "79af00c6-4712-432a-8989-b6419c8baa40",
     "userId": "16807000",
+    "aLaCarte": true,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d94",
     "jobStatus": "FAILED",
     "statusModifiedDate": 1524994349000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "aaa1",
     "owningEntityName": "aaa1",
-    "project": "DFW",
+    "project": "WATKINS",
     "aicZoneId": null,
     "aicZoneName": null,
     "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
     "tenantName": "AIN Web Tool-15-D-STTest2",
-    "regionId": "mtn6",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": null,
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "ComplexService",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1524994349000
+    "createdBulkDate": 1524994349000,
+    "isRetryEnabled": false
   },
   {
     "id": 3,
     "created": 1524991828000,
     "modified": 1524991830000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -181,32 +202,36 @@
     "jobId": "725ef127-4ee5-4665-bdf1-55ee342b362f",
     "templateId": "6bd53c0d-8742-43f6-9ed2-efbb87062779",
     "userId": "16807000",
+    "aLaCarte": true,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d96",
     "jobStatus": "FAILED",
     "statusModifiedDate": 1524991828000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "aaa1",
     "owningEntityName": "aaa1",
-    "project": "DFW",
+    "project": "WATKINS",
     "aicZoneId": "NFT1",
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
     "tenantName": "USP-SIP-IC-24335-T-01",
-    "regionId": "AAIAIC25",
+    "regionId": "JANET25",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": null,
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "ComplexService",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1524991828000
+    "createdBulkDate": 1524991828000,
+    "isRetryEnabled": false
   },
   {
     "id": 2,
     "created": 1524663233000,
     "modified": 1524663236000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -215,32 +240,36 @@
     "jobId": "b1ff271b-829a-43f9-a2e3-23987a34f261",
     "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9",
     "userId": "16807000",
+    "aLaCarte": true,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d98",
     "jobStatus": "FAILED",
     "statusModifiedDate": 1524663233000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-    "owningEntityName": "MetroPacketCore",
-    "project": "DFW",
+    "owningEntityName": "WayneHolland",
+    "project": "WATKINS",
     "aicZoneId": "NFT1",
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
-    "tenantName": "AIN Web Tool-15-D-testgamma",
-    "regionId": "mtn6",
+    "tenantName": "AIN Web Tool-15-D-testalexandria",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": "sPenLiZXXpqzsVck instance name_02",
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "action-data",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1524663233000
+    "createdBulkDate": 1524663233000,
+    "isRetryEnabled": true
   },
   {
     "id": 1,
     "created": 1524663233000,
     "modified": 1524663236000,
+    "action": "INSTANTIATE",
     "createdId": null,
     "modifiedId": null,
     "rowNum": null,
@@ -249,26 +278,104 @@
     "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339ca",
     "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9",
     "userId": "16807000",
+    "aLaCarte": true,
+    "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45",
     "jobStatus": "IN_PROGRESS",
     "statusModifiedDate": 1524663233000,
     "hidden": false,
     "pause": false,
     "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-    "owningEntityName": "MetroPacketCore",
-    "project": "DFW",
+    "owningEntityName": "WayneHolland",
+    "project": "WATKINS",
     "aicZoneId": "NFT1",
     "aicZoneName": "NFTJSSSS-NFT1",
     "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
-    "tenantName": "AIN Web Tool-15-D-testgamma",
-    "regionId": "mtn6",
+    "tenantName": "AIN Web Tool-15-D-testalexandria",
+    "regionId": "hvf6",
     "regionName": null,
-    "serviceType": "VIRTUAL USP",
+    "serviceType": "TYLER SILVIA",
     "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
     "serviceInstanceId": null,
     "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01",
     "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
     "serviceModelName": "action-data",
     "serviceModelVersion": "1.0",
-    "createdBulkDate": 1524663233000
-  }
+    "createdBulkDate": 1524663233000,
+    "isRetryEnabled": false
+  },
+  {
+  "id": 9,
+  "created": 1524663233000,
+  "modified": 1524663236000,
+  "action": "DELETE",
+  "createdId": null,
+  "modifiedId": null,
+  "rowNum": null,
+  "auditUserId": null,
+  "auditTrail": null,
+  "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339c2",
+  "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9",
+  "userId": "16807000",
+  "aLaCarte": true,
+  "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45",
+  "jobStatus": "IN_PROGRESS",
+  "statusModifiedDate": 1524663233000,
+  "hidden": false,
+  "pause": false,
+  "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+  "owningEntityName": "WayneHolland",
+  "project": "WATKINS",
+  "aicZoneId": "NFT1",
+  "aicZoneName": "NFTJSSSS-NFT1",
+  "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+  "tenantName": "AIN Web Tool-15-D-testalexandria",
+  "regionId": "hvf6",
+  "regionName": null,
+  "serviceType": "TYLER SILVIA",
+  "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "serviceInstanceId": null,
+  "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01",
+  "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+  "serviceModelName": "action-data",
+  "serviceModelVersion": "1.0",
+  "createdBulkDate": 1524663233000,
+  "isRetryEnabled": false
+},
+  {
+  "id": 10,
+  "created": 1524663233000,
+  "modified": 1524663236000,
+  "action": "UPDATE",
+  "createdId": null,
+  "modifiedId": null,
+  "rowNum": null,
+  "auditUserId": null,
+  "auditTrail": null,
+  "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339c1",
+  "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9",
+  "userId": "16807000",
+  "aLaCarte": true,
+  "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45",
+  "jobStatus": "COMPLETED",
+  "statusModifiedDate": 1524663233000,
+  "hidden": false,
+  "pause": false,
+  "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+  "owningEntityName": "WayneHolland",
+  "project": "WATKINS",
+  "aicZoneId": "NFT1",
+  "aicZoneName": "NFTJSSSS-NFT1",
+  "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+  "tenantName": "AIN Web Tool-15-D-testalexandria",
+  "regionId": "hvf6",
+  "regionName": null,
+  "serviceType": "TYLER SILVIA",
+  "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "serviceInstanceId": null,
+  "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01",
+  "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+  "serviceModelName": "action-data",
+  "serviceModelVersion": "1.0",
+  "createdBulkDate": 1524663233000
+}
 ]