Skip to content

Commit

Permalink
use dynamic columns from ADF (#889)
Browse files Browse the repository at this point in the history
* upgrade to latest ADF 3.0.0 alpha

* migrate to ADF column components

* use dynamic column from ADF

* fix e2e tests
  • Loading branch information
DenysVuika authored Jan 4, 2019
1 parent 2d59a33 commit fe8c459
Show file tree
Hide file tree
Showing 38 changed files with 657 additions and 1,533 deletions.
4 changes: 2 additions & 2 deletions e2e/components/data-table/data-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export class DataTable extends Component {
selectedRow: '.adf-datatable-row.adf-is-selected',
cell: '.adf-data-table-cell',
locationLink: '.aca-location-link',
nameLink: '.dl-link',
libraryRole: 'app-library-role-column',
nameLink: '.adf-datatable-link',
libraryRole: 'adf-library-role-column',

selectedIcon: '.mat-icon',

Expand Down
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "3.0.0-beta5",
"@alfresco/adf-core": "3.0.0-beta5",
"@alfresco/adf-extensions": "3.0.0-beta5",
"@alfresco/adf-content-services": "3.0.0-dd25467a98fad2898a2b71d07fa50bb175cea81c",
"@alfresco/adf-core": "3.0.0-dd25467a98fad2898a2b71d07fa50bb175cea81c",
"@alfresco/adf-extensions": "3.0.0-dd25467a98fad2898a2b71d07fa50bb175cea81c",
"@angular/animations": "7.1.4",
"@angular/cdk": "^7.2.0",
"@angular/common": "7.1.4",
Expand All @@ -53,7 +53,7 @@
"@ngrx/store": "^7.0.0",
"@ngrx/store-devtools": "^7.0.0",
"@ngx-translate/core": "^10.0.2",
"alfresco-js-api": "3.0.0-beta6",
"alfresco-js-api": "3.0.0-beta7",
"core-js": "^2.5.7",
"hammerjs": "2.0.8",
"minimatch-browser": "^1.0.0",
Expand Down
40 changes: 9 additions & 31 deletions src/app/components/common/common.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,46 +28,24 @@ import { CommonModule } from '@angular/common';
import { GenericErrorComponent } from './generic-error/generic-error.component';
import { CoreModule } from '@alfresco/adf-core';
import { LocationLinkComponent } from './location-link/location-link.component';
import { NameColumnComponent } from './name-column/name-column.component';
import { LibraryNameColumnComponent } from './library-name-column/library-name-column.component';
import { LibraryStatusColumnComponent } from './library-status-column/library-status-column.component';
import { LibraryRoleColumnComponent } from './library-role-column/library-role-column.component';
import { TrashcanNameColumnComponent } from './trashcan-name-column/trashcan-name-column.component';
import { DynamicColumnComponent } from './dynamic-column/dynamic-column.component';
import { IconComponent } from './icon/icon.component';
import { MatIconModule } from '@angular/material';
import { ExtensionsModule } from '@alfresco/adf-extensions';

@NgModule({
imports: [CommonModule, CoreModule.forChild(), MatIconModule],
declarations: [
GenericErrorComponent,
LocationLinkComponent,
NameColumnComponent,
LibraryNameColumnComponent,
LibraryStatusColumnComponent,
LibraryRoleColumnComponent,
TrashcanNameColumnComponent,
DynamicColumnComponent,
IconComponent
imports: [
CommonModule,
CoreModule.forChild(),
MatIconModule,
ExtensionsModule
],
declarations: [GenericErrorComponent, LocationLinkComponent, IconComponent],
exports: [
ExtensionsModule,
GenericErrorComponent,
LocationLinkComponent,
NameColumnComponent,
LibraryNameColumnComponent,
LibraryStatusColumnComponent,
LibraryRoleColumnComponent,
TrashcanNameColumnComponent,
DynamicColumnComponent,
IconComponent
],
entryComponents: [
LocationLinkComponent,
NameColumnComponent,
LibraryNameColumnComponent,
LibraryStatusColumnComponent,
LibraryRoleColumnComponent,
TrashcanNameColumnComponent
]
entryComponents: [LocationLinkComponent]
})
export class AppCommonModule {}
108 changes: 0 additions & 108 deletions src/app/components/common/dynamic-column/dynamic-column.component.ts

This file was deleted.

This file was deleted.

Loading

0 comments on commit fe8c459

Please sign in to comment.