PropTypes and refactoring

This commit is contained in:
2021-05-04 19:22:45 -05:00
parent 811f022229
commit ace51f61d1
30 changed files with 491 additions and 279 deletions

View File

@@ -1,32 +1,16 @@
import React from 'react';
import './DependencyList.css';
import { connect } from 'react-redux';
import * as Constants from '../../constants';
import { createDismissDisplay } from '../../utils.jsx';
import Dependency from './Dependency/Dependency';
import Box from '../UI/Box/Box';
import Dependency from './Dependency/Dependency';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createDismissDisplay } from '../../utils.jsx';
import { downloadItem } from '../../redux/actions/download_actions';
import { extractFileNameFromURL } from '../../utils.jsx';
import { setDismissDependencies } from '../../redux/actions/install_actions';
const mapStateToProps = (state) => {
return {
AllowDismissDependencies: state.relver.AllowDismissDependencies,
MissingDependencies: state.install.MissingDependencies,
};
};
const mapDispatchToProps = (dispatch) => {
return {
downloadItem: (name, type, url, isWinFSP) => dispatch(downloadItem(name, type, url, isWinFSP)),
setDismissDependencies: (dismiss) => dispatch(setDismissDependencies(dismiss)),
};
};
export default connect(
mapStateToProps,
mapDispatchToProps
)((props) => {
const DependencyList = (props) => {
const items = props.MissingDependencies.map((k, i) => {
return (
<Dependency
@@ -69,4 +53,27 @@ export default connect(
{items}
</Box>
);
});
};
const mapStateToProps = (state) => {
return {
AllowDismissDependencies: state.relver.AllowDismissDependencies,
MissingDependencies: state.install.MissingDependencies,
};
};
const mapDispatchToProps = (dispatch) => {
return {
downloadItem: (name, type, url, isWinFSP) => dispatch(downloadItem(name, type, url, isWinFSP)),
setDismissDependencies: (dismiss) => dispatch(setDismissDependencies(dismiss)),
};
};
DependencyList.propTypes = {
AllowDismissDependencies: PropTypes.bool,
MissingDependencies: PropTypes.array,
downloadItem: PropTypes.func.isRequired,
setDismissDependencies: PropTypes.func.isRequired,
};
export default connect(mapStateToProps, mapDispatchToProps)(DependencyList);