-
and
+ @if (!isFirst) {
+
and
+ }
{{ node?.node?.statement || '' }}
{
- @Input()
- node: NodeWithInput;
+ @Input({ required: true })
+ node!: NodeWithInput;
@Input()
isLast = false;
@@ -26,10 +27,10 @@ export class NodeComponent {
@Input()
isFirst = false;
- @Input()
+ @Input({ required: true })
inputTemplate!: TemplateRef;
- @Input()
+ @Input({ required: true })
popupTemplate!: NgxPopperjsContentComponent;
@Output()
diff --git a/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.html b/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.html
index 026f4e0..5d3cf26 100644
--- a/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.html
+++ b/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.html
@@ -1,9 +1,9 @@
-
+@if (showsTooltip) {
+ >
{{ tooltipText }}
-
+}
diff --git a/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.ts b/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.ts
index 0f74090..1ed3b2c 100644
--- a/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.ts
+++ b/projects/workflows-creator/src/lib/builder/tooltip-render/tooltip-render.component.ts
@@ -1,17 +1,14 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input} from '@angular/core';
@Component({
- selector: 'workflow-tooltip-render',
- templateUrl: './tooltip-render.component.html',
- styleUrls: ['./tooltip-render.component.scss'],
+ selector: 'workflow-tooltip-render',
+ templateUrl: './tooltip-render.component.html',
+ styleUrls: ['./tooltip-render.component.scss'],
+ standalone: false
})
-export class TooltipRenderComponent implements OnInit {
+export class TooltipRenderComponent {
@Input() showsTooltip = true;
@Input() tooltipText = 'Default tooltip text';
@Input() topPosition = 215;
@Input() leftPosition = 400;
-
- constructor() {}
-
- ngOnInit(): void {}
}
diff --git a/projects/workflows-creator/src/lib/classes/nodes/abstract-list-prompt.class.ts b/projects/workflows-creator/src/lib/classes/nodes/abstract-list-prompt.class.ts
index 6c4e92c..eb78d19 100644
--- a/projects/workflows-creator/src/lib/classes/nodes/abstract-list-prompt.class.ts
+++ b/projects/workflows-creator/src/lib/classes/nodes/abstract-list-prompt.class.ts
@@ -1,4 +1,4 @@
-import {BpmnNode} from '../../types';
+import {BpmnNode, RecordOfAnyType} from '../../types';
import {State} from '../state/state.class';
import {WorkflowPrompt} from './abstract-prompt.class';
@@ -6,7 +6,7 @@ export abstract class WorkflowListPrompt extends WorkflowPrompt {
abstract listNameField: string;
abstract listValueField: string;
abstract isHidden?: (node: BpmnNode) => boolean;
- abstract options: (state: State) => R[];
+ abstract options: (state: State) => R[];
}
export function isSelectInput(
diff --git a/projects/workflows-creator/src/lib/classes/nodes/abstract-prompt.class.ts b/projects/workflows-creator/src/lib/classes/nodes/abstract-prompt.class.ts
index 67afaec..30dda6e 100644
--- a/projects/workflows-creator/src/lib/classes/nodes/abstract-prompt.class.ts
+++ b/projects/workflows-creator/src/lib/classes/nodes/abstract-prompt.class.ts
@@ -54,6 +54,7 @@ export abstract class WorkflowPrompt {
value: AllowedValues | AllowedValuesMap,
) {
switch (this.typeFunction(state)) {
+ case InputTypes.OptionList:
case InputTypes.List:
return value;
case InputTypes.People: {
@@ -94,12 +95,19 @@ export abstract class WorkflowPrompt {
const dateTime = `${this.onDateSelect(date)} ${hours}:${min}`;
return moment(dateTime.toString(), 'DD-MM-YYYY hh:mm').format();
case InputTypes.Email:
+ (value as AllowedValuesMap).body = (
+ (value as AllowedValuesMap).body as string
+ ).replace(/"/g, '\\"');
+ (value as AllowedValuesMap).subject = (
+ (value as AllowedValuesMap).subject as string
+ ).replace(/"/g, '\\"');
(value as AllowedValuesMap).displayValue = 'email';
return value;
case InputTypes.Number:
case InputTypes.Text:
case InputTypes.Boolean:
case InputTypes.Percentage:
+ case InputTypes.Stepper:
default:
if (value) {
return (value as HTMLInputElement).value;
@@ -140,6 +148,7 @@ export abstract class WorkflowPrompt {
*/
getValueName(state: State) {
switch (this.typeFunction(state)) {
+ case InputTypes.OptionList:
case InputTypes.List:
if (typeof state.get(`${this.inputKey}Name`) === 'object') {
return state.get(`${this.inputKey}Name`)?.displayValue;
@@ -161,10 +170,14 @@ export abstract class WorkflowPrompt {
.utc(state.get(this.inputKey), 'YYYY-MM-DD hh:mm')
.format('MMM DD, YYYY hh:mm A')
: '';
+ case InputTypes.IntervalDate:
+ case InputTypes.IntervalTime:
+ return state.get(this.inputKey)?.value;
case InputTypes.Number:
case InputTypes.Text:
case InputTypes.Boolean:
case InputTypes.Percentage:
+ case InputTypes.Stepper:
default:
return state.get(this.inputKey);
}
@@ -178,6 +191,7 @@ export abstract class WorkflowPrompt {
*/
setValueName(state: State) {
switch (this.typeFunction(state)) {
+ case InputTypes.OptionList:
case InputTypes.List:
if (
typeof state.get(this.inputKey) === 'object' &&
@@ -200,6 +214,7 @@ export abstract class WorkflowPrompt {
case InputTypes.Text:
case InputTypes.Boolean:
case InputTypes.Percentage:
+ case InputTypes.Stepper:
default:
return state.get(this.inputKey);
}
diff --git a/projects/workflows-creator/src/lib/classes/services/abstract-node-service.class.ts b/projects/workflows-creator/src/lib/classes/services/abstract-node-service.class.ts
index 0ae7224..c7f2805 100644
--- a/projects/workflows-creator/src/lib/classes/services/abstract-node-service.class.ts
+++ b/projects/workflows-creator/src/lib/classes/services/abstract-node-service.class.ts
@@ -4,7 +4,7 @@ import {WorkflowNode} from '../../types/base.types';
import {AbstractBaseGroup} from '../nodes';
export abstract class NodeService {
- abstract getActions(): WorkflowNode[];
+ abstract getActions(selectedEvent?: string): WorkflowNode[];
abstract getEvents(trigger?: boolean): WorkflowNode[];
abstract getGroups(
trigger?: boolean,
diff --git a/projects/workflows-creator/src/lib/const.ts b/projects/workflows-creator/src/lib/const.ts
index 65c943d..092f4ce 100644
--- a/projects/workflows-creator/src/lib/const.ts
+++ b/projects/workflows-creator/src/lib/const.ts
@@ -14,14 +14,14 @@ xmlns:camunda="http://camunda.org/schema/1.0/bpmn"
xmlns:modeler="http://camunda.org/schema/modeler/1.0"
id="Definitions_1aj5pzu"
targetNamespace="http://bpmn.io/schema/bpmn"
-exporter="Camunda Modeler" exporterVersion="4.12.0"
+exporter="Camunda Modeler" exporterVersion="5.21.0"
modeler:executionPlatform="Camunda Platform"
-modeler:executionPlatformVersion="7.15.0">
+modeler:executionPlatformVersion="7.21.0">
`;
-export const JSON_SCRIPT_START = `var json = S(\"{}\");\n`;
-export const JSON_SCRIPT_END = `\n json`;
+export const JSON_SCRIPT_START = `var json = {};\n`;
+export const JSON_SCRIPT_END = `\n JSON.stringify(json)`;
export const BASE_XML = new InjectionToken('diagram.bpmn.base');
export const MODDLE = new InjectionToken(
diff --git a/projects/workflows-creator/src/lib/enum.ts b/projects/workflows-creator/src/lib/enum.ts
index 9914cfb..0e9d3da 100644
--- a/projects/workflows-creator/src/lib/enum.ts
+++ b/projects/workflows-creator/src/lib/enum.ts
@@ -20,6 +20,11 @@ export enum InputTypes {
People = 'people',
Percentage = 'percentage',
Text = 'text',
+ OptionList = 'optionList',
+ Item = 'Item',
+ Stepper = 'Stepper',
+ IntervalDate = 'IntervalDate',
+ IntervalTime = 'IntervalTime',
}
/* Defining the types of conditions that can be used in the application. */
@@ -79,6 +84,11 @@ export enum EventTypes {
OnValueEvent = 'OnValueEvent',
}
+export enum ActionTypes {
+ ChangeColumnValueAction = 'ChangeColumnValueAction',
+ SendEmailAction = 'SendEmailAction',
+}
+
export enum StartElementTypes {
BasicStartElement = 'StartElement',
StartOnIntervalElement = 'StartOnIntervalElement',
@@ -101,3 +111,12 @@ export enum LocalizedStringKeys {
SelectColumnTooltip = 'selectColumnTooltip',
SetLbl = 'setLbl',
}
+
+export enum IntervalType {
+ Day = 'day',
+ Days = 'days',
+ Weeks = 'weeks',
+ Months = 'months',
+ Week = 'week',
+ Month = 'month',
+}
diff --git a/projects/workflows-creator/src/lib/interfaces/element-input.interface.ts b/projects/workflows-creator/src/lib/interfaces/element-input.interface.ts
index 9e4a8ba..3c97be0 100644
--- a/projects/workflows-creator/src/lib/interfaces/element-input.interface.ts
+++ b/projects/workflows-creator/src/lib/interfaces/element-input.interface.ts
@@ -1,4 +1,5 @@
import {State} from '../classes';
+import {RecordOfAnyType} from '../types';
/* It's defining an interface called ElementInput. */
export interface ElementInput {
@@ -45,7 +46,7 @@ export type StateParam = {
* @property formatter - A function that takes the current state and returns a string.
*/
export type FormattedParam = {
- formatter: (state: State) => string;
+ formatter: (state: State) => string;
};
/**
diff --git a/projects/workflows-creator/src/lib/layout/helpers.ts b/projects/workflows-creator/src/lib/layout/helpers.ts
index 4a5ff70..67436eb 100644
--- a/projects/workflows-creator/src/lib/layout/helpers.ts
+++ b/projects/workflows-creator/src/lib/layout/helpers.ts
@@ -54,7 +54,7 @@ export function connectRectangles(
if (['top-left', 'top', 'top-right'].includes(orientation)) {
start = {original: start, x: start['x'], y: source.y + source.height};
end = {original: end, x: end['x'], y: target.y};
- } else if (['bottom-left', 'bottom', 'bottom-right']) {
+ } else if (['bottom-left', 'bottom', 'bottom-right'].includes(orientation)) {
start = {original: start, x: start['x'], y: source.y};
end = {original: end, x: end['x'], y: target.y + target.height};
} else {
diff --git a/projects/workflows-creator/src/lib/pipes/localization.pipe.ts b/projects/workflows-creator/src/lib/pipes/localization.pipe.ts
index 4e5fe5f..44d62b7 100644
--- a/projects/workflows-creator/src/lib/pipes/localization.pipe.ts
+++ b/projects/workflows-creator/src/lib/pipes/localization.pipe.ts
@@ -3,7 +3,8 @@ import {LocalizationProviderService} from '../services/localization-provider.ser
import {LocalizedStringKeys} from '../enum';
@Pipe({
- name: 'localization',
+ name: 'localization',
+ standalone: false
})
export class LocalizationPipe implements PipeTransform {
constructor(private readonly localizationSvc: LocalizationProviderService) {}
diff --git a/projects/workflows-creator/src/lib/services/bpmn/builder.service.ts b/projects/workflows-creator/src/lib/services/bpmn/builder.service.ts
index 3b9f009..388da48 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/builder.service.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/builder.service.ts
@@ -347,7 +347,10 @@ export class BpmnBuilderService extends BuilderService<
const [id, key] = property['name'].split('_');
if (state[id]) {
try {
- state[id][key] = JSON.parse(property['value']);
+ state[id][key] =
+ typeof JSON.parse(property['value']) === 'object'
+ ? JSON.parse(property['value'])
+ : property['value'];
} catch (error) {
state[id][key] = property['value'];
}
diff --git a/projects/workflows-creator/src/lib/services/bpmn/elements/gateways/gateway.element.ts b/projects/workflows-creator/src/lib/services/bpmn/elements/gateways/gateway.element.ts
index 6c178e5..74b653f 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/elements/gateways/gateway.element.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/elements/gateways/gateway.element.ts
@@ -21,7 +21,7 @@ export class GatewayElement extends BpmnElement {
) {
super();
}
- tag = 'bpmn:ExclusiveGateway';
+ tag = 'bpmn:InclusiveGateway';
name = 'gateway';
properties = {};
statement: string | undefined;
diff --git a/projects/workflows-creator/src/lib/services/bpmn/elements/process/process.element.ts b/projects/workflows-creator/src/lib/services/bpmn/elements/process/process.element.ts
index 059f7ba..0c30ab4 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/elements/process/process.element.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/elements/process/process.element.ts
@@ -30,6 +30,7 @@ export class ProcessElement extends BpmnElement {
static identifier = 'ProcessElement';
attributes = {
isExecutable: true,
+ historyTimeToLive: 'P3650D',
};
getIdentifier(): string {
diff --git a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/change-column-value.task.ts b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/change-column-value.task.ts
index ce89120..26d9262 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/change-column-value.task.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/change-column-value.task.ts
@@ -8,6 +8,7 @@ import {CREATE_TASK_STRATEGY} from '../../strategies/create';
import {LINK_BASIC_STRATEGY} from '../../strategies/link';
import {ServiceTaskElement} from './service-task.task';
import {ENV_TOKEN} from '../../../../token';
+import {InputTypes} from '../../../../enum';
@Injectable()
export class ChangeColumnValue extends ServiceTaskElement {
@@ -41,12 +42,25 @@ export class ChangeColumnValue extends ServiceTaskElement {
},
changedValue: {
formatter: (state: State) => {
- if (typeof state.get('value') === 'object') {
- return `'${JSON.stringify(state.get('value'))}'`;
+ switch (state.get('valueInputType')) {
+ case InputTypes.People:
+ return `'${JSON.stringify(state.get('value'))}'`;
+ case InputTypes.OptionList:
+ case InputTypes.List:
+ if (!state.get('value')) return '';
+ return `'${JSON.stringify({
+ displayValue: state.get('value').text?.split('"').join(''),
+ value: state.get('value').value,
+ iconClass: state.get('value').iconClass,
+ color: state.get('value').color,
+ bgColor: state.get('value').bgColor,
+ })}'`;
+ default:
+ return `'{"displayValue": "${
+ state.get('valueName')?.split('"').join('') ??
+ state.get('value')
+ }", "value": "${state.get('value')}"}'`;
}
- return `'{"displayValue": "${
- state.get('valueName') ?? state.get('value')
- }", "value": "${state.get('value')}"}'`;
},
},
},
diff --git a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/read-column.task.ts b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/read-column.task.ts
index 5d7d7fd..64c116c 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/read-column.task.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/read-column.task.ts
@@ -32,6 +32,9 @@ export class ReadColumnValue extends ServiceTaskElement {
taskIds: {
from: 'taskIds',
},
+ metaData: {
+ state: 'metaData',
+ },
groupColumnId: {
state: 'column',
},
diff --git a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/send-email.task.ts b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/send-email.task.ts
index fb309e8..f52ef29 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/send-email.task.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/elements/tasks/send-email.task.ts
@@ -54,7 +54,8 @@ export class SendEmail extends ServiceTaskElement {
},
},
};
- outputs: string;
+
+ outputs = 'outputVariable';
static identifier = 'SendEmail';
getIdentifier(): string {
diff --git a/projects/workflows-creator/src/lib/services/bpmn/node.service.ts b/projects/workflows-creator/src/lib/services/bpmn/node.service.ts
index 386f973..07f0ab7 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/node.service.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/node.service.ts
@@ -34,18 +34,36 @@ export class BpmnNodesService extends NodeService {
* > Get all the nodes that are of type `ACTION`
*
* The function is a bit more complicated than that, but that's the gist of it
+ * @param selectedEvent - Optional event identifier to filter actions by eventBinded property
* @returns An array of action nodes.
*/
- getActions() {
- return this.nodes
- .map(
- Node =>
- new Node(
- this.localizationSvc.getLocalizedStringMap(),
- this.utils.uuid(),
- ),
- )
- .filter(n => n.type === NodeTypes.ACTION);
+ getActions(selectedEvent?: string) {
+ const localizedStrings = this.localizationSvc.getLocalizedStringMap();
+
+ const actions = this.nodes
+ .map(Node => new Node(localizedStrings, this.utils.uuid()))
+ .filter(n => n.type === NodeTypes.ACTION)
+ .sort((a, b) =>
+ a.name.toString().localeCompare(b.name.toString(), undefined, {
+ sensitivity: 'base',
+ }),
+ );
+
+ return actions.filter(action => {
+ const a = action as WorkflowAction & {eventBinded?: string[]};
+ const events = a.eventBinded;
+
+ if (!Array.isArray(events)) {
+ // unbound actions always allowed
+ return true;
+ }
+
+ if (!selectedEvent) {
+ // no selectedEvent → return only unbound actions
+ return false;
+ }
+ return events.includes(selectedEvent);
+ });
}
/**
diff --git a/projects/workflows-creator/src/lib/services/bpmn/strategies/create/basic-interval-create.strategy.ts b/projects/workflows-creator/src/lib/services/bpmn/strategies/create/basic-interval-create.strategy.ts
index 8813cf2..61da4f7 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/strategies/create/basic-interval-create.strategy.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/strategies/create/basic-interval-create.strategy.ts
@@ -7,7 +7,17 @@ import {
ModdleElement,
RecordOfAnyType,
} from '../../../../types';
-import {WorkflowElement} from '../../../../classes';
+import {State, WorkflowElement} from '../../../../classes';
+
+enum WeekDaysEnum {
+ sunday = 1,
+ monday = 2,
+ tuesday = 3,
+ wednesday = 4,
+ thursday = 5,
+ friday = 6,
+ saturday = 7,
+}
@Injectable()
export class CreateBasicIntervalStrategy
@@ -38,9 +48,7 @@ export class CreateBasicIntervalStrategy
const state = workflowNode.state;
const timeCycle = this.moddle.create('bpmn:FormalExpression', {
'xsi:type': 'bpmn:tFormalExpression',
- body: `R/P${state.get('timescale')}${state.get('value')}${state.get(
- 'interval',
- )}`,
+ body: this.intervalBodyPrepare(state),
});
timerEventDefinition['timeCycle'] = timeCycle;
@@ -53,6 +61,53 @@ export class CreateBasicIntervalStrategy
});
}
+ private intervalBodyPrepare(state: State) {
+ if (
+ state.get('interval') === 'M' &&
+ state.get('toInterval') &&
+ state.get('TimeInterval')
+ ) {
+ const val =
+ state.get('value') == 1
+ ? '*'
+ : `${state.get('toInterval').month}/${state.get('value')}`;
+ const timeZoneDate = new Date();
+ timeZoneDate.setHours(state.get('TimeInterval').hour);
+ timeZoneDate.setMinutes(state.get('TimeInterval').min);
+ return `0 timeZoneDate(${timeZoneDate})timeZoneDateEnd ${
+ state.get('toInterval').date
+ } ${val} ?`;
+ } else if (
+ state.get('interval') === 'W' &&
+ state.get('toInterval') &&
+ state.get('TimeInterval')
+ ) {
+ const val = state.get('value') == 1 ? '' : `/${state.get('value')}`;
+ let weekDays = state
+ .get('toInterval')
+ ?.ids?.map(
+ (day: string) => WeekDaysEnum[day as keyof typeof WeekDaysEnum],
+ )
+ .join(',');
+ const timeZoneDate = new Date();
+ timeZoneDate.setHours(state.get('TimeInterval').hour);
+ timeZoneDate.setMinutes(state.get('TimeInterval').min);
+ return `0 timeZoneDate(${timeZoneDate})timeZoneDateEnd ? * ${weekDays}${val}`;
+ } else if (state.get('interval') === 'D' && state.get('TimeInterval')) {
+ const today = new Date();
+ today.setHours(state.get('TimeInterval').hour);
+ today.setMinutes(state.get('TimeInterval').min);
+ let isoString = '';
+ if (today.getTime() < new Date().getTime()) {
+ today.setDate(today.getDate() + 1);
+ }
+ isoString = today.toISOString();
+ return `R/${isoString}/P${state.get('value')}${state.get('interval')}`;
+ } else {
+ return '0 0 0 ? * *';
+ }
+ }
+
/**
* It takes an object of attributes and a node, and returns the same object of attributes, but with
* any attribute that is a state reference replaced with the value of that state
diff --git a/projects/workflows-creator/src/lib/services/bpmn/strategies/create/task-create.strategy.ts b/projects/workflows-creator/src/lib/services/bpmn/strategies/create/task-create.strategy.ts
index 72562df..b18d0f4 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/strategies/create/task-create.strategy.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/strategies/create/task-create.strategy.ts
@@ -142,38 +142,53 @@ export class CreateTaskStrategy implements CreateStrategy {
let read = '';
if (froms.length > 0) {
if (prevIds.length) {
- read = `var readObj = ${prevIds
- .map(id => `JSON.parse(execution.getVariable('${id}'))`)
- .join(' || ')} || {};`;
+ read = `${prevIds
+ .map(
+ (id, index) =>
+ `var readObj${index} = JSON.parse(execution.getVariable('${id}')) || {};`,
+ )
+ .join('\n')}
+ `;
}
}
- const getVariables = froms
- .map(
- p =>
- `var ${(p as FromParam).from}Local = readObj.${
- (p as FromParam).from
- };`,
- )
- .join('\n');
+ const getVariables = froms.map(
+ p =>
+ `
+ var ${(p as FromParam).from}Local;
+ ${prevIds
+ .map(
+ (_: any, index: number) => `
+ if(readObj${index}.${
+ (p as FromParam).from
+ } && readObj${index}.${(froms[0] as FromParam).from}.length){
+ ${(froms[0] as FromParam).from}Local = readObj${index}.${
+ (froms[0] as FromParam).from
+ };
+ }
+ `,
+ )
+ .join('\n')}
+ `,
+ );
const setVariabels = Object.keys(params).reduce(
(p: string, key: string) => {
const tmp = params[key];
if (isFormattedParam(tmp)) {
- return `${p}\njson.prop("${key}", ${tmp.formatter(state)});`;
+ return `${p}\njson["${key}"] = ${tmp.formatter(state)};`;
} else if (isFromParam(tmp)) {
- return `${p}\njson.prop("${key}", ${tmp.from}Local);`;
+ return `${p}\njson["${key}"] = ${tmp.from}Local;`;
} else if (isStateParam(tmp)) {
if (
tmp.state === 'recipients' &&
Array.isArray(state.get(tmp.state))
) {
const metaValue = this.transposeArrayToString(state.get(tmp.state));
- return `${p}\njson.prop("${key}", [${metaValue ?? ''}]);`;
+ return `${p}\njson["${key}"] = [${metaValue ?? ''}];`;
}
- return `${p}\njson.prop("${key}", "${state.get(tmp.state) ?? ''}");`;
+ return `${p}\njson["${key}"] = "${state.get(tmp.state) ?? ''}";`;
} else {
- return `${p}\njson.prop("${key}", "${tmp.value}");`;
+ return `${p}\njson["${key}"] = "${tmp.value}";`;
}
},
'',
@@ -181,9 +196,9 @@ export class CreateTaskStrategy implements CreateStrategy {
return [
read,
getVariables,
- `var json = S("{}");`,
+ `var json = {};`,
setVariabels,
- 'json',
+ 'JSON.stringify(json)',
].join('\n');
}
diff --git a/projects/workflows-creator/src/lib/services/bpmn/strategies/link/gateway-link.strategy.ts b/projects/workflows-creator/src/lib/services/bpmn/strategies/link/gateway-link.strategy.ts
index 5021d09..d936798 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/strategies/link/gateway-link.strategy.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/strategies/link/gateway-link.strategy.ts
@@ -193,12 +193,13 @@ export class GatewayLinkStrategy implements LinkStrategy {
) {
const lastNodeWithOutput = this.getLastNodeWithOutput(node);
const read = `var readObj = JSON.parse(execution.getVariable('${lastNodeWithOutput.element.id}'));`;
- const declarations = `var ids = [];var json = S("{}");`;
+ const declarations = `var ids = [];var json = {};`;
const column = node.workflowNode.state.get('columnName');
const condition = this.getCondition(node);
const loop = this.createLoopScript(node, condition, isElse);
const setters = `
- json.prop("taskIds", ids);
+ json["taskIds"] = ids;
+ json = JSON.stringify(json);
execution.setVariable('${flowId}',json);
if(ids.length > 0){true;}else {false;}
`;
@@ -224,10 +225,30 @@ export class GatewayLinkStrategy implements LinkStrategy {
) {
const column: string = node.workflowNode.state.get('columnName');
const conditionType = node.workflowNode.state.get('condition');
- const value = node.workflowNode.state.get('value');
+ const valueType = node.workflowNode.state.get('valueType');
+ const valueInputType = node.workflowNode.state.get('valueInputType');
- if (!conditionType && value) {
- switch (value) {
+ if (
+ valueInputType === InputTypes.Date &&
+ (valueType === ValueTypes.Custom ||
+ conditionType === ConditionTypes.Equal)
+ ) {
+ return `
+ for (var key in readObj) {
+ var taskValuePair = readObj[key];
+ if (taskValuePair && (taskValuePair.value || taskValuePair.value==='')) {
+ var readDateValue = taskValuePair.value.split('T')[0];
+ var customDate = "${condition}";
+
+ if (${isElse ? '!' : ''}(readDateValue === customDate)) {
+ ids.push(taskValuePair.id);
+ }
+ }
+ }
+ `;
+ }
+ if (!conditionType && valueType && valueInputType === InputTypes.Date) {
+ switch (valueType) {
case ValueTypes.PastToday:
return `
for(var key in readObj){
@@ -252,6 +273,20 @@ export class GatewayLinkStrategy implements LinkStrategy {
}
}
`;
+ case ValueTypes.Custom:
+ return `
+ for (var key in readObj) {
+ var taskValuePair = readObj[key];
+ if (taskValuePair && taskValuePair.value) {
+ var readDateValue = taskValuePair.value.split('T')[0];
+ var customDate = "${condition}";
+
+ if (${isElse ? '!' : ''}(readDateValue === customDate)) {
+ ids.push(taskValuePair.id);
+ }
+ }
+ }
+ `;
}
}
@@ -302,6 +337,28 @@ export class GatewayLinkStrategy implements LinkStrategy {
}
}`;
}
+ if (column === InputTypes.Item) {
+ return `var selectedVals = ${condition};
+ var selCol = selectedVals.split(',');
+ for(var key in readObj){
+ var taskValuePair = readObj[key];
+ if(taskValuePair && taskValuePair.value && taskValuePair.value.length){
+ var hasItem = false;
+ var usCol = taskValuePair.value;
+
+ for(var selKey in selCol){
+ for(var myKey in usCol){
+ if(usCol[myKey].value == selCol[selKey] && !hasItem){
+ hasItem = true;
+ }
+ }
+ }
+ if(${conditionExpression}(hasItem)){
+ ids.push(taskValuePair.id);
+ }
+ }
+ }`;
+ }
switch (conditionType) {
case ConditionTypes.PastToday:
return `
@@ -322,9 +379,13 @@ export class GatewayLinkStrategy implements LinkStrategy {
var taskValuePair = readObj[key];
if(taskValuePair && taskValuePair.value){
var readDateValue = new Date(taskValuePair.value);
+ var today = new Date();
+ readDateValue.setHours(0,0,0,0);
+ today.setHours(0,0,0,0);
+ readDateValue.setDate(readDateValue.getDate()${condition});
if(${
isElse ? '!' : ''
- }(readDateValue > new Date() && readDateValue.setDate(readDateValue.getDate()${condition}) < new Date())){
+ }(readDateValue.valueOf() === today.valueOf())){
ids.push(taskValuePair.id);
}
}
@@ -369,12 +430,21 @@ export class GatewayLinkStrategy implements LinkStrategy {
private getCondition(node: BpmnStatementNode) {
let value = node.workflowNode.state.get('value');
const valueType = node.workflowNode.state.get('valueInputType');
- if (valueType === InputTypes.Text || valueType === InputTypes.List) {
- value = `'${value}'`;
- }
- if (value && valueType === InputTypes.People) {
- return `'${value.ids}'`;
- }
+ if (value)
+ switch (valueType) {
+ case InputTypes.Stepper:
+ case InputTypes.Text:
+ value = `'${value}'`;
+ break;
+ case InputTypes.OptionList:
+ case InputTypes.List:
+ value = `'${value.value}'`;
+ break;
+ case InputTypes.People:
+ return `'${value.ids}'`;
+ case InputTypes.Date:
+ return `${value.split('T')[0]}`;
+ }
const condition = node.workflowNode.state.get('condition');
const pair = this.conditions.find(item => item.condition === condition);
if (!pair) {
diff --git a/projects/workflows-creator/src/lib/services/bpmn/strategies/link/or-gateway-link.strategy.ts b/projects/workflows-creator/src/lib/services/bpmn/strategies/link/or-gateway-link.strategy.ts
index 9b4c948..2ed9de6 100644
--- a/projects/workflows-creator/src/lib/services/bpmn/strategies/link/or-gateway-link.strategy.ts
+++ b/projects/workflows-creator/src/lib/services/bpmn/strategies/link/or-gateway-link.strategy.ts
@@ -112,12 +112,13 @@ export class OrGatewayLinkStrategy implements LinkStrategy {
) {
const lastNodeWithOutput = this.getLastNodeWithOutput(node);
const read = `var readObj = JSON.parse(execution.getVariable('${lastNodeWithOutput.element.id}'));`;
- const declarations = `var ids = [];var json = S("{}");`;
+ const declarations = `var ids = [];var json = {};`;
const column = node.workflowNode.state.get('columnName');
const condition = this.getCondition(node);
const loop = this.createLoopScript(node, condition, isElse);
const setters = `
- json.prop("taskIds", ids);
+ json["taskIds"] = ids;
+ json.stringify(json);
execution.setVariable('${flowId}',json);
if(ids.length > 0){true;}else {false;}
`;
@@ -161,9 +162,13 @@ export class OrGatewayLinkStrategy implements LinkStrategy {
var taskValuePair = readObj[key];
if(taskValuePair && taskValuePair.value){
var readDateValue = new Date(taskValuePair.value);
+ var today = new Date();
+ readDateValue.setHours(0,0,0,0);
+ today.setHours(0,0,0,0);
+ readDateValue.setDate(readDateValue.getDate()${condition});
if(${
isElse ? '!' : ''
- }(readDateValue > new Date() && readDateValue.setDate(readDateValue.getDate()${condition}) < new Date())){
+ }(readDateValue.valueOf() === today.valueOf())){
ids.push(taskValuePair.id);
}
}
diff --git a/projects/workflows-creator/src/lib/services/statement/events/oninterval.event.ts b/projects/workflows-creator/src/lib/services/statement/events/oninterval.event.ts
index 60b3434..26fa0f1 100644
--- a/projects/workflows-creator/src/lib/services/statement/events/oninterval.event.ts
+++ b/projects/workflows-creator/src/lib/services/statement/events/oninterval.event.ts
@@ -2,8 +2,9 @@ import {LocalizedStringKeys, StartElementTypes} from '../../../enum';
import {RecordOfAnyType} from '../../../types';
import {BpmnEvent} from '../../../types/bpmn.types';
import {TriggerOnInterval} from '../../bpmn/elements/tasks/trigger-on-interval.task';
+import {TimeIntervalInput, ToIntervalInput} from '../inputs';
import {IntervalInput} from '../inputs/interval.input';
-import {ValueInput} from '../inputs/value.input';
+import {StepperInput} from '../inputs/stepper.input';
export class OnIntervalEvent extends BpmnEvent {
groupType: string;
@@ -14,7 +15,12 @@ export class OnIntervalEvent extends BpmnEvent {
name = 'On Interval';
statement = 'Every ';
properties = {};
- prompts = [ValueInput.identifier, IntervalInput.identifier];
+ prompts = [
+ StepperInput.identifier,
+ IntervalInput.identifier,
+ ToIntervalInput.identifier,
+ TimeIntervalInput.identifier,
+ ];
static identifier = 'OnIntervalEvent';
constructor(
localizedStringMap: RecordOfAnyType,
diff --git a/projects/workflows-creator/src/lib/services/statement/events/onvalue.event.ts b/projects/workflows-creator/src/lib/services/statement/events/onvalue.event.ts
index a8c4c41..f792117 100644
--- a/projects/workflows-creator/src/lib/services/statement/events/onvalue.event.ts
+++ b/projects/workflows-creator/src/lib/services/statement/events/onvalue.event.ts
@@ -3,8 +3,8 @@ import {RecordOfAnyType} from '../../../types';
import {BpmnEvent} from '../../../types/bpmn.types';
import {GatewayElement} from '../../bpmn/elements/gateways/gateway.element';
import {ReadColumnValue} from '../../bpmn/elements/tasks/read-column.task';
-import {ColumnInput} from '../inputs/column.input';
import {ConditionInput} from '../inputs/condition.input';
+import {CriteriaInput} from '../inputs/criteria.input';
import {ValueInput} from '../inputs/value.input';
export class OnValueEvent extends BpmnEvent {
@@ -16,7 +16,7 @@ export class OnValueEvent extends BpmnEvent {
statement = 'check if ';
properties = {};
prompts = [
- ColumnInput.identifier,
+ CriteriaInput.identifier,
ConditionInput.identifier,
ValueInput.identifier,
];
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/column.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/column.input.ts
index 0d942ef..7495fef 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/column.input.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/column.input.ts
@@ -9,7 +9,7 @@ export class ColumnInput extends WorkflowPrompt {
inputKey = 'column';
listNameField = 'text';
listValueField = 'value';
- placeholder = 'Column';
+ placeholder = 'column';
options = (state: State) =>
state.get('columns');
static identifier = 'ColumnInput';
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/criteria.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/criteria.input.ts
new file mode 100644
index 0000000..754a0f1
--- /dev/null
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/criteria.input.ts
@@ -0,0 +1,20 @@
+import {State, WorkflowPrompt} from '../../../classes';
+import {InputTypes} from '../../../enum';
+import {RecordOfAnyType} from '../../../types';
+
+export class CriteriaInput extends WorkflowPrompt {
+ prefix = '';
+ suffix = '';
+ typeFunction = () => InputTypes.OptionList;
+ inputKey = 'column';
+ listNameField = 'text';
+ listValueField = 'value';
+ placeholder = 'criteria';
+ options = (state: State) =>
+ state.get('columns');
+ static identifier = 'CriteriaInput';
+
+ getIdentifier(): string {
+ return CriteriaInput.identifier;
+ }
+}
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/email.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/email.input.ts
index 141ec59..019a7e6 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/email.input.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/email.input.ts
@@ -9,7 +9,7 @@ export class EmailDataInput extends WorkflowPrompt {
suffix = '';
typeFunction = () => InputTypes.Email;
inputKey = 'email';
- placeholder = 'Email';
+ placeholder = 'email';
static identifier = 'EmailDataInput';
getIdentifier(): string {
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/index.ts b/projects/workflows-creator/src/lib/services/statement/inputs/index.ts
index ea94d81..9207aaa 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/index.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/index.ts
@@ -7,3 +7,7 @@ export * from './value.input';
export * from './interval.input';
export * from './triggercolumn.input';
export * from './valuetype.input';
+export * from './criteria.input';
+export * from './stepper.input';
+export * from './tointerval.input';
+export * from './timeinterval.input';
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/interval.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/interval.input.ts
index dbae337..2bcf237 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/interval.input.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/interval.input.ts
@@ -3,13 +3,13 @@ import {InputTypes} from '../../../enum';
import {RecordOfAnyType} from '../../../types';
export class IntervalInput extends WorkflowPrompt {
- prefix = '';
- suffix = '';
+ prefix: string | {state: string} = {state: 'valuePrefix'};
+ suffix: string | {state: string} = {state: 'intervalValueSuffix'};
typeFunction = () => InputTypes.List;
inputKey = 'interval';
listNameField = 'text';
listValueField = 'value';
- placeholder = 'Interval';
+ placeholder = 'interval';
options = (state: State) =>
state.get('intervalList');
static identifier = 'IntervalInput';
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/stepper.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/stepper.input.ts
new file mode 100644
index 0000000..06433e9
--- /dev/null
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/stepper.input.ts
@@ -0,0 +1,21 @@
+import {State, WorkflowPrompt} from '../../../classes';
+import {InputTypes} from '../../../enum';
+import {RecordOfAnyType} from '../../../types';
+
+export class StepperInput extends WorkflowPrompt {
+ prefix = '';
+ suffix = '';
+ typeFunction = () => InputTypes.Stepper;
+ inputKey = 'value';
+ listNameField = 'text';
+ listValueField = 'value';
+ placeholder = 'n';
+ customPlaceholder: string | {state: string} = {state: 'stepperPlaceholder'};
+ options = (state: State) =>
+ state.get('stepperCount') as [];
+ static identifier = 'StepperInput';
+
+ getIdentifier(): string {
+ return StepperInput.identifier;
+ }
+}
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/timeinterval.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/timeinterval.input.ts
new file mode 100644
index 0000000..b25aa25
--- /dev/null
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/timeinterval.input.ts
@@ -0,0 +1,30 @@
+import {State, WorkflowPrompt} from '../../../classes';
+import {InputTypes, IntervalType} from '../../../enum';
+import {BpmnNode, RecordOfAnyType} from '../../../types';
+export class TimeIntervalInput extends WorkflowPrompt {
+ prefix: string | {state: string} = {state: 'timeIntervalSuffix'};
+ suffix = '';
+ typeFunction = () => InputTypes.IntervalTime;
+ inputKey = 'TimeInterval';
+ listNameField = 'text';
+ listValueField = 'value';
+ placeholder = 'hh:mm';
+ customPlaceholder: string | {state: string} = {state: 'timeStatePlaceholder'};
+ isHidden = (node: BpmnNode) => {
+ return ![
+ IntervalType.Weeks,
+ IntervalType.Months,
+ IntervalType.Week,
+ IntervalType.Month,
+ IntervalType.Days,
+ IntervalType.Day,
+ ].includes(node.state.get('intervalType'));
+ };
+ options = (state: State) =>
+ state.get('timevalues');
+ static identifier = 'TimeIntervalInput';
+
+ getIdentifier(): string {
+ return TimeIntervalInput.identifier;
+ }
+}
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/tointerval.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/tointerval.input.ts
new file mode 100644
index 0000000..fcf6c88
--- /dev/null
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/tointerval.input.ts
@@ -0,0 +1,30 @@
+import {State, WorkflowPrompt} from '../../../classes';
+import {InputTypes, IntervalType} from '../../../enum';
+import {BpmnNode, RecordOfAnyType} from '../../../types';
+
+export class ToIntervalInput extends WorkflowPrompt {
+ prefix = '';
+ suffix = '';
+ typeFunction = (state: State) =>
+ state.get('valueInputTypes') as InputTypes;
+ inputKey = 'toInterval';
+ listNameField = 'text';
+ listValueField = 'value';
+ placeholder = 'weekday';
+ customPlaceholder: string | {state: string} = {state: 'dateStatePlaceholder'};
+ isHidden = (node: BpmnNode) => {
+ return ![
+ IntervalType.Weeks,
+ IntervalType.Months,
+ IntervalType.Week,
+ IntervalType.Month,
+ ].includes(node.state.get('intervalType'));
+ };
+ options = (state: State) =>
+ state.get('intervalOption');
+ static identifier = 'ToIntervalInput';
+
+ getIdentifier(): string {
+ return ToIntervalInput.identifier;
+ }
+}
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/value.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/value.input.ts
index 293db18..481b0bd 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/value.input.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/value.input.ts
@@ -9,12 +9,12 @@ import {
import {BpmnNode, RecordOfAnyType} from '../../../types';
export class ValueInput extends WorkflowListPrompt {
- prefix: string | {state: string} = '';
+ prefix: string | {state: string} = {state: 'valuePrefix'};
suffix: string | {state: string} = {state: 'valueSuffix'};
inputKey = 'value';
listNameField = 'text';
listValueField = 'value';
- placeholder = 'Something';
+ placeholder = 'something';
customPlaceholder: string | {state: string} = {state: 'valuePlaceholder'};
isHidden = (node: BpmnNode) => {
@@ -32,6 +32,7 @@ export class ValueInput extends WorkflowListPrompt {
InputTypes.Number,
InputTypes.People,
InputTypes.Percentage,
+ InputTypes.Date,
].includes(node.state.get('valueInputType')) &&
node.state.get('valueType') !== ValueTypes.Custom)
);
diff --git a/projects/workflows-creator/src/lib/services/statement/inputs/valuetype.input.ts b/projects/workflows-creator/src/lib/services/statement/inputs/valuetype.input.ts
index 58ad5fc..43c785b 100644
--- a/projects/workflows-creator/src/lib/services/statement/inputs/valuetype.input.ts
+++ b/projects/workflows-creator/src/lib/services/statement/inputs/valuetype.input.ts
@@ -9,7 +9,7 @@ export class ValueTypeInput extends WorkflowListPrompt {
inputKey = 'valueType';
listNameField = 'text';
listValueField = 'value';
- placeholder = 'Something';
+ placeholder = 'something';
options = (state: State) =>
state.get('valueTypes') as [];
@@ -20,6 +20,7 @@ export class ValueTypeInput extends WorkflowListPrompt {
InputTypes.Number,
InputTypes.People,
InputTypes.Percentage,
+ InputTypes.Date,
].includes(node.state.get('valueInputType'));
};
diff --git a/projects/workflows-creator/src/lib/types/base.types.ts b/projects/workflows-creator/src/lib/types/base.types.ts
index 91916cf..d38576f 100644
--- a/projects/workflows-creator/src/lib/types/base.types.ts
+++ b/projects/workflows-creator/src/lib/types/base.types.ts
@@ -172,6 +172,7 @@ export type EmailInput = {
subject: string;
body: string;
focusKey: string;
+ caretPos: number;
};
/**
diff --git a/projects/workflows-creator/src/lib/workflow-builder.module.ts b/projects/workflows-creator/src/lib/workflow-builder.module.ts
index 2501d7d..da96fbf 100644
--- a/projects/workflows-creator/src/lib/workflow-builder.module.ts
+++ b/projects/workflows-creator/src/lib/workflow-builder.module.ts
@@ -78,7 +78,7 @@ import {
NgbTimepickerModule,
NgbPopoverModule,
} from '@ng-bootstrap/ng-bootstrap';
-import {NgMultiSelectDropDownModule} from 'ng-multiselect-dropdown';
+import {NgSelectModule} from '@ng-select/ng-select';
import {OrGatewayElement} from './services/bpmn/elements/gateways/or-gateway.element';
import {OnIntervalEvent} from './services/statement/events/oninterval.event';
import {TriggerOnInterval} from './services/bpmn/elements/tasks/trigger-on-interval.task';
@@ -89,6 +89,12 @@ import {TriggerColumnInput} from './services/statement/inputs/triggercolumn.inpu
import {ValueTypeInput} from './services/statement/inputs/valuetype.input';
import {TooltipRenderComponent} from './builder/tooltip-render/tooltip-render.component';
import {LocalizationPipe} from './pipes/localization.pipe';
+import {
+ CriteriaInput,
+ StepperInput,
+ TimeIntervalInput,
+ ToIntervalInput,
+} from './services';
@NgModule({
declarations: [
BuilderComponent,
@@ -105,7 +111,7 @@ import {LocalizationPipe} from './pipes/localization.pipe';
NgbDatepickerModule,
NgbTimepickerModule,
NgbPopoverModule,
- NgMultiSelectDropDownModule.forRoot(),
+ NgSelectModule,
],
providers: [
{
@@ -143,7 +149,11 @@ import {LocalizationPipe} from './pipes/localization.pipe';
{provide: BPMN_ELEMENTS, useClass: ChangeColumnValue, multi: true},
{provide: BPMN_ELEMENTS, useClass: ProcessPropertiesElement, multi: true},
{provide: BPMN_INPUTS, useClass: ColumnInput, multi: true},
+ {provide: BPMN_INPUTS, useClass: CriteriaInput, multi: true},
+ {provide: BPMN_INPUTS, useClass: StepperInput, multi: true},
+ {provide: BPMN_INPUTS, useClass: TimeIntervalInput, multi: true},
{provide: BPMN_INPUTS, useClass: TriggerColumnInput, multi: true},
+ {provide: BPMN_INPUTS, useClass: ToIntervalInput, multi: true},
{provide: BPMN_INPUTS, useClass: IntervalInput, multi: true},
{provide: BPMN_INPUTS, useClass: ConditionInput, multi: true},
{provide: BPMN_INPUTS, useClass: EmailDataInput, multi: true},
diff --git a/projects/workflows-creator/src/test.ts b/projects/workflows-creator/src/test.ts
index 09565eb..b2f20fe 100644
--- a/projects/workflows-creator/src/test.ts
+++ b/projects/workflows-creator/src/test.ts
@@ -8,24 +8,8 @@ import {
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
-declare const require: {
- context(
- path: string,
- deep?: boolean,
- filter?: RegExp,
- ): {
- (id: string): T;
- keys(): string[];
- };
-};
-
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/tsconfig.json b/tsconfig.json
index d4c4c60..6bd6caa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,17 +15,20 @@
"allowSyntheticDefaultImports": true,
"emitDecoratorMetadata": true,
"paths": {
- "@sourceloop/workflows-creator": ["dist"]
+ "@sourceloop/workflows-creator": [
+ "dist"
+ ]
},
"experimentalDecorators": true,
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
"importHelpers": true,
- "target": "es2017",
- "module": "es2020",
- "lib": ["es2018", "dom"]
- },
- "paths": {
- "@angular/*": ["./node_modules/@angular/*"]
+ "target": "ES2022",
+ "module": "ES2022",
+ "lib": [
+ "ES2022",
+ "dom"
+ ],
+ "useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,