Skip to content

Frontend support for resource approval #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ganning127 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Frontend support for resource approval #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e96d24
support adding author roles
ganning127 Jul 19, 2025
34d41d0
saving changes
ganning127 Aug 10, 2025
ec494f8
Merge branch 'author-roles' of https://github.com/apache/airavata-por…
ganning127 Aug 10, 2025
980041d
frontend support for resource approval
ganning127 Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"typescript.tsdk": "node_modules/typescript/lib"
}
1 change: 1 addition & 0 deletions airavata-research-portal/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ VITE_APP_URL=http://localhost:5173
VITE_API_VERSION=v1
VITE_CLIENT_ID=
VITE_OPENID_CONFIG_URL=
VITE_ADMIN_EMAILS=

@ganning127 ganning127 Aug 10, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a comma-separated string, like "test1@gmail.com,test2@gmail.com"

138 changes: 66 additions & 72 deletions airavata-research-portal/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,32 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import {useColorMode} from "./components/ui/color-mode";
import {Route, Routes, useLocation, useNavigate} from "react-router";
import { useColorMode } from "./components/ui/color-mode";
import { Route, Routes, useLocation, useNavigate } from "react-router";
import Home from "./components/home";
import {Models} from "./components/models";
import {Datasets} from "./components/datasets";
import { Models } from "./components/models";
import { Datasets } from "./components/datasets";
import ResourceDetails from "./components/resources/ResourceDetails";
import Notebooks from "./components/notebooks";
import Repositories from "./components/repositories";
import {Login} from "./components/auth/UserLoginPage";
import { Login } from "./components/auth/UserLoginPage";
import ProtectedComponent from "./components/auth/ProtectedComponent";
import {AuthProvider, AuthProviderProps} from "react-oidc-context";
import {useEffect, useState} from "react";
import { AuthProvider, AuthProviderProps } from "react-oidc-context";
import { useEffect, useState } from "react";
import NavBarFooterLayout from "./layouts/NavBarFooterLayout";
import {CybershuttleLanding} from "./components/home/CybershuttleLanding";
import {APP_REDIRECT_URI, CLIENT_ID, OPENID_CONFIG_URL,} from "./lib/constants";
import {WebStorageStateStore} from "oidc-client-ts";
import {Resources} from "./components/resources";
import {UserSet} from "./components/auth/UserSet";
import {Toaster} from "./components/ui/toaster";
import {Events} from "./components/events";
import {AddRepoMaster} from "./components/add/AddRepoMaster";
import {Add} from "./components/add";
import {AddProjectMaster} from "./components/add/AddProjectMaster";
import {StarredResourcesPage} from "@/components/resources/StarredResourcesPage.tsx";
import { CybershuttleLanding } from "./components/home/CybershuttleLanding";
import {
APP_REDIRECT_URI,
CLIENT_ID,
OPENID_CONFIG_URL,
} from "./lib/constants";
import { WebStorageStateStore } from "oidc-client-ts";
import { Resources } from "./components/resources";
import { UserSet } from "./components/auth/UserSet";
import { Toaster } from "./components/ui/toaster";
import { Events } from "./components/events";
import { AddRepoMaster } from "./components/add/AddRepoMaster";
import { Add } from "./components/add";
import { AddProjectMaster } from "./components/add/AddProjectMaster";
import { StarredResourcesPage } from "@/components/resources/StarredResourcesPage.tsx";
import { PendingResourcesSection } from "./components/resources/admin/PendingResourcesSection";

function App() {
const colorMode = useColorMode();
Expand Down Expand Up @@ -74,7 +60,7 @@ function App() {
userinfo_endpoint: data.userinfo_endpoint,
jwks_uri: data.jwks_uri,
},
userStore: new WebStorageStateStore({store: window.localStorage}),
userStore: new WebStorageStateStore({ store: window.localStorage }),
automaticSilentRenew: true,
};

Expand All @@ -92,42 +78,50 @@ function App() {
}

return (
<>
<AuthProvider
{...oidcConfig}
onSigninCallback={() => {
navigate(location.search, {replace: true});
}}
>
<Toaster/>
<UserSet/>
<Routes>
{/* Public Route */}
<Route element={<NavBarFooterLayout/>}>
<Route path="/" element={<CybershuttleLanding/>}/>
<Route path="/login" element={<Login/>}/>
<Route path="/resources" element={<Resources/>}/>
<Route path="/events" element={<Events/>}/>
<Route path="/resources/datasets" element={<Datasets/>}/>
<Route path="/resources/notebooks" element={<Notebooks/>}/>
<Route path="/resources/repositories" element={<Repositories/>}/>
<Route path="/resources/models" element={<Models/>}/>
<Route path="/resources/:type/:id" element={<ResourceDetails/>}/>
</Route>
<>
<AuthProvider
{...oidcConfig}
onSigninCallback={() => {
navigate(location.search, { replace: true });
}}
>
<Toaster />
<UserSet />
<Routes>
{/* Public Route */}
<Route element={<NavBarFooterLayout />}>
<Route path="/" element={<CybershuttleLanding />} />
<Route path="/login" element={<Login />} />
<Route path="/resources" element={<Resources />} />
<Route path="/events" element={<Events />} />
<Route path="/resources/datasets" element={<Datasets />} />
<Route path="/resources/notebooks" element={<Notebooks />} />
<Route path="/resources/repositories" element={<Repositories />} />
<Route path="/resources/models" element={<Models />} />
<Route path="/resources/:type/:id" element={<ResourceDetails />} />
</Route>

{/* Protected Routes with Layout */}
<Route
element={<ProtectedComponent Component={NavBarFooterLayout} />}
>
<Route
path="/resources/starred"
element={<StarredResourcesPage />}
/>
<Route path="/sessions" element={<Home />} />
<Route path="/add" element={<Add />} />
<Route path="/add/repo" element={<AddRepoMaster />} />
<Route path="/add/project" element={<AddProjectMaster />} />

{/* Protected Routes with Layout */}
<Route
element={<ProtectedComponent Component={NavBarFooterLayout}/>}
>
<Route path="/resources/starred" element={<StarredResourcesPage/>}/>
<Route path="/sessions" element={<Home/>}/>
<Route path="/add" element={<Add/>}/>
<Route path="/add/repo" element={<AddRepoMaster/>}/>
<Route path="/add/project" element={<AddProjectMaster/>}/>
</Route>
</Routes>
</AuthProvider>
</>
path="/admin/pending-resources"
element={<PendingResourcesSection />}
/>
</Route>
</Routes>
</AuthProvider>
</>
);
}

Expand Down
Loading