Skip to content

Commit

Permalink
Merged develop into feature/shibui-2267
Browse files Browse the repository at this point in the history
Former-commit-id: a97c5ad2c8e6dcb690cbc87e2f5b3de018057905
  • Loading branch information
chasegawa committed Aug 12, 2022
2 parents 7b4175b + 890ddec commit 9a823d4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions ui/src/app/metadata/hoc/MetadataXmlLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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>
);
Expand Down
7 changes: 6 additions & 1 deletion ui/src/app/metadata/view/MetadataXml.js
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 9a823d4

Please sign in to comment.