mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-] update library to use new js-api 3.0.0 (#4097)
This commit is contained in:
committed by
Eugenio Romano
parent
2acd1b4e26
commit
3ef7d3b7ea
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { TestBed, fakeAsync, tick } from '@angular/core/testing';
|
||||
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
|
||||
import { NodeEntry, Node, SitePaging, Site } from '@alfresco/js-api';
|
||||
import { AppConfigService, SitesService, setupTestBed } from '@alfresco/adf-core';
|
||||
import { DocumentListService } from '../document-list/services/document-list.service';
|
||||
import { ContentNodeDialogService } from './content-node-dialog.service';
|
||||
@@ -24,13 +24,20 @@ import { MatDialog } from '@angular/material';
|
||||
import { Subject, of } from 'rxjs';
|
||||
import { ContentTestingModule } from '../testing/content.testing.module';
|
||||
|
||||
const fakeNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const fakeNodeEntry: NodeEntry = <NodeEntry> {
|
||||
entry: {
|
||||
id: 'fake',
|
||||
name: 'fake-name'
|
||||
}
|
||||
};
|
||||
|
||||
const fakeSiteList: SitePaging = {
|
||||
list: {
|
||||
const fakeNode: Node = <Node> {
|
||||
id: 'fake',
|
||||
name: 'fake-name'
|
||||
};
|
||||
|
||||
const fakeSiteList: SitePaging = new SitePaging({
|
||||
list: {
|
||||
pagination: {
|
||||
count: 1,
|
||||
hasMoreItems: false,
|
||||
@@ -48,7 +55,7 @@ const fakeSiteList: SitePaging = {
|
||||
}
|
||||
]
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
describe('ContentNodeDialogService', () => {
|
||||
|
||||
@@ -82,12 +89,13 @@ describe('ContentNodeDialogService', () => {
|
||||
});
|
||||
|
||||
it('should not open the lock node dialog if have no permission', () => {
|
||||
const testNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const testNode: Node = <Node> {
|
||||
id: 'fake',
|
||||
isFile: false
|
||||
};
|
||||
|
||||
service.openLockNodeDialog(testNode).subscribe(() => {}, (error) => {
|
||||
service.openLockNodeDialog(testNode).subscribe(() => {
|
||||
}, (error) => {
|
||||
expect(error).toBe('OPERATION.FAIL.NODE.NO_PERMISSION');
|
||||
});
|
||||
});
|
||||
@@ -103,7 +111,8 @@ describe('ContentNodeDialogService', () => {
|
||||
|
||||
it('should NOT be able to open the dialog when node has NOT permission', () => {
|
||||
service.openCopyMoveDialog('fake-action', fakeNode, 'noperm').subscribe(
|
||||
() => { },
|
||||
() => {
|
||||
},
|
||||
(error) => {
|
||||
expect(spyOnDialogOpen).not.toHaveBeenCalled();
|
||||
expect(JSON.parse(error.message).error.statusCode).toBe(403);
|
||||
@@ -111,24 +120,27 @@ describe('ContentNodeDialogService', () => {
|
||||
});
|
||||
|
||||
it('should be able to open the dialog using a folder id', fakeAsync(() => {
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
|
||||
service.openFileBrowseDialogByFolderId('fake-folder-id').subscribe(() => {});
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeEntry));
|
||||
service.openFileBrowseDialogByFolderId('fake-folder-id').subscribe(() => {
|
||||
});
|
||||
tick();
|
||||
expect(spyOnDialogOpen).toHaveBeenCalled();
|
||||
}));
|
||||
|
||||
it('should be able to open the dialog for files using the first user site', fakeAsync(() => {
|
||||
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
|
||||
service.openFileBrowseDialogBySite().subscribe(() => {});
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeEntry));
|
||||
service.openFileBrowseDialogBySite().subscribe(() => {
|
||||
});
|
||||
tick();
|
||||
expect(spyOnDialogOpen).toHaveBeenCalled();
|
||||
}));
|
||||
|
||||
it('should be able to open the dialog for folder using the first user site', fakeAsync(() => {
|
||||
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
|
||||
service.openFolderBrowseDialogBySite().subscribe(() => {});
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeEntry));
|
||||
service.openFolderBrowseDialogBySite().subscribe(() => {
|
||||
});
|
||||
tick();
|
||||
expect(spyOnDialogOpen).toHaveBeenCalled();
|
||||
}));
|
||||
@@ -140,23 +152,23 @@ describe('ContentNodeDialogService', () => {
|
||||
});
|
||||
|
||||
describe('for the copy/move dialog', () => {
|
||||
const siteNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const siteNode: Node = <Node> {
|
||||
id: 'site-node-id',
|
||||
nodeType: 'st:site'
|
||||
};
|
||||
const sites: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const sites: Node = <Node> {
|
||||
id: 'sites-id',
|
||||
nodeType: 'st:sites'
|
||||
};
|
||||
const site: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const site: Site = <Site> {
|
||||
id: 'site-id',
|
||||
guid: 'any-guid'
|
||||
};
|
||||
const nodeEntryWithRightPermissions: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const nodeEntryWithRightPermissions: Node = <Node> {
|
||||
id: 'node-id',
|
||||
allowableOperations: ['create']
|
||||
};
|
||||
const nodeEntryNoPermissions: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
|
||||
const nodeEntryNoPermissions: Node = <Node> {
|
||||
id: 'node-id',
|
||||
allowableOperations: []
|
||||
};
|
||||
@@ -192,7 +204,7 @@ describe('ContentNodeDialogService', () => {
|
||||
beforeEach(() => {
|
||||
spyOnDialogOpen.and.callFake((contentNodeSelectorComponent: any, config: any) => {
|
||||
testContentNodeSelectorComponentData = config.data;
|
||||
return {componentInstance: {}};
|
||||
return { componentInstance: {} };
|
||||
});
|
||||
service.openCopyMoveDialog('fake-action', fakeNode, '!update');
|
||||
});
|
||||
|
@@ -20,7 +20,7 @@ import { EventEmitter, Injectable, Output } from '@angular/core';
|
||||
import { ContentService } from '@alfresco/adf-core';
|
||||
import { Subject, Observable, throwError } from 'rxjs';
|
||||
import { ShareDataRow } from '../document-list/data/share-data-row.model';
|
||||
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
|
||||
import { Node, NodeEntry, SitePaging } from '@alfresco/js-api';
|
||||
import { DataColumn, SitesService, TranslationService, PermissionsEnum } from '@alfresco/adf-core';
|
||||
import { DocumentListService } from '../document-list/services/document-list.service';
|
||||
import { ContentNodeSelectorComponent } from './content-node-selector.component';
|
||||
@@ -49,9 +49,9 @@ export class ContentNodeDialogService {
|
||||
* @param folderNodeId ID of the folder to use
|
||||
* @returns Information about the selected file(s)
|
||||
*/
|
||||
openFileBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
|
||||
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
|
||||
return this.openUploadFileDialog('Choose', node);
|
||||
openFileBrowseDialogByFolderId(folderNodeId: string): Observable<Node[]> {
|
||||
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((nodeEntry: NodeEntry) => {
|
||||
return this.openUploadFileDialog('Choose', nodeEntry.entry);
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ export class ContentNodeDialogService {
|
||||
* @param contentEntry Node to lock
|
||||
* @returns Error/status message (if any)
|
||||
*/
|
||||
public openLockNodeDialog(contentEntry: MinimalNodeEntryEntity): Subject<string> {
|
||||
public openLockNodeDialog(contentEntry: Node): Subject<string> {
|
||||
const observable: Subject<string> = new Subject<string>();
|
||||
|
||||
if (this.contentService.hasPermission(contentEntry, PermissionsEnum.LOCK)) {
|
||||
@@ -85,7 +85,7 @@ export class ContentNodeDialogService {
|
||||
* Opens a file browser at a chosen site location.
|
||||
* @returns Information about the selected file(s)
|
||||
*/
|
||||
openFileBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
|
||||
openFileBrowseDialogBySite(): Observable<Node[]> {
|
||||
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
|
||||
return this.openFileBrowseDialogByFolderId(response.list.entries[0].entry.guid);
|
||||
}));
|
||||
@@ -95,7 +95,7 @@ export class ContentNodeDialogService {
|
||||
* Opens a folder browser at a chosen site location.
|
||||
* @returns Information about the selected folder(s)
|
||||
*/
|
||||
openFolderBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
|
||||
openFolderBrowseDialogBySite(): Observable<Node[]> {
|
||||
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
|
||||
return this.openFolderBrowseDialogByFolderId(response.list.entries[0].entry.guid);
|
||||
}));
|
||||
@@ -106,9 +106,9 @@ export class ContentNodeDialogService {
|
||||
* @param folderNodeId ID of the folder to use
|
||||
* @returns Information about the selected folder(s)
|
||||
*/
|
||||
openFolderBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
|
||||
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
|
||||
return this.openUploadFolderDialog('Choose', node);
|
||||
openFolderBrowseDialogByFolderId(folderNodeId: string): Observable<Node[]> {
|
||||
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: NodeEntry) => {
|
||||
return this.openUploadFolderDialog('Choose', node.entry);
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -119,10 +119,10 @@ export class ContentNodeDialogService {
|
||||
* @param permission Permission for the operation
|
||||
* @returns Information about files that were copied/moved
|
||||
*/
|
||||
openCopyMoveDialog(action: string, contentEntry: MinimalNodeEntryEntity, permission?: string): Observable<MinimalNodeEntryEntity[]> {
|
||||
openCopyMoveDialog(action: string, contentEntry: Node, permission?: string): Observable<Node[]> {
|
||||
if (this.contentService.hasPermission(contentEntry, permission)) {
|
||||
|
||||
const select = new Subject<MinimalNodeEntryEntity[]>();
|
||||
const select = new Subject<Node[]>();
|
||||
select.subscribe({
|
||||
complete: this.close.bind(this)
|
||||
});
|
||||
@@ -164,8 +164,8 @@ export class ContentNodeDialogService {
|
||||
* @param contentEntry Item to upload
|
||||
* @returns Information about the chosen folder(s)
|
||||
*/
|
||||
openUploadFolderDialog(action: string, contentEntry: MinimalNodeEntryEntity): Observable<MinimalNodeEntryEntity[]> {
|
||||
const select = new Subject<MinimalNodeEntryEntity[]>();
|
||||
openUploadFolderDialog(action: string, contentEntry: Node): Observable<Node[]> {
|
||||
const select = new Subject<Node[]>();
|
||||
select.subscribe({
|
||||
complete: this.close.bind(this)
|
||||
});
|
||||
@@ -190,8 +190,8 @@ export class ContentNodeDialogService {
|
||||
* @param contentEntry Item to upload
|
||||
* @returns Information about the chosen file(s)
|
||||
*/
|
||||
openUploadFileDialog(action: string, contentEntry: MinimalNodeEntryEntity): Observable<MinimalNodeEntryEntity[]> {
|
||||
const select = new Subject<MinimalNodeEntryEntity[]>();
|
||||
openUploadFileDialog(action: string, contentEntry: Node): Observable<Node[]> {
|
||||
const select = new Subject<Node[]>();
|
||||
select.subscribe({
|
||||
complete: this.close.bind(this)
|
||||
});
|
||||
@@ -214,7 +214,7 @@ export class ContentNodeDialogService {
|
||||
}
|
||||
|
||||
private imageResolver(row: ShareDataRow, col: DataColumn): string | null {
|
||||
const entry: MinimalNodeEntryEntity = row.node.entry;
|
||||
const entry: Node = row.node.entry;
|
||||
if (!this.contentService.hasPermission(entry, 'create')) {
|
||||
return this.documentListService.getMimeTypeIcon('disable/folder');
|
||||
}
|
||||
@@ -223,7 +223,7 @@ export class ContentNodeDialogService {
|
||||
}
|
||||
|
||||
private rowFilter(currentNodeId, row: ShareDataRow): boolean {
|
||||
const node: MinimalNodeEntryEntity = row.node.entry;
|
||||
const node: Node = row.node.entry;
|
||||
|
||||
if (node.id === currentNodeId || node.isFile) {
|
||||
return false;
|
||||
@@ -232,23 +232,23 @@ export class ContentNodeDialogService {
|
||||
}
|
||||
}
|
||||
|
||||
private isNodeFile(entry: MinimalNodeEntryEntity): boolean {
|
||||
private isNodeFile(entry: Node): boolean {
|
||||
return entry.isFile;
|
||||
}
|
||||
|
||||
private hasPermissionOnNodeFolder(entry: MinimalNodeEntryEntity): boolean {
|
||||
private hasPermissionOnNodeFolder(entry: Node): boolean {
|
||||
return this.isNodeFolder(entry) && this.contentService.hasPermission(entry, 'create');
|
||||
}
|
||||
|
||||
private isNodeFolder(entry: MinimalNodeEntryEntity): boolean {
|
||||
private isNodeFolder(entry: Node): boolean {
|
||||
return entry.isFolder;
|
||||
}
|
||||
|
||||
private isCopyMoveSelectionValid(entry: MinimalNodeEntryEntity): boolean {
|
||||
private isCopyMoveSelectionValid(entry: Node): boolean {
|
||||
return this.hasEntityCreatePermission(entry) && !this.isSite(entry);
|
||||
}
|
||||
|
||||
private hasEntityCreatePermission(entry: MinimalNodeEntryEntity): boolean {
|
||||
private hasEntityCreatePermission(entry: Node): boolean {
|
||||
return this.contentService.hasPermission(entry, 'create');
|
||||
}
|
||||
|
||||
|
@@ -18,13 +18,13 @@
|
||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { async, fakeAsync, tick, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { MinimalNodeEntryEntity, SiteEntry, SitePaging } from 'alfresco-js-api';
|
||||
import { NodeEntry, Node, SiteEntry, SitePaging } from '@alfresco/js-api';
|
||||
import { SearchService, SitesService, setupTestBed } from '@alfresco/adf-core';
|
||||
import { Observable, Observer, of, throwError } from 'rxjs';
|
||||
import { DropdownBreadcrumbComponent } from '../breadcrumb';
|
||||
import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
|
||||
import { ContentNodeSelectorService } from './content-node-selector.service';
|
||||
import { NodePaging } from 'alfresco-js-api';
|
||||
import { NodePaging } from '@alfresco/js-api';
|
||||
import { ContentTestingModule } from '../testing/content.testing.module';
|
||||
import { DocumentListService } from '../document-list/services/document-list.service';
|
||||
import { DocumentListComponent } from '../document-list/components/document-list.component';
|
||||
@@ -98,7 +98,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
describe('Parameters', () => {
|
||||
|
||||
it('should trigger the select event when selection has been made', (done) => {
|
||||
const expectedNode = <MinimalNodeEntryEntity> {};
|
||||
const expectedNode = <Node> {};
|
||||
component.select.subscribe((nodes) => {
|
||||
expect(nodes.length).toBe(1);
|
||||
expect(nodes[0]).toBe(expectedNode);
|
||||
@@ -116,10 +116,10 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
expectedDefaultFolderNode;
|
||||
|
||||
beforeEach(() => {
|
||||
expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
|
||||
expectedDefaultFolderNode = <Node> { path: { elements: [] } };
|
||||
documentListService = TestBed.get(DocumentListService);
|
||||
sitesService = TestBed.get(SitesService);
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(<NodeEntry> { entry: { path: { elements: [] } } }));
|
||||
spyOn(documentListService, 'getFolder').and.returnValue(throwError('No results for test'));
|
||||
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
|
||||
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
|
||||
@@ -134,7 +134,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
fixture.detectChanges();
|
||||
const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
|
||||
expect(breadcrumb).not.toBeNull();
|
||||
expect(breadcrumb.componentInstance.folderNode).toBe(expectedDefaultFolderNode);
|
||||
expect(breadcrumb.componentInstance.folderNode).toEqual(expectedDefaultFolderNode);
|
||||
done();
|
||||
});
|
||||
});
|
||||
@@ -189,7 +189,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
|
||||
tick(debounceSearch);
|
||||
|
||||
const chosenNode = <MinimalNodeEntryEntity> { path: { elements: ['one'] } };
|
||||
const chosenNode = new Node({ path: { elements: ['one'] } });
|
||||
component.onNodeSelect({ detail: { node: { entry: chosenNode } } });
|
||||
fixture.detectChanges();
|
||||
|
||||
@@ -210,13 +210,13 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
component.onFolderChange();
|
||||
fixture.detectChanges();
|
||||
|
||||
const chosenNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
|
||||
const chosenNode = <Node> { path: { elements: [] } };
|
||||
component.onNodeSelect({ detail: { node: { entry: chosenNode } } });
|
||||
fixture.detectChanges();
|
||||
|
||||
const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
|
||||
expect(breadcrumb).not.toBeNull();
|
||||
expect(breadcrumb.componentInstance.folderNode).toBe(expectedDefaultFolderNode);
|
||||
expect(breadcrumb.componentInstance.folderNode).toEqual(expectedDefaultFolderNode);
|
||||
done();
|
||||
}, 300);
|
||||
});
|
||||
@@ -229,13 +229,13 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
expect(component.breadcrumbTransform).toBeNull();
|
||||
|
||||
const breadcrumb = fixture.debugElement.query(By.directive(DropdownBreadcrumbComponent));
|
||||
expect(breadcrumb.componentInstance.folderNode).toBe(expectedDefaultFolderNode);
|
||||
expect(breadcrumb.componentInstance.folderNode).toEqual(expectedDefaultFolderNode);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should make changes to breadcrumb\'s folderNode if breadcrumbTransform is defined', (done) => {
|
||||
const transformedFolderNode = <MinimalNodeEntryEntity> {
|
||||
const transformedFolderNode = <Node> {
|
||||
id: 'trans-node',
|
||||
name: 'trans-node-name',
|
||||
path: { elements: [{ id: 'testId', name: 'testName' }] }
|
||||
@@ -288,7 +288,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
const documentListService = TestBed.get(DocumentListService);
|
||||
const expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
|
||||
const expectedDefaultFolderNode = <NodeEntry> { entry: { path: { elements: [] } } };
|
||||
|
||||
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
|
||||
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
|
||||
@@ -319,7 +319,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
}));
|
||||
|
||||
it('should reset the currently chosen node in case of starting a new search', fakeAsync(() => {
|
||||
component.chosenNode = <MinimalNodeEntryEntity> {};
|
||||
component.chosenNode = <Node> {};
|
||||
typeToSearchBox('kakarot');
|
||||
|
||||
tick(debounceSearch);
|
||||
@@ -458,7 +458,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
}));
|
||||
|
||||
it('should clear the search field, nodes and chosenNode when clicking on the X (clear) icon', () => {
|
||||
component.chosenNode = <MinimalNodeEntryEntity> {};
|
||||
component.chosenNode = <Node> {};
|
||||
component.nodes = {
|
||||
list: {
|
||||
entries: [{ entry: component.chosenNode }]
|
||||
@@ -684,7 +684,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
|
||||
describe('Chosen node', () => {
|
||||
|
||||
const entry: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {};
|
||||
const entry: Node = <Node> {};
|
||||
const nodePage: NodePaging = <NodePaging> { list: {}, pagination: {} };
|
||||
let hasPermission;
|
||||
|
||||
@@ -783,7 +783,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
|
||||
it('should be null when the chosenNode is reset', async(() => {
|
||||
hasPermission = true;
|
||||
component.onNodeSelect({ detail: { node: { entry: <MinimalNodeEntryEntity> {} } } });
|
||||
component.onNodeSelect({ detail: { node: { entry: <Node> {} } } });
|
||||
fixture.detectChanges();
|
||||
|
||||
component.select.subscribe((nodes) => {
|
||||
@@ -833,7 +833,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
|
||||
it('should be null when the chosenNode is reset', async(() => {
|
||||
fixture.detectChanges();
|
||||
component.onNodeSelect({ detail: { node: { entry: <MinimalNodeEntryEntity> {} } } });
|
||||
component.onNodeSelect({ detail: { node: { entry: <Node> {} } } });
|
||||
fixture.detectChanges();
|
||||
|
||||
component.select.subscribe((nodes) => {
|
||||
@@ -885,7 +885,7 @@ describe('ContentNodeSelectorComponent', () => {
|
||||
it('should be null when the chosenNode is reset', async(() => {
|
||||
fixture.detectChanges();
|
||||
|
||||
component.onNodeSelect({ detail: { node: { entry: <MinimalNodeEntryEntity> {} } } });
|
||||
component.onNodeSelect({ detail: { node: { entry: <Node> {} } } });
|
||||
fixture.detectChanges();
|
||||
|
||||
component.select.subscribe((nodes) => {
|
||||
|
@@ -21,7 +21,7 @@ import {
|
||||
PaginatedComponent, PaginationModel
|
||||
} from '@alfresco/adf-core';
|
||||
import { FormControl } from '@angular/forms';
|
||||
import { MinimalNodeEntryEntity, NodePaging, Pagination, SiteEntry, SitePaging } from 'alfresco-js-api';
|
||||
import { Node, NodePaging, Pagination, SiteEntry, SitePaging } from '@alfresco/js-api';
|
||||
import { DocumentListComponent, PaginationStrategy } from '../document-list/components/document-list.component';
|
||||
import { RowFilter } from '../document-list/data/row-filter.model';
|
||||
import { ImageResolver } from '../document-list/data/image-resolver.model';
|
||||
@@ -30,7 +30,7 @@ import { debounceTime } from 'rxjs/operators';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { CustomResourcesService } from '../document-list/services/custom-resources.service';
|
||||
|
||||
export type ValidationFunction = (entry: MinimalNodeEntryEntity) => boolean;
|
||||
export type ValidationFunction = (entry: Node) => boolean;
|
||||
|
||||
const defaultValidation = () => true;
|
||||
|
||||
@@ -95,7 +95,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
|
||||
/** Emitted when the user has chosen an item. */
|
||||
@Output()
|
||||
select: EventEmitter<MinimalNodeEntryEntity[]> = new EventEmitter<MinimalNodeEntryEntity[]>();
|
||||
select: EventEmitter<Node[]> = new EventEmitter<Node[]>();
|
||||
|
||||
@ViewChild('documentList')
|
||||
documentList: DocumentListComponent;
|
||||
@@ -109,7 +109,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
showingSearchResults: boolean = false;
|
||||
loadingSearchResults: boolean = false;
|
||||
inDialog: boolean = false;
|
||||
_chosenNode: MinimalNodeEntryEntity = null;
|
||||
_chosenNode: Node = null;
|
||||
folderIdToShow: string | null = null;
|
||||
paginationStrategy: PaginationStrategy = PaginationStrategy.Infinite;
|
||||
pagination: BehaviorSubject<PaginationModel>;
|
||||
@@ -141,7 +141,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
this.pagination = new BehaviorSubject<PaginationModel>(defaultPagination);
|
||||
}
|
||||
|
||||
set chosenNode(value: MinimalNodeEntryEntity) {
|
||||
set chosenNode(value: Node) {
|
||||
this._chosenNode = value;
|
||||
let valuesArray = null;
|
||||
if (value) {
|
||||
@@ -184,8 +184,8 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
/**
|
||||
* Returns the actually selected|entered folder node or null in case of searching for the breadcrumb
|
||||
*/
|
||||
get breadcrumbFolderNode(): MinimalNodeEntryEntity | null {
|
||||
let folderNode: MinimalNodeEntryEntity;
|
||||
get breadcrumbFolderNode(): Node | null {
|
||||
let folderNode: Node;
|
||||
|
||||
if (this.showingSearchResults && this.chosenNode) {
|
||||
folderNode = this.chosenNode;
|
||||
@@ -345,7 +345,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
*
|
||||
* @param entry
|
||||
*/
|
||||
private attemptNodeSelection(entry: MinimalNodeEntryEntity): void {
|
||||
private attemptNodeSelection(entry: Node): void {
|
||||
if (this.isSelectionValid(entry)) {
|
||||
this.chosenNode = entry;
|
||||
} else {
|
||||
@@ -369,8 +369,8 @@ export class ContentNodeSelectorPanelComponent implements OnInit, PaginatedCompo
|
||||
this.attemptNodeSelection(event.detail.node.entry);
|
||||
}
|
||||
|
||||
onNodeDoubleClick(e: CustomEvent) {
|
||||
const node: any = e.detail.node.entry;
|
||||
onNodeDoubleClick(customEvent: CustomEvent) {
|
||||
const node: any = customEvent.detail.node.entry;
|
||||
|
||||
if (node && node.guid) {
|
||||
const options = {
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
|
||||
import { Node, SitePaging } from '@alfresco/js-api';
|
||||
import { Subject } from 'rxjs';
|
||||
|
||||
export interface ContentNodeSelectorComponentData {
|
||||
@@ -26,7 +26,7 @@ export interface ContentNodeSelectorComponentData {
|
||||
dropdownSiteList?: SitePaging;
|
||||
rowFilter?: any;
|
||||
imageResolver?: any;
|
||||
isSelectionValid?: (entry: MinimalNodeEntryEntity) => boolean;
|
||||
isSelectionValid?: (entry: Node) => boolean;
|
||||
breadcrumbTransform?: (node) => any;
|
||||
select: Subject<MinimalNodeEntryEntity[]>;
|
||||
select: Subject<Node[]>;
|
||||
}
|
||||
|
@@ -20,7 +20,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { EventEmitter } from '@angular/core';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { ContentNodeSelectorComponent } from './content-node-selector.component';
|
||||
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
|
||||
import { Node } from '@alfresco/js-api';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { setupTestBed, SitesService } from '@alfresco/adf-core';
|
||||
import { of } from 'rxjs';
|
||||
@@ -35,7 +35,7 @@ describe('ContentNodeSelectorDialogComponent', () => {
|
||||
let data: any = {
|
||||
title: 'Move along citizen...',
|
||||
actionName: 'move',
|
||||
select: new EventEmitter<MinimalNodeEntryEntity>(),
|
||||
select: new EventEmitter<Node>(),
|
||||
rowFilter: () => {
|
||||
},
|
||||
imageResolver: () => 'piccolo',
|
||||
@@ -140,7 +140,7 @@ describe('ContentNodeSelectorDialogComponent', () => {
|
||||
});
|
||||
|
||||
it('should be enabled when a node is chosen', () => {
|
||||
component.onSelect([{ id: 'fake' }]);
|
||||
component.onSelect([new Node({ id: 'fake' })]);
|
||||
fixture.detectChanges();
|
||||
|
||||
let actionButton = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-actions-choose"]'));
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { Component, Inject, ViewEncapsulation, Input } from '@angular/core';
|
||||
import { MAT_DIALOG_DATA } from '@angular/material';
|
||||
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
|
||||
import { Node, SitePaging } from '@alfresco/js-api';
|
||||
import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
|
||||
import { RowFilter } from '../document-list/data/row-filter.model';
|
||||
import { ImageResolver } from '../document-list/data/image-resolver.model';
|
||||
@@ -73,7 +73,7 @@ export class ContentNodeSelectorComponent {
|
||||
pageSize: number;
|
||||
|
||||
buttonActionName: string;
|
||||
chosenNode: MinimalNodeEntryEntity[];
|
||||
chosenNode: Node[];
|
||||
|
||||
constructor(@Inject(MAT_DIALOG_DATA) public data: ContentNodeSelectorComponentData) {
|
||||
this.buttonActionName = data.actionName ? `NODE_SELECTOR.${data.actionName.toUpperCase()}` : 'NODE_SELECTOR.CHOOSE';
|
||||
@@ -83,7 +83,7 @@ export class ContentNodeSelectorComponent {
|
||||
this.data.select.complete();
|
||||
}
|
||||
|
||||
onSelect(nodeList: MinimalNodeEntryEntity[]) {
|
||||
onSelect(nodeList: Node[]) {
|
||||
this.chosenNode = nodeList;
|
||||
}
|
||||
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { QueryBody } from 'alfresco-js-api';
|
||||
import { QueryBody } from '@alfresco/js-api';
|
||||
import { SearchService, setupTestBed } from '@alfresco/adf-core';
|
||||
import { ContentNodeSelectorService } from './content-node-selector.service';
|
||||
import { ContentTestingModule } from '../testing/content.testing.module';
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { SearchService } from '@alfresco/adf-core';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { NodePaging } from 'alfresco-js-api';
|
||||
import { NodePaging } from '@alfresco/js-api';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user