diff --git a/src/app/appmarket/admin/webhook/webhook-list/webhook-list.component.html b/src/app/appmarket/admin/webhook/webhook-list/webhook-list.component.html
index 677a5006c29f1b09b63dd1421c5b9cd44d9d1f25..7497352aae9c11450bdb0c5fad7467fbb9c1d953 100644
--- a/src/app/appmarket/admin/webhook/webhook-list/webhook-list.component.html
+++ b/src/app/appmarket/admin/webhook/webhook-list/webhook-list.component.html
@@ -37,28 +37,28 @@
<th pSortableColumn="type" id="type"> {{ 'WEBHOOKS.TYPE' | translate }}
<p-sortIcon field="type"></p-sortIcon>
</th>
- <th></th>
+<!-- <th></th>-->
</tr>
</ng-template>
<ng-template pTemplate="body" let-webhook>
<tr>
<td [routerLink]="[webhook.id]">{{webhook.id}}</td>
- <td>{{webhook.name}}</td>
- <td>{{('WEBHOOKS.' + webhook.eventType.toString().toUpperCase() ) | translate}}</td>
- <td>{{webhook.targetUrl}}</td>
+ <td [routerLink]="[webhook.id]">{{webhook.name}}</td>
+ <td [routerLink]="[webhook.id]">{{('WEBHOOKS.' + webhook.eventType.toString().toUpperCase() ) | translate}}</td>
+ <td [routerLink]="[webhook.id]">{{webhook.targetUrl}}</td>
- <td class="text-right">
- <span class="dropdown">
- <a style="display: inline-block" class="dropdown-toggle" aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" href="#" role="button">
- <em class="pi pi-cog" style="font-size: 1.8rem; color: var(--l-text-color)"></em>
- </a>
- <ul class="dropdown-menu pull-right-drop" >
- <li><a [routerLink]="[ webhook.id]" class="">
- {{ 'WEBHOOKS.DETAILS' | translate }}</a>
- </li>
- </ul>
- </span>
- </td>
+<!-- <td class="text-right">-->
+<!-- <span class="dropdown">-->
+<!-- <a style="display: inline-block" class="dropdown-toggle" aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" href="#" role="button">-->
+<!-- <em class="pi pi-cog" style="font-size: 1.8rem; color: var(--l-text-color)"></em>-->
+<!-- </a>-->
+<!-- <ul class="dropdown-menu pull-right-drop" >-->
+<!-- <li><a [routerLink]="[ webhook.id]" class="">-->
+<!-- {{ 'WEBHOOKS.DETAILS' | translate }}</a>-->
+<!-- </li>-->
+<!-- </ul>-->
+<!-- </span>-->
+<!-- </td>-->
</tr>
</ng-template>
</p-table>
diff --git a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
index e2e0bfa73612cd9b31dac8e6494b820a7ecd7a41..9ebd86b5aff1deba6a6fdf8e19c0a1365b59fe89 100644
--- a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
+++ b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
@@ -41,16 +41,16 @@
<ng-template pTemplate="header">
<tr>
- <th>{{ 'APP_INSTANCES.NAME' | translate }}</th>
- <th>{{ 'APP_INSTANCES.APPLICATION' | translate }}</th>
- <th>{{ 'APP_INSTANCES.VERSION' | translate }}</th>
- <th *ngIf="domainId === undefined || domainId === domainService.getGlobalDomainId()">
+ <th style="width:15%">{{ 'APP_INSTANCES.NAME' | translate }}</th>
+ <th style="width:10%">{{ 'APP_INSTANCES.APPLICATION' | translate }}</th>
+ <th style="width:10%">{{ 'APP_INSTANCES.VERSION' | translate }}</th>
+ <th style="width:20%" *ngIf="domainId === undefined || domainId === domainService.getGlobalDomainId()">
{{ 'APP_INSTANCES.DOMAIN' | translate }}
</th>
- <th>{{ 'APP_INSTANCES.OWNER' | translate }}</th>
- <th>{{ 'APP_INSTANCES.DEPLOYED_AT' | translate }}</th>
- <th>{{ 'APP_INSTANCES.STATE' | translate }}</th>
- <th></th>
+ <th style="width:20%">{{ 'APP_INSTANCES.OWNER' | translate }}</th>
+ <th style="width:15%">{{ 'APP_INSTANCES.DEPLOYED_AT' | translate }}</th>
+ <th style="width:10%">{{ 'APP_INSTANCES.STATE' | translate }}</th>
+<!-- <th></th>-->
</tr>
</ng-template>
@@ -66,11 +66,11 @@
<td>{{ appInstance?.owner?.username }}</td>
<td>{{ appInstance?.createdAt | localDate:'dd-MM-yyyy HH:mm' }}</td>
<td>{{ translateState(appInstance?.state) }}</td>
- <td>
- <ng-container *ngIf="appInstance?.upgradePossible">
- <span class="pi pi-arrow-circle-up"></span>
- </ng-container>
- </td>
+<!-- <td>-->
+<!-- <ng-container *ngIf="appInstance?.upgradePossible">-->
+<!-- <span class="pi pi-arrow-circle-up"></span>-->
+<!-- </ng-container>-->
+<!-- </td>-->
</tr>
</ng-template>
</p-table>
@@ -129,20 +129,22 @@
[responsiveLayout]="'scroll'" aria-describedby="Undeployed instances">
<ng-template pTemplate="header">
<tr>
- <th>{{ 'APP_INSTANCES.NAME' | translate }}</th>
- <th>{{ 'APP_INSTANCES.APPLICATION' | translate }}</th>
- <th *ngIf="domainId === undefined || domainId === domainService.getGlobalDomainId()">
+ <th style="width:15%">{{ 'APP_INSTANCES.NAME' | translate }}</th>
+ <th style="width:10%">{{ 'APP_INSTANCES.APPLICATION' | translate }}</th>
+ <th style="width:10%"></th>
+ <th style="width:20%" *ngIf="domainId === undefined || domainId === domainService.getGlobalDomainId()">
{{ 'APP_INSTANCES.DOMAIN' | translate }}
</th>
- <th>{{ 'APP_INSTANCES.OWNER' | translate }}</th>
- <th>{{ 'APP_INSTANCES.DEPLOYED_AT' | translate }}</th>
- <th>{{ 'APP_INSTANCES.STATE' | translate }}</th>
+ <th style="width:20%">{{ 'APP_INSTANCES.OWNER' | translate }}</th>
+ <th style="width:15%">{{ 'APP_INSTANCES.DEPLOYED_AT' | translate }}</th>
+ <th style="width:10%">{{ 'APP_INSTANCES.STATE' | translate }}</th>
</tr>
</ng-template>
<ng-template pTemplate="body" let-appInstance>
<tr [ngClass]="{'clickable': true}" [routerLink]="[appInstance.id]">
<td>{{ appInstance?.name }}</td>
<td>{{ appInstance?.applicationName }}</td>
+ <td></td>
<td *ngIf="domainId === undefined || domainId === domainService.getGlobalDomainId()">
{{ appInstance?.domainName }}
</td>
diff --git a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.ts b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.ts
index c81c76f21997933419b999402eaf4d2c86caa155..6b92e2be15b18e447a3ec82cce010fc28284471a 100644
--- a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.ts
+++ b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.ts
@@ -86,6 +86,9 @@ export class AppInstanceListComponent implements OnInit {
if (ls !== undefined) {
this.listSelection = ls;
this.showMy = ls === AppInstanceListSelection.MY;
+ } else {
+ this.listSelection = AppInstanceListSelection.ALL;
+ sessionStorage.setItem(this.list_selection_key, AppInstanceListSelection[this.listSelection]);
}
console.log(this.listSelection);
this.userDataService.selectedDomainId.subscribe(domainId => {