Skip to content
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.

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

Re-added fastgraph, added c2dat map #88

Merged
merged 2 commits into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion client/app/components/AuthorSearch/AuthorResultsForm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import { withRouter } from "react-router-dom";
import AuthorCard from '../common/AuthorCard';
Expand Down
12 changes: 1 addition & 11 deletions client/app/components/Clickhouse/ClickhouseForm.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import PropTypes from 'prop-types';
import React, { useEffect, useState, Component } from 'react';
import ReactDOM from 'react-dom';
import React, { Component } from 'react';
import { withRouter, Router } from "react-router-dom";
import { connect } from 'react-redux';
import { styles } from '../common/styles';
// import queryString from 'query-string';
import TextFieldGroup from '../common/TextFieldGroup';
import {
Grid,
Expand All @@ -15,14 +11,8 @@ import {
Button,
Card,
CardBody,
CardHeader,
Form,
FormFeedback,
FormGroup,
Label,
ListGroup,
ListGroupItem,
Table,
UncontrolledTooltip
} from "reactstrap";

Expand Down
3 changes: 1 addition & 2 deletions client/app/components/Clickhouse/ClickhousePage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { withRouter } from "react-router-dom";
import ClickhouseForm from './ClickhouseForm';
import { clickhouseQuery } from '../../../actions/Search';

Expand Down
9 changes: 2 additions & 7 deletions client/app/components/Clickhouse/ClickhouseResultsForm.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import PropTypes from 'prop-types';
import React, { useEffect, useState, Component } from 'react';
import ReactDOM from 'react-dom';
import { withRouter, Router } from "react-router-dom";
import React, {Component } from 'react';
import { withRouter } from "react-router-dom";
import { connect } from 'react-redux';
import { styles } from '../common/styles';
// import queryString from 'query-string';
import Markdown from 'react-markdown';
import {
Card,
CardBody,
CardHeader,
ListGroup,
ListGroupItem,
Table
} from "reactstrap";

Expand Down
3 changes: 0 additions & 3 deletions client/app/components/Clickhouse/ClickhouseResultsPage.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import ClickhouseForm from './ClickhouseForm';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import ClickhouseResultsForm from './ClickhouseResultsForm';
import { Row, Col, Container, Card } from 'reactstrap';
import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom';
import { clickhouseQuery } from '../../../actions/Search';

class ClickhouseResultsPage extends Component {
Expand Down
7 changes: 6 additions & 1 deletion client/app/components/Dashboard/LanguageChart.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import React from "react";

// reactstrap components
import { Container, Row, Col, Card, CardHeader, CardBody, Button, Table } from "reactstrap";
import {
Row,
Card,
CardHeader,
CardBody,
} from "reactstrap";
import { ResponsivePie } from '@nivo/pie';

class LanguageChart extends React.Component {
Expand Down
4 changes: 0 additions & 4 deletions client/app/components/Dashboard/TorvaldsGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ import React from "react";

// reactstrap components
import {
Container,
Row,
Col,
Card,
CardHeader,
CardBody,
Button,
Table,
UncontrolledTooltip
} from "reactstrap";
import { Graph } from 'react-d3-graph';
Expand Down
1 change: 0 additions & 1 deletion client/app/components/FastGraph/FastGraph.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getGraphData } from '../../../actions/getGraph';
import React, { Component } from "react";
import { connect } from 'react-redux';

// reactstrap components
import {
Expand Down
3 changes: 0 additions & 3 deletions client/app/components/FastGraph/FastGraphForm.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import React, { Component } from 'react';
// import { FilterableContent } from 'react-filterable-content';
import { withRouter } from "react-router-dom";
import { connect } from 'react-redux';
import TextFieldGroup from '../common/TextFieldGroup';
import {
Button,
Card,
CardHeader,
CardBody,
Label,
FormGroup
Expand Down
3 changes: 0 additions & 3 deletions client/app/components/FastGraph/FastGraphPage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { withRouter } from "react-router-dom";
import FastGraphForm from './FastGraphForm';

class FastGraphPage extends Component {
Expand Down
5 changes: 0 additions & 5 deletions client/app/components/FastGraph/FastGraphResultsPage.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { Card, CardBody } from 'reactstrap';
import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom';
import FastGraph from './FastGraph.js';
import { lookupSha } from '../../../actions/Search';
import { type } from 'os';

class FastGraphResultsPage extends Component {
constructor(props) {
Expand Down
15 changes: 2 additions & 13 deletions client/app/components/FastGraph/GraphButton.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
import PropTypes from 'prop-types';
import React, { useEffect, useState, Component } from 'react';
import ReactDOM from 'react-dom';
import { withRouter, Router } from "react-router-dom";
import React, { Component } from 'react';
import { connect } from 'react-redux';
import FastGraph from './FastGraph';
import { lookupSha } from '../../../actions/Search';
import '../common/modal.css';

import {
Button as MenuButton,
FormControl,
Menu,
MenuItem,
InputLabel,
Select
} from '@material-ui/core';
import { Button as MenuButton } from '@material-ui/core';

import {
Card,
CardBody,
Modal,
ModalHeader,
ModalBody,
} from 'reactstrap';

Expand Down
2 changes: 0 additions & 2 deletions client/app/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class Header extends React.Component {
<span className="nav-link-inner--text">Clickhouse</span>
</NavLink>
</NavItem>
{ /*
<NavItem>
<NavLink
className="nav-link-icon"
Expand All @@ -76,7 +75,6 @@ class Header extends React.Component {
<span className="nav-link-inner--text">FastGraph</span>
</NavLink>
</NavItem>
*/}
<NavItem>
<NavLink
className="nav-link-icon"
Expand Down
9 changes: 7 additions & 2 deletions client/app/components/Home/HomeWOC.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import React, { Component } from 'react';
import { withRouter } from "react-router-dom";
import { connect } from 'react-redux';
import { Container, Row, Col, Card, CardHeader, ListGroup, ListGroupItem } from "reactstrap";
import PropTypes from 'prop-types';
import {
Row,
Card,
CardHeader,
ListGroup,
ListGroupItem
} from "reactstrap";

// decodeURIComponent(%40article %7B ma2021world, title%22%7BWorld of code: Enabling a research workflow for mining and analyzing the universe of open source vcs data%7D, author%22%7BMa, Yuxing and Dey, Tapajit and Bogart, Chris and Amreen, Sadika and Valiev, Marat and Tutko, Adam and Kennard, David and Zaretzki, Russell and Mockus, Audris%7D, journal%22%7BEmpirical Software Engineering%7D, volume%2226, number%222, pages%22%7B1--42%7D, year%222021, publisher%22Springer%7D</a>
class HomeWOC extends Component {
Expand Down
2 changes: 0 additions & 2 deletions client/app/components/Locate/LocateProfilesPage.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { addFlashMessage } from '../../../actions/flashMessages';
import PropTypes from 'prop-types';
import LocateProfilesForm from './LocateProfilesForm';
import { getAllUsers } from '../../../actions/userActions';
import { withRouter } from "react-router-dom";

class LocateProfilesPage extends Component {
render() {
Expand Down
42 changes: 13 additions & 29 deletions client/app/components/Lookup/LookupResultsForm.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
import PropTypes from 'prop-types';
import React, { useEffect, useState, Component } from 'react';
import ReactDOM from 'react-dom';
import { withRouter, Router } from "react-router-dom";
import React, { Component } from 'react';
import { withRouter } from "react-router-dom";
import { connect } from 'react-redux';
import { styles } from '../common/styles';
import ErrorPage from '../App/NotFound';
import MapButton from '../Mapping/MapButton';
//import GraphButton from '../FastGraph/GraphButton';
import GraphButton from '../FastGraph/GraphButton';
// import queryString from 'query-string';
import Markdown from 'react-markdown';
import {
Button as MenuButton,
FormControl,
Menu,
MenuItem,
InputLabel,
Select
} from '@material-ui/core';

import {
Button,
Card,
CardBody,
CardHeader,
FormGroup,
ListGroup,
ListGroupItem,
Modal,
ModalHeader,
ModalBody,
Table
} from "reactstrap";

Expand Down Expand Up @@ -130,19 +114,19 @@ class LookupResultsForm extends Component{
<ListGroup>
<ListGroupItem>Commit: {sha}
<MapButton query={sha} from="commit"/>
{/*<GraphButton sha={sha} type="commit"/> */}
<GraphButton sha={sha} type="commit"/>
</ListGroupItem>
<ListGroupItem>Tree: <a href="#" onClick={(e) => this.onClick(e,"tree", tree, "showCnt")}>{tree}</a></ListGroupItem>
<ListGroupItem>Parent:{spacer}
{(p ? <a href="#" onClick={(e) => this.onClick(e,"commit", p, "showCnt")}>{p}</a>
: "This commit has no parents")}
{p && <MapButton query={p} from="commit"/>}
{/*p && <GraphButton sha={p} type="commit"/>*/}
{p && <GraphButton sha={p} type="commit"/>}
</ListGroupItem>
{p2 && <ListGroupItem>Parent:{spacer}
<a href="#" onClick={(e) => this.onClick(e,"commit", p2, "showCnt")}>{p2}</a>
<MapButton query={p2} from="commit"/>
{/*<GraphButton sha={p2} type="commit"/>*/}
<GraphButton sha={p2} type="commit"/>
</ListGroupItem>}
<ListGroupItem>Author: {author}
<MapButton query={author} from="author"/>
Expand Down Expand Up @@ -195,13 +179,13 @@ class LookupResultsForm extends Component{
else if(type == 'blob'){
return (
<div className="row justify-content-center">
<Card className="bg-secondary shadow border-0">
<CardHeader>Lookup Results for Blob {sha}</CardHeader>
<CardBody>
<Markdown children={data} />
</CardBody>
</Card>
</div>
<Card className="bg-secondary shadow border-0">
<CardHeader>Lookup Results for Blob {sha}</CardHeader>
<CardBody>
<Markdown children={data} />
</CardBody>
</Card>
</div>
)
}
}
Expand Down
3 changes: 0 additions & 3 deletions client/app/components/Lookup/LookupResultsPage.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import LookupSearchForm from './LookupSearchForm';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import LookupResultsForm from './LookupResultsForm';
import { Row, Col, Container, Card } from 'reactstrap';
import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom';
import { lookupSha } from '../../../actions/Search';

class LookupResultsPage extends Component {
Expand Down
12 changes: 5 additions & 7 deletions client/app/components/Lookup/LookupSearchForm.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React, { Component } from 'react';
// import { FilterableContent } from 'react-filterable-content';
import { withRouter } from "react-router-dom";
import { connect } from 'react-redux';
import TextFieldGroup from '../common/TextFieldGroup';
import Markdown from 'react-markdown';
import {
FormControl,
InputLabel,
Expand All @@ -18,16 +16,16 @@ import {
FormGroup
} from "reactstrap";

class LookupSearchForm extends React.Component {
class LookupSearchForm extends Component {
constructor(props){
super(props);
this.state = {
this.state = {
sha: '',
type: '',
isLoading: false,
badInput: false,
tutorial: false,
noType: false
badInput: false,
tutorial: false,
noType: false
}
this.onChange = this.onChange.bind(this);
this.onSubmit = this.onSubmit.bind(this);
Expand Down
1 change: 0 additions & 1 deletion client/app/components/Lookup/LookupSearchPage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { withRouter } from "react-router-dom";
import LookupSearchForm from './LookupSearchForm';
import { lookupSha } from '../../../actions/Search';

Expand Down
Loading