use dynamic columns from ADF (#889)

* upgrade to latest ADF 3.0.0 alpha

* migrate to ADF column components

* use dynamic column from ADF

* fix e2e tests
This commit is contained in:
Denys Vuika
2019-01-04 11:50:51 +00:00
committed by GitHub
parent 2d59a3354e
commit fe8c459637
38 changed files with 664 additions and 1540 deletions

View File

@@ -1,10 +1,10 @@
<app-page-layout [hasError]="!isValidPath">
<app-page-layout-header>
<adf-breadcrumb
[root]="title"
[folderNode]="node"
(navigate)="onBreadcrumbNavigate($event)">
(navigate)="onBreadcrumbNavigate($event)"
>
</adf-breadcrumb>
<adf-toolbar class="inline">
@@ -20,66 +20,71 @@
<app-page-layout-content>
<div class="main-content">
<adf-upload-drag-area
[parentId]="node?.id"
[disabled]="!canUpload">
<adf-document-list #documentList
acaDocumentList
acaContextActions
[display]="documentDisplayMode$ | async"
[sorting]="[ 'modifiedAt', 'desc' ]"
selectionMode="multiple"
[currentFolderId]="node?.id"
[allowDropFiles]="true"
[navigate]="false"
[imageResolver]="imageResolver"
(node-dblclick)="navigateTo($event.detail?.node)"
(name-click)="navigateTo($event.detail?.node)">
<data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById">
<ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
<data-column
[key]="column.key"
[title]="column.title"
[type]="column.type"
[format]="column.format"
[class]="column.class"
[sortable]="column.sortable">
<ng-template let-context>
<app-dynamic-column
[id]="column.template"
[context]="context">
</app-dynamic-column>
</ng-template>
</data-column>
</ng-container>
<ng-container *ngIf="!column.template && !(column.desktopOnly && isSmallScreen)">
<data-column
[key]="column.key"
[title]="column.title"
[type]="column.type"
[format]="column.format"
[class]="column.class"
[sortable]="column.sortable">
</data-column>
</ng-container>
<adf-upload-drag-area [parentId]="node?.id" [disabled]="!canUpload">
<adf-document-list
#documentList
acaDocumentList
acaContextActions
[display]="documentDisplayMode$ | async"
[sorting]="['modifiedAt', 'desc']"
selectionMode="multiple"
[currentFolderId]="node?.id"
[allowDropFiles]="true"
[navigate]="false"
[imageResolver]="imageResolver"
(node-dblclick)="navigateTo($event.detail?.node)"
(name-click)="navigateTo($event.detail?.node)"
>
<data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById">
<ng-container
*ngIf="
column.template && !(column.desktopOnly && isSmallScreen)
"
>
<data-column
[key]="column.key"
[title]="column.title"
[type]="column.type"
[format]="column.format"
[class]="column.class"
[sortable]="column.sortable"
>
<ng-template let-context>
<adf-dynamic-column
[id]="column.template"
[context]="context"
>
</adf-dynamic-column>
</ng-template>
</data-column>
</ng-container>
</data-columns>
<ng-container
*ngIf="
!column.template && !(column.desktopOnly && isSmallScreen)
"
>
<data-column
[key]="column.key"
[title]="column.title"
[type]="column.type"
[format]="column.format"
[class]="column.class"
[sortable]="column.sortable"
>
</data-column>
</ng-container>
</ng-container>
</data-columns>
</adf-document-list>
<adf-pagination acaPagination [target]="documentList">
</adf-pagination>
<adf-pagination acaPagination [target]="documentList"> </adf-pagination>
</adf-upload-drag-area>
</div>
<div class="sidebar" *ngIf="infoDrawerOpened$ | async">
<div class="sidebar" *ngIf="(infoDrawerOpened$ | async)">
<aca-info-drawer [node]="selection.last"></aca-info-drawer>
</div>
</app-page-layout-content>
</app-page-layout>