Merge branch 'bugfix/SHIBUI-1378' into feature/SHIBUI-1333-QA

TIER · Aug 1, 2019 · 668db82 · 668db82
2 parents 953f6a2 + 23b9da2
commit 668db82
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 57 deletions.
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -106,7 +106,7 @@ class SeleniumSIDETest extends Specification {
 //        'Create and Delete Name ID Format Regex Filter'     | '/CreateAndDeleteNameIDFormatRegexFilter.side'
 //        'Create and Delete Name ID Format Script Filter'    | '/CreateAndDeleteNameIDFormatScriptFilter.side'
 //        'Create and Modify Filter Order'                    | '/ModifyFilterOrder.side'
-//        'SHIBUI-1281: Metadata Source Dashboard'            | '/SHIBUI-1281.side'
+        'SHIBUI-1281: Metadata Source Dashboard'            | '/SHIBUI-1281.side'
         'SHIBUI-1311: Metadata Provider Dashboard'          | '/SHIBUI-1311.side'
         'SHIBUI-950: Metadata Source from XML w/ digest'    | '/SHIBUI-950.side'
         'SHIBUI-1352: Create LocalDynamic provider'         | '/SHIBUI-1352-1.side'

diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
@@ -824,35 +824,35 @@
       "id": "6c794e94-9c64-4683-816a-380432f2ed79",
       "comment": "",
       "command": "click",
-      "target": "id=/securityInfo/x509CertificateAvailable",
+      "target": "id=/securityInfo/x509CertificateAvailable.true",
       "targets": [
-        ["id=/securityInfo/x509CertificateAvailable", "id"],
-        ["css=.form-check:nth-child(3) #\\/securityInfo\\/x509CertificateAvailable", "css:finder"],
-        ["xpath=//input[@id='/securityInfo/x509CertificateAvailable']", "xpath:attributes"],
+        ["id=/securityInfo/x509CertificateAvailable.true", "id"],
+        ["css=#\\/securityInfo\\/x509CertificateAvailable\\.true", "css:finder"],
+        ["xpath=//input[@id='/securityInfo/x509CertificateAvailable.true']", "xpath:attributes"],
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "f0ade90e-2c31-4a77-b936-3b2a00388477",
       "comment": "",
       "command": "click",
-      "target": "id=/securityInfo/authenticationRequestsSigned",
+      "target": "id=/securityInfo/authenticationRequestsSigned.true",
       "targets": [
-        ["id=/securityInfo/authenticationRequestsSigned", "id"],
-        ["css=.form-check:nth-child(3) #\\/securityInfo\\/authenticationRequestsSigned", "css:finder"],
-        ["xpath=//input[@id='/securityInfo/authenticationRequestsSigned']", "xpath:attributes"],
+        ["id=/securityInfo/authenticationRequestsSigned.true", "id"],
+        ["css=#\\/securityInfo\\/authenticationRequestsSigned\\.true", "css:finder"],
+        ["xpath=//input[@id='/securityInfo/authenticationRequestsSigned.true']", "xpath:attributes"],
         ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "e26eda6f-1897-42e2-9ea9-671b1ff88874",
       "comment": "",
       "command": "click",
-      "target": "id=/securityInfo/wantAssertionsSigned",
+      "target": "id=/securityInfo/wantAssertionsSigned.true",
       "targets": [
-        ["id=/securityInfo/wantAssertionsSigned", "id"],
-        ["css=.form-check:nth-child(3) #\\/securityInfo\\/wantAssertionsSigned", "css:finder"],
-        ["xpath=//input[@id='/securityInfo/wantAssertionsSigned']", "xpath:attributes"],
+        ["id=/securityInfo/wantAssertionsSigned.true", "id"],
+        ["css=#\\/securityInfo\\/wantAssertionsSigned\\.true", "css:finder"],
+        ["xpath=//input[@id='/securityInfo/wantAssertionsSigned.true']", "xpath:attributes"],
         ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"]
       ],
       "value": ""
@@ -886,12 +886,12 @@
       "id": "23ff8b87-ac6c-4f82-a779-aa91be11f49c",
       "comment": "",
       "command": "click",
-      "target": "id=/securityInfo/x509Certificates/0/type",
+      "target": "id=/securityInfo/x509Certificates/0/type.0",
       "targets": [
-        ["id=/securityInfo/x509Certificates/0/type", "id"],
-        ["name=field51", "name"],
-        ["css=.form-check:nth-child(3) > #\\/securityInfo\\/x509Certificates\\/0\\/type", "css:finder"],
-        ["xpath=//input[@id='/securityInfo/x509Certificates/0/type']", "xpath:attributes"],
+        ["id=/securityInfo/x509Certificates/0/type.0", "id"],
+        ["name=field55", "name"],
+        ["css=#\\/securityInfo\\/x509Certificates\\/0\\/type\\.0", "css:finder"],
+        ["xpath=//input[@id='/securityInfo/x509Certificates/0/type.0']", "xpath:attributes"],
         ["xpath=//div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -960,10 +960,11 @@
       "id": "835ad053-0a10-4606-a148-c7ba36be316f",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) > #\\/securityInfo\\/x509Certificates\\/1\\/type",
+      "target": "id=/securityInfo/x509Certificates/1/type.1",
       "targets": [
-        ["css=.form-check:nth-child(4) > #\\/securityInfo\\/x509Certificates\\/1\\/type", "css:finder"],
-        ["xpath=(//input[@id='/securityInfo/x509Certificates/1/type'])[2]", "xpath:attributes"],
+        ["id=/securityInfo/x509Certificates/1/type.1", "id"],
+        ["css=#\\/securityInfo\\/x509Certificates\\/1\\/type\\.1", "css:finder"],
+        ["xpath=//input[@id='/securityInfo/x509Certificates/1/type.1']", "xpath:attributes"],
         ["xpath=//li[2]/div/div/div[2]/sf-form-element/div/sf-widget-chooser/custom-object/div/div/fieldset/div/div[2]/sf-form-element/div/sf-widget-chooser/custom-radio-widget/div/div[2]/input", "xpath:position"]
       ],
       "value": ""

diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -149,10 +149,11 @@
       "id": "f0459917-b2a1-4e3c-8800-25273965129f",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/initializeFromBackupFile",
+      "target": "id=/initializeFromBackupFile.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/initializeFromBackupFile", "css:finder"],
-        ["xpath=(//input[@id='/initializeFromBackupFile'])[2]", "xpath:attributes"],
+        ["id=/initializeFromBackupFile.false", "id"],
+        ["css=#\\/initializeFromBackupFile\\.false", "css:finder"],
+        ["xpath=//input[@id='/initializeFromBackupFile.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""
@@ -198,44 +199,47 @@
       "id": "bf041d41-5d58-4f69-8fcc-49ec79e5547d",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/requireValidMetadata",
+      "target": "id=/requireValidMetadata.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/requireValidMetadata", "css:finder"],
-        ["xpath=(//input[@id='/requireValidMetadata'])[2]", "xpath:attributes"],
+        ["id=/requireValidMetadata.false", "id"],
+        ["css=#\\/requireValidMetadata\\.false", "css:finder"],
+        ["xpath=//input[@id='/requireValidMetadata.false']", "xpath:attributes"],
         ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "fba85c75-e218-4deb-b5e1-888ff75b6a4e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/failFastInitialization",
+      "target": "id=/failFastInitialization.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/failFastInitialization", "css:finder"],
-        ["xpath=(//input[@id='/failFastInitialization'])[2]", "xpath:attributes"],
+        ["id=/failFastInitialization.false", "id"],
+        ["css=#\\/failFastInitialization\\.false", "css:finder"],
+        ["xpath=//input[@id='/failFastInitialization.false']", "xpath:attributes"],
         ["xpath=//div[7]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "375b8d6e-179b-4f14-8f00-d8a8cad29d7e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/useDefaultPredicateRegistry",
+      "target": "id=/useDefaultPredicateRegistry.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/useDefaultPredicateRegistry", "css:finder"],
-        ["xpath=(//input[@id='/useDefaultPredicateRegistry'])[2]", "xpath:attributes"],
+        ["id=/useDefaultPredicateRegistry.false", "id"],
+        ["css=#\\/useDefaultPredicateRegistry\\.false", "css:finder"],
+        ["xpath=//input[@id='/useDefaultPredicateRegistry.false']", "xpath:attributes"],
         ["xpath=//div[8]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div[2]/label/input", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "8b4bf341-62c0-491f-b775-d2faf55477bc",
       "comment": "",
       "command": "click",
-      "target": "id=/satisfyAnyPredicates",
+      "target": "id=/satisfyAnyPredicates.true",
       "targets": [
-        ["id=/satisfyAnyPredicates", "id"],
-        ["css=.form-check:nth-child(3) #\\/satisfyAnyPredicates", "css:finder"],
-        ["xpath=//input[@id='/satisfyAnyPredicates']", "xpath:attributes"],
+        ["id=/satisfyAnyPredicates.true", "id"],
+        ["css=#\\/satisfyAnyPredicates\\.true", "css:finder"],
+        ["xpath=//input[@id='/satisfyAnyPredicates.true']", "xpath:attributes"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"]
       ],
       "value": ""
@@ -674,10 +678,11 @@
       "id": "d389f80c-4923-40ad-bdb6-f1142cb95a5e",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/initializeFromBackupFile",
+      "target": "id=/initializeFromBackupFile.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/initializeFromBackupFile", "css:finder"],
-        ["xpath=(//input[@id='/initializeFromBackupFile'])[2]", "xpath:attributes"],
+        ["id=/initializeFromBackupFile.false", "id"],
+        ["css=#\\/initializeFromBackupFile\\.false", "css:finder"],
+        ["xpath=//input[@id='/initializeFromBackupFile.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""

diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side
@@ -238,6 +238,18 @@
         ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "5ac765a9-4850-4a48-b0b4-6ea52003e5a4",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn",
+      "targets": [
+        ["css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn", "css:finder"],
+        ["xpath=(//button[@type='button'])[3]", "xpath:attributes"],
+        ["xpath=//div[@id='/dynamicMetadataResolverAttributes/maxCacheDuration-container']/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
+      ],
+      "value": "10000"
     }, {
       "id": "a5274853-084e-438f-8cea-9a74e55fd0b9",
       "comment": "",
@@ -292,10 +304,11 @@
       "id": "1176d384-4b0c-4a67-8e43-6cc3cbbcff73",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData",
+      "target": "id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData", "css:finder"],
-        ["xpath=(//input[@id='/dynamicMetadataResolverAttributes/removeIdleEntityData'])[2]", "xpath:attributes"],
+        ["id=/dynamicMetadataResolverAttributes/removeIdleEntityData.false", "id"],
+        ["css=#\\/dynamicMetadataResolverAttributes\\/removeIdleEntityData\\.false", "css:finder"],
+        ["xpath=//input[@id='/dynamicMetadataResolverAttributes/removeIdleEntityData.false']", "xpath:attributes"],
         ["xpath=//div[2]/label/input", "xpath:position"]
       ],
       "value": ""

diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side
@@ -179,11 +179,12 @@
       "id": "88cf741f-0922-4dfb-aaea-9e4c146ed8e1",
       "comment": "",
       "command": "click",
-      "target": "css=.form-check:nth-child(4) #\\/doInitialization",
+      "target": "id=/doInitialization.false",
       "targets": [
-        ["css=.form-check:nth-child(4) #\\/doInitialization", "css:finder"],
-        ["xpath=(//input[@id='/doInitialization'])[2]", "xpath:attributes"],
-        ["xpath=//div[2]/label/input", "xpath:position"]
+        ["id=/doInitialization.true", "id"],
+        ["css=#\\/doInitialization\\.true", "css:finder"],
+        ["xpath=//input[@id='/doInitialization.true']", "xpath:attributes"],
+        ["xpath=//label/input", "xpath:position"]
       ],
       "value": ""
     }, {

diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
@@ -30,7 +30,7 @@
                     <ng-container *ngSwitchDefault>
                         <sf-form-element class="flex-grow-1" [formProperty]="itemProperty"></sf-form-element>
                         <div class="py-2">
-                            <button class="btn btn-link pt-1" (click)="removeItem(i, itemProperty); $event.stopPropagation()" role="button">
+                            <button class="btn btn-link pt-1" (click)="removeItem(itemProperty); $event.stopPropagation()" role="button">
                                 <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
                                 <span class="sr-only" translate="action.remove">Remove</span>
                             </button>
@@ -48,7 +48,7 @@
                                         <small class="sr-only" *ngIf="itemProperty.value.makeDefault === true" translate="label.default">(default)</small>
                                     </ng-container>
                                 </span>
-                                <button class="btn btn-link pt-1" (click)="removeItem(i, itemProperty); $event.stopPropagation()" role="button">
+                                <button class="btn btn-link pt-1" (click)="removeItem(itemProperty); $event.stopPropagation()" role="button">
                                     <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
                                     <span class="sr-only" translate="action.remove">Remove</span>
                                 </button>

diff --git a/ui/src/app/schema-form/widget/array/inline-obj-list.component.html b/ui/src/app/schema-form/widget/array/inline-obj-list.component.html
@@ -34,7 +34,7 @@
                                     <small class="sr-only" *ngIf="itemProperty.value.makeDefault === true" translate="label.default">(default)</small>
                                 </ng-container>
                             </span>
-                            <button class="btn btn-link pt-1" (click)="removeItem(i)" role="button">
+                            <button class="btn btn-link pt-1" (click)="removeItem(itemProperty)" role="button">
                                 <i class="fa fa-fw fa-trash fa-lg text-danger"></i>
                                 <span class="sr-only" translate="action.remove">Remove</span>
                             </button>

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
@@ -9,7 +9,7 @@
     <div *ngFor="let option of schema.oneOf; let i=index;" class="form-check form-check-inline">
         <label class="control-label">
             <input
-                [id]="formProperty._canonicalPath"
+                [id]="formProperty._canonicalPath + '.' + option.enum[0]"
                 [formControl]="control"
                 [name]="name"
                 [value]="option.enum[0]"

diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -1,7 +1,8 @@
 <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="custom-control custom-checkbox custom-control-inline custom-control-reverse"
+                [id]="formProperty._canonicalPath + '.parent'">
                 <input [formControl]="control"
                     class="custom-control-input"
                     [attr.name]="name"
@@ -20,12 +21,12 @@
         </div>
     </ng-container>
     <ng-container *ngIf="schema.type === 'array'">
-        <div *ngFor="let option of schema.items.oneOf" class="checkbox">
+        <div *ngFor="let option of schema.items.oneOf; let i = index;" class="checkbox">
             <label class="horizontal control-label" [attr.for]="formProperty._canonicalPath">
                 <input
-                    [id]="formProperty._canonicalPath"
+                    [id]="formProperty._canonicalPath + '.' + i"
                     [attr.name]="name" 
-                    value="{{option.enum[0]}}"
+                    [value]="option.enum[0]"
                     type="checkbox"
                     [attr.disabled]="schema.readOnly?true:null"
                     (change)="onCheck($event.target)"

diff --git a/ui/src/app/schema-form/widget/radio/radio.component.html b/ui/src/app/schema-form/widget/radio/radio.component.html
@@ -1,9 +1,9 @@
 <div class="widget form-group">
     <label [translate]="schema.title">{{schema.title}}</label>
     <span *ngIf="schema.description" class="formHelp" [translate]="schema.description">{{schema.description}}</span>
-    <ng-container *ngFor="let option of schema.oneOf">
+    <ng-container *ngFor="let option of schema.oneOf; let i = index;">
         <div class="form-check" [ngClass]="schema.widget.class">
-            <input class="form-check-input" [formControl]="control" type="radio" [attr.name]="name" [id]="formProperty._canonicalPath" value="{{option.enum[0]}}" [attr.disabled]="schema.readOnly">
+            <input class="form-check-input" [formControl]="control" type="radio" [attr.name]="name" [id]="formProperty._canonicalPath + '.' + i" [value]="option.enum[0]" [attr.disabled]="schema.readOnly">
             <label class="form-check-label" [for]="name" [translate]="option.description">{{option.description}}</label>
         </div>
     </ng-container>