From 999e513087d995bb77042b441b7e224f1c0dab4e Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@alfresco.com>
Date: Wed, 26 Feb 2020 14:58:26 +0000
Subject: [PATCH] add missing DataColumn module to DataTable (#5512)

* add missing DataColumn module to DataTable

* fix import path
---
 .../about-application-modules.component.spec.ts             | 3 +--
 .../about-product-version.component.spec.ts                 | 3 +--
 lib/core/about/about.module.ts                              | 6 ++----
 lib/core/datatable/datatable.module.ts                      | 4 +++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/core/about/about-application-modules/about-application-modules.component.spec.ts b/lib/core/about/about-application-modules/about-application-modules.component.spec.ts
index 0cd6857d33..d96a12c0bc 100644
--- a/lib/core/about/about-application-modules/about-application-modules.component.spec.ts
+++ b/lib/core/about/about-application-modules/about-application-modules.component.spec.ts
@@ -20,7 +20,6 @@ import { CoreTestingModule } from '../../testing/core.testing.module';
 import { setupTestBed } from '../../testing/setup-test-bed';
 import { AboutApplicationModulesComponent } from './about-application-modules.component';
 import { MatTableModule } from '@angular/material/table';
-import { DataColumnModule } from '../../data-column/data-column.module';
 import { DataTableModule } from '../../datatable/datatable.module';
 import { mockDependencies, mockPlugins } from '../about.mock';
 
@@ -29,7 +28,7 @@ describe('AboutApplicationModulesComponent', () => {
     let component: AboutApplicationModulesComponent;
 
     setupTestBed({
-        imports: [CoreTestingModule, MatTableModule, DataColumnModule, DataTableModule]
+        imports: [CoreTestingModule, MatTableModule, DataTableModule]
     });
 
     beforeEach(() => {
diff --git a/lib/core/about/about-product-version/about-product-version.component.spec.ts b/lib/core/about/about-product-version/about-product-version.component.spec.ts
index 907acc2b0f..fce6ce3941 100644
--- a/lib/core/about/about-product-version/about-product-version.component.spec.ts
+++ b/lib/core/about/about-product-version/about-product-version.component.spec.ts
@@ -22,7 +22,6 @@ import { AboutProductVersionComponent } from './about-product-version.component'
 import { DiscoveryApiService } from '../../services/discovery-api.service';
 import { AuthenticationService } from '../../services/authentication.service';
 import { of } from 'rxjs';
-import { DataColumnModule } from '../../data-column/data-column.module';
 import { DataTableModule } from '../../datatable/datatable.module';
 import { MatCardModule } from '@angular/material';
 import { aboutAPSMockDetails, mockModules } from '../about.mock';
@@ -33,7 +32,7 @@ describe('AboutProductVersionComponent', () => {
     let discoveryApiService:  DiscoveryApiService;
 
     setupTestBed({
-        imports: [CoreTestingModule, DataColumnModule, DataTableModule, MatCardModule]
+        imports: [CoreTestingModule, DataTableModule, MatCardModule]
     });
 
     beforeEach(() => {
diff --git a/lib/core/about/about.module.ts b/lib/core/about/about.module.ts
index 38dc34b4c5..9e2f4e3db3 100644
--- a/lib/core/about/about.module.ts
+++ b/lib/core/about/about.module.ts
@@ -20,7 +20,6 @@ import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.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 { AboutProductVersionComponent } from './about-product-version/about-product-version.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: [
         CommonModule,
         MaterialModule,
-        TranslateModule.forChild(),
-        DataTableModule,
-        DataColumnModule
+        TranslateModule,
+        DataTableModule
     ],
     declarations: [
         AboutApplicationModulesComponent,
diff --git a/lib/core/datatable/datatable.module.ts b/lib/core/datatable/datatable.module.ts
index e3b943750a..8aae06d8d7 100644
--- a/lib/core/datatable/datatable.module.ts
+++ b/lib/core/datatable/datatable.module.ts
@@ -44,13 +44,15 @@ import { CustomNoPermissionTemplateDirective } from './directives/custom-no-perm
 import { JsonCellComponent } from './components/datatable/json-cell.component';
 import { ClipboardModule } from '../clipboard/clipboard.module';
 import { DropZoneDirective } from './components/datatable/drop-zone.directive';
+import { DataColumnModule } from '../data-column/data-column.module';
 
 @NgModule({
     imports: [
         RouterModule,
         MaterialModule,
         CommonModule,
-        TranslateModule.forChild(),
+        TranslateModule,
+        DataColumnModule,
         ContextMenuModule,
         PipeModule,
         DirectiveModule,