From 3d0f86e20f1857a2c347a3890ab9e98964f6b46a Mon Sep 17 00:00:00 2001 From: Matt Krick Date: Thu, 17 Aug 2017 21:56:46 -0700 Subject: [PATCH] fix #1270 (will test against prod data) --- .../containers/OutcomeCard/OutcomeCardContainer.js | 1 - .../components/TeamArchive/TeamArchive.js | 13 ++++++++----- .../containers/TeamArchive/TeamArchiveContainer.js | 9 ++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/universal/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.js b/src/universal/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.js index e06c2c24647..e76db761ed5 100644 --- a/src/universal/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.js +++ b/src/universal/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.js @@ -72,7 +72,6 @@ class OutcomeCardContainer extends Component { }); }; - setEditorRef = (c) => { this.setState({ editorRef: c diff --git a/src/universal/modules/teamDashboard/components/TeamArchive/TeamArchive.js b/src/universal/modules/teamDashboard/components/TeamArchive/TeamArchive.js index d90635d1550..ee55dd7fa6d 100644 --- a/src/universal/modules/teamDashboard/components/TeamArchive/TeamArchive.js +++ b/src/universal/modules/teamDashboard/components/TeamArchive/TeamArchive.js @@ -6,10 +6,11 @@ import appTheme from 'universal/styles/theme/appTheme'; import {ib, overflowTouch} from 'universal/styles/helpers'; import ui from 'universal/styles/ui'; import TeamArchiveHeader from 'universal/modules/teamDashboard/components/TeamArchiveHeader/TeamArchiveHeader'; -import OutcomeCardContainer from 'universal/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer'; import Helmet from 'universal/components/ParabolHelmet/ParabolHelmet'; import FontAwesome from 'react-fontawesome'; import getRallyLink from 'universal/modules/userDashboard/helpers/getRallyLink'; +import OutcomeOrNullCard from 'universal/components/OutcomeOrNullCard/OutcomeOrNullCard'; +import {TEAM_DASH} from 'universal/utils/constants'; const iconStyle = { ...ib, @@ -18,7 +19,7 @@ const iconStyle = { }; const TeamArchive = (props) => { - const {archivedProjects, styles, teamId, teamName} = props; + const {archivedProjects, styles, teamId, teamName, userId} = props; return (
@@ -32,9 +33,10 @@ const TeamArchive = (props) => {
{archivedProjects.map((project) => (
-
) @@ -60,7 +62,8 @@ TeamArchive.propTypes = { styles: PropTypes.object, teamId: PropTypes.string, teamName: PropTypes.string, - teamMembers: PropTypes.array + teamMembers: PropTypes.array, + userId: PropTypes.string.isRequired }; const styleThunk = () => ({ diff --git a/src/universal/modules/teamDashboard/containers/TeamArchive/TeamArchiveContainer.js b/src/universal/modules/teamDashboard/containers/TeamArchive/TeamArchiveContainer.js index ec0ad2b3d72..3d1df8d7c7b 100644 --- a/src/universal/modules/teamDashboard/containers/TeamArchive/TeamArchiveContainer.js +++ b/src/universal/modules/teamDashboard/containers/TeamArchive/TeamArchiveContainer.js @@ -64,17 +64,19 @@ const mapStateToProps = (state, props) => { const {archivedProjects} = teamArchiveContainer.data; return { archivedProjects, - teamId + teamId, + userId }; }; const TeamArchiveContainer = (props) => { - const {archivedProjects, teamId, teamName} = props; + const {archivedProjects, teamId, teamName, userId} = props; return ( ); }; @@ -83,7 +85,8 @@ TeamArchiveContainer.propTypes = { archivedProjects: PropTypes.array.isRequired, match: PropTypes.object.isRequired, teamId: PropTypes.string.isRequired, - teamName: PropTypes.string + teamName: PropTypes.string, + userId: PropTypes.string.isRequired }; export default connect(mapStateToProps)(TeamArchiveContainer);