diff --git a/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.html b/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.html
index 8be89d8561a8e06827ef554d8351485a0368ba3e..1facf3361cb99e7c3c0171b11060a587ccba24be 100644
--- a/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.html
+++ b/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.html
@@ -1,6 +1,7 @@
<div
[ngClass]="{ 'smp-warning-panel': label,
- 'alert-info': type === 'info',
+ 'smp-warning-panel-padding': padding && label,
+ 'alert-info': type === 'info',
'alert-success': type === 'success',
'alert-warning': type === 'warning',
'alert-error': type === 'error'}"
diff --git a/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.ts b/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.ts
index 9a8b820c69ccafd0cc4451271967e0d7b806d7a0..7ca12d58545fe0f7b6c89601189ac3bdb2ce00e3 100644
--- a/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.ts
+++ b/smp-angular/src/app/common/components/smp-warning-panel/smp-warning-panel.component.ts
@@ -5,6 +5,7 @@ import { Component, Input } from '@angular/core';
templateUrl: './smp-warning-panel.component.html',
})
export class SmpWarningPanelComponent {
+ @Input() padding:boolean = true;
@Input() label:string;
@Input() icon:string;
@Input() type:string = 'warning';
diff --git a/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html b/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
index a6f1d7e7697c7ec3d137797eed54f28994e43bb6..ff0fb560b85fe98020d4051e09aa2899530abb40 100644
--- a/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
+++ b/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
@@ -46,7 +46,12 @@
(change)="uploadCertificate($event)">
<button id="importButton" mat-flat-button color="primary" (click)="fileInput.click()">Import</button>
</label>
-
+ <mat-form-field class="certificate-id" style="width:100%">
+ <mat-label>SMP certificate ID</mat-label>
+ <input matInput formControlName="certificateId"
+ id="certificateId_id"
+ resizeable="true" readonly="true">
+ </mat-form-field>
<mat-form-field class="certificate-subject" style="width:100%">
<mat-label>Subject Name</mat-label>
<input matInput formControlName="subject" id="subject_id"
@@ -74,12 +79,7 @@
<input matInput formControlName="serialNumber"
id="servialNumber_id" readonly="true">
</mat-form-field>
- <mat-form-field class="certificate-id" style="width:100%">
- <mat-label>SMP certificate ID</mat-label>
- <input matInput formControlName="certificateId"
- id="certificateId_id"
- resizeable="true" readonly="true">
- </mat-form-field>
+
</div>
</mat-dialog-content>
<mat-dialog-actions>
diff --git a/smp-angular/src/app/common/panels/certificate-panel/certificate-panel.component.html b/smp-angular/src/app/common/panels/certificate-panel/certificate-panel.component.html
index 10de1966fc40be22628c03607c2a362af079d75f..1504ec77f1f1ba906e7c2d02e3cc5a6169c95960 100644
--- a/smp-angular/src/app/common/panels/certificate-panel/certificate-panel.component.html
+++ b/smp-angular/src/app/common/panels/certificate-panel/certificate-panel.component.html
@@ -36,25 +36,6 @@
[value]="certificate?.subject"
readonly>
</mat-form-field>
- <mat-form-field>
- <mat-label>Issuer</mat-label>
- <input matInput placeholder="Issuer"
- id="issuer_id"
- [value]="certificate?.issuer"
- readonly>
- </mat-form-field>
- <mat-form-field>
- <mat-label>Serial Number</mat-label>
- <input matInput placeholder="Serial Number" id="servialNumber_id"
- [value]="certificate?.serialNumber"
- readonly>
- </mat-form-field>
- <mat-form-field>
- <mat-label>Certificate revocation list URL</mat-label>
- <input matInput placeholder="Certificate revocation list URL" id="clrUrl_id"
- [value]="certificate?.crlUrl"
- readonly>
- </mat-form-field>
<div style="display: flex;flex-direction: row;flex-grow: 1">
<mat-form-field style="flex-grow: 1">
<mat-label>Valid from date</mat-label>
@@ -82,5 +63,25 @@
</ngx-mat-datetime-picker>
</mat-form-field>
</div>
+ <mat-form-field>
+ <mat-label>Issuer</mat-label>
+ <input matInput placeholder="Issuer"
+ id="issuer_id"
+ [value]="certificate?.issuer"
+ readonly>
+ </mat-form-field>
+ <mat-form-field>
+ <mat-label>Serial Number</mat-label>
+ <input matInput placeholder="Serial Number" id="servialNumber_id"
+ [value]="certificate?.serialNumber"
+ readonly>
+ </mat-form-field>
+ <mat-form-field>
+ <mat-label>Certificate revocation list URL</mat-label>
+ <input matInput placeholder="Certificate revocation list URL" id="clrUrl_id"
+ [value]="certificate?.crlUrl"
+ readonly>
+ </mat-form-field>
+
</div>
diff --git a/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.html b/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.html
index 5162c5cb8e105a26d15df9147d519500a2149c94..163c73123da887be19f6d2f1d965a197cc79673d 100644
--- a/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.html
+++ b/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.html
@@ -1,16 +1,17 @@
<div class="panel smp-data-panel" [formGroup]="credentialForm" (ngSubmit)="onSaveButtonClicked()">
- <smp-warning-panel *ngIf="_credential.certificate?.invalid;"
+ <smp-warning-panel *ngIf="_credential.certificate?.invalid;" class="smp-certificate-warning-panel"
+ [padding]="false"
icon="error"
label="Invalid certificate: {{_credential.certificate.invalidReason}}">
</smp-warning-panel>
<div style="display: flex;flex-flow: row wrap;">
<mat-form-field style="flex-grow: 2">
<mat-label>Certificate ID</mat-label>
- <input matInput placeholder="Access token ID"
+ <input matInput [matTooltip]="credential?.name"
[value]="credential?.name"
maxlength="255" readonly>
</mat-form-field>
- <div style="display: inline">
+ <div style="display: inline;display: flex; flex-direction: row; justify-content: space-between; gap: 3px;">
<button id="deleteButton" mat-raised-button
(click)="onDeleteButtonClicked()"
color="primary" >
diff --git a/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.scss b/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..588a7d255e8db0eb482aa3fc25b87044a7cfcd24 100644
--- a/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.scss
+++ b/smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.scss
@@ -0,0 +1,4 @@
+.smp-certificate-warning-panel {
+ font-size: 0.8em;
+}
+
diff --git a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
index bd09fd9e6215eafe125b18c3ad242fb5f091ceff..0efdfaaf48d815e11beaf78e5c1b548d91818da4 100644
--- a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
+++ b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
@@ -109,7 +109,7 @@ export class UserCertificatesComponent implements BeforeLeaveGuard {
this.dialog.open(ConfirmationDialogComponent, {
data: {
title: "Update Certificate data",
- description: "Action will update Certificate settings: " + credential.name + " data!<br /><br />Do you wish to continue?"
+ description: "Action will update Certificate data:<br />" + credential.name + "!<br /><br />Do you wish to continue?"
}
}).afterClosed().subscribe(result => {
if (result) {
diff --git a/smp-angular/src/styles.css b/smp-angular/src/styles.css
index 960680b433dfc1ad60c2712d2e821336c940186b..612b3b3899f72fd83c3a8a5be0bb1cbb81d57ae9 100644
--- a/smp-angular/src/styles.css
+++ b/smp-angular/src/styles.css
@@ -245,6 +245,9 @@ a:hover {
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);
+}
+
+.smp-warning-panel-padding {
padding: 0.5em;
}
diff --git a/smp-resource-extensions/oasis-cppa3-spi/pom.xml b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
index 99d0390197b8298dda654fe78c267b8d8ab80750..3856fe473de68c6dff41cf4591804b39b0cf4e94 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/pom.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
@@ -25,7 +25,6 @@
<jaxb-api.version>2.3.1</jaxb-api.version>
<org.glassfish.jaxb.jaxb-runtime.version>2.3.8</org.glassfish.jaxb.jaxb-runtime.version>
</properties>
-
<artifactId>oasis-cppa3-spi</artifactId>
<name>oasis-cppa3-spi</name>
<packaging>jar</packaging>