Skip to content

Commit

Permalink
set version
Browse files Browse the repository at this point in the history
  • Loading branch information
AVRMEEST committed Mar 8, 2021
1 parent 47e23d9 commit a859379
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 26 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ plugins {
}

group = "org.assimbly.gateway"
version = '3.3.0'
version = '3.4.0'

description = ""

Expand Down Expand Up @@ -309,8 +309,8 @@ dependencies {
implementation "org.mapstruct:mapstruct-jdk8:${mapstruct_version}"

// custom dependencies (non-jhipster)
implementation group: "org.assimbly", name: "connectorModule", version: "3.3.0", changing: true
implementation group: "org.assimbly", name: "brokerModule", version: "3.3.0", changing: true
implementation group: "org.assimbly", name: "connectorModule", version: "3.4.0", changing: true
implementation group: "org.assimbly", name: "brokerModule", version: "3.4.0", changing: true
implementation "io.github.assimbly:docconverter:1.4.0"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.3"
implementation "org.jdom:jdom2:2.0.6"
Expand Down
44 changes: 21 additions & 23 deletions src/main/webapp/app/entities/flow/flow-edit-all.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {
});
} else if (!this.finished) {
setTimeout(() => {
//create new flow object
this.flow = new Flow();
this.flow.autoStart = false;
this.flow.offLoading = false;
Expand All @@ -321,15 +322,23 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {
}
this.initializeForm(this.flow);

//create new from endpoint
this.endpoint = new Endpoint();
this.endpoint.endpointType = EndpointType.FROM;

this.endpoint.componentType = ComponentType[this.gateways[this.indexGateway].defaultFromComponentType];

(<FormArray>this.editFlowForm.controls.endpointsData).push(this.initializeEndpointData(this.endpoint));
this.endpointsOptions[0] = [new Option()];

//set documentation links
this.setTypeLinks(this.endpoint, 0);

let componentType = this.endpoint.componentType.toString().toLowerCase();
let camelComponentType = this.components.getCamelComponentType(componentType);

//get list of options (from Camel Catalog
this.setComponentOptions(this.endpoint, camelComponentType);

this.numberOfFromEndpoints = 1;

let optionArrayFrom: Array<string> = [];
Expand All @@ -338,13 +347,19 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {

this.endpoints.push(this.endpoint);

//create new to endpoint
this.endpoint = new Endpoint();
this.endpoint.endpointType = EndpointType.TO;
this.endpoint.componentType = ComponentType[this.gateways[this.indexGateway].defaultToComponentType];
(<FormArray>this.editFlowForm.controls.endpointsData).push(this.initializeEndpointData(this.endpoint));
this.endpointsOptions[1] = [new Option()];

this.setTypeLinks(this.endpoint, 1);
componentType = this.endpoint.componentType.toString().toLowerCase();
camelComponentType = this.components.getCamelComponentType(componentType);

this.setComponentOptions(this.endpoint, camelComponentType);

this.numberOfToEndpoints = 1;

let optionArrayTo: Array<string> = [];
Expand All @@ -353,13 +368,18 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {

this.endpoints.push(this.endpoint);

//create new error endpoint
this.endpoint = new Endpoint();
this.endpoint.endpointType = EndpointType.ERROR;
this.endpoint.componentType = ComponentType[this.gateways[this.indexGateway].defaultErrorComponentType];
(<FormArray>this.editFlowForm.controls.endpointsData).push(this.initializeEndpointData(this.endpoint));
this.endpointsOptions[2] = [new Option()];
this.setTypeLinks(this.endpoint, 2);

componentType = this.endpoint.componentType.toString().toLowerCase();
camelComponentType = this.components.getCamelComponentType(componentType);
this.setComponentOptions(this.endpoint, camelComponentType);

let optionArrayError: Array<string> = [];
optionArrayError.splice(0, 0, '');
this.selectedOptions.splice(2, 0, optionArrayError);
Expand Down Expand Up @@ -753,19 +773,6 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {
this.selectedOptions[endpointIndex].splice(optionIndex, 1);
}

/*
validateOptions(option: FormGroup) {
if (option.value.key || option.value.value) {
option.controls.key.setValidators([Validators.required]);
option.controls.value.setValidators([Validators.required]);
} else {
option.controls.key.clearValidators();
option.controls.value.clearValidators();
}
option.controls.key.updateValueAndValidity();
option.controls.value.updateValueAndValidity();
}*/

selectOptions(endpointIndex): FormArray {
const endpointData = (<FormArray>this.editFlowForm.controls.endpointsData).controls[endpointIndex];
return <FormArray>(<FormGroup>endpointData).controls.options;
Expand All @@ -778,26 +785,17 @@ export class FlowEditAllComponent implements OnInit, OnDestroy {
if (componentOption[0]) {
defaultValue = componentOption[0].defaultValue;
} else {
console.log('add to custom options');
const customOption = new Option();
customOption.key = selectedOption;

let componentType = endpoint.componentType.toString().toLowerCase();
let camelComponentType = this.components.getCamelComponentType(componentType);

console.log('add to custom options cameltype=' + camelComponentType);

let optionArray: Array<string> = [];
optionArray.splice(optionIndex, 0, customOption.key);

console.log('add to custom options cameltype X=' + JSON.stringify(this.selectedOptions[index]));

//this.selectedOptions[index].splice(optionIndex, 0,optionArray);

//selectedOptions[index][optionIndex] =

//console.log('add to custom options cameltype y=' + JSON.stringify(this.selectedOptions[index]));

this.componentOptions[index].push({
name: selectedOption,
displayName: selectedOption,
Expand Down

0 comments on commit a859379

Please sign in to comment.