re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 385 insertions, 255 deletions

diff --git a/catalog-ui/configurations/menu.js b/catalog-ui/configurations/menu.js
index 99cb2f7da0..71eed11448 100644
--- a/catalog-ui/configurations/menu.js
+++ b/catalog-ui/configurations/menu.js
@@ -1,209 +1,319 @@
 const SDC_MENU_CONFIG = {
-    "roles":{
-        "ADMIN":{
+    "roles": {
+        "ADMIN": {
             "title": "Admin's Workspace",
-            "pages":[],
-            "states":{
-                "NOT_CERTIFIED_CHECKOUT":{
-                    "ANY":[
-                        {"text":"Submit for Testing","action":"changeLifecycleState", "url":"lifecycleState/certificationRequest" , "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
-                    ]
-                },
-                "NOT_CERTIFIED_CHECKIN": {
-                    "ANY": [
-                        {"text": "Submit for Testing", "action": "changeLifecycleState", "url": "lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
-                    ]
-                },
-                "READY_FOR_CERTIFICATION": {
-                    "ANY":[
-                    ]
-                },
-                "CERTIFICATION_IN_PROGRESS":{
-                    "ANY":[
-                    ]
-                },
-                "CERTIFIED":{
-                    "ANY":[
-                    ]
-                }
-            }
         },
-        "DESIGNER":{
+        "DESIGNER": {
             "title": "Designer's Workspace",
-            "pages":[],
             "dashboard": {
                 "showCreateNew": true
             },
-            "changeLifecycleStateButtons":{
-                "NOT_CERTIFIED_CHECKOUT":{  "submitForTesting": {"text":"Submit for Testing", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"},
-                                            "checkIn":          {"text":"Check in",  "url":"lifecycleState/CHECKIN", "confirmationModal": "lifecycleState/CHECKIN"},
-                                            "deleteVersion":    {"text":"Delete Version", "url":"lifecycleState/UNDOCHECKOUT", "alertModal": "lifecycleState/UNDOCHECKOUT"}
-                },
-                "CERTIFIED":{               "checkOut":         {"text":"Check Out",  "url":"lifecycleState/CHECKOUT"}
+            "changeLifecycleStateButtons": {
+                "NOT_CERTIFIED_CHECKOUT": {
+                    "RESOURCE": {
+                        "certify": {
+                            "text": "Certify",
+                            "url": "lifecycleState/certify",
+                            "confirmationModal": "lifecycleState/certify"
+                        },
+                        "checkIn": {
+                            "text": "Check in",
+                            "url": "lifecycleState/CHECKIN",
+                            "confirmationModal": "lifecycleState/CHECKIN"
+                        },
+                        "deleteVersion": {
+                            "text": "Delete Version",
+                            "url": "lifecycleState/UNDOCHECKOUT",
+                            "alertModal": "lifecycleState/UNDOCHECKOUT"
+                        }
+                    },
+                    "SERVICE": {
+                        "submitForTesting": {
+                            "text": "Submit for Testing",
+                            "url": "lifecycleState/certificationRequest",
+                            "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+                        },
+                        "checkIn": {
+                            "text": "Check in",
+                            "url": "lifecycleState/CHECKIN",
+                            "confirmationModal": "lifecycleState/CHECKIN"
+                        },
+                        "deleteVersion": {
+                            "text": "Delete Version",
+                            "url": "lifecycleState/UNDOCHECKOUT",
+                            "alertModal": "lifecycleState/UNDOCHECKOUT"
+                        }
+                    }
+
                 },
-                "NOT_CERTIFIED_CHECKIN":{   "submitForTesting": {"text":"Submit for Testing", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"},
-                                            "checkOut":         {"text":"Check Out",  "url":"lifecycleState/CHECKOUT"}
-                }
-            },
-            "states":{
-                "NOT_CERTIFIED_CHECKOUT":{
-                    "ANY":[
-                        {"text":"Submit for Testing","action":"changeLifecycleState", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
-                    ]
+                "CERTIFIED": {
+                    "RESOURCE": {
+                        "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
+                    },
+                    "SERVICE": {
+                        "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
+                    }
                 },
                 "NOT_CERTIFIED_CHECKIN": {
-                    "ANY": [
-                        {"text": "Submit for Testing", "action": "changeLifecycleState", "url": "lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
-                    ]
-                },
-                "READY_FOR_CERTIFICATION": {
-                    "ANY":[
-                    ]
-                },
-                "CERTIFICATION_IN_PROGRESS":{
-                    "ANY":[
-                    ]
-                },
-                "CERTIFIED":{
-                    "ANY":[
-                    ]
+                    "RESOURCE": {
+                        "certify": {
+                            "text": "Certify",
+                            "url": "lifecycleState/certify",
+                            "confirmationModal": "lifecycleState/certify"
+                        },
+                        "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
+                    },
+                    "SERVICE": {
+                        "submitForTesting": {
+                            "text": "Submit for Testing",
+                            "url": "lifecycleState/certificationRequest",
+                            "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+                        },
+                        "checkOut": {"text": "Check Out", "url": "lifecycleState/CHECKOUT"}
+                    }
                 }
             },
-            "folder":[
-                {"text": "Active Projects",     "groupname": "IN_PROGRESS" },
-                {"text": "Check Out",         "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKOUT"},
-                {"text": "Check In",          "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKIN"},
-                {"text": "Followed Projects",   "groupname": "FOLLOWING" },
-                {"text": "Ready For Testing",   "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
+            "folder": [
+                {"text": "Active Projects", "groupname": "IN_PROGRESS"},
+                {"text": "Check Out", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKOUT"},
+                {"text": "Check In", "group": "IN_PROGRESS", "state": "NOT_CERTIFIED_CHECKIN"},
+                {"text": "Followed Projects", "groupname": "FOLLOWING"},
+                {"text": "Ready For Testing", "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
                 {"text": "In Testing", "group": "FOLLOWING", "state": "CERTIFICATION_IN_PROGRESS"},
-                {"text": "Certified",           "group": "FOLLOWING", "state": "CERTIFIED"}
+                {"text": "Certified", "group": "FOLLOWING", "state": "CERTIFIED"}
             ]
 
         },
-        "TESTER":{
+        "TESTER": {
             "title": "Tester's Workspace",
-            "pages":[],
             "dashboard": {
                 "showCreateNew": false
             },
-            "changeLifecycleStateButtons":{
-                "READY_FOR_CERTIFICATION":{     "startTesting": {"text":"Start Testing",  "url":"lifecycleState/startCertification"}
-
-                },
-                "CERTIFICATION_IN_PROGRESS":{   "accept":       {"text":"Accept", "url":"lifecycleState/certify", "confirmationModal": "lifecycleState/certify"},
-                                                "reject":       {"text":"Reject", "url":"lifecycleState/failCertification", "confirmationModal": "lifecycleState/failCertification"},
-                                                "cancel":       {"text":"Cancel","action":"changeLifecycleState", "url":"lifecycleState/cancelCertification", "confirmationModal": "lifecycleState/cancel"}
-                }
-            },
-            "states": {
-                "READY_FOR_CERTIFICATION":{
-                    "ANY":[
-                        {"text":"Start Testing","action":"changeLifecycleState", "url":"lifecycleState/startCertification"}
-                    ]
+            "changeLifecycleStateButtons": {
+                "READY_FOR_CERTIFICATION": {
+                    "RESOURCE":{},
+                    "SERVICE":{
+                        "startTesting": {"text": "Start Testing", "url": "lifecycleState/startCertification"}
+                    }
                 },
-                "CERTIFICATION_IN_PROGRESS":{
-                    "ANY":[
-                        {"text":"Accept","action":"changeLifecycleState", "url":"lifecycleState/certify", "confirmationModal": "lifecycleState/certify"},
-                        {"text":"Reject","action":"changeLifecycleState", "url":"lifecycleState/failCertification", "confirmationModal": "lifecycleState/failCertification"},
-                        {"text":"Cancel","action":"changeLifecycleState", "url":"lifecycleState/cancelCertification", "confirmationModal": "lifecycleState/cancel" }
-                    ]
+                "CERTIFICATION_IN_PROGRESS": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "accept": {
+                            "text": "Accept",
+                            "url": "lifecycleState/certify",
+                            "confirmationModal": "lifecycleState/certify"
+                        },
+                        "reject": {
+                            "text": "Reject",
+                            "url": "lifecycleState/failCertification",
+                            "confirmationModal": "lifecycleState/failCertification"
+                        },
+                        "cancel": {
+                            "text": "Cancel",
+                            "action": "changeLifecycleState",
+                            "url": "lifecycleState/cancelCertification",
+                            "confirmationModal": "lifecycleState/cancel"
+                        }
+                    }
                 }
             },
-            "folder":[
-                {"text": "Active Projects",     "groupname": "FOLLOWING" },
-                {"text": "Ready For Testing",   "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
+            "folder": [
+                {"text": "Active Projects", "groupname": "FOLLOWING"},
+                {"text": "Ready For Testing", "group": "FOLLOWING", "state": "READY_FOR_CERTIFICATION"},
                 {"text": "In Testing", "group": "FOLLOWING", "state": "CERTIFICATION_IN_PROGRESS"}
             ]
         },
-        "OPS":{
+        "OPS": {
             "title": "Operations Workspace",
-            "pages":[],
             "dashboard": {
                 "showCreateNew": false
             },
-            "changeLifecycleStateButtons":{
-                "DISTRIBUTION_APPROVED":{   "distribute":   {"text":"Distribute",  "url":"distribution/PROD/activate", "conformanceLevelModal": { "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject" }},
-                                            "monitor":      {"text":"Monitor", "disabled":true}
+            "changeLifecycleStateButtons": {
+                "DISTRIBUTION_APPROVED": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "distribute": {
+                            "text": "Distribute",
+                            "url": "distribution/PROD/activate",
+                            "conformanceLevelModal": {
+                                "url": "distribution-state/reject",
+                                "confirmationModal": "distribution-state/reject"
+                            }
+                        },
+                        "monitor": {"text": "Monitor", "disabled": true}
+                    }
                 },
-                "DISTRIBUTED":{             "redistribute": {"text":"Redistribute", "url":"distribution/PROD/activate", "conformanceLevelModal": { "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject" }},
-                                            "monitor":      {"text":"Monitor", "url":"distribution-state/monitor"}
+                "DISTRIBUTED": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "redistribute": {
+                            "text": "Redistribute",
+                            "url": "distribution/PROD/activate",
+                            "conformanceLevelModal": {
+                                "url": "distribution-state/reject",
+                                "confirmationModal": "distribution-state/reject"
+                            }
+                        },
+                        "monitor": {"text": "Monitor", "url": "distribution-state/monitor"}
+                    }
                 }
             },
-            "states": {
-                "CERTIFIED": {
-                    "DISTRIBUTION_APPROVED": [
-                        {"text": "Distribute","action":"changeLifecycleState", "url":"distribution/PROD/activate"}
-                    ],
-                    "DISTRIBUTED": [
-                        {"text": "Monitor","action":"openDistributionModal", "url":"distribution-state/monitor"},
-                        {"text": "Redistribute","action":"changeLifecycleState", "url":"distribution/PROD/activate"}
-                    ]
-                }
-            },
-            "folder":[
-                {"text": "Active Projects",         "groupname": "FOLLOWING" },
-                {"text": "Waiting For Distribution",  "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTION_APPROVED"},
-                {"text": "Distributed",    "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTED"}
+            "folder": [
+                {"text": "Active Projects", "groupname": "FOLLOWING"},
+                {
+                    "text": "Waiting For Distribution",
+                    "group": "FOLLOWING",
+                    "state": "CERTIFIED",
+                    "dist": "DISTRIBUTION_APPROVED"
+                },
+                {"text": "Distributed", "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTED"}
             ]
         },
-        "GOVERNOR":{
+        "GOVERNOR": {
             "title": "Governance Rep's Workspace",
-            "pages":[],
             "dashboard": {
                 "showCreateNew": false
             },
-            "changeLifecycleStateButtons":{
-                "DISTRIBUTION_NOT_APPROVED":{   "approve":  {"text":"Approve", "url":"distribution-state/approve", "confirmationModal": "distribution-state/approve", "conformanceLevelModal": { "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject" }},
-                                                "reject":   {"text":"Reject", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
+            "changeLifecycleStateButtons": {
+                "DISTRIBUTION_NOT_APPROVED": {
+                "RESOURCE":{},
+                "SERVICE": {                   
+                        "approve": {
+                            "text": "Approve",
+                            "url": "distribution-state/approve",
+                            "confirmationModal": "distribution-state/approve",
+                            "conformanceLevelModal": {
+                                "url": "distribution-state/reject",
+                                "confirmationModal": "distribution-state/reject"
+                            }
+                        },
+                        "reject": {
+                            "text": "Reject",
+                            "url": "distribution-state/reject",
+                            "confirmationModal": "distribution-state/reject"
+                        }
+                    }
                 },
-                "DISTRIBUTION_APPROVED":{       "reject":   {"text":"Reject", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
+                "DISTRIBUTION_APPROVED": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "reject": {
+                            "text": "Reject",
+                            "url": "distribution-state/reject",
+                            "confirmationModal": "distribution-state/reject"
+                        }
+                    }
                 },
-                "DISTRIBUTED": {                "reject":   {"text":"Reject", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
+                "DISTRIBUTED": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "reject": {
+                            "text": "Reject",
+                            "url": "distribution-state/reject",
+                            "confirmationModal": "distribution-state/reject"
+                        }
+                    }
                 },
-                "DISTRIBUTION_REJECTED": {      "approve":  {"text": "Approve", "url": "distribution-state/approve", "confirmationModal": "distribution-state/approve", "conformanceLevelModal": { "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject" }}
+                "DISTRIBUTION_REJECTED": {
+                    "RESOURCE":{},
+                    "SERVICE": {
+                        "approve": {
+                            "text": "Approve",
+                            "url": "distribution-state/approve",
+                            "confirmationModal": "distribution-state/approve",
+                            "conformanceLevelModal": {
+                                "url": "distribution-state/reject",
+                                "confirmationModal": "distribution-state/reject"
+                            }
+                        }
+                    }
                 }
             },
-            "states": {
-                "CERTIFIED": {
-                    "DISTRIBUTION_NOT_APPROVED": [
-                        {"text":"Approve","action":"changeLifecycleState", "url":"distribution-state/approve", "confirmationModal": "distribution-state/approve"},
-                        {"text":"Reject","action":"changeLifecycleState", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
-                    ],
-                    "DISTRIBUTION_APPROVED": [
-                        {"text":"Reject","action":"changeLifecycleState", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
-                    ],
-                    "DISTRIBUTED": [
-                        {"text":"Reject","action":"changeLifecycleState", "url":"distribution-state/reject", "confirmationModal": "distribution-state/reject"}
-                    ],
-                    "DISTRIBUTION_REJECTED": [
-                        {"text":"Approve","action":"changeLifecycleState", "url":"distribution-state/approve", "confirmationModal": "distribution-state/approve"}
-                    ]
+            "folder": [
+                {"text": "Active Projects", "groupname": "FOLLOWING"},
+                {
+                    "text": "Waiting For Approval",
+                    "group": "FOLLOWING",
+                    "state": "CERTIFIED",
+                    "dist": "DISTRIBUTION_NOT_APPROVED"
+                },
+                {
+                    "text": "Distribution Rejected",
+                    "group": "FOLLOWING",
+                    "state": "CERTIFIED",
+                    "dist": "DISTRIBUTION_REJECTED"
+                },
+                {
+                    "text": "Distribution Approved",
+                    "group": "FOLLOWING",
+                    "state": "CERTIFIED",
+                    "dist": "DISTRIBUTION_APPROVED,DISTRIBUTED"
                 }
-            },
-            "folder":[
-                {"text": "Active Projects",  "groupname": "FOLLOWING" },
-                {"text": "Waiting For Approval",  "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTION_NOT_APPROVED"},
-                {"text": "Distribution Rejected", "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTION_REJECTED"},
-                {"text": "Distribution Approved", "group": "FOLLOWING", "state": "CERTIFIED", "dist": "DISTRIBUTION_APPROVED,DISTRIBUTED"}
 
             ]
         }
     },
     "confirmationMessages": {
-        "lifecycleState/CHECKIN": {"showComment":true, "title": "Check in confirmation", "message": "Please add comment and confirm the check in."},
-        "lifecycleState/CHECKOUT": {"showComment":true, "title": "Check out confirmation", "message": "Please add comment and confirm the check out."},
-        "lifecycleState/certify": {"showComment":true, "title": "Certification confirmation", "message": "Please add comment and confirm test results."},
-        "lifecycleState/cancel": {"showComment":true, "title": "Cancel test", "message": "Please add comment and cancel test."},
-        "lifecycleState/failCertification": {"showComment":true, "title": "Rejection confirmation", "message": "Please add comment and confirm test results."},
-        "lifecycleState/CERTIFICATIONREQUEST": {"showComment":true, "title": "Submit for testing", "message": "Please add comment and submit for testing."},
-        "distribution-state/approve": {"showComment":true, "title": "Distribution confirmation", "message": "Please add comment and confirm %1 approval for distribution."},
-        "distribution-state/reject": {"showComment":true, "title": "Rejection confirmation", "message": "Please add comment and confirm %1 rejection for distribution."},
-        "updateTemplate": {"showComment":false, "title": "Update Template Confirmation", "message": "Modifying the Template might cause losing of previous information"}
+        "lifecycleState/CHECKIN": {
+            "showComment": true,
+            "title": "Check in confirmation",
+            "message": "Please add comment and confirm the check in."
+        },
+        "lifecycleState/CHECKOUT": {
+            "showComment": true,
+            "title": "Check out confirmation",
+            "message": "Please add comment and confirm the check out."
+        },
+        "lifecycleState/certify": {
+            "showComment": true,
+            "title": "Certification confirmation",
+            "message": "Please add comment and confirm test results."
+        },
+        "lifecycleState/cancel": {
+            "showComment": true,
+            "title": "Cancel test",
+            "message": "Please add comment and cancel test."
+        },
+        "lifecycleState/failCertification": {
+            "showComment": true,
+            "title": "Rejection confirmation",
+            "message": "Please add comment and confirm test results."
+        },
+        "lifecycleState/CERTIFICATIONREQUEST": {
+            "showComment": true,
+            "title": "Submit for testing",
+            "message": "Please add comment and submit for testing."
+        },
+        "distribution-state/approve": {
+            "showComment": true,
+            "title": "Distribution confirmation",
+            "message": "Please add comment and confirm %1 approval for distribution."
+        },
+        "distribution-state/reject": {
+            "showComment": true,
+            "title": "Rejection confirmation",
+            "message": "Please add comment and confirm %1 rejection for distribution."
+        },
+        "updateTemplate": {
+            "showComment": false,
+            "title": "Update Template Confirmation",
+            "message": "Modifying the Template might cause losing of previous information"
+        }
     },
     "alertMessages": {
-        "lifecycleState/UNDOCHECKOUT": {"title": "Delete Version Confirmation", "message": "Are you sure you want to delete this version?"},
-        "exitWithoutSaving": {"title": "Exit Without Saving Confirmation", "message": "All unsaved changes will be lost. Are you sure you want to exit this page?"},
-        "upgradeInstance": {"title": "Switch Versions", "message": "Switching versions will erase service paths: %1. Are you sure you want to proceed?"},
+        "lifecycleState/UNDOCHECKOUT": {
+            "title": "Delete Version Confirmation",
+            "message": "Are you sure you want to delete this version?"
+        },
+        "exitWithoutSaving": {
+            "title": "Exit Without Saving Confirmation",
+            "message": "All unsaved changes will be lost. Are you sure you want to exit this page?"
+        },
+        "upgradeInstance": {
+            "title": "Switch Versions",
+            "message": "Switching versions will erase service paths: %1. Are you sure you want to proceed?"
+        },
         "deleteInstance": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"},
         "deleteInput": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"}
     },
@@ -238,136 +348,156 @@ const SDC_MENU_CONFIG = {
         "Network L4": "Network Layer 4+",
         "VoIP Call Control": "Application Layer 4+"
     },
-    "catalogMenuItem":{
-        "DESIGNER":{
-            "states":{
-                "NOT_CERTIFIED_CHECKOUT":{
-                    "ANY":[
-                        {"text":"Submit for Testing","action":"changeLifecycleState", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
+    "catalogMenuItem": {
+        "DESIGNER": {
+            "states": {
+                "NOT_CERTIFIED_CHECKOUT": {
+                    "ANY": [
+                        {
+                            "text": "Submit for Testing",
+                            "action": "changeLifecycleState",
+                            "url": "lifecycleState/certificationRequest",
+                            "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+                        }
                     ],
-                    "NOT_OWNER":[
-                    ]
+                    "NOT_OWNER": []
                 },
                 "NOT_CERTIFIED_CHECKIN": {
                     "ANY": [
-                        {"text": "Submit for Testing", "action": "changeLifecycleState", "url": "lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"}
+                        {
+                            "text": "Submit for Testing",
+                            "action": "changeLifecycleState",
+                            "url": "lifecycleState/certificationRequest",
+                            "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+                        }
                     ]
                 },
                 "READY_FOR_CERTIFICATION": {
-                    "ANY":[
-                    ]
+                    "ANY": []
                 },
-                "CERTIFICATION_IN_PROGRESS":{
-                    "ANY":[
-                    ]
+                "CERTIFICATION_IN_PROGRESS": {
+                    "ANY": []
                 },
-                "CERTIFIED":{
-                    "ANY":[
-                    ]
+                "CERTIFIED": {
+                    "ANY": []
                 }
 
             }
         },
-        "OTHER":{
-            "states":{
-                "ANY":{
-                    "ANY":[
-                    ]
+        "OTHER": {
+            "states": {
+                "ANY": {
+                    "ANY": []
                 }
             }
         }
     },
-    "LifeCycleStatuses":{
-        "NOT_CERTIFIED_CHECKOUT":    { "text":"In Design Check Out", "icon": "checkout-editable-status-icon"},
-        "NOT_CERTIFIED_CHECKIN" :    { "text":"In Design Check In", "icon": "checkin-status-icon "},
-        "READY_FOR_CERTIFICATION":   { "text":"Ready for testing"},
-        "CERTIFICATION_IN_PROGRESS": { "text":"In Testing"},
-        "CERTIFIED":                 { "text":"Certified", "icon": "checkin-status-icon "}
+    "LifeCycleStatuses": {
+        "NOT_CERTIFIED_CHECKOUT": {"text": "In Design Check Out", "icon": "checkout-editable-status-icon"},
+        "NOT_CERTIFIED_CHECKIN": {"text": "In Design Check In", "icon": "checkin-status-icon "},
+        "READY_FOR_CERTIFICATION": {"text": "Ready for testing"},
+        "CERTIFICATION_IN_PROGRESS": {"text": "In Testing"},
+        "CERTIFIED": {"text": "Certified", "icon": "checkin-status-icon "}
     },
-    "DistributionStatuses":{
-        "DISTRIBUTION_NOT_APPROVED": { "text":"Waiting For Distribution"},
-        "DISTRIBUTION_APPROVED" :    { "text":"Distribution Approved"},
-        "DISTRIBUTION_REJECTED":     { "text":"Distribution Rejected"},
-        "DISTRIBUTED":               { "text":"Distributed"}
+    "DistributionStatuses": {
+        "DISTRIBUTION_NOT_APPROVED": {"text": "Waiting For Distribution"},
+        "DISTRIBUTION_APPROVED": {"text": "Distribution Approved"},
+        "DISTRIBUTION_REJECTED": {"text": "Distribution Rejected"},
+        "DISTRIBUTED": {"text": "Distributed"}
     },
-    "canvas_buttons":{
-        "checkIn":          {"text":"Check in","action":"changeLifecycleState", "url":"lifecycleState/CHECKIN", "confirmationModal": "lifecycleState/CHECKIN"},
-        "submitForTesting": {"text":"Submit for Testing","action":"changeLifecycleState", "url":"lifecycleState/certificationRequest", "emailModal": "lifecycleState/CERTIFICATIONREQUEST"},
-        "deleteVersion":    {"text":"Delete Version", "action":"changeLifecycleState", "url":"lifecycleState/UNDOCHECKOUT", "alertModal": "lifecycleState/UNDOCHECKOUT"}
+    "canvas_buttons": {
+        "checkIn": {
+            "text": "Check in",
+            "action": "changeLifecycleState",
+            "url": "lifecycleState/CHECKIN",
+            "confirmationModal": "lifecycleState/CHECKIN"
+        },
+        "submitForTesting": {
+            "text": "Submit for Testing",
+            "action": "changeLifecycleState",
+            "url": "lifecycleState/certificationRequest",
+            "emailModal": "lifecycleState/CERTIFICATIONREQUEST"
+        },
+        "deleteVersion": {
+            "text": "Delete Version",
+            "action": "changeLifecycleState",
+            "url": "lifecycleState/UNDOCHECKOUT",
+            "alertModal": "lifecycleState/UNDOCHECKOUT"
+        }
     },
 
     "component_workspace_menu_option": {
-        "VFC":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Properties", "action":"onMenuItemPressed", "state": "workspace.properties"},
-            {"text":"Attributes", "action":"onMenuItemPressed", "state": "workspace.attributes"},
-            {"text":"Req. & Capabilities", "action":"onMenuItemPressed", "state": "workspace.reqAndCap"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"}
+        "VFC": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Properties", "action": "onMenuItemPressed", "state": "workspace.properties"},
+            {"text": "Attributes", "action": "onMenuItemPressed", "state": "workspace.attributes"},
+            {"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCap"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"}
         ],
-        "VL":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Properties", "action":"onMenuItemPressed", "state": "workspace.properties"},
-            {"text":"Attributes", "action":"onMenuItemPressed", "state": "workspace.attributes"},
-            {"text":"Req. & Capabilities", "action":"onMenuItemPressed", "state": "workspace.reqAndCap"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"}
+        "VL": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Properties", "action": "onMenuItemPressed", "state": "workspace.properties"},
+            {"text": "Attributes", "action": "onMenuItemPressed", "state": "workspace.attributes"},
+            {"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCap"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"}
         ],
-        "CP":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Properties", "action":"onMenuItemPressed", "state": "workspace.properties"},
-            {"text":"Attributes", "action":"onMenuItemPressed", "state": "workspace.attributes"},
-            {"text":"Req. & Capabilities", "action":"onMenuItemPressed", "state": "workspace.reqAndCap"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"}
+        "CP": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Properties", "action": "onMenuItemPressed", "state": "workspace.properties"},
+            {"text": "Attributes", "action": "onMenuItemPressed", "state": "workspace.attributes"},
+            {"text": "Req. & Capabilities", "action": "onMenuItemPressed", "state": "workspace.reqAndCap"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"}
         ],
-        "VF":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+        "VF": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
             // {"text":"Properties", "action":"onMenuItemPressed", "state": "workspace.properties"},
-            {"text":"Composition", "action":"onMenuItemPressed", "state": "workspace.composition.details"},
+            {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
             {"text":"Operation", "action":"onMenuItemPressed", "state": "workspace.interface_operation"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
-            {"text":"Deployment", "action":"onMenuItemPressed", "state": "workspace.deployment"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
+            {"text": "Deployment", "action": "onMenuItemPressed", "state": "workspace.deployment"},
             // {"text":"Inputs", "action":"onMenuItemPressed", "state": "workspace.resource_inputs"},
-            {"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
+            {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
         ],
-        "PNF":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Composition", "action":"onMenuItemPressed", "state": "workspace.composition.details"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
-            {"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
+        "PNF": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
+            {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
         ],
-        "CR":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
-            {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Composition", "action":"onMenuItemPressed", "state": "workspace.composition.details"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
-            {"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
+        "CR": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+            {"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
+            {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
         ],
-        "SERVICE":[
-            {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
-            {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
-            {"text":"Composition", "action":"onMenuItemPressed", "state": "workspace.composition.details"},
-            {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
-            {"text":"Management Workflow", "action":"onMenuItemPressed", "state": "workspace.management_workflow"},
-            {"text":"Network Call Flow ", "action":"onMenuItemPressed", "state": "workspace.network_call_flow"},
-            {"text":"Monitor ", "action":"onMenuItemPressed", "state": "workspace.distribution", "disabledRoles": ["ADMIN", "TESTER", "GOVERNOR", "DESIGNER"]},
-            {"text":"Deployment", "action":"onMenuItemPressed", "state": "workspace.deployment"},
+        "SERVICE": [
+            {"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+            {"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+            {"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
+            {"text": "Activity Log", "action": "onMenuItemPressed", "state": "workspace.activity_log"},
+            {"text": "Management Workflow", "action": "onMenuItemPressed", "state": "workspace.management_workflow"},
+            {"text": "Network Call Flow ", "action": "onMenuItemPressed", "state": "workspace.network_call_flow"},
+            {"text": "Distribution","action": "onMenuItemPressed","state": "workspace.distribution","disabledRoles": ["ADMIN", "TESTER", "GOVERNOR", "DESIGNER"]},
+            {"text": "Deployment", "action": "onMenuItemPressed", "state": "workspace.deployment"},
             // {"text":"Inputs", "action":"onMenuItemPressed", "state": "workspace.service_inputs"},
-            {"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
+            {"text": "Properties Assignment", "action": "onMenuItemPressed", "state": "workspace.properties_assignment"}
         ]
     }
 
diff --git a/catalog-ui/configurations/mock.json b/catalog-ui/configurations/mock.json
index 0ce1fbbb5d..63daabd710 100644
--- a/catalog-ui/configurations/mock.json
+++ b/catalog-ui/configurations/mock.json
@@ -58,10 +58,10 @@
                 "xEcompRequestId": "ccccc"
             },
             "tester": {
-                "userId": "kb0004",
+                "userId": "jm0007",
                 "email": "tester@sdc.com",
-                "firstName": "Kate",
-                "lastName": "Bush",
+                "firstName": "Johnny",
+                "lastName": "Depp",
                 "xEcompRequestId": "ccccc"
             },
             "governor": {