From a4e52f7004680a3e16b2e95ad0e10c5fb9a9cda7 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 23 Feb 2021 07:17:42 -0700
Subject: [PATCH] UI Tweaks

---
 .../src/main/resources/metadata-sources-ui-schema.json |  6 ++++++
 ui/src/app/contention/effect/contention.effect.ts      |  4 ++--
 .../resolver/container/resolver-edit.component.ts      |  7 +++----
 .../app/schema-form/widget/array/array.component.html  |  5 +++--
 .../widget/boolean-radio/boolean-radio.component.html  | 10 +++++-----
 .../schema-form/widget/check/checkbox.component.html   |  6 +++---
 .../app/schema-form/widget/radio/radio.component.html  | 10 ++++------
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
index 9a0b4fb9e..156dffce2 100644
--- a/backend/src/main/resources/metadata-sources-ui-schema.json
+++ b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -446,6 +446,12 @@
                                 "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                             ],
                             "description": "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                        },
+                        {
+                            "enum": [
+                                "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+                            ],
+                            "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
                         }
                     ]
                 }
diff --git a/ui/src/app/contention/effect/contention.effect.ts b/ui/src/app/contention/effect/contention.effect.ts
index aa89ffbd1..f6845df3f 100644
--- a/ui/src/app/contention/effect/contention.effect.ts
+++ b/ui/src/app/contention/effect/contention.effect.ts
@@ -23,12 +23,12 @@ export class ContentionEffects {
         switchMap(contention => {
             const resolutionAction = of(new ResolveContentionAction({ value: contention.resolutionObject, handlers: contention.handlers }));
             const rejectionAction = of(new CancelContentionAction({ value: contention.rejectionObject, handlers: contention.handlers }));
-            if (contention.ourChanges.length < 1) {
+            /*if (contention.ourChanges.length < 1) {
                 return rejectionAction;
             }
             if (contention.theirChanges.length < 1) {
                 return resolutionAction;
-            }
+            }*/
             return this.modal
                 .open(ContentionDialogComponent, DEFAULT_MODAL_OPTIONS, { contention })
                 .pipe(
diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts
index 6d5e802d2..c5cc6b324 100644
--- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { Observable, of, Subject } from 'rxjs';
-import { skipWhile, map, combineLatest, filter, takeUntil } from 'rxjs/operators';
+import { map, filter } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import * as fromWizard from '../../../wizard/reducer';
 import * as fromResolver from '../reducer';
-import { ClearWizard, SetIndex, LoadSchemaRequest } from '../../../wizard/action/wizard.action';
+import { LoadSchemaRequest } from '../../../wizard/action/wizard.action';
 import { MetadataResolver } from '../../domain/model';
 import { Clear } from '../action/entity.action';
 import { Wizard } from '../../../wizard/model';
@@ -41,7 +41,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate
     constructor(
         private store: Store<fromResolver.ResolverState>,
         private router: Router,
-        private route: ActivatedRoute,
         private modalService: NgbModal,
         private diffService: DifferentialService
     ) {
diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
index 2bcf6271b..84a5a1e9b 100644
--- a/ui/src/app/schema-form/widget/array/array.component.html
+++ b/ui/src/app/schema-form/widget/array/array.component.html
@@ -38,9 +38,10 @@
                     </ng-container>
                     <ng-container *ngSwitchCase="'object'">
                         <div #acc>
-                            <div class="d-flex justify-content-between" (click)="acc.isHidden = !acc.isHidden">
+                            <div class="d-flex justify-content-between align-items-center" >
                                 <span>
-                                    <i class="fa fa-fw" [ngClass]="{'fa-chevron-right': acc.isHidden, 'fa-chevron-down': !acc.isHidden}"></i>
+                                    <button class="btn btn-text" (click)="acc.isHidden = !acc.isHidden"><i class="fa fa-fw" [ngClass]="{'fa-chevron-right': acc.isHidden, 'fa-chevron-down': !acc.isHidden}"></i></button>
+                                    
                                     &nbsp;
                                     <translate-i18n key="label.new-of-type" [params]="{ type: (itemProperty.schema.title | translate) }"></translate-i18n>
                                     <ng-container *ngIf="itemProperty.schema.properties.makeDefault">
diff --git a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
index 8b335f58e..217dd94ee 100644
--- a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
+++ b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
@@ -8,18 +8,18 @@
     <span *ngIf="schema.description" class="sr-only"><translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n></span>
     <div class="d-flex">
         <ng-container *ngFor="let option of schema.oneOf; let i=index;">
-            <div class="custom-control custom-radio custom-control-inline">
+            <div class="form-check mr-3">
                 <input
-                    disableValidation="true"
-                    class="custom-control-input"
+                    class="form-check-input"
                     [id]="formProperty._canonicalPath + '.' + option.enum[0]"
                     [formControl]="control"
                     [name]="name"
                     [value]="option.enum[0]"
                     type="radio"
-                    [attr.disabled]="schema.readOnly">
+                    [attr.disabled]="schema.readOnly"
+                    disableValidation="true">
                 <label
-                    class="custom-control-label"
+                    class="form-check-label"
                     [for]="formProperty._canonicalPath + '.' + option.enum[0]">
                     <translate-i18n [key]="option.description">{{ option.description }}</translate-i18n></label>
             </div>
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
index 62be86566..538251826 100644
--- a/ui/src/app/schema-form/widget/check/checkbox.component.html
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -1,17 +1,17 @@
 <div class="widget form-group">
     <ng-container *ngIf="schema.type !== 'array'">
         <div class="d-flex justify-content-start">
-            <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse"
+            <div class="form-check control-reverse"
                 [id]="formProperty._canonicalPath + '.parent'">
                 <input [formControl]="control"
-                    class="custom-control-input"
+                    class="form-check-input"
                     [attr.name]="name"
                     [indeterminate]="control.value !== false && control.value !== true ? true :null"
                     type="checkbox"
                     [attr.disabled]="schema.readOnly?true:null"
                     [id]="formProperty._canonicalPath"
                     [disableValidation]="true">
-                <label [attr.for]="formProperty._canonicalPath" class="custom-control-label">
+                <label [attr.for]="formProperty._canonicalPath" class="form-check-label">
                     <translate-i18n [key]="schema.title">{{ schema.title }}</translate-i18n>
                 </label>
             </div>
diff --git a/ui/src/app/schema-form/widget/radio/radio.component.html b/ui/src/app/schema-form/widget/radio/radio.component.html
index 316161909..de9187120 100644
--- a/ui/src/app/schema-form/widget/radio/radio.component.html
+++ b/ui/src/app/schema-form/widget/radio/radio.component.html
@@ -4,16 +4,14 @@
         <translate-i18n [key]="schema.description">{{schema.description}}</translate-i18n>
     </span>
     <ng-container *ngFor="let option of schema.oneOf; let i = index;">
-        <div class="custom-control custom-radio custom-control-inline" [ngClass]="schema.widget.class">
-            <input class="custom-control-input"
-                [formControl]="control"
+        <div class="form-check" [ngClass]="schema.widget.class">
+            <input class="form-check-input"
                 type="radio"
-                [attr.name]="name"
+                [name]="name"
                 [id]="formProperty._canonicalPath + '.' + i"
                 [value]="option.enum[0]"
-                [attr.disabled]="schema.readOnly"
                 disableValidation="true">
-            <label class="custom-control-label" [for]="formProperty._canonicalPath + '.' + i">
+            <label class="form-check-label" [for]="formProperty._canonicalPath + '.' + i">
                 <translate-i18n [key]="option.description">{{option.description}}</translate-i18n>
             </label>
         </div>