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

add missing DataColumn module to DataTable (#5512)

Browse Source 
* add missing DataColumn module to DataTable

* fix import path
This commit is contained in:
Denys Vuika
2020-02-26 14:58:26 +00:00
committed by GitHub
parent 1e67f50346
commit 999e513087
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/about/about-application-modules/about-application-modules.component.spec.ts
View File

@@ -20,7 +20,6 @@ import { CoreTestingModule } from '../../testing/core.testing.module';
import { setupTestBed } from '../../testing/setup-test-bed'; import { setupTestBed } from '../../testing/setup-test-bed';
import { AboutApplicationModulesComponent } from './about-application-modules.component'; import { AboutApplicationModulesComponent } from './about-application-modules.component';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { DataColumnModule } from '../../data-column/data-column.module';
import { DataTableModule } from '../../datatable/datatable.module'; import { DataTableModule } from '../../datatable/datatable.module';
import { mockDependencies, mockPlugins } from '../about.mock'; import { mockDependencies, mockPlugins } from '../about.mock';
@@ -29,7 +28,7 @@ describe('AboutApplicationModulesComponent', () => {
let component: AboutApplicationModulesComponent; let component: AboutApplicationModulesComponent;
setupTestBed({ setupTestBed({
imports: [CoreTestingModule, MatTableModule, DataColumnModule, DataTableModule] imports: [CoreTestingModule, MatTableModule, DataTableModule]
}); });
beforeEach(() => { beforeEach(() => {

3
lib/core/about/about-product-version/about-product-version.component.spec.ts
View File

@@ -22,7 +22,6 @@ import { AboutProductVersionComponent } from './about-product-version.component'
import { DiscoveryApiService } from '../../services/discovery-api.service'; import { DiscoveryApiService } from '../../services/discovery-api.service';
import { AuthenticationService } from '../../services/authentication.service'; import { AuthenticationService } from '../../services/authentication.service';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { DataColumnModule } from '../../data-column/data-column.module';
import { DataTableModule } from '../../datatable/datatable.module'; import { DataTableModule } from '../../datatable/datatable.module';
import { MatCardModule } from '@angular/material'; import { MatCardModule } from '@angular/material';
import { aboutAPSMockDetails, mockModules } from '../about.mock'; import { aboutAPSMockDetails, mockModules } from '../about.mock';
@@ -33,7 +32,7 @@ describe('AboutProductVersionComponent', () => {
let discoveryApiService: DiscoveryApiService; let discoveryApiService: DiscoveryApiService;
setupTestBed({ setupTestBed({
imports: [CoreTestingModule, DataColumnModule, DataTableModule, MatCardModule] imports: [CoreTestingModule, DataTableModule, MatCardModule]
}); });
beforeEach(() => { beforeEach(() => {

6
lib/core/about/about.module.ts
View File

@@ -20,7 +20,6 @@ import { NgModule } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { MaterialModule } from '../material.module'; import { MaterialModule } from '../material.module';
import { DataTableModule } from '../datatable/datatable.module'; import { DataTableModule } from '../datatable/datatable.module';
import { DataColumnModule } from '../data-column/data-column.module';
import { AboutApplicationModulesComponent } from './about-application-modules/about-application-modules.component'; import { AboutApplicationModulesComponent } from './about-application-modules/about-application-modules.component';
import { AboutProductVersionComponent } from './about-product-version/about-product-version.component'; import { AboutProductVersionComponent } from './about-product-version/about-product-version.component';
import { AboutGithubLinkComponent } from './about-github-link/about-github-link.component'; import { AboutGithubLinkComponent } from './about-github-link/about-github-link.component';
@@ -29,9 +28,8 @@ import { AboutGithubLinkComponent } from './about-github-link/about-github-link.
imports: [ imports: [
CommonModule, CommonModule,
MaterialModule, MaterialModule,
TranslateModule.forChild(), TranslateModule,
DataTableModule, DataTableModule
DataColumnModule
], ],
declarations: [ declarations: [
AboutApplicationModulesComponent, AboutApplicationModulesComponent,

4
lib/core/datatable/datatable.module.ts
View File

@@ -44,13 +44,15 @@ import { CustomNoPermissionTemplateDirective } from './directives/custom-no-perm
import { JsonCellComponent } from './components/datatable/json-cell.component'; import { JsonCellComponent } from './components/datatable/json-cell.component';
import { ClipboardModule } from '../clipboard/clipboard.module'; import { ClipboardModule } from '../clipboard/clipboard.module';
import { DropZoneDirective } from './components/datatable/drop-zone.directive'; import { DropZoneDirective } from './components/datatable/drop-zone.directive';
import { DataColumnModule } from '../data-column/data-column.module';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule, RouterModule,
MaterialModule, MaterialModule,
CommonModule, CommonModule,
TranslateModule.forChild(), TranslateModule,
DataColumnModule,
ContextMenuModule, ContextMenuModule,
PipeModule, PipeModule,
DirectiveModule, DirectiveModule,