2 files changed, 34 insertions, 37 deletions
diff --git a/opendc-web/opendc-web-ui/src/containers/projects/ProjectListContainer.js b/opendc-web/opendc-web-ui/src/containers/projects/ProjectListContainer.js
new file mode 100644
index 00000000..6632a8b5
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/containers/projects/ProjectListContainer.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import ProjectList from '../../components/projects/ProjectList'
+import { useAuth } from '../../auth'
+import { useProjects } from '../../data/project'
+
+const getVisibleProjects = (projects, filter, userId) => {
+    switch (filter) {
+        case 'SHOW_ALL':
+            return projects
+        case 'SHOW_OWN':
+            return projects.filter((project) =>
+                project.authorizations.some((a) => a.userId === userId && a.level === 'OWN')
+            )
+        case 'SHOW_SHARED':
+            return projects.filter((project) =>
+                project.authorizations.some((a) => a.userId === userId && a.level !== 'OWN')
+            )
+        default:
+            return projects
+    }
+}
+
+const ProjectListContainer = ({ filter }) => {
+    const { user } = useAuth()
+    const projects = useProjects()
+    return <ProjectList projects={getVisibleProjects(projects, filter, user?.sub)} />
+}
+
+ProjectListContainer.propTypes = {
+    filter: PropTypes.string.isRequired,
+}
+
+export default ProjectListContainer
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 8e1d063b..00000000
--- a/opendc-web/opendc-web-ui/src/containers/projects/VisibleProjectAuthList.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { useSelector } from 'react-redux'
-import ProjectList from '../../components/projects/ProjectList'
-
-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 VisibleProjectAuthList = ({ filter }) => {
-    const authorizations = useSelector((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 getVisibleProjectAuths(denormalizedAuthorizations, filter)
-    })
-    return <ProjectList authorizations={authorizations} />
-}
-
-VisibleProjectAuthList.propTypes = {
-    filter: PropTypes.string.isRequired,
-}
-
-export default VisibleProjectAuthList