Skip to content

Commit

Permalink
Merge pull request #1046 from hubmapconsortium/cleaning-commentsandco…
Browse files Browse the repository at this point in the history 
…nsole

Cleaning commentsandconsole
  • Loading branch information
@yuanzhou
yuanzhou committed Feb 6, 2023
2 parents 2ce47d0 + b3f0a84 commit 916f092
Show file tree
Hide file tree
Showing 19 changed files with 311 additions and 2,197 deletions.
71 changes: 1 addition & 70 deletions src/src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,7 @@ export function App (props){
var [userGroups, setUserGroups] = useState({});
var [userDataGroups, setUserDataGroups] = useState({});
let navigate = useNavigate();
// const { sampleType, keywords } = useParams();




// function LocalStorageAuth(){


// }



useEffect(() => {

Expand Down Expand Up @@ -147,10 +137,6 @@ export function App (props){
setIsLoading(false)
});

// The Dataset Form for New entites loads through the Form

// return dt_dict;


} else if (results && results.status === 401) {
// console.debug("LocalStorageAuth", results);
Expand All @@ -168,77 +154,41 @@ export function App (props){

});
}catch {
// console.debug("LocalStorageAuth", "CATCh No LocalStorage");
setTimerStatus(false);
setIsLoading(false)
}


}, [groupsToken, isLoading]);


// A custom hook that builds on useLocation to parse
// the query string for you.
// function useQuery() {
// const { search } = useLocation();
// return React.useMemo(() => new URLSearchParams(search), [search]);
// }


function Logout(){
//console.debug("Logging out");
localStorage.removeItem("info");
localStorage.removeItem("isAuthenticated");
window.location.replace(`${process.env.REACT_APP_URL}`);
};


// function onChangeGlobusLink(newLink, newDataset){
// // const {name, display_doi, doi} = newDataset;
// // this.setState({globus_url: newLink, name: name, display_doi: display_doi, doi: doi});
// };



function handleCancel(){
window.history.back();
}



const onClose = (event, reason) => {
// setLoginDialogRender(true)
// console.debug("onClose ", event, reason);
navigate("/");
// setLoginDialogRender(false);

}


const onCloseLogin = (event, reason) => {
// setLoginDialogRender(true)
// console.debug("onCloseLogin ", event, reason);
navigate("/");
setLoginDialogRender(false);

}

function CallLoginDialog(){
// console.debug("CallLoginDialog Open");
setLoginDialogRender(true);
}

// function CallUploadsDialog(){
// //console.debug("CallUploadsDialog uploadsDialogRender");
// setUploadsDialogRender(true);
// }




function urlChange(target) {
var lowerTarget = target.toLowerCase();
// console.debug("urlChange", target, lowerTarget);
navigate(lowerTarget, { replace: true });
}

Expand All @@ -256,19 +206,13 @@ export function App (props){
var bundledParameters = {entityType: queryType, keywords: queryKeyword, group: queryGroup};

function reportError (error){
// TO CALL:
// this.props.reportError("message");
console.error("reportError", error);
// var errJsonString = JSON.stringify();
// var errObjectString = error.toString();
// setErrorInfo(errObjectString)
var errString = JSON.stringify(BuildError(error), Object.getOwnPropertyNames(BuildError(error)))
console.debug("reportError", errString);
setErrorInfo(errString);
setErrorShow(true);
}

//console.debug("props", props);
return (
<div className="App">

Expand All @@ -279,7 +223,6 @@ function reportError (error){
app_info={ app_info_storage}
userGroups={userGroups}
userDataGroups={userDataGroups}
// uploadsDialogRender={uploadsDialogRender}
onCreatedReditect={""}
/>

Expand Down Expand Up @@ -427,11 +370,6 @@ function reportError (error){
<Route path='dataset' element={<Forms reportError={reportError} formType='dataset' dataTypeList={dataTypeList} dtl_all={dataTypeListAll} dtl_primary={dataTypeListPrimary}new='true' onReturn={onClose} handleCancel={handleCancel} /> }/>
<Route path='sample' element={<Forms reportError={reportError} formType='sample' onReturn={onClose} handleCancel={handleCancel} /> }/>

{/*
<Route path="/new/donor" element={ <Forms formType='donor' onReturn={onClose} handleCancel={handleCancel} />}/>
<Route path="/new/dataset" element={<Forms formType='dataset' dataTypeList={dataTypeList} new='true' onReturn={onClose} handleCancel={handleCancel} /> }/>
<Route path="/new/sample" element={<Forms formType='sample' onReturn={onClose} handleCancel={handleCancel} /> }/> */}

</Route>
<Route path="/donors" element={<SearchComponent reportError={reportError} filter_type="donors" urlChange={urlChange}/>} ></Route>
<Route path="/samples" element={<SearchComponent reportError={reportError} filter_type="Sample" urlChange={urlChange} />} ></Route>
Expand All @@ -443,23 +381,16 @@ function reportError (error){
<Route path="/dataset/:uuid" element={<RenderDataset reportError={reportError} dataTypeList={dataTypeList} handleCancel={handleCancel} status="view"/>} />
<Route path="/upload/:uuid" element={<RenderUpload reportError={reportError} handleCancel={handleCancel} status="view"/>} />

{/* <Route path="/new/sample" element={<RenderSample status="new" />} /> */}
{/* <Route path="/new/dataset" element={<RenderDataset status="new" />} /> */}
<Route path="/bulk/donors" reportError={reportError} exact element={<RenderBulk bulkType="donors" />} />
<Route path="/bulk/samples" reportError={reportError} element={<RenderBulk bulkType="samples" />} />
{/* <Route path="/new/data" element={<SearchComponent uploadsDialog="true" CallUploadsDialog={CallUploadsDialog} changeLink={onChangeGlobusLink} />} /> */}
{/* <Route path="/new/data" element={<SearchComponent uploadsDialog="true" CallUploadsDialog={CallUploadsDialog} changeLink={onChangeGlobusLink} />} /> */}
{/* <Forms formType={this.state.formType} handleCancel={this.handleClose} /> */}

</Routes>

</Routes>

</Paper>
)}
</div>
</div>
);
// return html;

}

Expand Down
50 changes: 0 additions & 50 deletions src/src/Nav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,61 +32,27 @@ export const Navigation = (props) => {
let navigate = useNavigate();

useEffect(() => {
//console.debug("props", props);
//console.debug("props.appInfo", props.app_info);
//console.debug("location", location);
// setAuthStatus(props.login)
setUserInfo(props.app_info);
setUserGroups(props.userGroups);
// console.debug("userInfo", userInfo);
setUserDataGroups([props.userDataGroups]);
// console.debug("===== props.userGroups",props.userGroups);
// @TODO: Consider moving all the User & User Group info into its own utils,
//mdn Array.reduce;



// console.debug("userDataGroups", props.userDataGroups, props.userDataGroups.length);
// if(userGroups && userGroups.length > 0){
// const dataGroups = DataProviders(userGroups);
// console.log(dataGroups, userDataGroups, userDataGroups.length);
// }



// props.userGroups.reduce((acc, group) => {
// console.debug("group", group);
// console.debug("acc", acc);
// if(group.data_provider === "true"){
// // setUserGroups(item);
// console.debug("group", group);
// }
// // return acc;
// console.debug("acc", acc);
// });


if(location.pathname === "/new/data"){
//console.debug("Setting uploadsDialog to true");
setUploadsDialog(true);
}
}, [props, props.app_info, location]);



const handleClick_I = (event) => {
console.debug("HandleClick", event );
setAnchorEl_I(event.currentTarget);
// setAnchorEl_I(!anchorEl_I);
};

const handleClick_B = (event) => {
//console.debug("HandleClick", event );
setAnchorEl_B(event.currentTarget);
};

const handleClose = () => {
//console.debug("HandleClose", e);
setAnchorEl_I();
setAnchorEl_B();
};
Expand All @@ -98,29 +64,19 @@ export const Navigation = (props) => {

const onClose = () => {
setUploadsDialog(false);
//console.debug("onClose");
};

const onCreated = (data) => {
console.debug("onCreated");
// console.debug("data", data.uuid, data.results.uuid);
// navigate("/Upload/"+data.uuid);
navigate("/Upload/"+data.results.uuid);
setUploadsDialog(false);
};

function logout(e) {
//console.debug("Logging out");
localStorage.removeItem("info");
localStorage.removeItem("isAuthenticated");
window.location.replace(`${process.env.REACT_APP_URL}`);

};
// const NavTo = (path, type) => {
// //console.debug("NavTo", path, type);
// navigate('/'+path+'/'+type);
// }

return(
<div>
<Dialog
Expand All @@ -140,9 +96,7 @@ export const Navigation = (props) => {
<div id="MenuLeft">
<a className="navbar-brand" href="/">
<img
//src="https://hubmapconsortium.org/wp-content/uploads/2019/01/HuBMAP-Retina-Logo-Color-300x110.png"
src="https://hubmapconsortium.org/wp-content/uploads/2020/09/hubmap-type-white250.png"
//width="300"
height="40"
className="d-inline-block align-top"
id="MenuLogo"
Expand All @@ -153,12 +107,8 @@ export const Navigation = (props) => {
{props.login && userDataGroups[0] && userDataGroups[0].length >0 &&(
<div className="d-inline">
<span className="menu-bar-static-label mr-4">REGISTER NEW:</span>




<Button
// className="ml-2"
id="IndividualButton"
endIcon={<ArrowDropDownIcon />}
aria-controls={open_I ? 'IndividualMenu' : undefined}
Expand Down
7 changes: 0 additions & 7 deletions src/src/components/bulk.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import React from "react";
import BulkCreation from "./ingest/bulk";
// import {useNavigate} from "react-router-dom";



export const RenderBulk = (props) => {
// let navigate = useNavigate();

function handleCancel(){
if(this.props.handleCancel){
// How is this happening???
this.props.handleCancel();
}else{
window.history.back();
Expand Down
Loading

0 comments on commit 916f092

Please sign in to comment.