NOJIRA - handling migration of values for existing bundles

TIER · Sep 26, 2024 · 09afabb · 09afabb
1 parent 002234c
commit 09afabb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -25,7 +25,7 @@ class JsonSchemaBuilderService {
         List<Object> result = new ArrayList<>()
         List<String> resultNames = new ArrayList<>()
         attributeBundleService.findAll().forEach({ bundle ->
-            result.add(bundle.getAttributes())
+            result.add(bundle.getAttributeNames())
             resultNames.add(bundle.getName())
         })
 

diff --git a/...internet2/tier/shibboleth/admin/ui/configuration/MigrationTasksContextLoadedListener.java b/...internet2/tier/shibboleth/admin/ui/configuration/MigrationTasksContextLoadedListener.java
@@ -85,10 +85,10 @@ void doAttributeBundleMigration() {
         attributeBundleRepository.findAll().forEach(attrBundleEntry -> {
             try {
                 Set<String> names = new HashSet<String>();
-                attrBundleEntry.getAttributes().forEach(value -> {
+                attrBundleEntry.getAttributeNames().forEach(value -> {
                     names.add(BundleableAttributeType.values()[Integer.parseInt(value)].label());
                 });
-                attrBundleEntry.setAttributes(names);
+                attrBundleEntry.setAttributeNames(names);
                 attributeBundleRepository.save(attrBundleEntry);
             }
             catch (NumberFormatException ignore) {

diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/AttributeBundleController.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/AttributeBundleController.java
@@ -93,7 +93,7 @@ public ResponseEntity<?> getBundleSchema() {
         itemsMap.put("type", "string");
         itemsMap.put("enum", getAttributeNames());
         attributesMap.put("items", itemsMap);
-        props.put("attributes", attributesMap);
+        props.put("attributeNames", attributesMap);
         result.put("properties", props);
         return ResponseEntity.ok(result);
     }

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeBundle.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeBundle.java
@@ -15,7 +15,7 @@
 public class AttributeBundle {
     @Column(name="attribute_names", nullable = false)
     @ElementCollection
-    Set<String> attributes = new HashSet<>();
+    Set<String> attributeNames = new HashSet<>();
 
     @Column(name = "name", nullable = true)
     String name;

diff --git a/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/AttributeBundleService.java b/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/AttributeBundleService.java
@@ -40,7 +40,7 @@ public AttributeBundle updateBundle(AttributeBundle bundle) throws PersistentEnt
         }
         AttributeBundle bundleToUpdate = dbBundle.get();
         bundleToUpdate.setName(bundle.getName());
-        bundleToUpdate.setAttributes(bundle.getAttributes());
+        bundleToUpdate.setAttributeNames(bundle.getAttributeNames());
         return attributeBundleRepository.save(bundleToUpdate);
     }
 

diff --git a/ui/src/app/metadata/domain/attribute/AttributeBundleDefinition.js b/ui/src/app/metadata/domain/attribute/AttributeBundleDefinition.js
@@ -7,7 +7,7 @@ export const AttributeBundleDefinition = {
     steps: [],
     schema: `${BASE_PATH}api/custom/entity/bundles/bundle_schema`,
     uiSchema: {
-        attributes: {
+        attributeNames: {
             'ui:widget': 'AttributeReleaseWidget'
         }
     },

diff --git a/ui/src/app/metadata/view/MetadataAttributeBundles.js b/ui/src/app/metadata/view/MetadataAttributeBundles.js
@@ -18,7 +18,7 @@ export function MetadataAttributeBundles() {
         <AttributeBundleApi>
             {(load, find, create, update, remove, loading) =>
                 <AttributeBundleList load={load}>
-                    {(bundles, reload) => 
+                    {(bundles, reload) =>
                     <div className="container-fluid p-3">
                         <section className="section">
                             <div className="section-body border border-top-0 border-primary">
@@ -49,7 +49,7 @@ export function MetadataAttributeBundles() {
                                                     {bundles.map((bundle, i) =>
                                                         <tr key={i}>
                                                             <td>{ bundle.name }</td>
-                                                            <td><TruncateText text={ bundle?.attributes?.join(', ') } /></td>
+                                                            <td><TruncateText text={ bundle?.attributeNames?.join(', ') } /></td>
                                                             <td className="text-end">
                                                                 <Link to={`../bundles/${bundle.resourceId}/edit`} className="btn btn-link text-primary">
                                                                     <FontAwesomeIcon icon={faEdit} size="lg" />
@@ -71,12 +71,12 @@ export function MetadataAttributeBundles() {
                                         </div>
                                     </div>
                             </div>
-                                
+
                         </section>
                     </div>
                     }
                 </AttributeBundleList>
             }
         </AttributeBundleApi>
     );
-}
+}