From 68f674c0fdfc0fd26eb0949622c51296bc0ba142 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Fri, 12 Apr 2019 16:25:58 +0100 Subject: [PATCH] [ADF-3983] Add permission template to app list cloud (#4592) * [ADF-3983] Add permission template to app list cloud * [ADF-3983] Fix and add unit tests --- .../components/app-list-cloud.component.html | 18 ++- .../components/app-list-cloud.component.scss | 2 +- .../app-list-cloud.component.spec.ts | 27 +++- .../components/app-list-cloud.component.ts | 153 +++++++++--------- .../src/lib/i18n/en.json | 10 +- 5 files changed, 124 insertions(+), 86 deletions(-) diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.html b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.html index 3c05799595..bff0c2bd52 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.html +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.html @@ -1,8 +1,8 @@ -
+
- +
@@ -24,15 +24,23 @@ - +
- + +
+ + +
+ + diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss index 0c80dc2f08..88e1d3b6a6 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss @@ -8,7 +8,7 @@ cursor: pointer; } - .adf-app-list-spinner, .adf-app-list-empty { + .adf-app-list-spinner, .adf-app-list-empty, .adf-app-list-error { display: flex; align-items: center; justify-content: center; diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts index 55ea187214..eb89b3832b 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts @@ -18,7 +18,7 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { setupTestBed, CoreModule, AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core'; -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { fakeApplicationInstance } from '../mock/app-model.mock'; import { AppListCloudComponent } from './app-list-cloud.component'; @@ -40,7 +40,7 @@ describe('AppListCloudComponent', () => { } }; - beforeEach( async(() => { + beforeEach(async(() => { TestBed.configureTestingModule({ imports: [CoreModule.forRoot(), ProcessServiceCloudTestingModule, AppListCloudModule], providers: [ @@ -56,7 +56,7 @@ describe('AppListCloudComponent', () => { }).compileComponents(); })); - beforeEach( () => { + beforeEach(() => { fixture = TestBed.createComponent(AppListCloudComponent); component = fixture.componentInstance; alfrescoApiService = TestBed.get(AlfrescoApiService); @@ -105,11 +105,28 @@ describe('AppListCloudComponent', () => { expect(defaultEmptyTemplate).toBeDefined(); expect(defaultEmptyTemplate).not.toBeNull(); expect(emptyContent).not.toBeNull(); - expect(emptyTitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.TITLE'); - expect(emptySubtitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.SUBTITLE'); + expect(emptyTitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.NO_APPS.TITLE'); + expect(emptySubtitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.NO_APPS.SUBTITLE'); expect(getAppsSpy).toHaveBeenCalled(); }); + it('should display default no permissions template when response returns exception', () => { + getAppsSpy.and.returnValue(throwError({})); + fixture.detectChanges(); + fixture.whenStable().then(() => { + component.loadingError$.next(true); + fixture.detectChanges(); + const errorTemplate = fixture.nativeElement.querySelector('.adf-app-list-error'); + const errorTitle = fixture.debugElement.nativeElement.querySelector('.adf-empty-content__title'); + const errorSubtitle = fixture.debugElement.nativeElement.querySelector('.adf-empty-content__subtitle'); + expect(errorTemplate).not.toBeNull(); + expect(errorTitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.ERROR.TITLE'); + expect(errorSubtitle.innerText).toBe('ADF_CLOUD_TASK_LIST.APPS.ERROR.SUBTITLE'); + expect(getAppsSpy).toHaveBeenCalled(); + }); + + }); + describe('Grid Layout ', () => { it('should display a grid by default', () => { diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts index 79302daf4c..3984e0c105 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts @@ -15,93 +15,100 @@ * limitations under the License. */ - import { CustomEmptyContentTemplateDirective } from '@alfresco/adf-core'; - import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild } from '@angular/core'; - import { Observable } from 'rxjs'; - import { AppsProcessCloudService } from '../services/apps-process-cloud.service'; - import { ApplicationInstanceModel } from '../models/application-instance.model'; - import { ApplicationDeploymentCloudService } from '../services/app-deployment-cloud.service'; +import { CustomEmptyContentTemplateDirective } from '@alfresco/adf-core'; +import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild } from '@angular/core'; +import { Observable, of, Subject } from 'rxjs'; +import { AppsProcessCloudService } from '../services/apps-process-cloud.service'; +import { ApplicationInstanceModel } from '../models/application-instance.model'; +import { ApplicationDeploymentCloudService } from '../services/app-deployment-cloud.service'; +import { catchError } from 'rxjs/operators'; - @Component({ - selector: 'adf-cloud-app-list', - templateUrl: './app-list-cloud.component.html', - styleUrls: ['./app-list-cloud.component.scss'], - providers: [ +@Component({ + selector: 'adf-cloud-app-list', + templateUrl: './app-list-cloud.component.html', + styleUrls: ['./app-list-cloud.component.scss'], + providers: [ { provide: AppsProcessCloudService, useClass: ApplicationDeploymentCloudService } - ] - }) - export class AppListCloudComponent implements OnInit, AfterContentInit { + ] +}) +export class AppListCloudComponent implements OnInit, AfterContentInit { - public static LAYOUT_LIST: string = 'LIST'; - public static LAYOUT_GRID: string = 'GRID'; - public static RUNNING_STATUS: string = 'RUNNING'; + public static LAYOUT_LIST: string = 'LIST'; + public static LAYOUT_GRID: string = 'GRID'; + public static RUNNING_STATUS: string = 'RUNNING'; - @ContentChild(CustomEmptyContentTemplateDirective) - emptyCustomContent: CustomEmptyContentTemplateDirective; + @ContentChild(CustomEmptyContentTemplateDirective) + emptyCustomContent: CustomEmptyContentTemplateDirective; - /** (**required**) Defines the layout of the apps. There are two possible - * values, "GRID" and "LIST". - */ - @Input() - layoutType: string = AppListCloudComponent.LAYOUT_GRID; + /** (**required**) Defines the layout of the apps. There are two possible + * values, "GRID" and "LIST". + */ + @Input() + layoutType: string = AppListCloudComponent.LAYOUT_GRID; - /** Emitted when an app entry is clicked. */ - @Output() - appClick: EventEmitter = new EventEmitter(); + /** Emitted when an app entry is clicked. */ + @Output() + appClick: EventEmitter = new EventEmitter(); - apps$: Observable; + apps$: Observable; + loadingError$ = new Subject(); + hasEmptyCustomContentTemplate: boolean = false; - hasEmptyCustomContentTemplate: boolean = false; + constructor(private appsProcessCloudService: AppsProcessCloudService) { } - constructor(private appsProcessCloudService: AppsProcessCloudService) { } + ngOnInit() { + if (!this.isValidType()) { + this.setDefaultLayoutType(); + } - ngOnInit() { - if (!this.isValidType()) { - this.setDefaultLayoutType(); - } + this.apps$ = this.appsProcessCloudService.getDeployedApplicationsByStatus(AppListCloudComponent.RUNNING_STATUS) + .pipe( + catchError((error) => { + this.loadingError$.next(true); + return of(); + }) + ); + } - this.apps$ = this.appsProcessCloudService.getDeployedApplicationsByStatus(AppListCloudComponent.RUNNING_STATUS); - } + ngAfterContentInit() { + if (this.emptyCustomContent) { + this.hasEmptyCustomContentTemplate = true; + } + } - ngAfterContentInit() { - if (this.emptyCustomContent) { - this.hasEmptyCustomContentTemplate = true; - } - } + onSelectApp(app: ApplicationInstanceModel): void { + this.appClick.emit(app); + } - onSelectApp(app: ApplicationInstanceModel): void { - this.appClick.emit(app); - } + /** + * Check if the value of the layoutType property is an allowed value + */ + isValidType(): boolean { + if (this.layoutType && (this.layoutType === AppListCloudComponent.LAYOUT_LIST || this.layoutType === AppListCloudComponent.LAYOUT_GRID)) { + return true; + } + return false; + } - /** - * Check if the value of the layoutType property is an allowed value - */ - isValidType(): boolean { - if (this.layoutType && (this.layoutType === AppListCloudComponent.LAYOUT_LIST || this.layoutType === AppListCloudComponent.LAYOUT_GRID)) { - return true; - } - return false; - } + /** + * Assign the default value to LayoutType + */ + setDefaultLayoutType(): void { + this.layoutType = AppListCloudComponent.LAYOUT_GRID; + } - /** - * Assign the default value to LayoutType - */ - setDefaultLayoutType(): void { - this.layoutType = AppListCloudComponent.LAYOUT_GRID; - } + /** + * Return true if the layout type is LIST + */ + isList(): boolean { + return this.layoutType === AppListCloudComponent.LAYOUT_LIST; + } - /** - * Return true if the layout type is LIST - */ - isList(): boolean { - return this.layoutType === AppListCloudComponent.LAYOUT_LIST; - } + /** + * Return true if the layout type is GRID + */ + isGrid(): boolean { - /** - * Return true if the layout type is GRID - */ - isGrid(): boolean { - - return this.layoutType === AppListCloudComponent.LAYOUT_GRID; - } - } + return this.layoutType === AppListCloudComponent.LAYOUT_GRID; + } +} diff --git a/lib/process-services-cloud/src/lib/i18n/en.json b/lib/process-services-cloud/src/lib/i18n/en.json index 796e9d4232..71173431f6 100644 --- a/lib/process-services-cloud/src/lib/i18n/en.json +++ b/lib/process-services-cloud/src/lib/i18n/en.json @@ -47,8 +47,14 @@ }, "ADF_CLOUD_TASK_LIST": { "APPS": { - "TITLE": "No Applications Found", - "SUBTITLE": "Create a new application that you want to easily find later" + "NO_APPS": { + "TITLE": "No Applications Found", + "SUBTITLE": "Create a new application that you want to easily find later" + }, + "ERROR": { + "TITLE": "There was an error", + "SUBTITLE": "Check you have permission to access the apps" + } }, "START_TASK": { "FORM": {