From 8c100682cfef19b53add99ba22a79dda51249e32 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 17 Jan 2024 16:22:38 +0100
Subject: [PATCH 1/4] improve ldn form template

---
 .../ldn-service-form.component.html           | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index 6b4f808595..e32af3f259 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -34,20 +34,41 @@
                 class="form-control" formControlName="description" id="description" name="description"></textarea>
     </div>
 
-    <!-- In the url section -->
     <div class="mb-5 mt-5">
-      <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
-      <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
-             formControlName="url"
-             id="url"
-             name="url"
-             type="text">
-      <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
-        {{ 'ldn-new-service.form.error.url' | translate }}
+      <!-- In the url section -->
+      <div class="d-flex">
+        <div class="d-flex flex-column w-50 mr-2">
+          <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
+                 formControlName="url"
+                 id="url"
+                 name="url"
+                 type="text">
+          <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.url' | translate }}
+          </div>
+        </div>
+
+        <div class="d-flex flex-column w-50">
+          <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
+                 id="score"
+                 name="score"
+                 min="0"
+                 max="1"
+                 step=".01"
+                 class="form-control"
+                 type="number">
+          <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.score' | translate }}
+          </div>
+        </div>
       </div>
     </div>
 
+
     <!-- In the ldnUrl section -->
     <div class="mb-5 mt-5">
       <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
@@ -62,22 +83,6 @@
       </div>
     </div>
 
-    <!-- In the score section -->
-    <div class="mb-2">
-      <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
-      <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
-             id="score"
-             name="score"
-             min="0"
-             max="1"
-             step=".01"
-             class="form-control"
-             type="number">
-      <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
-        {{ 'ldn-new-service.form.error.score' | translate }}
-      </div>
-    </div>
 
     <!-- In the Inbound Patterns Labels section -->
     <div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
@@ -134,8 +139,6 @@
                               ngbDropdownItem
                               type="button">
                         <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
-                        <div
-                          class="small-text">{{ 'ldn-service.form.pattern.' + pattern + '.description' | translate }}</div>
                       </button>
                     </div>
                   </div>

From 37edb063524b22b11db09e76c22b3edba8f2ad2a Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 17 Jan 2024 16:58:42 +0100
Subject: [PATCH 2/4] restore ip section

---
 .../ldn-service-form.component.html           | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index e32af3f259..b64d214ffe 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -68,6 +68,30 @@
       </div>
     </div>
 
+    <!-- In the IP range section -->
+    <div class="mb-5 mt-5">
+      <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
+      <div class="d-flex">
+        <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
+               formControlName="lowerIp"
+               id="lowerIp"
+               name="lowerIp"
+               type="text">
+        <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
+               formControlName="upperIp"
+               id="upperIp"
+               name="upperIp"
+               type="text">
+      </div>
+      <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
+        {{ 'ldn-new-service.form.error.ipRange' | translate }}
+      </div>
+      <div *ngIf="!(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="text-muted">
+        {{ 'ldn-new-service.form.hint.ipRange' | translate }}
+      </div>
+    </div>
 
     <!-- In the ldnUrl section -->
     <div class="mb-5 mt-5">

From 25890248ad9c0489933380e74c50726ee44f4c1d Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 17 Jan 2024 17:00:25 +0100
Subject: [PATCH 3/4] remove pointless double negation

---
 .../ldn-service-form/ldn-service-form.component.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index b64d214ffe..4c6c3c13db 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -113,7 +113,7 @@
       <div class="col">
         <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
       </div>
-      <ng-container *ngIf="!!(formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern)">
+      <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
         <div class="col">
           <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
         </div>
@@ -172,7 +172,7 @@
 
             <div class="col">
               <ng-container
-                *ngIf="!!(formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern)">
+                *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
                 <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
                      placement="top-start">
                   <div class="position-relative right-addon" role="combobox">

From 9ee2ecf718d317de2cc2a55e17fb630ad70bead0 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 17 Jan 2024 17:16:38 +0100
Subject: [PATCH 4/4] fix style

---
 .../ldn-service-form/ldn-service-form.component.html            | 2 +-
 .../ldn-service-form/ldn-service-form.component.scss            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index 4c6c3c13db..cab2692f17 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -36,7 +36,7 @@
 
     <div class="mb-5 mt-5">
       <!-- In the url section -->
-      <div class="d-flex">
+      <div class="d-flex align-items-center">
         <div class="d-flex flex-column w-50 mr-2">
           <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
index bace82b209..afd5c80d1c 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
@@ -6,7 +6,7 @@ form {
   position: relative;
 }
 
-input[type="text"],
+input,
 select {
   max-width: 100%;
   width: 100%;