Merge branch 'SI-2564-close-button' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into DEVELOP

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 811a1d7..90458ba 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html

@@ -13,11 +13,11 @@
 <app-card-layout *ngIf="gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async as formState">
   <div header>
     <div class="header-container">
+      <div class="header-title">
+        <span>{{ 'GridFailure.Title' | translate }}</span>
+      </div>
       <div class="diverse-btn-container">
         <div>
-          <span>{{ 'GridFailure.Title' | translate }}</span>
-        </div>
-        <div>
           <button
             *ngIf="!gridFailureDetailsSandbox.currentFormState.isPristine"
             type="button"

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
index 7a0af7d..c8586ce 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss

@@ -78,12 +78,17 @@
 
 .header-container {
   display: flex;
-  flex-direction: column;
   justify-content: space-between;
 }
 
+.header-title {
+  flex: 1;
+  padding-top: 15px;
+}
+
 .diverse-btn-container {
   display: flex;
+  flex: 1;
   justify-content: space-between;
 
   * {

diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts
index 99ad218..ad3c82c 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts

@@ -129,6 +129,7 @@
     sortable: true,
     suppressMovable: true,
     filter: 'setFilterComponent',
+    valueGetter: params => (params.data.postcode ? params.data.postcode : params.data.freetextPostcode),
   },
   {
     field: 'city',
@@ -136,6 +137,7 @@
     sortable: true,
     suppressMovable: true,
     filter: 'setFilterComponent',
+    valueGetter: params => (params.data.city ? params.data.city : params.data.freetextCity),
   },
   {
     field: 'district',
@@ -143,6 +145,7 @@
     sortable: true,
     suppressMovable: true,
     filter: 'setFilterComponent',
+    valueGetter: params => (params.data.district ? params.data.district : params.data.freetextDistrict),
   },
   {
     field: 'street',