Merge pull request #25 from HIP-infrastructure/feat/public-space-v2

Feat/public space v2

package.json

@@ -10,7 +10,6 @@
 		"@mui/lab": "^5.0.0-alpha.128",
 		"@mui/material": "^5.12.2",
 		"@mui/styled-engine-sc": "^5.12.0",
-		"@nextcloud/auth": "^1.3.0",
 		"@testing-library/jest-dom": "^5.16.4",
 		"@testing-library/react": "^13.3.0",
 		"@testing-library/user-event": "^14.2.0",

src/App.tsx

@@ -6,14 +6,12 @@ import './App.css'
 import AppList from './components/Documentation/AppList'
 import Dataset from './components/UI/BIDS/Dataset'
 import CenterDatasets from './components/Center/Datasets'
-import PublicDatasets from './components/Public/Datasets'
 import Centers from './components/Centers'
 import CenterWorkspace from './components/Center/Workspace'
 import About from './components/Documentation/About'
 import CreateProject from './components/Projects/Create'
 import ProjectWorkspace from './components/Project/Workspace'
 import ProjectDataset from './components/Project/Dataset'
-import Projects from './components/Projects'
 import Desktop from './components/Desktop/Desktop'
 import CenterDesktops from './components/Center/Desktops'
 import ProjectDesktops from './components/Project/Desktops'
@@ -89,7 +87,6 @@ const App = () => (
 				</Route>
 			</Route>
 			<Route path={'projects'} element={<Outlet />}>
-				<Route index element={<Projects />} />
 				<Route path={'create'} element={<CreateProject />} />
 				<Route path={':projectId'} element={<Project />}>
 					<Route index element={<ProjectWorkspace />} />
@@ -102,7 +99,17 @@ const App = () => (
 					</Route>
 				</Route>
 			</Route>
-			<Route path={'public'} element={<PublicDatasets />}></Route>
+			<Route path={'public'} element={<Outlet />}>
+				<Route path={':projectId'} element={<Project />}>
+					<Route index element={<ProjectWorkspace />} />
+					<Route path={'desktops'} element={<ProjectDesktops />} />
+					<Route path={'metadata'} element={<Files />} />
+					<Route path={'datasets'} element={<Outlet />}>
+						<Route index element={<ProjectDataset />} />
+						<Route path={':datasetId'} element={<ProjectDataset />} />
+					</Route>
+				</Route>
+			</Route>
 			<Route
 				path='*'
 				element={

src/Store.tsx

@@ -1,4 +1,4 @@
-import { getCurrentUser } from '@nextcloud/auth'
+import { getCurrentUser } from './nextcloudAuth'
 import React, { useState } from 'react'
 import { refreshBidsDatasetsIndex } from './api/bids'
 import { getCenters, getUser } from './api/gatewayClientAPI'
@@ -104,9 +104,10 @@ export const AppStoreProvider = ({
 
 	// Fetch initial data
 	React.useEffect(() => {
-		const currentUser = getCurrentUser() as UserCredentials
-		setUser(currentUser)
+		const currentUser = getCurrentUser()
+		if (!currentUser) return
 
+		setUser(currentUser)
 		getUser(currentUser.uid)
 			.then(data => {
 				if (data) {

src/api/gatewayClientAPI.tsx

@@ -59,7 +59,7 @@ export const getUsers = async (): Promise<User[]> =>
 		.then(checkForError)
 		.catch(catchError)
 
-export const getUser = async (userid?: string): Promise<User> =>
+export const getUser = async (userid: string): Promise<User> =>
 	fetch(`${API_GATEWAY}/users/${userid}`, {
 		headers: {
 			requesttoken: window.OC.requestToken,

src/api/types.ts

@@ -33,10 +33,9 @@ export enum ContainerType {
 }
 
 export interface UserCredentials {
-	uid?: string
-	displayName?: string | null
-	isAdmin?: boolean
-	password?: string
+	uid: string
+	displayName: string | null
+	isAdmin: boolean
 	groups?: string[]
 	hasProjectsAdminRole?: boolean
 }
@@ -91,8 +90,8 @@ export interface HIPCenter {
 export interface HIPProject {
 	name: string
 	title: string
+	isPublic: boolean
 	description?: string
-	acceptMembershipRequest?: boolean
 	isMember?: boolean
 	admins?: string[]
 	members?: string[]

src/components/Center/Datasets/index.tsx

@@ -37,7 +37,7 @@ const DatasetsIndex = () => {
 
 	return (
 		<>
-			<Datasets handleClickedDataset={handleClickedDataset} buttonTitle={'Make public'} />
+			<Datasets />
 			<Dialog open={open} onClose={handleCheckedClicked}>
 				<DialogTitle>Make Dataset Public</DialogTitle>
 				<DialogContent>

src/components/Projects/ProjectCard.tsx

@@ -35,7 +35,7 @@ const ProjectCard = ({ project, users }: Props) => {
 
 	return (
 		<NavLink to={`${ROUTE_PREFIX}/projects/${project.name}`}>
-			<Card elevation={3} component={Paper} sx={{ width: 280 }}>
+			<Card elevation={3} component={Paper} sx={{ width: 280, minHeight: 320 }}>
 				<CardContent>
 					<Box
 						sx={{