Skip to content

Commit

Permalink
feat: enable old and new data dictionary for VA
Browse files Browse the repository at this point in the history
  • Loading branch information
pieterlukasse committed Oct 25, 2024
1 parent 7d03acf commit 54d8b50
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/Analysis/AnalysisApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ class AnalysisApp extends React.Component {
case 'AtlasDataDictionary': {
return (
<div className='analysis-app_flex_row'>
<AtlasDataDictionaryContainer />
<AtlasDataDictionaryContainer
dataDictionaryVersion={analysisApps[app].dataDictionaryVersion}
/>
</div>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useLocation, useHistory, useRouteMatch } from 'react-router-dom';
import ProtectedContent from '../../Login/ProtectedContent';
import AtlasDataDictionaryLoading from './AtlasDataDictionaryTable/AtlasDataDictionaryLoading';
import AtlasDataDictionaryButton from './AtlasDataDictionaryButton/AtlasDataDictionaryButton';
import './AtlasDataDictionary.css';

const AtlasDataDictionaryContainer = () => {
const AtlasDataDictionaryContainer = ({ dataDictionaryVersion }) => {
const location = useLocation();
const history = useHistory();
const match = useRouteMatch();

if (!dataDictionaryVersion || !dataDictionaryVersion.includes('new')) {
// Default legacy component: render a div with AtlasDataDictionaryButton when
// no dataDictionaryVersion is set or it does not include 'new':
return (
<div style={{ width: '100%' }}><AtlasDataDictionaryButton /></div>
);
}
return (
<div className='atlas-data-dictionary-container'>
<ProtectedContent
Expand All @@ -21,4 +31,12 @@ const AtlasDataDictionaryContainer = () => {
);
};

AtlasDataDictionaryContainer.propTypes = {
dataDictionaryVersion: PropTypes.string,
};

AtlasDataDictionaryContainer.defaultProps = {
dataDictionaryVersion: null,
};

export default AtlasDataDictionaryContainer;

0 comments on commit 54d8b50

Please sign in to comment.