fix for modals and select

gradle.properties

@@ -3,8 +3,8 @@ profile=dev
 type=FULL
 
 # Dependency versions
-spring_boot_version=2.6.7
-hibernate_version=5.6.8.Final
+spring_boot_version=2.6.8
+hibernate_version=5.6.9.Final
 mapstruct_version=1.4.2.Final
 archunitJunit5Version=0.22.0
 log4j2_mock_version=0.0.2

src/main/webapp/app/admin/deployment/deployment.component.html

@@ -43,7 +43,7 @@ <h3 class="mt-3">Schedule Exports</h3>
       -->
       <h2>Export Flow</h2>
       <p>Export an XML configuration per flow to file. Select a gateway to see the flows.</p>
-        <select class="form-control w-50" (change)="getFlowsForSelectedGateway($event)">
+        <select class="form-control form-select w-50" (change)="getFlowsForSelectedGateway($event)">
           <option disabled selected hidden>Choose a gateway</option>
           <option *ngFor="let gateway of gateways" [value]="gateway.id">{{ gateway.name }}</option>
         </select>

src/main/webapp/app/entities/broker/broker-update.component.html

@@ -54,7 +54,7 @@ <h2 id="jhi-broker-heading">Create or edit a Broker</h2>
           <label class="form-control-label" for="field_autoStart">Autostart</label>
           <i triggers="mouseenter:mouseleave" placement="right"
              popoverTitle="Info" [ngbPopover]="autostartPopover" #p="ngbPopover"><fa-icon icon="info-circle"></fa-icon></i>
-          <select type="text" class="form-control" id="field_autostart" id="field_autoStart" name="autoStart"
+          <select type="text" class="form-control form-select" id="field_autostart" id="field_autoStart" name="autoStart"
                   [(ngModel)]="broker.autoStart">
             <option value="true">true</option>
             <option value="false">false</option>
@@ -64,7 +64,7 @@ <h2 id="jhi-broker-heading">Create or edit a Broker</h2>
           <label class="form-control-label" for="field_type">Type</label>
           <i triggers="mouseenter:mouseleave" placement="right"
              popoverTitle="Info" [ngbPopover]="typePopover" #p="ngbPopover"><fa-icon icon="info-circle"></fa-icon></i>
-          <select type="text" class="form-control" id="field_type" name="type" [(ngModel)]="broker.type"
+          <select type="text" class="form-control form-select" id="field_type" name="type" [(ngModel)]="broker.type"
                   (ngModelChange)="onTypeChange($event)">
             <option value="classic">ActiveMQ Classic</option>
             <option value="artemis">ActiveMQ Artemis</option>
@@ -74,7 +74,7 @@ <h2 id="jhi-broker-heading">Create or edit a Broker</h2>
           <label class="form-control-label" for="field_type">Configuration Type</label>
           <i triggers="mouseenter:mouseleave" placement="right"
              popoverTitle="Info" [ngbPopover]="configurationTypePopover" #p="ngbPopover"><fa-icon icon="info-circle"></fa-icon></i>
-          <select type="text" class="form-control" id="field_configuration_type" name="configurationType"
+          <select type="text" class="form-control form-select" id="field_configuration_type" name="configurationType"
                   [(ngModel)]="broker.configurationType">
             <option value="embedded">Embedded</option>
             <option value="file">File</option>

src/main/webapp/app/entities/broker/sender/broker-message-sender.component.html

@@ -145,7 +145,7 @@ <h4 style="margin-left: 0.3em">
                       <label class="form-control-label" for="jmsHeaderKey" *ngIf="i === 0"><b>Key</b></label>
                       <select
                         type="text"
-                        class="rounded-0 d-inline-block form-control"
+                        class="rounded-0 d-inline-block form-control form-select"
                         id="jmsHeaderKey"
                         formControlName="key"
                         data-toggle="tooltip"

src/main/webapp/app/entities/certificate/certificate-self-sign-dialog.component.html

@@ -10,7 +10,7 @@ <h4 class="modal-title" id="selfSignLabel">Generate Self-Signed Cetificate</h4>
         <div class="form-group">
             <label class="form-control-label font-weight-bold" for="certificateStore">Certificatie Store</label>
             <select
-                type="text" id="certificateStore" class="form-control" formControlName="certificateStore">
+                type="text" id="certificateStore" class="form-control form-select" formControlName="certificateStore">
                 <option value="keystore">keystore</option>
                 <option value="truststore">truststore</option>
             </select>

src/main/webapp/app/entities/certificate/certificate-upload-dialog.component.html

@@ -10,7 +10,7 @@ <h4 class="modal-title" id="uploadCertificateLabel">Upload certificate</h4>
         <div class="form-group">
             <label class="form-control-label font-weight-bold" for="certificate_store" style="margin-bottom: 4px;">Certificate Store</label>
             <select
-                type="text" id="field_certificateStore" name="certificateStore" class="form-control" [(ngModel)]="certificateStore">
+                type="text" id="field_certificateStore" name="certificateStore" class="form-control form-select" [(ngModel)]="certificateStore">
                 <option value="keystore">keystore</option>
                 <option value="truststore">truststore</option>
             </select>

src/main/webapp/app/entities/certificate/certificate-uploadp12-dialog.component.html

@@ -10,7 +10,7 @@ <h4 class="modal-title" id="myGatewayLabel">Upload P12 certificate (PKCS12)</h4>
         <div class="form-group">
             <label class="form-control-label font-weight-bold" for="certificate_store" style="margin-bottom: 4px;">Certificate Store</label>
             <select
-                type="text" id="field_certificateStore" class="form-control" formControlName="certificateStore">
+                type="text" id="field_certificateStore" class="form-control form-select" formControlName="certificateStore">
                 <option value="keystore">keystore</option>
                 <option value="truststore">truststore</option>
             </select>

src/main/webapp/app/entities/endpoint/endpoint-update.component.html

@@ -11,7 +11,7 @@ <h2 id="jhi-endpoint-heading">Create or edit a Endpoint</h2>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" for="field_type">ComponentType</label>
-                    <select class="form-control" name="componentType" [(ngModel)]="endpoint.componentType" id="field_type" >
+                    <select class="form-control form-select" name="componentType" [(ngModel)]="endpoint.componentType" id="field_type" >
                         <option value="FILE">FILE</option>
                     </select>
                 </div>
@@ -32,21 +32,21 @@ <h2 id="jhi-endpoint-heading">Create or edit a Endpoint</h2>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" for="field_flow">Flow</label>
-                    <select class="form-control" id="field_flow" name="flow" [(ngModel)]="endpoint.flowId" >
+                    <select class="form-control form-select" id="field_flow" name="flow" [(ngModel)]="endpoint.flowId" >
                         <option [ngValue]="null"></option>
                         <option [ngValue]="flowOption.id" *ngFor="let flowOption of flows; trackBy: trackFlowById">{{flowOption.id}}</option>
                     </select>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" for="field_service">Service</label>
-                    <select class="form-control" id="field_service" name="service" [(ngModel)]="endpoint.serviceId" >
+                    <select class="form-control form-select" id="field_service" name="service" [(ngModel)]="endpoint.serviceId" >
                         <option [ngValue]="null"></option>
                         <option [ngValue]="serviceOption.id" *ngFor="let serviceOption of services; trackBy: trackServiceById">{{serviceOption.id}}</option>
                     </select>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" for="field_header">Header</label>
-                    <select class="form-control" id="field_header" name="header" [(ngModel)]="endpoint.headerId" >
+                    <select class="form-control form-select" id="field_header" name="header" [(ngModel)]="endpoint.headerId" >
                         <option [ngValue]="null"></option>
                         <option [ngValue]="headerOption.id" *ngFor="let headerOption of headers; trackBy: trackHeaderById">{{headerOption.id}}</option>
                     </select>

src/main/webapp/app/entities/environment-variables/environment-variables-dialog.component.html

@@ -30,7 +30,7 @@ <h4 class="modal-title" id="myEnvironmentVariablesLabel">Create or edit an Envir
 
         <div class="form-group">
             <label class="form-control-label" for="gateway">Gateway</label>
-            <select *ngIf="gateways.length > 1; else oneGateway" class="form-control" id="gateway" formControlName="gatewayId" >
+            <select *ngIf="gateways.length > 1; else oneGateway" class="form-control form-select" id="gateway" formControlName="gatewayId" >
                 <option [ngValue]="null"></option>
                 <option [ngValue]="gatewayOption.id" *ngFor="let gatewayOption of gateways; trackBy: trackGatewayById">{{gatewayOption.id}}</option>
             </select>

src/main/webapp/app/entities/environment-variables/environment-variables-update.component.html

@@ -23,7 +23,7 @@ <h4 class="modal-title" id="myEnvironmentVariablesLabel">Create or edit an Envir
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" for="encrypted">Encrypt value</label>
-                    <select class="form-control" id="encrypted" [(ngModel)]="environmentVariables.encrypted"
+                    <select class="form-control form-select" id="encrypted" [(ngModel)]="environmentVariables.encrypted"
                             formControlName="encrypted" [value]="environmentVariables.encrypted">
                         <option [ngValue]=false [selected]="!environmentVariables.encrypted">no</option>
                         <option [ngValue]=true [selected]="environmentVariables.encrypted">yes</option>
@@ -51,7 +51,7 @@ <h4 class="modal-title" id="myEnvironmentVariablesLabel">Create or edit an Envir
 
                 <div class="form-group">
                     <label class="form-control-label" for="gateway">Gateway</label>
-                    <select *ngIf="gateways.length > 1; else oneGateway" class="form-control" id="gateway"
+                    <select *ngIf="gateways.length > 1; else oneGateway" class="form-control form-select" id="gateway"
                             formControlName="gatewayId">
                         <option [ngValue]="null"></option>
                         <option [ngValue]="gatewayOption.id"

src/main/webapp/app/entities/flow/editor/flow-editor-api.component.html

@@ -506,7 +506,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          [popover]="logLevelPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select class="form-control" name="logLevel" formControlName="logLevel" id="field_logLevel">
+                      <select class="form-control form-select" name="logLevel" formControlName="logLevel" id="field_logLevel">
                         <option *ngFor="let logLevel of logLevelListType"
                                 [ngValue]="logLevelListType[logLevel]" [value]="logLevel">
                           {{logLevel}}
@@ -520,7 +520,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_autostart" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_autostart" *ngIf="flow"
                               formControlName="autoStart">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -533,7 +533,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          [popover]="parallelProcessingPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_parallelprocessing" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_parallelprocessing" *ngIf="flow"
                               formControlName="parallelProcessing">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -546,7 +546,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          popoverTitle="Info" [popover]="assimblyHeadersPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_assimbly_headers" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_assimbly_headers" *ngIf="flow"
                               formControlName="assimblyHeaders">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -565,7 +565,7 @@ <h4 class="modal-title">URI (context path)</h4>
                     </div>
                     <div class="form-group" *ngIf="!singleGateway">
                       <label class="form-control-label" for="field_gateway" style="float: left; text-align: left;">Gateway</label>
-                      <select class="form-control" id="field_gateway" *ngIf="flow"
+                      <select class="form-control form-select" id="field_gateway" *ngIf="flow"
                               formControlName="gateway">
                         <option [ngValue]="gateway.id" *ngFor="let gateway of gateways">{{gateway.name}}</option>
                       </select>

src/main/webapp/app/entities/flow/editor/flow-editor-connector.component.html

@@ -504,7 +504,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          [popover]="logLevelPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select class="form-control" name="logLevel" formControlName="logLevel" id="field_logLevel">
+                      <select class="form-control form-select" name="logLevel" formControlName="logLevel" id="field_logLevel">
                         <option *ngFor="let logLevel of logLevelListType"
                                 [ngValue]="logLevelListType[logLevel]" [value]="logLevel">
                           {{logLevel}}
@@ -518,7 +518,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_autostart" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_autostart" *ngIf="flow"
                               formControlName="autoStart">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -531,7 +531,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          [popover]="parallelProcessingPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_parallelprocessing" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_parallelprocessing" *ngIf="flow"
                               formControlName="parallelProcessing">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -544,7 +544,7 @@ <h4 class="modal-title">URI (context path)</h4>
                          popoverTitle="Info" [popover]="assimblyHeadersPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select type="text" class="form-control" id="field_assimbly_headers" *ngIf="flow"
+                      <select type="text" class="form-control form-select" id="field_assimbly_headers" *ngIf="flow"
                               formControlName="assimblyHeaders">
                         <option value="true">true</option>
                         <option value="false">false</option>
@@ -563,7 +563,7 @@ <h4 class="modal-title">URI (context path)</h4>
                     </div>
                     <div class="form-group" *ngIf="!singleGateway">
                       <label class="form-control-label" for="field_gateway" style="float: left; text-align: left;">Gateway</label>
-                      <select class="form-control" id="field_gateway" *ngIf="flow"
+                      <select class="form-control form-select" id="field_gateway" *ngIf="flow"
                               formControlName="gateway">
                         <option [ngValue]="gateway.id" *ngFor="let gateway of gateways">{{gateway.name}}</option>
                       </select>

src/main/webapp/app/entities/flow/editor/flow-editor-connector.component.ts

@@ -474,6 +474,7 @@ export class FlowEditorConnectorComponent implements OnInit, OnDestroy {
   }
 
   setTypeLinks(endpoint: any, endpointFormIndex?, e?: Event): void {
+
     const endpointForm = <FormGroup>(<FormArray>this.editFlowForm.controls.endpointsData).controls[endpointFormIndex];
 
     if (typeof e !== 'undefined') {
@@ -562,7 +563,9 @@ export class FlowEditorConnectorComponent implements OnInit, OnDestroy {
   }
 
   setURIlist(index): void {
+
     this.URIList[index] = [];
+    let updatedList = [];
 
     const tEndpointsUnique = this.allendpoints.filter((v, i, a) => a.findIndex(t => t.uri === v.uri) === i);
 
@@ -571,13 +574,15 @@ export class FlowEditorConnectorComponent implements OnInit, OnDestroy {
 		  endpoint.endpointType === 'TO'   ||
 		  endpoint.endpointType === 'ERROR'   ||
 		  endpoint.endpointType === 'RESPONSE'){
-		  if (endpoint.componentType && this.selectedComponentType === endpoint.componentType.toLowerCase()) {
-				this.URIList[index].push(endpoint);
-		  }
-  	    }
+        if (endpoint.componentType && this.selectedComponentType === endpoint.componentType.toLowerCase()) {
+          updatedList.push(endpoint);
+        }
+  	  }
     });
 
-    this.URIList.sort();
+    this.URIList[index].push(...updatedList);
+
+    this.URIList[index].sort();
   }
 
   enableFields(endpointForm): void {
@@ -1030,16 +1035,14 @@ export class FlowEditorConnectorComponent implements OnInit, OnDestroy {
     this.modalRefPromise.then(res => {
         res.result.then(
           result => {
-            console.log('createHeader result 1: ', result);
             this.setHeader(endpoint, result.id, formHeader);
           },
           reason => {
-            console.log('createHeader result 2: ', reason);
             this.setHeader(endpoint, reason.id, formHeader);
           }
         );
     },(reason)=>{
-       console.log('createHeader result3: ', reason);
+       console.log('createHeader error: ', reason);
     });
 
   }

src/main/webapp/app/entities/flow/editor/flow-editor-esb.component.html

@@ -236,7 +236,7 @@
                          [popover]="logLevelPopover" style="float: left; margin-left: 6px;">
                         <fa-icon icon="info-circle"></fa-icon>
                       </i>
-                      <select class="form-control" name="logLevel" formControlName="logLevel" id="field_logLevel">
+                      <select class="form-control form-select" name="logLevel" formControlName="logLevel" id="field_logLevel">
                         <option *ngFor="let logLevel of logLevelListType"
                                 [ngValue]="logLevelListType[logLevel]" [value]="logLevel">
                           {{logLevel}}