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

added searchbar to dashboard, allows searching of data using filenames #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
29 changes: 29 additions & 0 deletions backend/routes/current_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,35 @@
from . import api


@api.route("/current_user/projects/search", methods=["GET"])
@jwt_required
def search_current_projects():
identity = get_jwt_identity()

try:
search_query = request.args.get("search_query")
request_user = User.query.filter_by(username=identity["username"]).first()
response = []
for project in request_user.projects:
response.extend(
[
data.original_filename
for data in Data.query.filter_by(
project_id=project.id, assigned_user_id=request_user.id
)
.filter(Data.original_filename.like(f"%{search_query}%"))
.all()
]
)
except Exception as e:
message = "Error fetching all projects"
app.logger.error(message)
app.logger.error(e)
return jsonify(message=message), 500

return jsonify(projects=response), 200


@api.route("/current_user/projects", methods=["GET"])
@jwt_required
def fetch_current_user_projects():
Expand Down
50 changes: 48 additions & 2 deletions frontend/src/pages/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import React from "react";
import { Helmet } from "react-helmet";

import Loader from "../components/loader";

import { ListGroup, Form, FormControl, Button } from "react-bootstrap";
class Dashboard extends React.Component {
constructor(props) {
super(props);
this.state = {
projects: [],
searchValue: "",
searchResults: [],
isProjectLoading: false,
};
}
Expand All @@ -34,14 +36,58 @@ class Dashboard extends React.Component {
});
}

handleSearchSubmit = () => {
if (this.state.searchValue) {
axios({
method: "get",
url: `/api/current_user/projects/search?search_query=${this.state.searchValue}`,
}).then((response) => {
this.setState({ searchResults: response.data.projects.slice(0, 5) });
});
this.setState({ searchValue: "" });
} else {
alert("Please enter some search text!");
}
};

render() {
const { isProjectLoading, projects } = this.state;
const { isProjectLoading, projects, searchResults } = this.state;
return (
<div>
<Helmet>
<title>Dashboard</title>
</Helmet>
<div className="container h-100">
<div className="row border-bottom my-5">
<Form inline onSubmit={this.handleFormSubmit}>
<FormControl
onChange={(e) => this.setState({ searchValue: e.target.value })}
value={this.state.searchValue}
onKeyUp={(event) => {
event.preventDefault();
if (event.key === "Enter" && event.keyCode === 13) {
this.handleSearchSubmit();
}
}}
type="text"
placeholder="Search for files by name"
className="mr-sm-2"
/>
<Button onClick={this.handleSearchSubmit} variant="outline-info">
Search
</Button>
</Form>
</div>
{searchResults.length ? (
<div className="h-100 mt-5">
<h2>Search Results:</h2>
<ListGroup>
{searchResults.map((item, itr) => {
return <ListGroup.Item key={itr}>{item}</ListGroup.Item>;
})}
</ListGroup>
</div>
) : null}
<div className="h-100 mt-5">
<div className="row border-bottom my-3">
<div className="col float-left">
Expand Down