From 8e51c383807075832ee1b250776fbe2de5d4464e Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 7 Dec 2018 14:07:58 -0700
Subject: [PATCH] Updated text

---
 .../resources/entity-attributes-filters-ui-schema.json    | 3 ---
 backend/src/main/resources/i18n/messages_en.properties    | 5 +++--
 backend/src/main/resources/nameid-filter.schema.json      | 3 +++
 .../metadata/filter/container/new-filter.component.html   | 8 ++++++--
 .../app/metadata/filter/container/new-filter.component.ts | 2 +-
 ui/src/assets/schema/filter/nameid.schema.json            | 3 +++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/resources/entity-attributes-filters-ui-schema.json b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
index 86b31393a..d67364b21 100644
--- a/backend/src/main/resources/entity-attributes-filters-ui-schema.json
+++ b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
@@ -1,9 +1,6 @@
 {
     "title": "EntityAttributes Filter",
     "type": "object",
-    "widget": {
-        "id": "fieldset"
-    },
     "properties": {
         "name": {
             "title": "label.filter-name",
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 32b85ae4c..050c5fc32 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -374,6 +374,8 @@ label.nameid-formats-format=NameID Format
 label.nameid-formats-value=NameID Value
 label.nameid-formats-type=NameID Type
 
+label.select-filter-type=Select Filter Type
+
 message.must-be-unique=Must be unique.
 message.name-must-be-unique=Name must be unique.
 message.uri-valid-format=URI must be valid format.
@@ -429,7 +431,7 @@ tooltip.assertion-consumer-service-location=Assertion Consumer Service Location
 tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
 tooltip.mark-as-default=Mark as Default
 tooltip.protocol-support-enumeration=Protocol Support Enumeration
-tooltip.nameid-format=Add NameID Format
+tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
 tooltip.enable-this-service-upon-saving=Enable this service upon saving
 tooltip.authentication-requests-signed=Authentication Requests Signed
 tooltip.want-assertions-signed=Want Assertions Signed
@@ -524,7 +526,6 @@ tooltip.velocity-engine=This attribute may be used to specify the name of the Ve
 tooltip.match=A regular expression against which the entityID is evaluated.
 
 tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)
-tooltip.nameid-formats=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
 tooltip.nameid-formats-format=Format
 tooltip.nameid-formats-value=Value
 tooltip.nameid-formats-type=Type
\ No newline at end of file
diff --git a/backend/src/main/resources/nameid-filter.schema.json b/backend/src/main/resources/nameid-filter.schema.json
index 461a9a39b..db562abe5 100644
--- a/backend/src/main/resources/nameid-filter.schema.json
+++ b/backend/src/main/resources/nameid-filter.schema.json
@@ -20,6 +20,9 @@
             ]
         }
     ],
+    "required": [
+        "name"
+    ],
     "properties": {
         "name": {
             "title": "label.filter-name",
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index 0e6d05a7d..58b46be99 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -15,9 +15,13 @@
                 <div class="d-flex justify-content-between">
                     <form [formGroup]="form" class="d-block w-50">
                         <div class="form-group">
-                            <label for="type">Filter Type</label>
+                            <label for="type">
+                                <translate-i18n key="label.select-filter-type">Select Filter Type</translate-i18n>
+                            </label>
                             <select class="form-control" formControlName="type" name="type">
-                                <option>Select Filter Type</option>
+                                <option value="" disabled>
+                                    <translate-i18n key="label.select-filter-type">Select Filter Type</translate-i18n>
+                                </option>
                                 <option *ngFor="let opt of options$ | async" [value]="opt.type">{{ opt.label }}</option>
                             </select>
                         </div>
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.ts b/ui/src/app/metadata/filter/container/new-filter.component.ts
index 08f4d509a..7fa2a5c7f 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.ts
@@ -41,7 +41,7 @@ export class NewFilterComponent implements OnDestroy, OnInit {
     validators$: Observable<{ [key: string]: any }>;
 
     form: FormGroup = this.fb.group({
-        type: [null, Validators.required]
+        type: ['', Validators.required]
     });
 
     options$: Observable<FormDefinition<MetadataFilter>[]>;
diff --git a/ui/src/assets/schema/filter/nameid.schema.json b/ui/src/assets/schema/filter/nameid.schema.json
index cb8a30410..2ddb21915 100644
--- a/ui/src/assets/schema/filter/nameid.schema.json
+++ b/ui/src/assets/schema/filter/nameid.schema.json
@@ -20,6 +20,9 @@
             ]
         }
     ],
+    "required": [
+        "name"
+    ],
     "properties": {
         "name": {
             "title": "label.filter-name",