[ADF-2500] fix trashcan bug plus refactoring documentlist (#3136)

* [ADF-2500] The full content of Trashcan is not displayed.

fix pagination problem and add tests

* refactor code

* custom resources services

* move custom resources in separate service part 2

* move custom resources in separate service part 3

* move isCustomResources in custom resources

* move getCorrispondinNodeIds in custom services

* reorganize code

* add pagination interface

* remove permissions check document list and use the common cs method
remove the merge option and move it in the paginator

* make infinte scrolling always use the target

* restore loading infinite page

* fix license header

* fix type problems

* breadcrumb test service

* fix test

* export CustomResourcesService

* fix test pagination

* fix content ndoe test

* remove timeout content node selector test

* fix after rebase

* ripristinate observalbe in search service

* fix wrong type return stub document list test

* fix search service

* fix test document list

* move handle error in common method

* restore observable in search control

* Update search-control.component.spec.ts

* fix after rebase

* add import switchmap

* core import in karma conf

* missing commas

* fix mocks

* fix mock searchquerybody

* search test fix
This commit is contained in:
Eugenio Romano
2018-04-09 10:31:43 +01:00
committed by Denys Vuika
parent 79789cb070
commit 07c247ca11
57 changed files with 1103 additions and 1088 deletions

View File

@@ -30,7 +30,7 @@ import {
FormFieldMetadata,
ContentService
} from '@alfresco/adf-core';
import { ContentNodeDialogService, DocumentListService } from '@alfresco/adf-content-services';
import { ContentNodeDialogService, DocumentListService, CustomResourcesService } from '@alfresco/adf-content-services';
import { Observable } from 'rxjs/Observable';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
@@ -110,6 +110,7 @@ describe('AttachFileWidgetComponent', () => {
ActivitiContentService,
SitesService,
DocumentListService,
CustomResourcesService,
ContentNodeDialogService,
ContentService
]

View File

@@ -26,7 +26,7 @@ import {
SitesService,
NodesApiService
} from '@alfresco/adf-core';
import { ContentNodeDialogService, DocumentListService } from '@alfresco/adf-content-services';
import { ContentNodeDialogService, DocumentListService, CustomResourcesService } from '@alfresco/adf-content-services';
import { Observable } from 'rxjs/Observable';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
@@ -62,6 +62,7 @@ describe('AttachFolderWidgetComponent', () => {
ThumbnailService,
SitesService,
DocumentListService,
CustomResourcesService,
ContentNodeDialogService,
NodesApiService
]

View File

@@ -19,18 +19,18 @@ appContext.keys().forEach(appContext);
const TestBed = require('@angular/core/testing').TestBed;
const browser = require('@angular/platform-browser-dynamic/testing');
const NoopAnimationsModule = require('@angular/platform-browser/animations').NoopAnimationsModule;
const CoreModule = require('@alfresco/adf-core').CoreModule;
const AppConfigService = require('@alfresco/adf-core').AppConfigService;
const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock;
const TranslationService = require('@alfresco/adf-core').TranslationService;
const TranslationMock = require('@alfresco/adf-core').TranslationMock;
const CoreModule = require('../core').CoreModule;
const AppConfigService = require('../core').AppConfigService;
const AppConfigServiceMock = require('../core').AppConfigServiceMock;
const TranslationService = require('../core').TranslationService;
const TranslationMock = require('../core').TranslationMock;
const TranslateModule = require('@ngx-translate/core').TranslateModule;
const CommonModule = require('@angular/common').CommonModule;
const FormsModule = require('@angular/forms').FormsModule;
const ReactiveFormsModule = require('@angular/forms').ReactiveFormsModule;
const AlfrescoApiServiceMock = require('@alfresco/adf-core').AlfrescoApiServiceMock;
const AlfrescoApiService = require('@alfresco/adf-core').AlfrescoApiService;
const AlfrescoApiServiceMock = require('../core').AlfrescoApiServiceMock;
const AlfrescoApiService = require('../core').AlfrescoApiService;
console.log('AlfrescoApiServiceMock' + AlfrescoApiServiceMock);

View File

@@ -30,7 +30,7 @@ import {
DataColumnListComponent,
PaginatedComponent,
PaginationComponent,
PaginationQueryParams,
PaginationModel,
UserPreferencesService
} from '@alfresco/adf-core';
import { DatePipe } from '@angular/common';
@@ -49,7 +49,6 @@ import { ProcessFilterParamRepresentationModel } from '../models/filter-process.
import { processPresetsDefaultModel } from '../models/process-preset.model';
import { ProcessService } from '../services/process.service';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Pagination } from 'alfresco-js-api';
import { ProcessListModel } from '../models/process-list.model';
@Component({
@@ -133,14 +132,14 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
isLoading: boolean = true;
layoutPresets = {};
pagination: BehaviorSubject<Pagination>;
pagination: BehaviorSubject<PaginationModel>;
constructor(private processService: ProcessService,
private userPreferences: UserPreferencesService,
private appConfig: AppConfigService) {
this.size = this.userPreferences.paginationSize;
this.pagination = new BehaviorSubject<Pagination>(<Pagination> {
this.pagination = new BehaviorSubject<PaginationModel>(<PaginationModel> {
maxItems: this.size,
skipCount: 0,
totalItems: 0
@@ -404,7 +403,7 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
return (this.layoutPresets['default']).map(col => new ObjectDataColumn(col));
}
updatePagination(params: PaginationQueryParams) {
updatePagination(params: PaginationModel) {
const needsReload = params.maxItems || params.skipCount;
this.size = params.maxItems;
this.page = this.currentPage(params.skipCount, params.maxItems);

View File

@@ -15,36 +15,17 @@
* limitations under the License.
*/
import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataColumn,
ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
import {
DataColumn,
DataRowEvent,
DataTableAdapter,
ObjectDataColumn,
ObjectDataRow,
ObjectDataTableAdapter
} from '@alfresco/adf-core';
AppConfigService, DataColumnListComponent, PaginationComponent, PaginatedComponent,
UserPreferencesService, UserPreferenceValues, PaginationModel } from '@alfresco/adf-core';
import {
AppConfigService,
DataColumnListComponent,
PaginationComponent,
PaginatedComponent,
PaginationQueryParams,
UserPreferencesService,
UserPreferenceValues
} from '@alfresco/adf-core';
import {
AfterContentInit,
Component,
ContentChild,
EventEmitter,
Input,
OnChanges,
Output,
SimpleChanges
} from '@angular/core';
AfterContentInit, Component, ContentChild, EventEmitter,
Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Pagination } from 'alfresco-js-api';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskListModel } from '../models/task-list.model';
import { taskPresetsDefaultModel } from '../models/task-preset.model';
@@ -141,7 +122,7 @@ export class TaskListComponent implements OnChanges, AfterContentInit, Paginated
currentInstanceId: string;
selectedInstances: any[];
layoutPresets = {};
pagination: BehaviorSubject<Pagination>;
pagination: BehaviorSubject<PaginationModel>;
/** The page number of the tasks to fetch. */
@Input()
@@ -170,7 +151,7 @@ export class TaskListComponent implements OnChanges, AfterContentInit, Paginated
this.size = pageSize;
});
this.pagination = new BehaviorSubject<Pagination>(<Pagination> {
this.pagination = new BehaviorSubject<PaginationModel>(<PaginationModel> {
maxItems: this.size,
skipCount: 0,
totalItems: 0
@@ -428,7 +409,7 @@ export class TaskListComponent implements OnChanges, AfterContentInit, Paginated
return (this.layoutPresets['default']).map(col => new ObjectDataColumn(col));
}
updatePagination(params: PaginationQueryParams) {
updatePagination(params: PaginationModel) {
const needsReload = params.maxItems || params.skipCount;
this.size = params.maxItems;
this.page = this.currentPage(params.skipCount, params.maxItems);