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

[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)

Browse Source 
* upgrade to HttpClient

* upgrade to Renderer2

* upgrade Document reference

* remove useless test with deprecated ReflectiveInjector

* upgrade to latest typescript

* upgrade libs

* upgrade package scripts

* remove rxjs blacklists and duplicate rules

* add rxjs compat to help with migration

* fix breaking changes

* fix breaking changes in material

* fix breaking changes (material 6)

* upgrade rxjs, ngx-translate and flex layout

* update unit tests

* restore providers

* upgrade deprecated Observable.error

* rebase
fix first configuration problems

* fix style issues commented

* fix core build

* fix lib template errors

* move lib test execution in angular.json

* ignore

* karma conf files

* fix import statement test

* single run option

* update packages reporter

* restore report

* increase timeout

* improve karma conf test configuration

* fix test issues about lint

* fix test analytics

* fix process service test

* content service fix test

* fix logout directive test

* fix core test

* fix build

* update node-sass to latest

* update angular cli dependencies

* improve build script

create directorites and move files only if previous command succeded

* upgrade individual libs to 6.0

* remove old webpack files

* revert sass change

* fix type issues
fix style issues

* fix tslint demo shell issue

* fix peerdependencies

* fix test e2e BC

* package upate

* fix style import issue

* extract-text-webpack-plugin beta

* fix test dist build command

* remove alpha js-api

* fix tslint issue
add banner tslint rule

* upload service fix

* change BC script

* fix test dist script

* increase demo shell timeout test

* verbose copy

* path absolute

* fix script bc

* fix copy part

* fix path warning
fix monaco editor

* remove duplicate header

* remove unused import

* fix align and check ago tests

* add missing import

* fix notification button selector

* [ANGULAR6] fixed core tests

* fix CS test

* fix cs test step 2

* increase travis_wait for dist

* fix attachment PS

* fix checklist test

* use pdf min
This commit is contained in:
Denys Vuika
2018-08-07 11:58:16 +01:00
committed by Eugenio Romano
parent c510ec864d
commit 6b24bfb1d4
371 changed files with 16287 additions and 24504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/content-services/upload/components/base-upload/upload-base.ts
View File

@@ -18,7 +18,7 @@
import { FileModel, FileInfo } from '@alfresco/adf-core';
import { EventEmitter, Input, Output, OnInit, OnDestroy, NgZone } from '@angular/core';
import { UploadService, TranslationService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Rx';
import { Subscription } from 'rxjs';
import { UploadFilesEvent } from '../upload-files.event';
export abstract class UploadBase implements OnInit, OnDestroy {

3
lib/content-services/upload/components/file-uploading-dialog.component.html
View File

@@ -59,7 +59,6 @@
<section class="upload-dialog__content"
[class.upload-dialog--padding]="isConfirmation">
<adf-file-uploading-list
(error)="onError($event)"
[class.upload-dialog--hide]="isConfirmation"
#uploadList
[files]="filesUploadingList">
@@ -101,7 +100,7 @@
*ngIf="uploadList.isUploadCompleted() || uploadList.isUploadCancelled()"
mat-button
color="primary"
(click)="close($event)">
(click)="close()">
{{ 'ADF_FILE_UPLOAD.BUTTON.CLOSE' | translate }}
</button>
</footer>

7
lib/content-services/upload/components/file-uploading-dialog.component.ts
View File

@@ -20,10 +20,8 @@ import {
FileUploadErrorEvent, FileUploadStatus, UploadService
} from '@alfresco/adf-core';
import { ChangeDetectorRef, Component, Input, Output, EventEmitter, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subscription } from 'rxjs/Subscription';
import { Subscription, merge } from 'rxjs';
import { FileUploadingListComponent } from './file-uploading-list.component';
import 'rxjs/add/observable/merge';
// @deprecated file-uploading-dialog TODO remove in 3.0.0
@Component({
@@ -69,8 +67,7 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
}
});
this.counterSubscription = Observable
.merge(
this.counterSubscription = merge(
this.uploadService.fileUploadComplete,
this.uploadService.fileUploadDeleted
)

5
lib/content-services/upload/components/file-uploading-list-row.component.html
View File

@@ -64,8 +64,7 @@
<div
*ngIf="file.status === FileUploadStatus.Error"
class="adf-file-uploading-row__block adf-file-uploading-row__status--error"
title="{{ file.response }}">
class="adf-file-uploading-row__block adf-file-uploading-row__status--error">
<mat-icon mat-list-icon>
report_problem
</mat-icon>
@@ -78,4 +77,4 @@
class="adf-file-uploading-row__block adf-file-uploading-row__status--cancelled">
{{ 'ADF_FILE_UPLOAD.STATUS.FILE_CANCELED_STATUS' | translate }}
</div>
<div>
<div>

18
lib/content-services/upload/components/file-uploading-list.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslationService, FileUploadStatus, NodesApiService, UploadService,
setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock
} from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { UploadModule } from '../upload.module';
import { FileUploadingListComponent } from './file-uploading-list.component';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -57,7 +57,7 @@ describe('FileUploadingListComponent', () => {
fixture = TestBed.createComponent(FileUploadingListComponent);
component = fixture.componentInstance;
spyOn(translateService, 'get').and.returnValue(Observable.of('some error message'));
spyOn(translateService, 'get').and.returnValue(of('some error message'));
spyOn(uploadService, 'cancelUpload');
});
@@ -71,7 +71,7 @@ describe('FileUploadingListComponent', () => {
describe('removeFile()', () => {
it('should change file status when api returns success', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
component.removeFile(file);
fixture.detectChanges();
@@ -80,7 +80,7 @@ describe('FileUploadingListComponent', () => {
});
it('should change file status when api returns error', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.removeFile(file);
fixture.detectChanges();
@@ -89,7 +89,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService on error', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.removeFile(file);
fixture.detectChanges();
@@ -98,7 +98,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService on success', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
component.removeFile(file);
fixture.detectChanges();
@@ -109,7 +109,7 @@ describe('FileUploadingListComponent', () => {
describe('Events', () => {
it('should throw an error event if delete file goes wrong', (done) => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.error.subscribe(() => {
done();
@@ -153,7 +153,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call deleteNode when there are completed uploads', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
component.files[0].status = FileUploadStatus.Complete;
component.cancelAllFiles();
@@ -162,7 +162,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService when there are uploading files', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
component.files[0].status = FileUploadStatus.Progress;
component.cancelAllFiles();

23
lib/content-services/upload/components/file-uploading-list.component.ts
View File

@@ -17,7 +17,8 @@
import { FileModel, FileUploadStatus, NodesApiService, TranslationService, UploadService } from '@alfresco/adf-core';
import { Component, ContentChild, Input, Output, TemplateRef, EventEmitter } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, forkJoin, of } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
@Component({
selector: 'adf-file-uploading-list',
@@ -77,7 +78,7 @@ export class FileUploadingListComponent {
.filter((file) => file.status === FileUploadStatus.Complete)
.map((file) => this.deleteNode(file));
Observable.forkJoin(...deletedFiles)
forkJoin(...deletedFiles)
.subscribe((files: FileModel[]) => {
const errors = files
.filter((file) => file.status === FileUploadStatus.Error);
@@ -122,14 +123,16 @@ export class FileUploadingListComponent {
return this.nodesApi
.deleteNode(id, { permanent: true })
.map(() => {
file.status = FileUploadStatus.Deleted;
return file;
})
.catch((error) => {
file.status = FileUploadStatus.Error;
return Observable.of(file);
});
.pipe(
map(() => {
file.status = FileUploadStatus.Deleted;
return file;
}),
catchError(() => {
file.status = FileUploadStatus.Error;
return of(file);
})
);
}
private notifyError(...files: FileModel[]) {

20
lib/content-services/upload/components/upload-button.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { SimpleChange } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentService, UploadService, TranslationService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { UploadButtonComponent } from './upload-button.component';
import { TranslationMock } from '@alfresco/adf-core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -120,7 +120,7 @@ describe('UploadButtonComponent', () => {
component.rootFolderId = '-root-';
component.success = null;
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -135,7 +135,7 @@ describe('UploadButtonComponent', () => {
component.rootFolderId = '-my-';
component.success = null;
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -161,8 +161,8 @@ describe('UploadButtonComponent', () => {
it('should create a folder and emit an File uploaded event', (done) => {
component.rootFolderId = '-my-';
spyOn(contentService, 'createFolder').and.returnValue(Observable.of(true));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'createFolder').and.returnValue(of(true));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
fixture.detectChanges();
@@ -353,7 +353,7 @@ describe('UploadButtonComponent', () => {
it('should not call uploadFiles for node without permission', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -367,7 +367,7 @@ describe('UploadButtonComponent', () => {
it('should not call uploadFiles when getNode fails', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -381,7 +381,7 @@ describe('UploadButtonComponent', () => {
it('should emit an error message when getNode fails', (done) => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
component.error.subscribe((value) => {
expect(value).toBe('error');
@@ -399,7 +399,7 @@ describe('UploadButtonComponent', () => {
fakeNodeWithNoPermission.entry.allowableOperations = ['other'];
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -413,7 +413,7 @@ describe('UploadButtonComponent', () => {
it('should call uploadFiles when node has CREATE', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');

3
lib/content-services/upload/components/upload-button.component.ts
View File

@@ -24,9 +24,8 @@ import {
OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation, NgZone
} from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { PermissionModel } from '../../document-list/models/permissions.model';
import 'rxjs/add/observable/throw';
import { UploadBase } from './base-upload/upload-base';
@Component({

4
lib/content-services/upload/components/upload-drag-area.component.spec.ts
View File

@@ -27,7 +27,7 @@ import {
import { FileDraggableDirective } from '../directives/file-draggable.directive';
import { UploadDragAreaComponent } from './upload-drag-area.component';
import { Observable } from 'rxjs/Observable';
import { throwError } from 'rxjs';
function getFakeShareDataRow(allowableOperations = ['delete', 'update', 'create']) {
return {
@@ -457,7 +457,7 @@ describe('UploadDragAreaComponent', () => {
};
fixture.detectChanges();
spyOn(uploadService, 'fileUploadError').and.returnValue(Observable.throw(new Error()));
spyOn(uploadService, 'fileUploadError').and.returnValue(throwError(new Error()));
component.error.subscribe((error) => {
expect(error).not.toBeNull();