From 95c7074d6501dacb788b5b0f3e1875fc06ac82b2 Mon Sep 17 00:00:00 2001
From: arditdomi <32884230+arditdomi@users.noreply.github.com>
Date: Wed, 29 Jan 2020 09:23:03 +0000
Subject: [PATCH] [AAE-1594] Fix partial group name of a valid group should not
 be valid, fix form-cloud able to search when people/group widget is readonly
 (#5417)

---
 .../lib/group/components/group-cloud.component.html    |  4 ++--
 .../lib/group/components/group-cloud.component.spec.ts |  2 --
 .../src/lib/group/components/group-cloud.component.ts  | 10 +++++++---
 .../lib/people/components/people-cloud.component.html  |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
index 91b995f1d2..a4c5920e51 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
@@ -1,6 +1,6 @@
 <form>
     <mat-form-field class="adf-cloud-group">
-        <mat-label
+        <mat-label *ngIf="!isReadonly()"
             id="adf-group-cloud-title-id">{{ (title || 'ADF_CLOUD_GROUPS.SEARCH-GROUP') | translate }}</mat-label>
         <mat-chip-list #groupChipList [disabled]="isReadonly() || isValidationLoading()" data-automation-id="adf-cloud-group-chip-list" class="apa-group-chip-list">
             <mat-chip
@@ -16,7 +16,7 @@
                     cancel
                 </mat-icon>
             </mat-chip>
-            <input matInput
+            <input *ngIf="!isReadonly()" matInput
                    [formControl]="searchGroupsControl"
                    [matAutocomplete]="auto"
                    [matChipInputFor]="groupChipList"
diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts
index bf6c888c98..288f4986e9 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts
@@ -119,7 +119,6 @@ describe('GroupCloudComponent', () => {
         it('should selectedGroup  and groupsChanged emit, update selected groups when a group is selected', (done) => {
             const group = { name: 'groupname' };
             fixture.detectChanges();
-            spyOn(component, 'hasGroupIdOrName').and.returnValue(true);
             const selectEmitSpy = spyOn(component.selectGroup, 'emit');
             const changedGroupsSpy = spyOn(component.changedGroups, 'emit');
             component.onSelect(group);
@@ -540,7 +539,6 @@ describe('GroupCloudComponent', () => {
 
             it('should check validation only for the first group and emit warning when group is invalid - single mode', (done) => {
                 spyOn(identityGroupService, 'findGroupsByName').and.returnValue(Promise.resolve([]));
-                spyOn(component, 'hasGroupIdOrName').and.returnValue(false);
 
                 const expectedWarning = {
                     message: 'INVALID_PRESELECTED_GROUPS',
diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
index c5480335cd..a611f895a0 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
@@ -266,7 +266,7 @@ export class GroupCloudComponent implements OnInit, OnChanges, OnDestroy {
         await Promise.all(preselectedGroupsToValidate.map(async (group: IdentityGroupModel) => {
             try {
                 const validationResult = await this.searchGroup(group.name);
-                if (!this.hasGroupIdOrName(validationResult)) {
+                if (this.isPreselectedGroupInvalid(group, validationResult)) {
                     this.invalidGroups.push(group);
                 }
             } catch (error) {
@@ -380,8 +380,12 @@ export class GroupCloudComponent implements OnInit, OnChanges, OnDestroy {
         this.searchGroupsSubject.next(this.searchGroups);
     }
 
-    hasGroupIdOrName(group: IdentityGroupModel): boolean {
-        return group && (group.id !== undefined || group.name !== undefined);
+    isPreselectedGroupInvalid(preselectedGroup: IdentityGroupModel, validatedGroup: IdentityGroupModel): boolean {
+        if (validatedGroup && validatedGroup.name !== undefined) {
+            return preselectedGroup.name !== validatedGroup.name;
+        } else {
+            return true;
+        }
     }
 
     isSingleMode(): boolean {
diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
index 89174f1969..63c6bc64ec 100644
--- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
@@ -1,6 +1,6 @@
 <form>
     <mat-form-field class="adf-people-cloud">
-        <mat-label id="adf-people-cloud-title-id">{{ title | translate }}</mat-label>
+        <mat-label *ngIf="!isReadonly()" id="adf-people-cloud-title-id">{{ title | translate }}</mat-label>
         <mat-chip-list #userMultipleChipList [disabled]="isReadonly() || isValidationLoading()" data-automation-id="adf-cloud-people-chip-list">
             <mat-chip
                 *ngFor="let user of selectedUsers"
@@ -16,7 +16,7 @@
                     cancel
                 </mat-icon>
             </mat-chip>
-            <input matInput
+            <input *ngIf="!isReadonly()" matInput
                    [formControl]="searchUserCtrl"
                    [matAutocomplete]="auto"
                    [matChipInputFor]="userMultipleChipList"