Adding usable search urls

- Fixes #242

diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx
index 48df1edd008f108d3da9fdf695f719325abf3f77..cce31fced2f7557619788808bc81e586ac034796 100644 (file)
--- a/ui/src/components/main.tsx
+++ b/ui/src/components/main.tsx
@@ -106,11 +106,12 @@ export class Main extends Component<any, MainState> {
 
   // Necessary for back button for some reason
   componentWillReceiveProps(nextProps: any) {
-    if (nextProps.history.action == 'POP') {
+    if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') {
       this.state = this.emptyState;
       this.state.type_ = this.getListingTypeFromProps(nextProps);
       this.state.sort = this.getSortTypeFromProps(nextProps);
       this.state.page = this.getPageFromProps(nextProps);
+      this.setState(this.state);
       this.fetchPosts();
     }
   }

diff --git a/ui/src/components/search.tsx b/ui/src/components/search.tsx
index 34a4a3d3178f4e1e6b52c68c1f91b9c5bfb6bd5c..42e1f3173650d93b23830ce681a6c0ef55f25ea3 100644 (file)
--- a/ui/src/components/search.tsx
+++ b/ui/src/components/search.tsx
@@ -4,7 +4,7 @@ import { Subscription } from "rxjs";
 import { retryWhen, delay, take } from 'rxjs/operators';
 import { UserOperation, Post, Comment, Community, UserView, SortType, SearchForm, SearchResponse, SearchType } from '../interfaces';
 import { WebSocketService } from '../services';
-import { msgOp, fetchLimit } from '../utils';
+import { msgOp, fetchLimit, routeSearchTypeToEnum, routeSortTypeToEnum } from '../utils';
 import { PostListing } from './post-listing';
 import { CommentNodes } from './comment-nodes';
 import { i18n } from '../i18next';
@@ -23,10 +23,10 @@ export class Search extends Component<any, SearchState> {
 
   private subscription: Subscription;
   private emptyState: SearchState = {
-    q: undefined,
-    type_: SearchType.All,
-    sort: SortType.TopAll,
-    page: 1,
+    q: this.getSearchQueryFromProps(this.props),
+    type_: this.getSearchTypeFromProps(this.props),
+    sort: this.getSortTypeFromProps(this.props),
+    page: this.getPageFromProps(this.props),
     searchResponse: {
       op: null,
       type_: null,
@@ -38,6 +38,26 @@ export class Search extends Component<any, SearchState> {
     loading: false,
   }
 
+  getSearchQueryFromProps(props: any): string {
+    return (props.match.params.q) ? props.match.params.q : '';
+  }
+
+  getSearchTypeFromProps(props: any): SearchType {
+    return (props.match.params.type) ? 
+      routeSearchTypeToEnum(props.match.params.type) : 
+      SearchType.All;
+  }
+
+  getSortTypeFromProps(props: any): SortType {
+    return (props.match.params.sort) ? 
+      routeSortTypeToEnum(props.match.params.sort) : 
+      SortType.TopAll;
+  }
+
+  getPageFromProps(props: any): number {
+    return (props.match.params.page) ? Number(props.match.params.page) : 1;
+  }
+
   constructor(props: any, context: any) {
     super(props, context);
 
@@ -50,6 +70,10 @@ export class Search extends Component<any, SearchState> {
         (err) => console.error(err),
         () => console.log('complete')
     );
+    
+    if (this.state.q) {
+      this.search();
+    }
 
   }
 
@@ -57,6 +81,19 @@ export class Search extends Component<any, SearchState> {
     this.subscription.unsubscribe();
   }
 
+  // Necessary for back button for some reason
+  componentWillReceiveProps(nextProps: any) {
+    if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') {
+      this.state = this.emptyState;
+      this.state.q = this.getSearchQueryFromProps(nextProps);
+      this.state.type_ = this.getSearchTypeFromProps(nextProps);
+      this.state.sort = this.getSortTypeFromProps(nextProps);
+      this.state.page = this.getPageFromProps(nextProps);
+      this.setState(this.state);
+      this.search();
+    }
+  }
+
   componentDidMount() {
     document.title = `${i18n.t('search')} - ${WebSocketService.Instance.site.name}`;
   }
@@ -256,12 +293,14 @@ export class Search extends Component<any, SearchState> {
   nextPage(i: Search) { 
     i.state.page++;
     i.setState(i.state);
+    i.updateUrl();
     i.search();
   }
 
   prevPage(i: Search) { 
     i.state.page--;
     i.setState(i.state);
+    i.updateUrl();
     i.search();
   }
 
@@ -275,19 +314,23 @@ export class Search extends Component<any, SearchState> {
       limit: fetchLimit,
     };
 
-    WebSocketService.Instance.search(form);
+    if (this.state.q != '') {
+      WebSocketService.Instance.search(form);
+    }
   }
 
   handleSortChange(i: Search, event: any) {
     i.state.sort = Number(event.target.value);
     i.state.page = 1;
     i.setState(i.state);
+    i.updateUrl();
   }
 
   handleTypeChange(i: Search, event: any) {
     i.state.type_ = Number(event.target.value);
     i.state.page = 1;
     i.setState(i.state);
+    i.updateUrl();
   }
 
   handleSearchSubmit(i: Search, event: any) {
@@ -295,6 +338,7 @@ export class Search extends Component<any, SearchState> {
     i.state.loading = true;
     i.search();
     i.setState(i.state);
+    i.updateUrl();
   }
 
   handleQChange(i: Search, event: any) {
@@ -302,6 +346,12 @@ export class Search extends Component<any, SearchState> {
     i.setState(i.state);
   }
 
+  updateUrl() {
+    let typeStr = SearchType[this.state.type_].toLowerCase();
+    let sortStr = SortType[this.state.sort].toLowerCase();
+    this.props.history.push(`/search/q/${this.state.q}/type/${typeStr}/sort/${sortStr}/page/${this.state.page}`);
+  }
+
   parseMessage(msg: any) {
     console.log(msg);
     let op: UserOperation = msgOp(msg);

diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index 63ecd53f250af5640f33bb830f544d179309cf7d..7a252be21c4e800c95b60eae5e1b47a03010828a 100644 (file)
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -61,6 +61,7 @@ class Index extends Component<any, any> {
               <Route path={`/modlog/community/:community_id`} component={Modlog} />
               <Route path={`/modlog`} component={Modlog} />
               <Route path={`/setup`} component={Setup} />
+              <Route path={`/search/q/:q/type/:type/sort/:sort/page/:page`} component={Search} />
               <Route path={`/search`} component={Search} />
               <Route path={`/sponsors`} component={Sponsors} />
             </Switch>

diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index fb326deb29891855c18d00bb964adfc73010a437..2d5076a5203f5b7d4966b60ed98aa10af906f777 100644 (file)
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -7,7 +7,7 @@ import 'moment/locale/sv';
 import 'moment/locale/ru';
 import 'moment/locale/nl';
 
-import { UserOperation, Comment, User, SortType, ListingType } from './interfaces';
+import { UserOperation, Comment, User, SortType, ListingType, SearchType } from './interfaces';
 import * as markdown_it from 'markdown-it';
 import * as markdownitEmoji from 'markdown-it-emoji/light';
 import * as markdown_it_container from 'markdown-it-container';
@@ -144,6 +144,10 @@ export function routeListingTypeToEnum(type: string): ListingType {
   return ListingType[capitalizeFirstLetter(type)];
 }
 
+export function routeSearchTypeToEnum(type: string): SearchType {
+  return SearchType[capitalizeFirstLetter(type)];
+}
+
 export async function getPageTitle(url: string) {
   let res = await fetch(`https://textance.herokuapp.com/title/${url}`);
   let data = await res.text();