inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-0000] - fixed run for process-service-cloud (#11855)

Browse Source 
* [AAE-0000] - fixed run for process-service-cloud

* [AAE-0000] - Stabilising process cloud tests
This commit is contained in:
Vito Albano
2026-05-04 23:35:25 +01:00
committed by GitHub
parent d6262eafc6
commit 0faa2e1a56
11 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/src/lib/app-config/app-config.service.ts
+1 -1
View File
@@ -252,7 +252,7 @@ export class AppConfigService {
* @returns auth config model
*/
get oauth2(): OauthConfigModel {
const config = this.get(AppConfigValues.OAUTHCONFIG, {});
const config = this.get(AppConfigValues.OAUTHCONFIG, {}) ?? {};
const implicitFlow = config['implicitFlow'] === true || config['implicitFlow'] === 'true';
const silentLogin = config['silentLogin'] === true || config['silentLogin'] === 'true';
const codeFlow = config['codeFlow'] === true || config['codeFlow'] === 'true';
lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html
-1
View File
@@ -24,7 +24,6 @@
[title]="field.tooltip"
panelClass="adf-select-filter"
[multiple]="field.hasMultipleValues"
[disabled]="field.readOnly"
[required]="field.required"
#select
(keydown.escape)="select.close()"
lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.spec.ts
+2 -5
View File
@@ -17,12 +17,11 @@
import { FileViewerWidgetComponent } from './file-viewer.widget';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormFieldModel, FormModel, FormService, NoopAuthModule, NoopTranslateModule } from '@alfresco/adf-core';
import { FormFieldModel, FormModel, NoopAuthModule, NoopTranslateModule } from '@alfresco/adf-core';
describe('FileViewerWidgetComponent', () => {
const fakeForm = new FormModel();
let widget: FileViewerWidgetComponent;
let formServiceStub: Partial<FormService>;
let fixture: ComponentFixture<FileViewerWidgetComponent>;
const fakePngAnswer: any = {
@@ -42,11 +41,9 @@ describe('FileViewerWidgetComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [NoopTranslateModule, NoopAuthModule, FileViewerWidgetComponent],
providers: [{ provide: FormService, useValue: formServiceStub }]
imports: [NoopTranslateModule, NoopAuthModule, FileViewerWidgetComponent]
});
formServiceStub = TestBed.inject(FormService);
fixture = TestBed.createComponent(FileViewerWidgetComponent);
widget = fixture.componentInstance;
});
lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
+1 -1
View File
@@ -12,7 +12,7 @@
{{group.name}}
<mat-icon *ngIf="!(group.readonly || readOnly)" matChipRemove [attr.data-automation-id]="'adf-cloud-group-chip-remove-icon-' + group.name" adf-icon="cancel" />
</mat-chip-row>
<input [disabled]="readOnly || isValidationLoading()" matInput
<input matInput
[formControl]="searchGroupsControl"
[matAutocomplete]="auto"
[matChipInputFor]="groupChipList"
lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
+16
View File
@@ -169,9 +169,13 @@ export class GroupCloudComponent implements OnInit, OnChanges {
ngOnInit(): void {
this.initSearch();
this.updateSearchControlState();
}
ngOnChanges(changes: SimpleChanges): void {
if (changes?.readOnly || changes?.validate) {
this.updateSearchControlState();
}
if (this.hasPreselectedGroupsChanged(changes) || this.hasModeChanged(changes) || this.isValidationChanged(changes)) {
if (this.hasPreSelectGroups()) {
this.loadPreSelectGroups();
@@ -312,8 +316,10 @@ export class GroupCloudComponent implements OnInit, OnChanges {
this.groupChipsCtrl.setValue(this.selectedGroups[0].name);
if (this.isValidationEnabled()) {
this.validationLoading = true;
this.updateSearchControlState();
await this.validatePreselectGroups();
this.validationLoading = false;
this.updateSearchControlState();
}
}
@@ -335,6 +341,7 @@ export class GroupCloudComponent implements OnInit, OnChanges {
this.groupChipsCtrlValue(this.selectedGroups[0].name);
this.changedGroups.emit(this.selectedGroups);
this.updateSearchControlState();
this.resetSearchGroups();
}
}
@@ -350,6 +357,7 @@ export class GroupCloudComponent implements OnInit, OnChanges {
}
this.searchGroupsControl.markAsDirty();
this.searchGroupsControl.markAsTouched();
this.updateSearchControlState();
if (this.isValidationEnabled()) {
this.removeGroupFromValidation(groupToRemove);
@@ -445,6 +453,14 @@ export class GroupCloudComponent implements OnInit, OnChanges {
return this.readOnly || this.isSingleSelectionReadonly();
}
updateSearchControlState(): void {
if (this.isReadonly() || this.isValidationLoading()) {
this.searchGroupsControl.disable({ emitEvent: false });
} else {
this.searchGroupsControl.enable({ emitEvent: false });
}
}
getDisplayName(group: IdentityGroupModel): string {
return group?.name || '';
}
lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
-2
View File
@@ -24,13 +24,11 @@
</mat-chip-row>
<input
matInput
[disabled]="isReadonly()"
[formControl]="searchUserCtrl"
[matAutocomplete]="auto"
[matChipInputFor]="userMultipleChipList"
[required]="required"
[placeholder]="placeholder"
[disabled]="isReadonly() || isValidationLoading()"
(focus)="setFocus(true)"
(blur)="setFocus(false); markAsTouched()"
class="adf-cloud-input"
lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
+14 -5
View File
@@ -231,6 +231,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
ngOnInit(): void {
this.initSearch();
this.updateSearchControlState();
}
ngOnChanges(changes: SimpleChanges): void {
@@ -247,11 +248,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
}
}
if (this.isReadonly() && this.searchUserCtrl.enabled) {
this.searchUserCtrl.disable();
} else if (!this.isReadonly() && this.searchUserCtrl.disabled) {
this.searchUserCtrl.enable();
}
this.updateSearchControlState();
}
ngAfterViewInit(): void {
@@ -348,8 +345,10 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
this.userChipsCtrl.setValue(this.selectedUsers[0].username);
if (this.isValidationEnabled()) {
this.validationLoading = true;
this.updateSearchControlState();
await this.validatePreselectUsers();
this.validationLoading = false;
this.updateSearchControlState();
}
}
@@ -427,6 +426,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
this.userChipsControlValue(this.selectedUsers[0].username);
this.changedUsers.emit(this.selectedUsers);
this.updateSearchControlState();
this.resetSearchUsers();
}
}
@@ -445,6 +445,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
}
this.searchUserCtrl.markAsDirty();
this.searchUserCtrl.markAsTouched();
this.updateSearchControlState();
if (this.isValidationEnabled()) {
this.removeUserFromValidation(userToRemove);
@@ -563,6 +564,14 @@ export class PeopleCloudComponent implements OnInit, OnChanges, AfterViewInit {
return this.isValidationEnabled() && this.validationLoading;
}
updateSearchControlState(): void {
if (this.isReadonly() || this.isValidationLoading()) {
this.searchUserCtrl.disable({ emitEvent: false });
} else {
this.searchUserCtrl.enable({ emitEvent: false });
}
}
markAsTouched(): void {
this.touched = true;
}
lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts
+20 -10
View File
@@ -531,11 +531,11 @@ describe('ProcessListCloudComponent', () => {
component.reload();
});
it('should call endpoint when a column visibility gets changed', () => {
spyOn(preferencesService, 'updatePreference').and.returnValue(of({}));
spyOn(processListCloudService, 'getProcessByRequest');
it('should update preferences when a column visibility gets changed', () => {
const updatePreferenceSpy = spyOn(preferencesService, 'updatePreference').and.returnValue(of({}));
spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
component.ngAfterContentInit();
spyOn(component, 'createDatatableSchema');
const createDatatableSchemaSpy = spyOn(component, 'createDatatableSchema');
component.appName = 'fake-app-name';
component.reload();
fixture.detectChanges();
@@ -544,7 +544,8 @@ describe('ProcessListCloudComponent', () => {
fixture.detectChanges();
expect(processListCloudService.getProcessByRequest).toHaveBeenCalledTimes(1);
expect(updatePreferenceSpy).toHaveBeenCalled();
expect(createDatatableSchemaSpy).toHaveBeenCalled();
});
describe('component changes', () => {
@@ -921,11 +922,11 @@ describe('ProcessListCloudComponent', () => {
component.reload();
});
it('should call endpoint when a column visibility gets changed', () => {
spyOn(preferencesService, 'updatePreference').and.returnValue(of({}));
spyOn(processListCloudService, 'fetchProcessList');
it('should update preferences when a column visibility gets changed', () => {
const updatePreferenceSpy = spyOn(preferencesService, 'updatePreference').and.returnValue(of({}));
spyOn(processListCloudService, 'fetchProcessList').and.returnValue(of(fakeProcessCloudList));
component.ngAfterContentInit();
spyOn(component, 'createDatatableSchema');
const createDatatableSchemaSpy = spyOn(component, 'createDatatableSchema');
component.appName = 'fake-app-name';
component.reload();
fixture.detectChanges();
@@ -934,7 +935,8 @@ describe('ProcessListCloudComponent', () => {
fixture.detectChanges();
expect(processListCloudService.fetchProcessList).toHaveBeenCalledTimes(1);
expect(updatePreferenceSpy).toHaveBeenCalled();
expect(createDatatableSchemaSpy).toHaveBeenCalled();
});
describe('component changes', () => {
@@ -1250,12 +1252,16 @@ describe('ProcessListCloudComponent', () => {
describe('ProcessListCloudComponent: Injecting custom columns for task list - CustomTaskListComponent', () => {
let fixtureCustom: ComponentFixture<CustomTaskListComponent>;
let componentCustom: CustomTaskListComponent;
let processListCloudService: ProcessListCloudService;
beforeEach(() => {
TestBed.configureTestingModule({
imports: [CustomTaskListComponent],
providers: [provideCloudPreferences()]
});
processListCloudService = TestBed.inject(ProcessListCloudService);
spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
spyOn(processListCloudService, 'fetchProcessList').and.returnValue(of(fakeProcessCloudList));
fixtureCustom = TestBed.createComponent(CustomTaskListComponent);
fixtureCustom.detectChanges();
componentCustom = fixtureCustom.componentInstance;
@@ -1292,6 +1298,7 @@ describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTe
}
let fixtureEmpty: ComponentFixture<EmptyTemplateComponent>;
let processListCloudService: ProcessListCloudService;
const preferencesService = jasmine.createSpyObj('preferencesService', {
getPreferences: of({}),
updatePreference: of({})
@@ -1302,6 +1309,9 @@ describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTe
imports: [NoopTranslateModule, CustomEmptyContentTemplateDirective, ProcessListCloudComponent, EmptyTemplateComponent],
providers: [{ provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, useValue: preferencesService }]
});
processListCloudService = TestBed.inject(ProcessListCloudService);
spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
spyOn(processListCloudService, 'fetchProcessList').and.returnValue(of(fakeProcessCloudList));
fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent);
fixtureEmpty.detectChanges();
});
lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts
+1 -1
View File
@@ -396,7 +396,7 @@ export class ProcessListCloudComponent
} else {
const requestNode = this.createRequestNode();
this.requestNode = requestNode;
return this.processListCloudService.getProcessByRequest(requestNode).pipe();
return this.processListCloudService.getProcessByRequest(requestNode);
}
}),
takeUntilDestroyed()
lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts
+2 -2
View File
@@ -121,9 +121,9 @@ describe('TaskAssignmentFilterComponent', () => {
it('should have floating labels when values are present', async () => {
const inputLabelsNodes = await loader.getAllHarnesses(MatFormFieldHarness);
inputLabelsNodes.forEach(async (labelNode) => {
for (const labelNode of inputLabelsNodes) {
expect(await labelNode.isLabelFloating()).toBeTruthy();
});
}
});
});
lib/process-services-cloud/src/lib/task/task-list/components/task-list/task-list-cloud.component.spec.ts
+5 -3
View File
@@ -238,9 +238,10 @@ describe('TaskListCloudComponent', () => {
component.reload();
});
it('should call endpoint when a column visibility gets changed', () => {
it('should update preferences when a column visibility gets changed', () => {
getTaskByRequestSpy.and.returnValue(of(fakeGlobalTasks));
component.ngAfterContentInit();
spyOn(component, 'createDatatableSchema');
const createDatatableSchemaSpy = spyOn(component, 'createDatatableSchema');
component.appName = 'fake-app-name';
component.reload();
fixture.detectChanges();
@@ -249,7 +250,8 @@ describe('TaskListCloudComponent', () => {
fixture.detectChanges();
expect(getTaskByRequestSpy).toHaveBeenCalledTimes(1);
expect(preferencesService.updatePreference).toHaveBeenCalled();
expect(createDatatableSchemaSpy).toHaveBeenCalled();
});
describe('component changes', () => {