small fixes

smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.ts

@@ -10,4 +10,5 @@ import { Component, Input } from '@angular/core';
 export class SmpWarningPanelComponent {
   @Input() label:string;
   @Input() icon:string;
+
 }

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

@@ -28,10 +28,9 @@
     </mat-tab-group>
   </data-panel>
   <ng-template #noUserAdminGroupsDataFound>
-    <div class="panel smp-no-data-panel">
-      <mat-icon>warning</mat-icon>
-      <span>User is not administrator of any of the domains </span>
-    </div>
+    <smp-warning-panel class="smp-no-data-panel"
+                       icon="warning"
+                       label="User is not administrator of any of the domains"></smp-warning-panel>
   </ng-template>
 </div>
 

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

@@ -34,10 +34,9 @@
       </mat-tab>
     </mat-tab-group>
     <ng-template #noUserAdminGroupsDataFound>
-      <div class="panel smp-no-data-panel">
-        <mat-icon >warning</mat-icon>
-        <span>User is not administrator of any of the groups </span>
-      </div>
+      <smp-warning-panel class="smp-no-data-panel"
+      icon="warning"
+      label="User is not administrator of any of the groups "></smp-warning-panel>
     </ng-template>
   </data-panel>
 

smp-angular/src/app/edit/edit-resources/edit-resource.component.html

@@ -45,10 +45,9 @@
     </mat-tab-group>
   </data-panel>
   <ng-template #noUserAdminGroupsDataFound>
-    <div class="panel smp-no-data-panel">
-      <mat-icon>warning</mat-icon>
-      <span>User is not administrator of any of the resources </span>
-    </div>
+    <smp-warning-panel class="smp-no-data-panel"
+                       icon="warning"
+                       label="User is not administrator of any of the resources"></smp-warning-panel>
   </ng-template>
 </div>
 

smp-angular/src/app/system-settings/admin-domain/domain-panel/domain-panel.component.html

@@ -2,6 +2,10 @@
   <form [formGroup]="domainForm" >
     <h3>Domain details</h3>
     <div class="panel" *ngIf="_domain!=null &&  !_domain.domainId"><p style="font-weight: bold">Enter data and click 'Save' to create new domain</div>
+    <smp-warning-panel *ngIf=" !!_domain?.domainId && !domainResourceTypes?.length"
+
+                       icon="warning"
+                       label="To complete domain configuration please select at least one resource type on tab 'Resource Types'"></smp-warning-panel>
     <mat-form-field style="width:100%">
       <mat-label>Domain Code</mat-label>
       <input matInput

smp-angular/src/styles.css

@@ -233,7 +233,7 @@ a:hover {
 .error-data-panel {
   display:flex;
   flex-direction: row;
-  gap:0.5em;
+  gap:0.7em;
   align-items: center;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
   padding: 0.5em;

smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java

@@ -31,7 +31,6 @@ import static eu.europa.ec.edelivery.smp.ui.ResourceConstants.*;
 public class DomainAdminController {
 
     private static final SMPLogger LOG = SMPLoggerFactory.getLogger(DomainAdminController.class);
-
     final UIDomainService uiDomainService;
     final DomainService domainService;
 
@@ -55,8 +54,9 @@ public class DomainAdminController {
         logAdminAccess("deleteDomain:" + domainEncId);
         Long domainId = SessionSecurityUtils.decryptEntityId(domainEncId);
         LOG.info("Delete domain with id [{}]", domainId);
-
-        return uiDomainService.deleteDomain(domainId);
+        DomainRO domainRO = uiDomainService.deleteDomain(domainId);
+        domainRO.setDomainId(domainEncId);
+        return domainRO;
     }
 
     @PutMapping(path = "/{user-enc-id}/create", produces = MimeTypeUtils.APPLICATION_JSON_VALUE, consumes = MimeTypeUtils.APPLICATION_JSON_VALUE)
@@ -83,6 +83,7 @@ public class DomainAdminController {
 
         DomainRO domainRO = uiDomainService.getDomainData(domainId);
         domainRO.setStatus(EntityROStatus.UPDATED.getStatusNumber());
+        domainRO.setDomainId(domainEncId);
         return domainRO;
     }
 
@@ -97,6 +98,7 @@ public class DomainAdminController {
         uiDomainService.updateResourceDefDomainList(domainId, resourceDefs);
         DomainRO domainRO = uiDomainService.getDomainData(domainId);
         domainRO.setStatus(EntityROStatus.UPDATED.getStatusNumber());
+        domainRO.setDomainId(domainEncId);
         return domainRO;
     }
 
@@ -111,6 +113,7 @@ public class DomainAdminController {
         uiDomainService.updateDomainSmlIntegrationData(domainId, domainData);
         DomainRO domainRO = uiDomainService.getDomainData(domainId);
         domainRO.setStatus(EntityROStatus.UPDATED.getStatusNumber());
+        domainRO.setDomainId(domainEncId);
         return domainRO;
     }