[PORTAL-20,PORTAL-23,PORTAL-32] Repair defects

PORTAL-20: remove mariadb client reference from be-common pom

PORTAL-23: Release Portal's SDK version 1.1.0

PORTAL-32: API URL correction for onboarded Apps

Change-Id: If75b54ca9202f94ce63c59343b94384da1040912
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

4 files changed, 15 insertions, 152 deletions

diff --git a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less
deleted file mode 100644
index 5568ca8e..00000000
--- a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less
+++ /dev/null
@@ -1,125 +0,0 @@
-.new-catalog-modal {
-  height: 430px;
-
-  .user-catalog-roles{
-    .title{
-      //.n18r;
-      .dGray18r;  //AT&T Dark Gray
-      border-bottom: @portalDBlue 3px solid;
-    }
-    
-       input:not([type="button"]) {
-    height: 13px;
-} 
-    .display-userApp-Catalog-Roles
-    {
-    padding-left: 16px;
-    padding-top: 10px;
-    font-family: Omnes-ECOMP-W02,Arial;
-    font-size: 18px;
-    color: #5a5a5a;
-    }
-	
-	#pending-checkbox{	
-	font-family: Omnes-ECOMP-W02,Arial;
-	font-size: 15px; 
-	color: #5a5a5a;
-	}
-    .app-catalog-roles-list{
-      height: 286px;
-      
-      
-      .app-catalog-item{
-        border: 1px solid @portalLGray;
-        border-radius: 2px;
-        background-color: @funcBkgGray;
-
-        padding: 10px;
-        margin-top: 8px;
-        //margin-right: 6px;
-        //margin-left: 6px;
-
-        .app-catalog-item-left{
-          padding-top: 0;
-          line-height: 30px;
-          height: 30px;
-          vertical-align: middle;
-          display:inline-block;
-          width: 45%;
-          border-radius: 2px;
-          border: 1px solid @portalLGray;
-          margin-right: 10px;
-          padding-left: 4px;
-          background: @portalWhite;
-          white-space: nowrap;
-
-        }
-        .app-catalog-item-right{
-          display:inline-block;
-          width: 45%;
-          border-radius: 2px;
-          border: 1px solid @portalLGray;
-          background: @portalWhite;
-          vertical-align: middle;
-        }
-
-        .app-catalog-item-right-error{
-          .portalRed;
-          padding: 7px 7px 7px 7px;
-          display:inline-block;
-          width: 45%;
-          border-radius: 2px;
-          border: 1px solid @portalLGray;
-          background: @portalWhite;
-          vertical-align: middle;
-        }
-
-        .app-catalog-item-right-contacting{
-          .portalGreen;
-          padding: 7px 7px 7px 7px;
-          display:inline-block;
-          width: 45%;
-          border-radius: 2px;
-          border: 1px solid @portalLGray;
-          background: @portalWhite;
-          vertical-align: middle;
-        }
-
-        .app-select-left{
-          width: 45%;
-          margin-right: 10px;
-          vertical-align: middle;
-
-
-          .select-field{
-            padding-top: 0;
-            line-height: 30px;
-            height: 30px;
-            vertical-align: middle;
-            border-radius: 2px;
-            border: 1px solid @portalLGray;
-            margin-right: 10px;
-            padding-left: 4px;
-            background: @portalWhite;
-            display:inline-block;
-          }
-        }
-
-
-        .app-item-delete{
-          .ico_trash_default;
-          display: inline-block;
-          vertical-align: 2px;
-          cursor: pointer;
-          position: relative;
-          top: 6px;
-          color: transparent;
-          margin-left: 8px;
-
-        }
-
-      }
-    }
-
-  }
-}
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
index 150a305e..1685c133 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
@@ -60,6 +60,13 @@ function _classCallCheck(instance, Constructor) {
             getExternalAccess();
         };
         
+		this.getAccess = function(item) {
+			if(!item.access)
+				confirmBoxService.showDynamicInformation(item,
+					'app/views/catalog/information-box.tpl.html','CatalogConfirmationBoxCtrl'
+				).then(isConfirmed => {});  
+		};
+		
         var getExternalAccess = () => {
     		ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then(
     				function(property) {
@@ -125,19 +132,18 @@ function _classCallCheck(instance, Constructor) {
                 data = {
                     dialogState: 2,
                     selectedUser:{
-                        attuid: $scope.attuid,
+                    	orgUserId: $scope.orgUserId,
                         firstName: $scope.firstName,
                         lastName: $scope.lastName,
                         headerText: item.headerText,
                         haloAppName : item.mlAppName,
                     	item: item,
-                    	extReqValue : externalRequest
                         
                     }
                 }
             ngDialog.open({
-                templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html',
-                controller: 'NewCatalogModalCtrl',
+                templateUrl: 'app/views/catalog/request-access-catalog-dialogs/request-access-catalog.modal.html',
+                controller: 'ExternalRequestAccessCtrl',
                 controllerAs: 'userInfo',
                 data: data
             }).closePromise.then(needUpdate => {
@@ -183,7 +189,7 @@ function _classCallCheck(instance, Constructor) {
 				.getUserProfile()
 				.then(
 						function(profile) {
-							$scope.attuid = profile.orgUserId;
+							$scope.orgUserId = profile.orgUserId;
 							$scope.firstName = profile.firstName;
 							$scope.lastName = profile.lastName;
 							$scope.appCatalog = [];
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
index b4063ad6..fd71e59b 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
@@ -58,18 +58,8 @@
 								                </label> 
 								                <i ng-show="item.pending" class="icon-tickets-contested"></i>							                      								                
 									</div>
-								</div>
-								<div class="gridster-box-content"
-									ng-style="{'cursor':'pointer',
-										'background-image': 'url('+(item.imageLink)+')',
-										'order': item.order, 
-										'background-color':'white',
-										'background-repeat': 'no-repeat',
-										'background-size': '170px 130px'}"
-									ng-click="catalog.openAddRoleModal(item)"
-									ng-hide="users.isLoadingTable && !users.getAppCatalogIsDone"
-									>
-								</div>
+								</div>								
+								<div ng-include src="'app/views/catalog/get-accessswitch.html'"></div>
 							</div>
 						</li>
 					</ul>
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html
index 8a848545..2802dac4 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html
@@ -21,17 +21,9 @@
     <div class="confirmation-message-wrap">
         <div class="confirmation-message" >
 			<div>
-				You do not have access to this application.  
-				See the 
+				You do not have access to this application. To request access to an application, please visit the
 				<a href="" ng-click="confirmBox.goTo('root.getAccess', {appName: confirmBox.message.headerText})">
-					Get Access page</a> and request access at MyLogins.
-					<br><br>
-					You may check this box if access is pending: 
-				<input type="checkbox" 
-					att-checkbox 
-					ng-model="confirmBox.message.pending"
-					ng-change="confirmBox.storeSelection(confirmBox.message)"
-				>
+					Get Access</a> page
 			</div>
 
 		</div>