Fix AAE-16968 BC (#9010)

* Fix AAE-16968 BC

* Fix incorrect import

* Move DataColumnType to extensions lib

* Lint fixes
This commit is contained in:
MichalKinas
2023-10-19 15:17:28 +02:00
committed by GitHub
parent 6644f539fa
commit 7c4304a1e7
5 changed files with 22 additions and 19 deletions

View File

@@ -18,7 +18,7 @@
/* eslint-disable @angular-eslint/component-selector, @angular-eslint/no-input-rename */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/no-input-rename */
import { Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core'; import { Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core';
import { DataColumnType } from '../public-api'; import { DataColumnType } from '@alfresco/adf-extensions';
@Component({ @Component({
selector: 'data-column', selector: 'data-column',

View File

@@ -16,21 +16,7 @@
*/ */
import { TemplateRef } from '@angular/core'; import { TemplateRef } from '@angular/core';
import { DataColumnType } from '@alfresco/adf-extensions';
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 DataColumn<T = unknown> { export interface DataColumn<T = unknown> {
id?: string; id?: string;

View File

@@ -16,7 +16,8 @@
*/ */
import { TemplateRef } from '@angular/core'; 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. // Simple implementation of the DataColumn interface.
export class ObjectDataColumn<T = unknown> implements DataColumn<T> { export class ObjectDataColumn<T = unknown> implements DataColumn<T> {

View File

@@ -17,9 +17,24 @@
import { ExtensionElement } from './extension-element'; 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 { export interface DocumentListPresetRef extends ExtensionElement {
key: string; key: string;
type: string; // text|image|date type: DataColumnType;
title?: string; title?: string;
format?: string; format?: string;
class?: string; class?: string;

View File

@@ -16,9 +16,10 @@
*/ */
import { Injectable } from '@angular/core'; 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 { ProcessListDataColumnCustomData } from '../models/data-column-custom-data';
import { ProcessInstanceVariable, WithVariablesMap } from '../models/process-instance-variable.model'; import { ProcessInstanceVariable, WithVariablesMap } from '../models/process-instance-variable.model';
import { DataColumnType } from '@alfresco/adf-extensions';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class VariableMapperService { export class VariableMapperService {