Skip to content

Commit

Permalink
Merge pull request #165 from edgi-govdata-archiving/64-if-you-have-a-…
Browse files Browse the repository at this point in the history
…url-or-even-just-part-of-one-we-can-find-your-page

Add unbelievably terrible search -- this will need a lot of rework and improvement going forward.
  • Loading branch information
Mr0grog authored Jan 6, 2018
2 parents 84b7d36 + d17dc58 commit 2804b6f
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 1 deletion.
44 changes: 44 additions & 0 deletions src/components/page-list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Loading from './loading';
* These props also inherit from React Router's RouteComponent props
* @typedef {Object} PageListProps
* @property {Page[]} pages
* @property {(any) => void} onSearch
*/

/**
Expand All @@ -15,13 +16,26 @@ import Loading from './loading';
* @param {PageListProps} props
*/
export default class PageList extends React.Component {
constructor (props) {
super(props);
this._didSearch = this._didSearch.bind(this);
this._dispatchSearch = debounce(this._dispatchSearch.bind(this), 500);
}

render () {
if (!this.props.pages) {
return <Loading />;
}

return (
<div className="container-fluid container-list-view">
<div className="row search-bar">
<input
type="text"
placeholder="Search for a URL..."
onChange={this._didSearch}
/>
</div>
<div className="row">
<div className="col-md-12">
<table className="table">
Expand Down Expand Up @@ -98,6 +112,28 @@ export default class PageList extends React.Component {

this.props.history.push(`/page/${page.uuid}`);
}

_didSearch (event) {
this._dispatchSearch(event.target.value);
}

_dispatchSearch (url) {
if (url) {
// If doesn't start with a protocol (or looks like it's going that way),
// prefix with an asterisk.
if (!/^(\*|\/\/|(h|ht|htt|https?|https?\/|https?\/\/))/.test(url)) {
url = url = `*//${url}`;
}
// If the search is for a domain + TLD, return all paths under it
if (/^[\w:*]+(\/\/)?[^/]+$/.test(url)) {
url = `${url}*`;
}
}
if (this.props.onSearch) {
const query = url ? {url} : null;
this.props.onSearch(query);
}
}
}

function isInAnchor (node) {
Expand All @@ -109,3 +145,11 @@ function isInAnchor (node) {
}
return isInAnchor(node.parentNode);
}

function debounce (func, delay) {
let timer = null;
return function (...args) {
clearTimeout(timer);
timer = setTimeout(() => func(...args), delay);
};
}
10 changes: 9 additions & 1 deletion src/components/web-monitoring-ui.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default class WebMonitoringUi extends React.Component {
isLoading: true,
pageFilter: '', // keeps track of which set of pages we are looking at
pages: null,
search: null,
showLogin: false,
user: null,
};
Expand All @@ -46,6 +47,7 @@ export default class WebMonitoringUi extends React.Component {
this.logOut = this.logOut.bind(this);
this.loadPages = this.loadPages.bind(this);
this.setPageFilter = this.setPageFilter.bind(this);
this.search = this.search.bind(this);
}

setPageFilter (filter) {
Expand All @@ -71,6 +73,11 @@ export default class WebMonitoringUi extends React.Component {
this.loadPages('pages');
}

search (query) {
this.setState({search: query});
this.loadPages(this.state.pageFilter);
}

/**
* Load pages depending on whether we want all pages or assigned pages.
* @private
Expand All @@ -87,7 +94,7 @@ export default class WebMonitoringUi extends React.Component {
return Promise.reject(new Error('You must be logged in to view pages'));
}

const query = {include_latest: true};
const query = Object.assign({include_latest: true}, this.state.search);
if (pageFilter === 'assignedPages') {
return localApi.getPagesForUser(api.userData.email, null, query);
}
Expand Down Expand Up @@ -137,6 +144,7 @@ export default class WebMonitoringUi extends React.Component {
{...routeProps}
pages={pages}
user={this.state.user}
onSearch={this.search}
/>;
};
};
Expand Down
12 changes: 12 additions & 0 deletions src/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ body {
background-color: #EEE;
}

.search-bar {
border-bottom: 1px solid #ccc;
margin-bottom: 0.5em;
}

.search-bar input {
width: 100%;
border: none;
font-size: 1.25em;
padding: 0.5em 15px;
}

/* ===== Page Detail View ===== */
.page-title {
font-size: 1.5em;
Expand Down

0 comments on commit 2804b6f

Please sign in to comment.