Merge pull request #1280 from ORCID/disable-org-change-when-editing-users

disable org change when editing users

Author: bobcaprice

ui/src/app/user/user-update.component.html

@@ -75,14 +75,13 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
             for="field_salesforceId.string"
             >Organization</label
           >
-          <fieldset [disabled]="disableSalesForceIdDD()">
+          <fieldset [disabled]="isExistentMember">
             <select
               *ngIf="memberList.length > 0"
               class="custom-select"
               name="salesforceId"
               id="field_salesforceId"
               formControlName="salesforceId"
-              (change)="validateOrgOwners()"
             >
               <option *ngFor="let member of memberList" [ngValue]="member.salesforceId">{{ member.clientName }}</option>
             </select>

ui/src/app/user/user-update.component.spec.ts

@@ -102,12 +102,12 @@ describe('UserUpdateComponent', () => {
     expect(router.navigate).toHaveBeenCalledWith(['/users'])
   })
 
-  it('should disable salesforceId dropdown on init for non-admin users', () => {
+  it('should disable salesforceId dropdown on init for existing users', () => {
     activatedRoute.data = of({ user: { salesforceId: 'test', id: 'id' } as IUser })
     accountService.hasAnyAuthority.and.returnValue(false)
     fixture.detectChanges()
 
-    expect(component.disableSalesForceIdDD()).toBe(true)
+    expect(component.isExistentMember).toBe(true)
   })
 
   it('should display disable 2fa checkbox for admins when editing an existing user', () => {
@@ -191,17 +191,18 @@ describe('UserUpdateComponent', () => {
     accountService.hasAnyAuthority.and.returnValue(true)
     fixture.detectChanges()
 
-    expect(component.disableSalesForceIdDD()).toBe(false)
+    expect(component.isExistentMember).toBe(false)
   })
 
   it('should validate non-owners', () => {
+    activatedRoute.data = of({ user: { salesforceId: 'test', id: 'id' } as IUser })
     userService.hasOwner.and.returnValue(of(true))
     fixture.detectChanges()
 
     component.editForm.patchValue({ salesforceId: '123', mainContact: false })
     component.validateOrgOwners()
     expect(component.hasOwner).toBe(false)
-    expect(component.editForm.get('salesforceId')?.disabled).toBe(false)
+    expect(component.isExistentMember).toBe(true)
   })
 
   it('should validate org owners', () => {
@@ -211,7 +212,6 @@ describe('UserUpdateComponent', () => {
     component.editForm.patchValue({ salesforceId: '123', mainContact: true })
     component.validateOrgOwners()
     expect(component.hasOwner).toBe(true)
-    expect(component.editForm.get('salesforceId')?.disabled).toBe(true)
   })
 
   it('should create new user', () => {

ui/src/app/user/user-update.component.ts

@@ -194,18 +194,6 @@ export class UserUpdateComponent {
     this.router.navigate(['/'])
   }
 
-  disableSalesForceIdDD() {
-    if (this.hasRoleAdmin()) {
-      return false
-    } else if (this.hasRoleOrgOwner() || this.hasRoleConsortiumLead()) {
-      this.editForm.patchValue({
-        salesforceId: this.getSalesForceId(),
-      })
-      return true
-    }
-    return this.isExistentMember
-  }
-
   getSalesForceId() {
     return this.accountService.getSalesforceId()
   }
@@ -234,12 +222,6 @@ export class UserUpdateComponent {
           this.hasOwner = value
         }
       })
-
-      if (this.editForm.get('mainContact')?.value) {
-        this.editForm.get('salesforceId')?.disable()
-      } else {
-        this.editForm.get('salesforceId')?.enable()
-      }
     }
   }