Merged develop into bugfix/shibui-2333

Former-commit-id: 480517637d60f3ac48594e7aef61c9aad3615aca
TIER · Aug 15, 2022 · 3f15969 · 3f15969
2 parents 136f35b + cccd529
commit 3f15969
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -91,10 +91,6 @@ spring.h2.console.enabled=true
 #spring.datasource.tomcat.initialSize=50
 #spring.datasource.tomcat.validationQuery=select 1
 
-# Liquibase properties
-liquibase.enabled=false
-#liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml
-
 # Hibernate properties
 # for production never ever use create, create-drop. It's BEST to use validate
 spring.jpa.hibernate.ddl-auto=create

diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json
@@ -64,7 +64,7 @@
             "title": "label.entity-attribute-help",
             "description": "tooltip.entity-attribute-help",
             "type": "string",
-            "minLength": 1,
+            "minLength": 0,
             "maxLength": 255
         }
     },

diff --git a/ui/src/app/metadata/hoc/MetadataAttributes.js b/ui/src/app/metadata/hoc/MetadataAttributes.js
@@ -1,8 +1,11 @@
 import React from 'react';
+import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 import { useMetadataAttribute, useMetadataAttributes } from '../hooks/api';
 
 export function MetadataAttributes ({children}) {
 
+     const dispatch = useNotificationDispatcher();
+
     const { get, response } = useMetadataAttributes({
         cachePolicy: 'no-cache'
     });
@@ -24,6 +27,7 @@ export function MetadataAttributes ({children}) {
         await del(`/${id}`);
         if (attrApi.response.ok) {
             loadAttributes();
+            dispatch(createNotificationAction(`Attribute deleted successfully`, NotificationTypes.SUCCESS, 5000));
         }
     }
 

diff --git a/ui/src/app/metadata/hoc/MetadataXmlLoader.js b/ui/src/app/metadata/hoc/MetadataXmlLoader.js
@@ -13,7 +13,7 @@ export function MetadataXmlLoader({ children }) {
     const [xml, setXml] = React.useState();
 
     async function loadMetadataXml(id) {
-        const data = await get(`/${id}`)
+        const data = await get(`/${id}`);
         if (response.ok) {
             setXml(data);
         }
@@ -22,12 +22,16 @@ export function MetadataXmlLoader({ children }) {
     /*eslint-disable react-hooks/exhaustive-deps*/
     React.useEffect(() => {
         if (type === 'source') {
-            loadMetadataXml(id)
+            reload()
         }
     }, [id]);
 
+    function reload() {
+        loadMetadataXml(id);
+    }
+
     return (
-        <MetadataXmlContext.Provider value={xml}>
+        <MetadataXmlContext.Provider value={{reload, xml}}>
             {children}
         </MetadataXmlContext.Provider>
     );

diff --git a/ui/src/app/metadata/new/NewAttribute.js b/ui/src/app/metadata/new/NewAttribute.js
@@ -11,7 +11,7 @@ import { useMetadataAttribute } from '../hooks/api';
 import {CustomAttributeDefinition} from '../domain/attribute/CustomAttributeDefinition';
 import MetadataSchema from '../hoc/MetadataSchema';
 import { MetadataForm } from '../hoc/MetadataFormContext';
-import { createNotificationAction, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
+import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 
 export function NewAttribute() {
     const history = useHistory();
@@ -25,11 +25,16 @@ export function NewAttribute() {
     const [blocking, setBlocking] = React.useState(false);
 
     async function save(metadata) {
+        let toast;
         const resp = await post(``, definition.parser(metadata));
         if (response.ok) {
+            toast =  createNotificationAction(`Added attribute successfully.`, NotificationTypes.SUCCESS);
             gotoDetail({ refresh: true });
         } else {
-            dispatch(createNotificationAction(`${resp.errorCode}: Unable to create attribute ... ${resp.errorMessage}`, 'danger', 5000));
+            toast = createNotificationAction(`${resp.errorCode}: Unable to create attribute ... ${resp.errorMessage}`, 'danger', 5000);
+        }
+        if (toast) {
+            dispatch(toast);
         }
     };
 

diff --git a/ui/src/app/metadata/view/MetadataAttributeEdit.js b/ui/src/app/metadata/view/MetadataAttributeEdit.js
@@ -11,7 +11,7 @@ import { useMetadataAttribute } from '../hooks/api';
 import { CustomAttributeDefinition, CustomAttributeEditor } from '../domain/attribute/CustomAttributeDefinition';
 import MetadataSchema from '../hoc/MetadataSchema';
 import { MetadataForm } from '../hoc/MetadataFormContext';
-import { createNotificationAction, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
+import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 
 export function MetadataAttributeEdit() {
     const { id } = useParams();
@@ -35,11 +35,16 @@ export function MetadataAttributeEdit() {
     }
 
     async function save(metadata) {
+        let toast;
         const resp = await put(``, definition.parser(metadata));
         if (response.ok) {
+            toast =  createNotificationAction(`Updated attribute successfully.`, NotificationTypes.SUCCESS);
             gotoDetail({ refresh: true });
         } else {
-            dispatch(createNotificationAction(`${resp.errorCode}: Unable to edit attribute ... ${resp.errorMessage}`, 'danger', 5000));
+            toast = createNotificationAction(`${resp.errorCode}: Unable to edit attribute ... ${resp.errorMessage}`, 'danger', 5000);
+        }
+        if (toast) {
+            dispatch(toast);
         }
     };
 

diff --git a/ui/src/app/metadata/view/MetadataXml.js b/ui/src/app/metadata/view/MetadataXml.js
@@ -12,12 +12,17 @@ import { MetadataViewToggle } from '../component/MetadataViewToggle';
 import { downloadAsXml } from '../../core/utility/download_as_xml';
 
 export function MetadataXml () {
-    const xml = React.useContext(MetadataXmlContext);
+    const { xml, reload } = React.useContext(MetadataXmlContext);
     const entity = React.useContext(MetadataObjectContext);
     const { type } = useParams();
 
     const download = () => downloadAsXml(entity.name ? entity.name : entity.serviceProviderName, xml);
 
+    /*eslint-disable react-hooks/exhaustive-deps*/
+    React.useEffect(() => {
+        reload();
+    }, []);
+
     return (
         <>
         <h2 className="mb-4">