Fix AAE-16968 BC (#9010)

* Fix AAE-16968 BC * Fix incorrect import * Move DataColumnType to extensions lib * Lint fixes
Alfresco · Oct 19, 2023 · 7c4304a · 7c4304a
1 parent 6644f53
commit 7c4304a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/lib/core/src/lib/datatable/data-column/data-column.component.ts b/lib/core/src/lib/datatable/data-column/data-column.component.ts
@@ -18,7 +18,7 @@
  /* eslint-disable @angular-eslint/component-selector, @angular-eslint/no-input-rename */
 
 import { Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core';
-import { DataColumnType } from '../public-api';
+import { DataColumnType } from '@alfresco/adf-extensions';
 
 @Component({
     selector: 'data-column',

diff --git a/lib/core/src/lib/datatable/data/data-column.model.ts b/lib/core/src/lib/datatable/data/data-column.model.ts
@@ -16,21 +16,7 @@
  */
 
 import { TemplateRef } from '@angular/core';
-
-export interface DataColumnTypes {
-    text: string;
-    image: string;
-    date: string;
-    json: string;
-    icon: string;
-    fileSize: string;
-    location: string;
-    // eslint-disable-next-line id-blacklist
-    boolean: string;
-    amount: string;
-}
-
-export type DataColumnType = keyof DataColumnTypes;
+import { DataColumnType } from '@alfresco/adf-extensions';
 
 export interface DataColumn<T = unknown> {
     id?: string;

diff --git a/lib/core/src/lib/datatable/data/object-datacolumn.model.ts b/lib/core/src/lib/datatable/data/object-datacolumn.model.ts
@@ -16,7 +16,8 @@
  */
 
 import { TemplateRef } from '@angular/core';
-import { CurrencyConfig, DataColumn, DataColumnType } from './data-column.model';
+import { DataColumnType } from '@alfresco/adf-extensions';
+import { CurrencyConfig, DataColumn } from './data-column.model';
 
 // Simple implementation of the DataColumn interface.
 export class ObjectDataColumn<T = unknown> implements DataColumn<T> {

diff --git a/lib/extensions/src/lib/config/document-list.extensions.ts b/lib/extensions/src/lib/config/document-list.extensions.ts
@@ -17,9 +17,24 @@
 
 import { ExtensionElement } from './extension-element';
 
+export interface DataColumnTypes {
+    text: string;
+    image: string;
+    date: string;
+    json: string;
+    icon: string;
+    fileSize: string;
+    location: string;
+    // eslint-disable-next-line id-blacklist
+    boolean: string;
+    amount: string;
+}
+
+export type DataColumnType = keyof DataColumnTypes;
+
 export interface DocumentListPresetRef extends ExtensionElement {
   key: string;
-  type: string; // text|image|date
+  type: DataColumnType;
   title?: string;
   format?: string;
   class?: string;

diff --git a/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts b/lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts
@@ -16,9 +16,10 @@
  */
 
 import { Injectable } from '@angular/core';
-import { DataColumn, DataColumnType } from '@alfresco/adf-core';
+import { DataColumn } from '@alfresco/adf-core';
 import { ProcessListDataColumnCustomData } from '../models/data-column-custom-data';
 import { ProcessInstanceVariable, WithVariablesMap } from '../models/process-instance-variable.model';
+import { DataColumnType } from '@alfresco/adf-extensions';
 
 @Injectable({ providedIn: 'root' })
 export class VariableMapperService {