From 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 Mon Sep 17 00:00:00 2001
From: ys9693 <ys9693@att.com>
Date: Sun, 19 Jan 2020 13:50:02 +0200
Subject: Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
---
 .../user-management/user-management-view.html      | 62 +---------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

(limited to 'catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view.html')

diff --git a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view.html b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view.html
index 9322ab00aa..89fd280205 100644
--- a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view.html
+++ b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view.html
@@ -13,7 +13,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-
 <div ng-controller="Sdc.ViewModels.UserManagementViewModel">
     <loader data-display="isLoading"></loader>
     <div class="sdc-user-management-top-bar">
@@ -22,48 +21,6 @@
             <input type="text" class="sdc-user-management-top-bar-form-input" placeholder="Search user by name, userId, email or role" data-ng-model="search.filterTerm" ng-model-options="{ debounce: 500 }" data-tests-id="searchbox" />
             <span class="w-sdc-search-icon" data-ng-class="{'cancel':search.filterTerm, 'magnification':!search.filterTerm}" data-ng-click="search.filterTerm=''" ></span>
         </div>
-        <div  class="vertical-border-container">
-            <div class="vertical-border"></div>
-        </div>
-        <form class="sdc-user-management-top-bar-create-user-container w-sdc-form" name="editForm">
-            <label class="sdc-user-management-top-bar-title">Create New User</label>
-            <div class="sdc-user-management-top-bar-wrapper">
-                <div class="i-sdc-form-item sdc-user-management-top-bar-form-container" data-ng-class="{error:(editForm.contactId.$dirty && editForm.contactId.$invalid)}">
-                    <input ng-focus="search.filterTerm=''" type="text"
-                           data-ng-model="newUser.userInfo.userId"
-                           class="i-sdc-form-input"
-                           placeholder="{{ USER_MANAGEMENT_SEARCH_TEXT | translate}}"
-                           data-ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 750, 'blur': 0 } }"
-                           name="contactId"
-                           data-ng-pattern="userIdValidationPattern"
-                           data-ng-change="clearForm()"
-                           data-ng-blur="clearForm()"
-                           data-required
-                           data-tests-id="newuserId" />
-
-                    <div class="input-error" data-ng-show="editForm.contactId.$dirty && editForm.contactId.$invalid">
-                        <span ng-show="editForm.contactId.$error.required" translate="NEW_USER_ERROR_USER_ID_REQUIRED"></span>
-                        <span ng-show="editForm.contactId.$error.pattern" translate="NEW_USER_ERROR_USER_ID_NOT_VALID"></span>
-                    </div>
-                </div>
-                <div class="i-sdc-form-item sdc-user-management-top-bar-form-container"  data-ng-class="{error:(editForm.role.$dirty && editForm.role.$invalid
-                                                                                                            && editForm.contactId.$viewValue)}">
-                    <select class="i-sdc-form-select capitalize"
-                            data-required
-                            name="role"
-                            data-tests-id="selectrole"
-                            data-ng-model = "newUser.userInfo.role"
-                            data-ng-options="role as (getTitle(role)) for role in roles | orderBy:'role'"
-                            ng-focus="search.filterTerm=''">
-                        <option value="">Select Role</option>
-                    </select>
-                    <div class="input-error" data-ng-show="editForm.role.$dirty && editForm.role.$invalid && editForm.contactId.$viewValue">
-                        <span ng-show="editForm.role.$error.required" translate="NEW_USER_ERROR_ROLE_REQUIRED"></span>
-                    </div>
-                </div>
-                <button data-tests-id="creategreen" data-ng-disabled="editForm.$invalid" class="sdc-user-management-top-bar-create-btn" ng-click="search.filterTerm = '' ; createUser()">Create</button>
-            </div>
-        </form>
     </div>
 
 
@@ -74,15 +31,13 @@
                 <div class="sdc-user-management-table-header head-row hand sdc-user-management-flex-item" data-tests-id="th{{header.title}}" ng-repeat="header in tableHeadersList" ng-click="sort(header.property)">{{header.title}}
                     <span  ng-if="sortBy === header.property" class="sdc-user-management-table-header-sort-arrow" data-ng-class="{'down': reverse, 'up':!reverse}"> </span>
                 </div>
-              <div class="sdc-user-management-table-no-text-header head-row sdc-user-management-flex-item"></div>
-                <div class="sdc-user-management-table-no-text-header head-row sdc-user-management-flex-item"></div>
             </div>
 
             <div class="body">
                 <perfect-scrollbar scroll-y-margin-offset="0" include-padding="true" class="scrollbar-container">
                     <div ng-init="user.filterTerm = user.firstName + ' ' + user.lastName + ' ' + user.userId + ' ' + user.email + ' ' + user.role + ' ' + (user.lastLoginTime | date: 'MM/dd/yyyy')"
                          ng-repeat="user in usersList | filter: search | orderBy:sortBy:reverse"
-                         data-ng-class="{'sdc-user-management-table-new-user-row': (isNewUser && $first), 'sdc-user-management-table-row-edit-mode': user.isInEditMode}"
+                         data-ng-class="{'sdc-user-management-table-new-user-row':  $first}"
                          class="sdc-user-management-flex-container data-row" data-tests-id="row_{{$index}}">
 
                         <div sdc-smart-tooltip class="sdc-user-management-table-col-general sdc-user-management-flex-item" data-tests-id="firstName_{{$index}}">{{user.firstName || '---'}}</div>
@@ -91,25 +46,10 @@
                         <div sdc-smart-tooltip class="sdc-user-management-table-col-general sdc-user-management-flex-item" data-tests-id="email_{{$index}}">{{user.email || '---'}}</div>
                         <div class="sdc-user-management-table-col-general sdc-user-management-flex-item">
                             <div class="sdc-user-management-table-role-select capitalize sdc-user-management-table-role-label"
-                                 data-ng-if="!user.isInEditMode"
                                  data-tests-id="role_{{$index}}"
                                  data-ng-bind="getTitle(user.role)"></div>
-                            <select class="sdc-user-management-table-role-select capitalize"
-                                    data-tests-id="selectRole_{{$index}}"
-                                    data-ng-if="user.isInEditMode"
-                                    data-ng-model="user.tempRole"
-                                    data-ng-options="role as (getTitle(role)) for role in roles | orderBy:'role'">
-                            </select>
                         </div>
                         <div class="sdc-user-management-table-col-general sdc-user-management-flex-item" data-tests-id="lastActive_{{$index}}">{{user.lastLoginTime == 0 ? 'Waiting' :  (user.lastLoginTime | date:'MM/dd/yyyy')}}</div>
-                        <div class="sdc-user-management-table-btn-col sdc-user-management-flex-item">
-                            <button data-ng-disabled="user.isInEditMode" data-ng-hide="user.isInEditMode || currentUser.userId === user.userId"  class="sdc-user-management-table-edit-btn" ng-click="onEditUserPressed(user)" data-tests-id="updateUser_{{$index}}"> </button>
-                            <button data-ng-show="user.isInEditMode" class="sdc-user-management-table-save-btn" ng-click="saveUserChanges(user)" data-tests-id="save_{{$index}}"> </button>
-                        </div>
-                        <div class="sdc-user-management-table-btn-col sdc-user-management-flex-item">
-                            <button data-ng-hide="currentUser.userId === user.userId"  class="sdc-user-management-table-delete-btn" ng-click="deleteUser(user.userId)" data-tests-id="delete_{{$index}}"> </button>
-                        </div>
-
                     </div>
                 </perfect-scrollbar>
             </div>
-- 
cgit 1.2.3-korg