Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AAE-16968 BC #9010

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Fix AAE-16968 BC #9010

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efc3b48
Fix AAE-16968 BC
MichalKinas Oct 19, 2023
006f80b
Fix incorrect import
MichalKinas Oct 19, 2023
cf6149b
Move DataColumnType to extensions lib
MichalKinas Oct 19, 2023
cb55241
Lint fixes
MichalKinas Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/core/src/lib/datatable/data-column/data-column.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Check failure on line 21 in lib/core/src/lib/datatable/data-column/data-column.component.ts

View workflow job for this annotation

GitHub Actions / Lint 

Missing semicolon

@Component({
selector: 'data-column',
Expand Down
16 changes: 1 addition & 15 deletions lib/core/src/lib/datatable/data/data-column.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Check failure on line 19 in lib/core/src/lib/datatable/data/data-column.model.ts

View workflow job for this annotation

GitHub Actions / Lint 

Missing semicolon

export interface DataColumn<T = unknown> {
id?: string;
Expand Down
3 changes: 2 additions & 1 deletion lib/core/src/lib/datatable/data/object-datacolumn.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
*/

import { TemplateRef } from '@angular/core';
import { CurrencyConfig, DataColumn, DataColumnType } from './data-column.model';
import { DataColumnType } from '@alfresco/adf-extensions'

Check failure on line 19 in lib/core/src/lib/datatable/data/object-datacolumn.model.ts

View workflow job for this annotation

GitHub Actions / Lint 

Missing semicolon
import { CurrencyConfig, DataColumn } from './data-column.model';

// Simple implementation of the DataColumn interface.
export class ObjectDataColumn<T = unknown> implements DataColumn<T> {
Expand Down
17 changes: 16 additions & 1 deletion lib/extensions/src/lib/config/document-list.extensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion lib/process-services-cloud/src/lib/services/variable-mapper.sevice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading