Skip to content
Snippets Groups Projects
Commit 53522d69 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch '239-update-bulk-view-details' into 'release/1.6.5' 

bulk update

See merge request !52
parents 9b194c5a 2e2286d2
Branches
Tags
3 merge requests!57Develop,!55Resolve "Merge 1.6.5 to develop",!52bulk update
Hide whitespace changes
Inline Side-by-side
src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
+ 2
− 2
View file @ 53522d69
......@@ -99,10 +99,10 @@
<li *ngIf="mode === bulkTypeApp">
<a [routerLink]="['/admin/apps/bulks/', bulk?.id]">{{ 'BULK.LIST.DETAILS' | translate }}</a>
</li>
<li *ngIf="mode === bulkTypeApp">
<li *ngIf="mode === bulkTypeApp && bulk?.state !== 'REMOVED'">
<a (click)="getAppBulkDetails(bulk?.id)"> {{"BULK.APP.DOWNLOAD_CSV" | translate}}</a>
</li>
<li *ngIf="mode === bulkTypeApp && bulk?.state !== 'REMOVED'">
<li *ngIf="mode === bulkTypeApp && bulk?.state !== 'REMOVED' ">
<a (click)="modal.show()">{{ 'BULK.LIST.REMOVE' | translate }}</a>
</li>
</ul>
......
src/app/appmarket/bulkDeployment/bulk-view/bulk-view.component.html
+ 37
− 26
View file @ 53522d69
......@@ -63,7 +63,9 @@
<td>{{getDomainName(response)}}</td>
<td>{{getDomainCodeName(response)}}</td>
<td style="width: 5%" class="text-right">
<span class="dropdown">
<i *ngIf="response.type === 'DOMAIN'" class="pi pi-search" style="font-size: 1.8rem; cursor: pointer" [routerLink]="['/admin/domains/view/', response?.details['domainId']]"></i>
<i *ngIf="response.type === 'USER'" class="pi pi-search" style="font-size: 1.8rem; cursor: pointer" [routerLink]="['/admin/users/view', response?.details['userId']]"></i>
<!-- <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="fas fa-cog icon-black icon-bigger"></em>
......@@ -76,7 +78,7 @@
<a [routerLink]="['/admin/users/view', response?.details['userId']]">{{ 'BULK.LIST.MOVE_USER' | translate }}</a>
</li>
</ul>
</span>
</span> -->
</td>
</tr>
</ng-template>
......@@ -114,7 +116,10 @@
<td>{{getUsername(response)}}</td>
<td>{{getEmail(response)}}</td>
<td style="width: 5%" class="text-right">
<span class="dropdown">
<i *ngIf="response.type === 'DOMAIN'" class="pi pi-search" style="font-size: 1.8rem; cursor: pointer" [routerLink]="['/admin/domains/view/', response?.details['domainId']]"></i>
<i *ngIf="response.type === 'USER'" class="pi pi-search" style="font-size: 1.8rem; cursor: pointer" [routerLink]="['/admin/users/view', response?.details['userId']]"></i>
<!-- <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="fas fa-cog icon-black icon-bigger"></em>
......@@ -127,7 +132,7 @@
<a [routerLink]="['/admin/users/view', response?.details['userId']]">{{ 'BULK.LIST.MOVE_USER' | translate }}</a>
</li>
</ul>
</span>
</span> -->
</td>
</tr>
</ng-template>
......@@ -141,7 +146,12 @@
</div>
<div *ngIf="bulk && bulkType === 'APPLICATION' ">
<h3>{{'BULK.APP.VIEW_HEADER' | translate}}</h3>
<div class="flex justify-content-between">
<h3>{{'BULK.APP.VIEW_HEADER' | translate}}</h3>
<img alt="App logo" style="width: 50px"
[src]="(appImagesService.getAppLogoUrl(bulk.details['appId']) | secure) || 'assets/images/app-logo-example.png'"/>
</div>
<div class="" style="padding-bottom: 5rem; margin-top: 3rem">
<label for="id" class="col-sm-2 control-label text-right mt-2">{{ 'BULK.LIST.ID' | translate }}</label>
<div class="col-sm-10">
......@@ -168,7 +178,7 @@
</div>
</div>
<div class="form-group" style="padding-bottom: 5rem">
<div class="" style="padding-bottom: 5rem">
<label for="state"
class="col-sm-2 control-label text-right mt-2">{{ 'BULK.LIST.STATE' | translate }}</label>
<div class="col-sm-10">
......@@ -176,6 +186,21 @@
placeholder="{{'BULK.STATE.' + bulk.state | translate}}">
</div>
</div>
<div class="" style="padding-bottom: 5rem;">
<label for="id" class="col-sm-2 control-label text-right mt-2">{{ 'BULK.LIST.APP_NAME' | translate }}</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="id" name="id" [disabled]="true"
[(ngModel)]="bulk.details['appName']" #name="ngModel">
</div>
</div>
<div class="flex justify-content-end" style="padding-right: 1.5rem">
<button class="btn btn-primary mr-2" (click)="refreshStates()">{{'BULK.APP.REFRESH' | translate}}</button>
<button class="btn btn-primary" (click)="getAppBulkDetails(this.bulkId)">{{'BULK.APP.DOWNLOAD_CSV' | translate}}</button>
</div>
<div class="panel panel-default" style="margin-top: 3rem">
<div class="panel-heading">
......@@ -187,22 +212,7 @@
</div>
<div class="panel-body">
<div class="flex flex-row mb-3 justify-content-between">
<div class="flex ml-2 mr-2">
<img alt="App logo" style="width: 50px"
[src]="(appImagesService.getAppLogoUrl(bulk.details['appId']) | secure) || 'assets/images/app-logo-example.png'"/>
<div class="flex align-items-center ml-2">
{{bulk.details['appName']}}
</div>
</div>
<div class="flex justify-content-end">
<button class="btn btn-primary mr-2" (click)="refreshStates()">{{'BULK.APP.REFRESH' | translate}}</button>
<button class="btn btn-primary" (click)="getAppBulkDetails(this.bulkId)">{{'BULK.APP.DOWNLOAD_CSV' | translate}}</button>
</div>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domains in Group table">
<thead>
<tr #column>
......@@ -226,7 +236,8 @@
<td>{{getAppInstanceName(response)}}</td>
<td>{{getDomainCodeName(response)}}</td>
<td style="width: 5%" class="text-right">
<span *ngIf="response?.details['appInstanceId'] !== undefined" class="dropdown">
<i class="pi pi-search" style="font-size: 1.8rem; cursor: pointer" [routerLink]="['/instances/', response?.details['appInstanceId']]"></i>
<!-- <span *ngIf="response?.details['appInstanceId'] !== undefined" class="dropdown">
<a style="display: inline-block" class="dropdown-toggle " aria-expanded="false" aria-haspopup="true"
data-toggle="dropdown" href="#" role="button">
<em class="fas fa-cog icon-black icon-bigger"></em>
......@@ -235,11 +246,11 @@
<li *ngIf="response.type === 'APPLICATION' && response?.details['appInstanceId'] !== undefined">
<a [routerLink]="['/instances/', response?.details['appInstanceId']]">{{ 'BULK.LIST.MOVE_APP' | translate }}</a>
</li>
<!-- <li *ngIf="response.type === 'APPLICATION' && response.state !== 'COMPLETED'">
<li *ngIf="response.type === 'APPLICATION' && response.state !== 'COMPLETED'">
<a>{{ 'BULK.APP.CHECK_STATE' | translate }}</a>
</li> -->
</li>
</ul>
</span>
</span> -->
</td>
</tr>
</ng-template>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment