diff --git a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
index 9e60ee4c58b3b97e668f511af26dfa6afef19270..4e103de0b2a785623baf7e8081165b046e789229 100644
--- a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
+++ b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
@@ -14,7 +14,7 @@
<div style="margin-bottom: 10px">
{{ 'APPS_MANAGEMENT.ADD_JSON_TEXTAREA'| translate}}
</div>
- <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false"></textarea>
+ <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea>
</div>
<div class="flex flex-row justify-content-center justify-content-center mt-2">
<button *ngIf="jsonText.length >0" pButton class="btn btn-success"
diff --git a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts
index 62638c292ab2e1df41073e8aa0f606e036379548..72a926ff40e141030bd298b5c5253dc280b2ca99 100644
--- a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts
+++ b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.ts
@@ -44,7 +44,11 @@ export class AppAddJsonAppComponent implements OnInit {
},
error => {
console.log(error)
- this.error = error.message
+ if (error.message === null) {
+ this.JsonError = true;
+ } else {
+ this.error = error.message
+ }
})
} catch (e) {
console.warn('invalid json')
@@ -68,7 +72,11 @@ export class AppAddJsonAppComponent implements OnInit {
},
error => {
console.log(error)
- this.error = error.message
+ if (error.message === null) {
+ this.JsonError = true;
+ } else {
+ this.error = error.message
+ }
})
} catch (e) {
console.warn('invalid json')
diff --git a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
index ca1889da3b63b88290cd60d4fffe655f1c572a08..7b228696a1610a3f2de818942a34ec135aca945a 100644
--- a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
+++ b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
@@ -14,7 +14,7 @@
<div style="margin-bottom: 10px">
{{ 'APPS_MANAGEMENT.ADD_JSON_TEXTAREA'| translate}}
</div>
- <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false"></textarea>
+ <textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea>
</div>
<div class="flex flex-row justify-content-center justify-content-center mt-2">
<button *ngIf="jsonText.length >0" pButton class="btn btn-success"
diff --git a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts
index 54532ee89bd6fdb61eea4d0016e933f79c40d422..f91cffb80728c3530d6f108cf04ebe0c4593a377 100644
--- a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts
+++ b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.ts
@@ -48,7 +48,11 @@ export class AppAddJsonVersionAppComponent implements OnInit {
},
error => {
console.log(error)
- this.error = error.error.message
+ if (error.message === null) {
+ this.JsonError = true;
+ } else {
+ this.error = error.message
+ }
})
} catch (e) {
console.warn('invalid json')
@@ -72,7 +76,11 @@ export class AppAddJsonVersionAppComponent implements OnInit {
},
error => {
console.log(error)
- this.error = error.error.message
+ if (error.message === null) {
+ this.JsonError = true;
+ } else {
+ this.error = error.message
+ }
})
} catch (e) {
console.warn('invalid json')
diff --git a/src/app/appmarket/domains/domain/domain.component.html b/src/app/appmarket/domains/domain/domain.component.html
index 8b6d0c7fa4700a716c6bd55f6cd1101657bcab9b..c25c5a2e2b6abbae42645004f1aa2d6fbfc4f90b 100644
--- a/src/app/appmarket/domains/domain/domain.component.html
+++ b/src/app/appmarket/domains/domain/domain.component.html
@@ -101,6 +101,47 @@
</div>
</div>
+ <div class="panel panel-default" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')">
+ <div class="panel-heading">{{ 'DOMAIN_DETAILS.DOMAIN_USERS' | translate }}</div>
+ <div class="panel-body">
+ <table class="table table-hover table-condensed" aria-describedby="Domains details table">
+ <thead>
+ <tr>
+ <th scope="col" *roles="['ROLE_SYSTEM_ADMIN']">{{ 'DOMAIN_DETAILS.ID' | translate }}</th>
+ <th scope="col">{{ 'DOMAIN_DETAILS.USER_NAME' | translate }}</th>
+ <th scope="col">{{ 'DOMAIN_DETAILS.FIRST_NAME' | translate }}</th>
+ <th scope="col">{{ 'DOMAIN_DETAILS.LAST_NAME' | translate }}</th>
+ <th scope="col">{{ 'DOMAIN_DETAILS.ROLES' | translate }}</th>
+ <th scope="col"> </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <ng-template ngFor let-user [ngForOf]="domainUsers">
+ <tr>
+ <td *ngIf="authService.hasRole('ROLE_SYSTEM_ADMIN')">{{user.id}}</td>
+ <td>{{user.username}}</td>
+ <td> {{user.firstname}}</td>
+ <td> {{user.lastname}}</td>
+ <td *ngIf="domainId == domainService.getGlobalDomainId()">
+ <div *ngFor="let role of filterDomainNames(user); last as isLast">
+ <span *ngIf="!isLast" style="float:left;padding-right: 3px">{{role.role | slice:5}}@{{this.getDomainName(role.domainId)|async}}, </span>
+ <span *ngIf="isLast" style="float:left">{{role.role | slice:5}}@{{this.getDomainName(role.domainId)|async}}</span>
+ </div>
+ </td>
+ <td *ngIf="domainId != domainService.getGlobalDomainId()">
+ <span *ngFor="let role of this.getDomainRoleNames(user.roles)">
+ {{"ENUM.USER_ROLES." + role.role.toUpperCase() | translate}}
+ </span>
+ </td>
+ </tr>
+ </ng-template>
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+
<div class="panel panel-default">
<div class="panel-heading">{{ 'DOMAIN_DETAILS.APP_STATUS' | translate }}</div>
<div class="panel-body">
@@ -185,46 +226,7 @@
- <div class="panel panel-default" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')">
- <div class="panel-heading">{{ 'DOMAIN_DETAILS.DOMAIN_USERS' | translate }}</div>
- <div class="panel-body">
- <table class="table table-hover table-condensed" aria-describedby="Domains details table">
- <thead>
- <tr>
- <th scope="col" *roles="['ROLE_SYSTEM_ADMIN']">{{ 'DOMAIN_DETAILS.ID' | translate }}</th>
- <th scope="col">{{ 'DOMAIN_DETAILS.USER_NAME' | translate }}</th>
- <th scope="col">{{ 'DOMAIN_DETAILS.FIRST_NAME' | translate }}</th>
- <th scope="col">{{ 'DOMAIN_DETAILS.LAST_NAME' | translate }}</th>
- <th scope="col">{{ 'DOMAIN_DETAILS.ROLES' | translate }}</th>
- <th scope="col"> </th>
- </tr>
- </thead>
-
- <tbody>
- <ng-template ngFor let-user [ngForOf]="domainUsers">
- <tr>
- <td *ngIf="authService.hasRole('ROLE_SYSTEM_ADMIN')">{{user.id}}</td>
- <td>{{user.username}}</td>
- <td> {{user.firstname}}</td>
- <td> {{user.lastname}}</td>
- <td *ngIf="domainId == domainService.getGlobalDomainId()">
- <div *ngFor="let role of filterDomainNames(user); last as isLast">
- <span *ngIf="!isLast" style="float:left;padding-right: 3px">{{role.role | slice:5}}@{{this.getDomainName(role.domainId)|async}}, </span>
- <span *ngIf="isLast" style="float:left">{{role.role | slice:5}}@{{this.getDomainName(role.domainId)|async}}</span>
- </div>
- </td>
- <td *ngIf="domainId != domainService.getGlobalDomainId()">
- <span *ngFor="let role of this.getDomainRoleNames(user.roles)">
- {{"ENUM.USER_ROLES." + role.role.toUpperCase() | translate}}
- </span>
- </td>
- </tr>
- </ng-template>
- </tbody>
- </table>
- </div>
- </div>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" class="btn btn-default" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
diff --git a/src/app/appmarket/domains/list/domainslist.component.html b/src/app/appmarket/domains/list/domainslist.component.html
index bc1be2ac41d411067d8defcab382aa48039a4a0e..9329f7f051eb013b3c0d86c8ad379d99b7f5dc2b 100644
--- a/src/app/appmarket/domains/list/domainslist.component.html
+++ b/src/app/appmarket/domains/list/domainslist.component.html
@@ -5,7 +5,7 @@
<a *roles="['ROLE_SYSTEM_ADMIN']" [routerLink]="['add']" class="btn btn-primary"
role="button">{{'DOMAINS.ADD_BUTTON' | translate}}</a>
</div>
- <div class="flex" style="align-content: center; margin-top: 8px;">
+ <div *roles="['ROLE_SYSTEM_ADMIN']" class="flex" style="align-content: center; margin-top: 8px;">
<span style="align-content: center; margin-right: 5px;"> {{'DOMAINS.NOTACTIVE' | translate}}</span>
<p-checkbox id="showNotActive" [binary]="true" [(ngModel)]=" showNotActive"></p-checkbox>
</div>
diff --git a/src/app/shared/navbar/navbar.component.html b/src/app/shared/navbar/navbar.component.html
index 3461603f3d6843e3cd3a174e6facd20cd1164ce6..32221d68902ed478ff2c88cbd22989ffc3b41d03 100644
--- a/src/app/shared/navbar/navbar.component.html
+++ b/src/app/shared/navbar/navbar.component.html
@@ -48,7 +48,7 @@
[routerLink]="['/admin/configuration']">{{ 'NAVBAR.SETTINGS' | translate }}</a>
</li>
- <li class="dropdown-divider"></li>
+ <li *roles="['ROLE_SYSTEM_ADMIN']" class="dropdown-divider"></li>
<li *roles="['ROLE_SYSTEM_ADMIN', 'ROLE_TOOL_MANAGER']"><a
[routerLink]="['/admin/apps']">{{ 'NAVBAR.MARKET' | translate }}</a>
</li>
@@ -65,7 +65,7 @@
[routerLink]="['/admin/languages']">{{'NAVBAR.LANGUAGES' | translate }}</a>
</li>
- <li class="dropdown-divider"></li>
+ <li *roles="['ROLE_SYSTEM_ADMIN']" class="dropdown-divider"></li>
<!-- <li *roles="['ROLE_SYSTEM_ADMIN', 'ROLE_OPERATOR']"><a [routerLink]="['/admin/clusters']">Kubernetes</a>-->
<!-- </li>-->