Updated error message

TIER · Aug 20, 2021 · 2b9c2ff · 2b9c2ff
1 parent 44dba26
commit 2b9c2ff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
@@ -71,7 +71,7 @@ public class User extends AbstractAuditable implements Owner, Ownable {
     private Set<Role> roles = new HashSet<>();
 
     @EqualsAndHashCode.Exclude
-    @JsonIgnore
+    // @JsonIgnore
     @Transient
     private Set<Group> userGroups = new HashSet<>();
 

diff --git a/ui/src/app/core/user/UserContext.js b/ui/src/app/core/user/UserContext.js
@@ -7,13 +7,6 @@ const UserContext = React.createContext();
 const { Provider, Consumer } = UserContext;
 
 const path = '/admin/users/current';
-const group = {
-    "name": "ADMIN-GROUP",
-    "resourceId": "admingroup",
-    "validationRegex": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
-    "ownerType": "GROUP",
-    "ownerId": "admingroup"
-};
 
 /*eslint-disable react-hooks/exhaustive-deps*/
 function UserProvider({ children }) {
@@ -26,10 +19,7 @@ function UserProvider({ children }) {
 
     async function loadUser() {
         const user = await get(`${path}`);
-        if (response.ok) setUser({
-            ...user,
-            group
-        });
+        if (response.ok) setUser(user);
     }
 
     const [user, setUser] = React.useState({});
@@ -62,12 +52,12 @@ function useIsAdminOrInGroup() {
 
 function useUserGroup() {
     const user = useCurrentUser();
-    return user?.group;
+    return user?.userGroups[0];
 }
 
 function useUserGroupRegexValidator () {
     const user = useCurrentUser();
-    return user?.group?.validationRegex;
+    return (user?.userGroups && user.userGroups.length > 0) ? user?.userGroups[0].validationRegex : null;
 }
 
 

diff --git a/ui/src/app/metadata/view/MetadataUpload.js b/ui/src/app/metadata/view/MetadataUpload.js
@@ -51,8 +51,14 @@ export function MetadataUpload() {
             setSaving(false);
             history.push('/dashboard');
         } else {
-            const message = await response.json();
-            dispatch(createNotificationAction(`${message.errorCode}: Unable to create file ... ${message.errorMessage}`, 'danger', 5000));
+            let msg;
+            if (f) {
+                const message = await response.json();
+                msg = `${message.errorCode}: Unable to create file ... ${message.errorMessage}`
+            } else {
+                msg = await response.text();
+            }
+            dispatch(createNotificationAction(msg, 'danger', 5000));
             setSaving(false);
         }
     }