inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-3358] Show user friendly error templates when there are no applications/processDefinitions (#5746)

Browse Source 
* * Added empty template on start process component

* * Removed errorMessageId

* * Added unit tests to recent changes

* * Added doc

* * fixed comments

* * Used showError notification

* * After rebase

* * Fixed failing e2e

* * Fixed comments
This commit is contained in:
siva kumar
2020-06-09 13:45:22 +05:30
committed by GitHub
parent fffa97c7f8
commit b161ceab26
13 changed files with 361 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
lib/process-services/src/lib/process-list/components/start-process.component.ts
View File

@@ -93,11 +93,11 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
/** Emitted when the process is canceled. */
@Output()
cancel: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
cancel: EventEmitter<void> = new EventEmitter<void>();
/** Emitted when an error occurs. */
@Output()
error: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
error: EventEmitter<any> = new EventEmitter<any>();
/** Emitted when process definition selection changes. */
@Output()
@@ -115,7 +115,6 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
processDefinitions: ProcessDefinitionRepresentation[] = [];
selectedProcessDef: ProcessDefinitionRepresentation;
errorMessageId: string = '';
processNameInput: FormControl;
processDefinitionInput: FormControl;
filteredProcessesDefinitions$: Observable<ProcessDefinitionRepresentation[]>;
@@ -123,7 +122,10 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
alfrescoRepositoryName: string;
applications: AppDefinitionRepresentationModel[] = [];
selectedApplication: AppDefinitionRepresentationModel;
isProcessDefinitionsLoading = true;
isAppsLoading = true;
private onDestroy$ = new Subject<boolean>();
constructor(private activitiProcess: ProcessService,
private activitiContentService: ActivitiContentService,
@@ -219,7 +221,6 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
loadProcessDefinitions(appId: any): void {
this.isProcessDefinitionsLoading = true;
this.resetSelectedProcessDefinition();
this.resetErrorMessage();
this.activitiProcess.getProcessDefinitions(appId).pipe(
map((processDefinitionRepresentations: ProcessDefinitionRepresentation[]) => {
@@ -248,9 +249,9 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
this.processDefinitionSelection.emit(this.selectedProcessDef);
this.isProcessDefinitionsLoading = false;
},
() => {
this.errorMessageId = 'ADF_PROCESS_LIST.START_PROCESS.ERROR.LOAD_PROCESS_DEFS';
(error) => {
this.isProcessDefinitionsLoading = false;
this.error.emit(error);
});
}
@@ -269,6 +270,7 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
}
loadApps() {
this.isAppsLoading = true;
this.appsProcessService
.getDeployedApplications()
.pipe(map((response: AppDefinitionRepresentationModel[]) => {
@@ -293,20 +295,32 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
this.selectedApplication = filteredApps.currentApplication;
this.applicationSelection.emit(this.selectedApplication);
this.toggleProcessNameAndDefinitionsDropdown();
this.loadProcessDefinitions(this.selectedApplication ? this.selectedApplication.id : null);
this.isAppsLoading = false;
this.loadProcessDefinitionsBasedOnSelectedApp();
},
err => {
(err) => {
this.isAppsLoading = false;
this.error.emit(err);
}
);
}
loadProcessDefinitionsBasedOnSelectedApp() {
if (this.selectedApplication && this.selectedApplication.id) {
this.loadProcessDefinitions(this.selectedApplication ? this.selectedApplication.id : null);
} else {
this.isProcessDefinitionsLoading = false;
this.resetProcessDefinitions();
}
}
onAppSelectionChange(selectedApplication: any) {
this.resetProcessDefinitions();
this.selectedApplication = selectedApplication.value;
this.applicationSelection.emit(this.selectedApplication);
this.toggleProcessNameAndDefinitionsDropdown();
this.loadProcessDefinitions(this.selectedApplication.id);
this.loadProcessDefinitionsBasedOnSelectedApp();
}
private isAppSelected(): boolean {
@@ -315,13 +329,28 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
private removeDefaultApps(apps: AppDefinitionRepresentationModel []): AppDefinitionRepresentationModel[] {
return apps.filter((app) => app.id);
}
hasApplications(): boolean {
return this.applications && this.applications.length > 0;
}
hasProcessDefinitions(): boolean {
return this.processDefinitions && this.processDefinitions.length > 0;
}
isProcessDefinitionSelected(): boolean {
return !!(this.selectedProcessDef && this.selectedProcessDef.id);
}
isProcessDefinitionsEmpty(): boolean {
return this.processDefinitions.length === 0;
}
disableDropdownButton(): boolean {
return this.showSelectApplicationDropdown && !this.isAppSelected();
}
getAlfrescoRepositoryName(): string {
let alfrescoRepositoryName = this.appConfig.get<string>(AppConfigValues.ALFRESCO_REPOSITORY_NAME);
if (!alfrescoRepositoryName) {
@@ -345,7 +374,6 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
startProcess(outcome?: string) {
if (this.selectedProcessDef && this.selectedProcessDef.id && this.name) {
this.resetErrorMessage();
const formValues = this.startForm ? this.startForm.form.values : undefined;
this.activitiProcess.startProcess(this.selectedProcessDef.id, this.name, outcome, formValues, this.variables).subscribe(
(res) => {
@@ -353,8 +381,7 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
this.start.emit(res);
},
(err) => {
this.errorMessageId = 'ADF_PROCESS_LIST.START_PROCESS.ERROR.START';
this.error.error(err);
this.error.emit(err);
}
);
}
@@ -368,11 +395,6 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
return this.selectedProcessDef && this.selectedProcessDef.hasStartForm;
}
isProcessDefinitionEmpty(): boolean {
const hasErrorMessage = this.errorMessageId ? true : false;
return this.processDefinitions ? (this.processDefinitions.length > 0 || hasErrorMessage) : hasErrorMessage;
}
isStartFormMissingOrValid(): boolean {
if (this.startForm) {
return this.startForm.form && this.startForm.form.isValid;
@@ -386,15 +408,15 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
}
private resetSelectedProcessDefinition() {
this.selectedProcessDef = new ProcessDefinitionRepresentation();
this.selectedProcessDef = undefined;
if (this.processDefinitionInput) {
this.processDefinitionInput.setValue('');
}
}
private resetErrorMessage(): void {
this.errorMessageId = '';
}
hasErrorMessage(): boolean {
return this.processDefinitions.length === 0 && !this.errorMessageId;
private resetProcessDefinitions() {
this.processDefinitions = [];
this.resetSelectedProcessDefinition();
}
public onOutcomeClick(outcome: string) {
@@ -407,7 +429,6 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
if (this.startForm) {
this.startForm.data = {};
}
this.resetErrorMessage();
}
displayFn(process: any): string {
@@ -453,4 +474,8 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit, OnDestr
this.selectedProcessDef = processDefinition;
this.processDefinitionSelection.emit(this.selectedProcessDef);
}
isLoading(): boolean {
return this.showSelectApplicationDropdown ? this.isAppsLoading : false;
}
}