From 1891a6f3963d3ddeae0ea093f9a7e3608a97b4d7 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 13 May 2021 16:35:01 +0200
Subject: ui: Simplify projects page

This change simplifies the logic and components of the projects page and
reduces its dependency on Redux for simple operations.
---
 .../src/containers/projects/FilterLink.js          | 13 ---------
 .../projects/NewProjectButtonContainer.js          | 11 --------
 .../src/containers/projects/NewProjectContainer.js | 33 ++++++++++++++++++++++
 .../containers/projects/VisibleProjectAuthList.js  | 13 ++++++---
 4 files changed, 42 insertions(+), 28 deletions(-)
 delete mode 100644 opendc-web/opendc-web-ui/src/containers/projects/FilterLink.js
 delete mode 100644 opendc-web/opendc-web-ui/src/containers/projects/NewProjectButtonContainer.js
 create mode 100644 opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js

(limited to 'opendc-web/opendc-web-ui/src/containers/projects')

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 26f95c55..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/FilterLink.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { setAuthVisibilityFilter } from '../../actions/projects'
-import FilterButton from '../../components/projects/FilterButton'
-
-const FilterLink = (props) => {
-    const active = useSelector((state) => state.projectList.authVisibilityFilter === props.filter)
-    const dispatch = useDispatch()
-
-    return <FilterButton {...props} onClick={() => dispatch(setAuthVisibilityFilter(props.filter))} active={active} />
-}
-
-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 b8f6fef5..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectButtonContainer.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react'
-import { useDispatch } from 'react-redux'
-import { openNewProjectModal } from '../../actions/modals/projects'
-import NewProjectButtonComponent from '../../components/projects/NewProjectButtonComponent'
-
-const NewProjectButtonContainer = (props) => {
-    const dispatch = useDispatch()
-    return <NewProjectButtonComponent {...props} onClick={() => dispatch(openNewProjectModal())} />
-}
-
-export default NewProjectButtonContainer
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js b/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js
new file mode 100644
index 00000000..5a8a2dcf
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/containers/projects/NewProjectContainer.js
@@ -0,0 +1,33 @@
+import React, { useState } from 'react'
+import { useDispatch } from 'react-redux'
+import { addProject } from '../../actions/projects'
+import TextInputModal from '../../components/modals/TextInputModal'
+import { Button } from 'reactstrap'
+
+/**
+ * A container for creating a new project.
+ */
+const NewProjectContainer = () => {
+    const [isVisible, setVisible] = useState(false)
+    const dispatch = useDispatch()
+    const callback = (text) => {
+        if (text) {
+            dispatch(addProject(text))
+        }
+        setVisible(false)
+    }
+
+    return (
+        <>
+            <div className="bottom-btn-container">
+                <Button color="primary" className="float-right" onClick={() => setVisible(true)}>
+                    <span className="fa fa-plus mr-2" />
+                    New Project
+                </Button>
+            </div>
+            <TextInputModal title="New Project" label="Project title" show={isVisible} callback={callback} />
+        </>
+    )
+}
+
+export default NewProjectContainer
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js b/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
index b869775c..8e1d063b 100644
--- a/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
+++ b/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
@@ -1,6 +1,7 @@
 import React from 'react'
+import PropTypes from 'prop-types'
 import { useSelector } from 'react-redux'
-import ProjectList from '../../components/projects/ProjectAuthList'
+import ProjectList from '../../components/projects/ProjectList'
 
 const getVisibleProjectAuths = (projectAuths, filter) => {
     switch (filter) {
@@ -15,7 +16,7 @@ const getVisibleProjectAuths = (projectAuths, filter) => {
     }
 }
 
-const VisibleProjectAuthList = (props) => {
+const VisibleProjectAuthList = ({ filter }) => {
     const authorizations = useSelector((state) => {
         const denormalizedAuthorizations = state.projectList.authorizationsOfCurrentUser.map((authorizationIds) => {
             const authorization = state.objects.authorization[authorizationIds]
@@ -24,9 +25,13 @@ const VisibleProjectAuthList = (props) => {
             return authorization
         })
 
-        return getVisibleProjectAuths(denormalizedAuthorizations, state.projectList.authVisibilityFilter)
+        return getVisibleProjectAuths(denormalizedAuthorizations, filter)
     })
-    return <ProjectList {...props} authorizations={authorizations} />
+    return <ProjectList authorizations={authorizations} />
+}
+
+VisibleProjectAuthList.propTypes = {
+    filter: PropTypes.string.isRequired,
 }
 
 export default VisibleProjectAuthList
-- 
cgit v1.2.3