From ffbe37aca11ff81763c1e5befa9a93222f72b9f5 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:39:18 +0100
Subject: [PATCH] small changes

---
 .../appinstance/appinstance.component.html    |  7 ++++---
 .../appinstance/appinstance.component.ts      | 10 ++++++++++
 .../domain-group-view.component.html          | 19 +++++++++++--------
 .../domain-group-view.component.ts            |  3 +++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
index 5f42dce..56766eb 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
@@ -260,7 +260,7 @@ <h4>{{'UPDATE_CONFIG_MODAL.HEADER' | translate}}</h4>
 
     <nmaas-modal styleModal="info" #showConfig>
         <div class="nmaas-modal-header">
-            <h4 style="text-align: center">{{'APP_INSTANCE.CONFIGURATION.HEADER' | translate}}</h4>
+            <h4 style="text-align: center">{{'APP_INSTANCE.CONFIGURATION.PREVIEW' | translate}}</h4>
         </div>
         <div class="nmaas-modal-body">
             <div class="col-xs-12">
@@ -275,13 +275,14 @@ <h4 style="text-align: center">{{'APP_INSTANCE.CONFIGURATION.HEADER' | translate
                         [options]='{"alerts": {"submitMessage": "Configuration applied"}, "errors": {"message": "Invalid configuration"}}'
                         [refresh]="refreshForm"
                         (formLoad)="changeForm()"
-                        [readOnly]="true">
+                        [readOnly]="true"
+                        [submission]="submissionData">
                 </formio>
             </div>
         </div>
         <div class="nmaas-modal-footer">
             <button type="button" class="btn btn-primary"
-                    (click)="this.applyConfig.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
+                    (click)="this.applyConfig.hide()">{{'UNDEPLOY_MODAL.CLOSE' | translate}}</button>
         </div>
     </nmaas-modal>
 
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.ts b/src/app/appmarket/appinstance/appinstance/appinstance.component.ts
index 591ddc7..5f22724 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.ts
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.ts
@@ -135,6 +135,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
 
     private deployParametersSubject = new BehaviorSubject<Map<string, string>>(new Map<string, string>());
     public deployParameters$ = this.deployParametersSubject.asObservable();
+    public submissionData = '';
 
     constructor(private appsService: AppsService,
                 public appImagesService: AppImagesService,
@@ -629,6 +630,15 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
     }
 
     public openShowConfigModal() {
+        let string = '{"data": {'
+        this.deployParameters$.subscribe(entry => {
+            entry.forEach( (value, key) => {
+                string += `"${key}": "${value}",`
+            })
+        })
+        string += "} }"
+        console.warn(string)
+        this.submissionData = string;
         this.showConfig.show()
     }
 
diff --git a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
index b53cd58..ac7aee9 100644
--- a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
+++ b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
@@ -54,10 +54,13 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
                     </tr>
                     <ng-template ngFor let-user [ngForOf]="domainGroup.managers" let-i="index">
                         <tr class="table-row">
-                            <td>{{user.username}}</td>
-                            <td>{{user.firstname}} {{user.lastname}}</td>
-                            <td style="width: 20%">
-                                <button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-danger" (click)="deleteUserAccess(user)">{{'DOMAINS.GROUP.DELETE_USER' | translate}}</button>
+                            <td style="width: 40%" >{{user.username}}</td>
+                            <td style="width: 40%" >{{user.firstname}} {{user.lastname}}</td>
+                            <td style="" class="flex justify-content-end">
+                                <div class="flex">
+                                    <button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-danger" (click)="deleteUserAccess(user)">{{'DOMAINS.GROUP.DELETE_USER' | translate}}</button>
+                                </div>
+
                             </td>
                         </tr>
                     </ng-template>
@@ -90,9 +93,9 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
                     </tr>
                     <ng-template ngFor let-domain [ngForOf]="domainGroup.domains" let-i="index">
                         <tr class="table-row">
-                            <td>{{domain.name}}</td>
-                            <td>{{domain.codename}}</td>
-                            <td style="width: 20%">
+                            <td style="width: 40%" >{{domain.name}}</td>
+                            <td style="width: 40%" >{{domain.codename}}</td>
+                            <td class="flex justify-content-end">
                                 <button type="button" class="btn btn-danger" (click)="deleteDomainFromGroup(domain)">{{'DOMAINS.LIST.DELETE' | translate}}</button>
                             </td>
                         </tr>
@@ -217,7 +220,7 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
     <div class="nmaas-modal-body" style="height: 300px">
         <div style="height: 100px">
             <p>{{'DOMAINS.GROUP.ADD_INFO' | translate}} {{domainGroup.name}}</p>
-            <input pInputText name="searchTexUser" id="searchTextUser" placeholder="{{'USERS.SEARCH' | translate}}" type="text" (keyup)="searchUsers($event.target.value)">
+            <input pInputText name="searchTexUser" id="searchTextUser" placeholder="{{'USERS.SEARCH' | translate}}" style="width: 270px" type="text" [(ngModel)]="searchUser" (keyup)="searchUsers($event.target.value)">
         </div>
         <table class="table table-hover table-condensed" aria-describedby="Users found by mail">
             <thead>
diff --git a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.ts b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.ts
index e87acf7..e5eafa0 100644
--- a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.ts
+++ b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.ts
@@ -23,6 +23,8 @@ export class DomainGroupViewComponent extends BaseComponent implements OnInit {
     public usersToAdd = [];
     public usersFound = [];
 
+    public searchUser = '';
+
     @ViewChild(ModalComponent, {static: true})
     public readonly modal: ModalComponent;
 
@@ -179,6 +181,7 @@ export class DomainGroupViewComponent extends BaseComponent implements OnInit {
     }
 
     public addUser(user: User) {
+        this.searchUser = ''
         user.roles = [];
         user.hasSshKeys = null;
         this.usersToAdd.push({username: user.username, id: user.id, firstname: user.firstname, lastname: user.lastname});