Merge remote-tracking branch 'origin/develop' into feature/shibui-2394

TIER · Oct 31, 2022 · 3d2a6bf · 3d2a6bf
2 parents 7ea6418 + 7f48a17
commit 3d2a6bf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 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
@@ -156,11 +156,11 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
         'SHIBUI-2380: OIDC metadata source CRUD'                            | '/SHIBUI-2380.side'
         'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
-        'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
+//        'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
         'SHIBUI-2270: Verify property set CRUD'                             | '/SHIBUI-2270-1.side'
         'SHIBUI-2270: Verify full property set'                             | '/SHIBUI-2270-2.side'
         'SHIBUI-2268: Verify Algorithm Filter'                              | '/SHIBUI-2268.side'
         'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.14.0-SNAPSHOT
+version=1.15.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

diff --git a/ui/src/app/admin/component/ConfigurationForm.js b/ui/src/app/admin/component/ConfigurationForm.js
@@ -17,15 +17,15 @@ import { includes, uniqBy } from 'lodash';
 export function ConfigurationForm({ configurations, configuration = {}, loading, onSave, onCancel }) {
 
     const [names, setNames] = React.useState([]);
-
+    
     const { control, register, getValues, watch, formState: { errors, isValid }, handleSubmit } = useForm({
         defaultValues: {
             ...configuration
         },
         reValidateMode: 'onChange',
         mode: 'onChange',
     });
-
+    
     const { fields, append, remove } = useFieldArray({
         control,
         name: "properties",
@@ -35,10 +35,11 @@ export function ConfigurationForm({ configurations, configuration = {}, loading,
     });
 
     const properties = useProperties();
-    const selected = watch('properties');
 
     const addProperties = (props) => {
 
+        const selected = getValues('properties');
+
         const parsed = props.reduce((coll, prop, idx) => {
             if (prop.isCategory) {
                 return [...coll, ...properties.filter(p => p.category === prop.category)];
@@ -147,7 +148,7 @@ export function ConfigurationForm({ configurations, configuration = {}, loading,
                                 </thead>
                                 <tbody>
                                     {fields.map((p, idx) => (
-                                        <tr key={p.id}>
+                                        <tr key={idx}>
                                             <td>{ p.propertyName }</td>
                                             <td>{ p.category }</td>
                                             <td>{ p.displayType === 'number' ? 'integer' : p.displayType }</td>

diff --git a/ui/src/app/form/component/templates/FieldTemplate.js b/ui/src/app/form/component/templates/FieldTemplate.js
@@ -19,7 +19,7 @@ export function FieldTemplate ({
 
     return (
         <>{!props.hidden ?
-            <Form.Group className="mb-3">
+            <Form.Group className="mb-3" id={`${id}-group`}>
                 <div>
                     {children}
                 </div>

diff --git a/ui/src/app/metadata/hoc/FilterTargetPreview.js b/ui/src/app/metadata/hoc/FilterTargetPreview.js
@@ -35,7 +35,7 @@ export function FilterTargetPreview ({ entityId, children }) {
 
     return (
         <React.Fragment>
-            {children(preview, loading, data)}
+            {children(data ? preview : null, loading, data)}
             <Modal show={show} onHide={handleClose} dialogClassName="modal-xl">
                 <Modal.Header closeButton>
                     <Modal.Title><Translate value="label.preview-provider">Preview XML</Translate></Modal.Title>