[ADF-1364] Infinite scrolling for Copy & Move (#2362)

* Use infinite pagination for search also
* Fix highlight in copy & move
* Fix highlight and material menu issue
* Update documentation
This commit is contained in:
Popovics András
2017-09-21 14:34:31 +01:00
committed by Eugenio Romano
parent b28a5b2a69
commit 2d6c8f92f0
29 changed files with 2598 additions and 4276 deletions

View File

@@ -0,0 +1,14 @@
<div *ngIf="pagination.hasMoreItems" class="adf-infinite-pagination">
<button md-button
*ngIf="!isLoading"
class="adf-infinite-pagination-load-more"
(click)="onLoadMore($event)"
data-automation-id="adf-infinite-pagination-button">
<ng-content></ng-content>
</button>
<md-progress-bar *ngIf="isLoading"
mode="indeterminate"
class="adf-infinite-pagination-spinner"
data-automation-id="adf-infinite-pagination-spinner"></md-progress-bar>
</div>

View File

@@ -0,0 +1,10 @@
.adf-infinite-pagination {
display: flex;
justify-content: space-around;
min-height: 56px;
&-load-more {
margin-bottom: 10px;
margin-top: 10px;
}
}

View File

@@ -0,0 +1,119 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { Pagination } from 'alfresco-js-api';
import { InfinitePaginationComponent } from './infinite-pagination.component';
describe('InfinitePaginationComponent', () => {
let fixture: ComponentFixture<InfinitePaginationComponent>;
let component: InfinitePaginationComponent;
let pagination: Pagination;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
NoopAnimationsModule,
MdDatepickerModule,
MdIconModule,
MdInputModule,
MdNativeDateModule
],
declarations: [
InfinitePaginationComponent
]
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(InfinitePaginationComponent);
component = fixture.componentInstance;
pagination = {
skipCount: 0,
hasMoreItems: false
};
});
afterEach(() => {
fixture.destroy();
TestBed.resetTestingModule();
});
it('should show the loading spinner if loading', () => {
pagination.hasMoreItems = true;
component.pagination = pagination;
component.isLoading = true;
fixture.detectChanges();
let loadingSpinner = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-spinner"]'));
expect(loadingSpinner).not.toBeNull();
});
it('should NOT show the loading spinner if NOT loading', () => {
pagination.hasMoreItems = true;
component.pagination = pagination;
component.isLoading = false;
fixture.detectChanges();
let loadingSpinner = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-spinner"]'));
expect(loadingSpinner).toBeNull();
});
it('should show the load more button if NOT loading and has more items', () => {
pagination.hasMoreItems = true;
component.pagination = pagination;
component.isLoading = false;
fixture.detectChanges();
let loadMoreButton = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-button"]'));
expect(loadMoreButton).not.toBeNull();
});
it('should NOT show anything if pagination has NO more items', () => {
pagination.hasMoreItems = false;
component.pagination = pagination;
fixture.detectChanges();
let loadMoreButton = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-button"]'));
expect(loadMoreButton).toBeNull();
let loadingSpinner = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-spinner"]'));
expect(loadingSpinner).toBeNull();
});
it('should trigger the loadMore event with the proper pagination object', (done) => {
pagination.hasMoreItems = true;
pagination.skipCount = 5;
component.pagination = pagination;
component.isLoading = false;
component.pageSize = 5;
fixture.detectChanges();
component.loadMore.subscribe((newPagination: Pagination) => {
expect(newPagination.skipCount).toBe(10);
done();
});
let loadMoreButton = fixture.debugElement.query(By.css('[data-automation-id="adf-infinite-pagination-button"]'));
loadMoreButton.triggerEventHandler('click', {});
});
});

View File

@@ -0,0 +1,69 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
Input,
OnInit,
Output,
ViewEncapsulation
} from '@angular/core';
import { Pagination } from 'alfresco-js-api';
@Component({
selector: 'adf-infinite-pagination',
host: { 'class': 'infinite-adf-pagination' },
templateUrl: './infinite-pagination.component.html',
styleUrls: [ './infinite-pagination.component.scss' ],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None
})
export class InfinitePaginationComponent implements OnInit {
static DEFAULT_PAGE_SIZE: number = 25;
static DEFAULT_PAGINATION: Pagination = {
skipCount: 0,
hasMoreItems: false
};
@Input()
pagination: Pagination;
@Input()
pageSize: number = InfinitePaginationComponent.DEFAULT_PAGE_SIZE;
@Input('loading')
isLoading: boolean = false;
@Output()
loadMore: EventEmitter<Pagination> = new EventEmitter<Pagination>();
ngOnInit() {
if (!this.pagination) {
this.pagination = InfinitePaginationComponent.DEFAULT_PAGINATION;
}
}
onLoadMore() {
this.pagination.skipCount += this.pageSize;
this.loadMore.next(this.pagination);
}
}

View File

@@ -21,6 +21,7 @@ import { MaterialModule } from '@angular/material';
import { TranslateModule } from '@ngx-translate/core';
import { InfinitePaginationComponent } from './infinite-pagination.component';
import { PaginationComponent } from './pagination.component';
@NgModule({
@@ -30,10 +31,12 @@ import { PaginationComponent } from './pagination.component';
MaterialModule
],
declarations: [
PaginationComponent
PaginationComponent,
InfinitePaginationComponent
],
exports: [
PaginationComponent
PaginationComponent,
InfinitePaginationComponent
]
})
export class PaginationModule {}