merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

4 files changed, 0 insertions, 84 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/projects/FilterLink.js b/opendc-web/opendc-web-ui/src/containers/projects/FilterLink.js
deleted file mode 100644
index dfd6affe..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/FilterLink.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { connect } from 'react-redux'
-import { setAuthVisibilityFilter } from '../../actions/projects'
-import FilterButton from '../../components/projects/FilterButton'
-
-const mapStateToProps = (state, ownProps) => {
-    return {
-        active: state.projectList.authVisibilityFilter === ownProps.filter,
-    }
-}
-
-const mapDispatchToProps = (dispatch, ownProps) => {
-    return {
-        onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)),
-    }
-}
-
-const FilterLink = connect(mapStateToProps, mapDispatchToProps)(FilterButton)
-
-export default FilterLink
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectButtonContainer.js b/opendc-web/opendc-web-ui/src/containers/projects/NewProjectButtonContainer.js
deleted file mode 100644
index ffd4a4a3..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectButtonContainer.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux'
-import { openNewProjectModal } from '../../actions/modals/projects'
-import NewProjectButtonComponent from '../../components/projects/NewProjectButtonComponent'
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        onClick: () => dispatch(openNewProjectModal()),
-    }
-}
-
-const NewProjectButtonContainer = connect(undefined, mapDispatchToProps)(NewProjectButtonComponent)
-
-export default NewProjectButtonContainer
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/ProjectActions.js b/opendc-web/opendc-web-ui/src/containers/projects/ProjectActions.js
deleted file mode 100644
index 8bcbb7fd..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/ProjectActions.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux'
-import { deleteProject } from '../../actions/projects'
-import ProjectActionButtons from '../../components/projects/ProjectActionButtons'
-
-const mapStateToProps = (state, ownProps) => {
-    return {
-        projectId: ownProps.projectId,
-    }
-}
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        onViewUsers: (id) => {}, // TODO implement user viewing
-        onDelete: (id) => dispatch(deleteProject(id)),
-    }
-}
-
-const ProjectActions = connect(mapStateToProps, mapDispatchToProps)(ProjectActionButtons)
-
-export default ProjectActions
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js b/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
deleted file mode 100644
index f0010540..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { connect } from 'react-redux'
-import ProjectList from '../../components/projects/ProjectAuthList'
-
-const getVisibleProjectAuths = (projectAuths, filter) => {
-    switch (filter) {
-        case 'SHOW_ALL':
-            return projectAuths
-        case 'SHOW_OWN':
-            return projectAuths.filter((projectAuth) => projectAuth.authorizationLevel === 'OWN')
-        case 'SHOW_SHARED':
-            return projectAuths.filter((projectAuth) => projectAuth.authorizationLevel !== 'OWN')
-        default:
-            return projectAuths
-    }
-}
-
-const mapStateToProps = (state) => {
-    const denormalizedAuthorizations = state.projectList.authorizationsOfCurrentUser.map((authorizationIds) => {
-        const authorization = state.objects.authorization[authorizationIds]
-        authorization.user = state.objects.user[authorization.userId]
-        authorization.project = state.objects.project[authorization.projectId]
-        return authorization
-    })
-
-    return {
-        authorizations: getVisibleProjectAuths(denormalizedAuthorizations, state.projectList.authVisibilityFilter),
-    }
-}
-
-const VisibleProjectAuthList = connect(mapStateToProps)(ProjectList)
-
-export default VisibleProjectAuthList