Commits

Alisa Ismailati authored and Stefano Maffei committed cb8f45575e4 Merge 
Merged in coar-CST-12700 (pull request #1035)

[CST-12700] fixes

Approved-by: Stefano Maffei
No tags
2386bb86b9a
gidlmaster

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html

Modified
1 1 <div class="container">
2 2 <form (ngSubmit)="onSubmit()" [formGroup]="formModel">
3 - <div class="d-flex">
3 + <div class="d-flex mb-5">
4 4 <h2 class="flex-grow-1">{{ 'ldn-create-service.title' | translate }}</h2>
5 5 </div>
6 6 <!-- In the name section -->
7 - <div class="mb-5 ">
7 + <div class="mb-5">
8 8 <label for="name">{{ 'ldn-new-service.form.label.name' | translate }}</label>
9 9 <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
10 10 [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
11 11 formControlName="name"
12 12 id="name"
13 13 name="name"
14 14 type="text">
15 15 <div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
16 16 {{ 'ldn-new-service.form.error.name' | translate }}
17 17 </div>
53 53 {{ 'ldn-new-service.form.error.ldnurl' | translate }}
54 54 </div>
55 55 </div>
56 56 <!-- In the score section -->
57 57 <div class="mb-2">
58 58 <label for="score">{{ 'ldn-new-service.form.label.score' | translate }}</label>
59 59 <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
60 60 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
61 61 id="score"
62 62 name="score"
63 + class="form-control"
63 64 type="text">
64 65 <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
65 66 {{ 'ldn-new-service.form.error.score' | translate }}
66 67 </div>
67 68 </div>
68 69 ​
69 70 <!-- In the Inbound Patterns Labels section -->
70 71 <div class="row mb-2 mt-5">
71 72 <div class="col">
72 73 <label>{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
73 74 </div>
74 75 <ng-container *ngIf="!!(formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern)">
75 76 <div class="col">
76 77 <label>{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
77 78 </div>
78 79 <div class="col-sm-1">
79 80 <label class="">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
80 81 </div>
81 82 </ng-container>
82 - <div class="col-sm-2">
83 + <div class="col-sm-1">
83 84 </div>
84 85 </div>
85 86 ​
86 87 <!-- In the Inbound Patterns section -->
87 88 <div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
88 89 formGroupName="notifyServiceInboundPatterns">
89 90 ​
90 91 <ng-container [formGroupName]="i">
91 92 ​
92 93 ​
195 196 <!-- In the Outbound Patterns Labels section -->
196 197 <div class="row mb-1 mt-5">
197 198 <div class="col">
198 199 <label>{{ 'ldn-new-service.form.label.outboundPattern' | translate }}</label>
199 200 </div>
200 201 <ng-container *ngIf="!!(formModel.get('notifyServiceOutboundPatterns')['controls'][0]?.value?.pattern)">
201 202 <div class="col">
202 203 <label class="">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
203 204 </div>
204 205 </ng-container>
205 - <div class="col-sm1 ">
206 - <label class="label-box-2" style="visibility: hidden;">
207 - {{ 'ldn-new-service.form.label.automatic' | translate }}
208 - </label>
209 - </div>
210 - <div class="col-sm-2 ">
206 + <div class="col-sm-2">
211 207 </div>
212 208 </div>
213 209 ​
214 210 <!-- In the Outbound Patterns section -->
215 211 <div *ngFor="let patternGroup of formModel.get('notifyServiceOutboundPatterns')['controls']; let i = index"
216 212 formGroupName="notifyServiceOutboundPatterns">
217 213 ​
218 214 <ng-container [formGroupName]="i">
219 215 ​
220 216 <div class="row mb-1">
304 300 <div class="col-sm-1">
305 301 <button (click)="removeOutboundPattern(i)" class="btn btn-outline-dark trash-button">
306 302 <i class="fas fa-trash"></i>
307 303 </button>
308 304 </div>
309 305 </div>
310 306 </ng-container>
311 307 ​
312 308 </div>
313 309 ​
314 - <span (click)="addOutboundPattern()"
310 + <div (click)="addOutboundPattern()"
315 311 class="add-pattern-link mb-4">{{ 'ldn-new-service.form.label.addPattern' | translate }}
316 - </span>
317 - <div class="mb-4">
318 - &nbsp;
319 312 </div>
320 313 ​
321 - <div aria-label="Basic example" class="submission-form-footer mt-1 mb-1 position-sticky" role="group">
314 + <div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
315 + <button (click)="this.openResetFormModal(this.resetFormModal)" class="btn btn-danger" type="button">
316 + <span><i class="fas fa-trash"></i>&nbsp;{{ 'submission.general.discard.submit' | translate }}</span>
317 + </button>
322 318 <button class="btn btn-primary" type="submit">
323 - <span><i class="fas fa-save"></i> {{ 'ldn-new-service.form.label.submit' | translate }}</span>
319 + <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
324 320 </button>
325 - <div class="d-flex">
326 - <button (click)="this.openResetFormModal(this.resetFormModal)" class="btn btn-danger" type="button">
327 - <span><i class="fas fa-trash"></i> {{ 'submission.general.discard.submit' | translate }}</span>
328 - </button>
329 - </div>
330 321 </div>
331 322 ​
332 -​
333 323 </form>
334 324 </div>
335 325 <ng-template #confirmModal>
336 326 ​
337 327 <div>
338 328 ​
339 329 <div class="modal-header">
340 330 <div>
341 331 <h4>{{'service.overview.create.modal' | translate }}</h4>
342 332 </div>
343 333 <button (click)="closeModal()" aria-label="Close"
344 334 class="close" type="button">
345 335 <span aria-hidden="true">×</span>
346 336 </button>
347 337 </div>
348 338 ​
349 339 <div class="modal-body">
350 340 <div>
351 - {{ 'service.create.body' | translate }}
341 + {{ 'service.overview.create.body' | translate }}
352 342 </div>
353 343 <div class="mt-4">
354 - <button (click)="closeModal()" class="btn btn-danger"
344 + <button (click)="closeModal()" class="btn btn-danger mr-2 "
355 345 id="delete-confirm">{{ 'service.refuse.create' | translate }}
356 346 </button>
357 347 <button (click)="createService()"
358 - class="btn btn-primary mr-2 custom-btn">{{ 'service.confirm.create' | translate }}
348 + class="btn btn-primary">{{ 'service.confirm.create' | translate }}
359 349 </button>
360 350 </div>
361 351 </div>
362 352 </div>
363 353 </ng-template>
364 354 ​
365 355 <ng-template #resetFormModal>
366 356 ​
367 357 <div>
368 358 ​
369 359 <div class="modal-header">
370 360 <div>
371 - <h4>{{'service.create.reset-form.modal' | translate }}</h4>
361 + <h4>{{'service.overview.reset-form.modal' | translate }}</h4>
372 362 </div>
373 363 <button (click)="closeModal()" aria-label="Close"
374 364 class="close" type="button">
375 365 <span aria-hidden="true">×</span>
376 366 </button>
377 367 </div>
378 368 ​
379 369 <div class="modal-body">
380 370 <div>
381 - {{ 'service.create.reset-form.body' | translate }}
371 + {{ 'service.overview.reset-form.body' | translate }}
382 372 </div>
383 373 <div class="mt-4">
384 374 <button (click)="resetFormAndLeave()"
385 - class="btn btn-primary mr-2 custom-btn"
375 + class="btn btn-primary mr-2"
386 376 id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
387 377 </button>
388 378 <button (click)="closeModal()" class="btn btn-danger"
389 379 id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
390 380 </button>
391 381 </div>
392 382 </div>
393 383 </div>
394 384 </ng-template>
395 385 ​
396 386 ​

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut