Merge pull request #148 in EDELIVERY/smp from...

Merge pull request #148 in EDELIVERY/smp from bugfix/EDELIVERY-4214-ui-data-table-scaling-details to development

* commit '761009f77b08bea242eea135deabb07e20ab2a72':
  Fix UI  scaling issue

smp-angular/src/app/alert/alert.component.css

@@ -17,8 +17,8 @@
   color: white;
   font-weight: bold;
   float: right;
-  font-size: 22px;
-  line-height: 20px;
+  font-size: 24px;
+  line-height: 24px;
   cursor: pointer;
   transition: 0.3s;
 }

smp-angular/src/app/app.component.html

@@ -56,8 +56,9 @@
   </mat-sidenav>
 
   <!-- primary content -->
-  <div fxLayout="column" id=".my-content" style="position:absolute; bottom:5px; top:5px; right: 5px; left: 5px">
-    <alert style=" left:220px; top:0;right:0;z-index: 500"></alert>
+  <div fxLayout="column" id=".my-content" style="position:absolute; bottom:5px; top:5px; right: 5px; left: 5px"
+       [style.margin-left]="fullMenu? '225px' : '65px'">
+    <alert></alert>
 
     <div  id="sandwichMenuHolder" style="z-index: 500">
       <div id="sandwichMenu">
@@ -96,7 +97,7 @@
       </div>
     </div>
 
-    <div fxFill="100" id="routerHolder" style="min-height: 100%" >
+    <div fxFill="100" fxFlex="<grow> <shrink> <basis>" id="routerHolder" style="min-height: 100%" >
         <router-outlet></router-outlet>
     </div>
   </div>

smp-angular/src/app/common/search-table/search-table.component.html

 <div fxLayout="column" fxFill="100" style=" top: 5px; bottom: 5px; left: 5px; right: 5px;">
   <h1  flex id="{{id}}_header_id" style="margin: 0 !important;">{{title}}</h1>
-  <div *ngIf="showSearchPanel" fxFlex="20" class="selectionCriteria">
+  <div *ngIf="showSearchPanel" fxFlex="170px" class="selectionCriteria">
     <mat-card>
       <mat-card-content>
         <div class="panel">
@@ -93,8 +93,8 @@
       </a>
     </ng-template>
   </div>
-  <div fxFlex="50px">
-    <ng-container *ngIf=showActionButtons>
+  <div fxFlex="50px"  *ngIf=showActionButtons >
+    <ng-container>
 
         <button id="cancelButton" mat-raised-button (click)="onCancelButtonClicked()" color="primary"
                 [disabled]="!submitButtonsEnabled">

smp-angular/src/app/footer/footer.component.css

 #footer {
   position:absolute;
   bottom:0;
-  left: 10px;
+  left: 0;
   width:100%;
   overflow:hidden;
   text-align: center;

smp-angular/src/styles.css

@@ -151,6 +151,7 @@ mat-sidenav[_ngcontent-c0] {
 /*--------------------------- */
 .mat-sidenav-content {
   min-height: 100vh;
+  margin-left: 0 !important;
 }
 
 /* --- Hamburger Menu ---*/

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java

@@ -40,9 +40,6 @@ import static eu.europa.ec.edelivery.smp.exceptions.ErrorCode.CONFIGURATION_ERRO
 @Repository(value = "configurationDao")
 public class ConfigurationDao extends BaseDao<DBConfiguration> {
 
-
-
-
     private static final SMPLogger LOG = SMPLoggerFactory.getLogger(ConfigurationDao.class);
 
 
@@ -143,7 +140,7 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> {
         if (lastUpdate == null || lastUpdateFromDB == null || lastUpdateFromDB.isAfter(lastUpdate)) {
             reloadPropertiesFromDatabase();
         } else {
-            LOG.info("Skip property update because max(LastUpdate) of properties in database is not changed: {}."+ lastUpdateFromDB );
+            LOG.info("Skip property update because max(LastUpdate) of properties in database is not changed: {}.", lastUpdateFromDB );
         }
     }
 
@@ -209,6 +206,7 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> {
                     String.join(",", lstMissingProperties)));
         }
 
+
         Map<String, Object> propertyValues = parseProperties(properties);
 
         // property validation
@@ -229,6 +227,7 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> {
         return propertyValues;
     }
 
+    @Transactional
     public void updateCurrentEncryptedValues() {
         File encryptionKey = (File) cachedPropertyValues.get(ENCRYPTION_FILENAME.getProperty());
         for (SMPPropertyEnum prop : SMPPropertyEnum.values()) {
@@ -242,8 +241,7 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> {
     }
 
 
-    protected Map<String, Object> parseProperties(Properties properties) {
-
+    protected void validateBasicProperties(Properties properties){
         // retrieve and validate  configuration dir and encryption filename
         // because they are important for 'parsing and validating' other parameters
         String configurationDir = getProperty(properties, CONFIGURATION_DIR);
@@ -267,6 +265,19 @@ public class ConfigurationDao extends BaseDao<DBConfiguration> {
             throw new SMPRuntimeException(CONFIGURATION_ERROR, String.format("Encryption file does not exists or is not a File! Value:  %s",
                     encryptionKeyFile.getAbsolutePath()));
         }
+    }
+
+
+    protected Map<String, Object> parseProperties(Properties properties) {
+
+        // retrieve and validate  configuration dir and encryption filename
+        // because they are important for 'parsing and validating' other parameters
+        validateBasicProperties(properties);
+        String configurationDir = getProperty(properties, CONFIGURATION_DIR);
+        String encryptionKeyFilename = getProperty(properties, ENCRYPTION_FILENAME);
+
+        File configFolder = new File(configurationDir);
+        File encryptionKeyFile = new File(configurationDir, encryptionKeyFilename);
 
         Map<String, Object> propertyValues = new HashMap();
         // put the first two values