Merge pull request #12 from Morning-Train/feature/filter-search-from-url

Feature/filter search from url
CodingPirates · Oct 3, 2021 · 303587b · 303587b
2 parents 43b78a4 + 135452d
commit 303587b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/resources/js/support/filters/Search.js b/resources/js/support/filters/Search.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Filter from "@morningtrain/react-filters/Filter";
 import Input from "@morningtrain/react-fields/simpletons/Input";
+import { Env } from '@morningtrain/helpers'
 
 export default class Search extends Filter {
 
@@ -11,6 +12,16 @@ export default class Search extends Filter {
         };
     }
 
+    componentDidMount () {
+        const {
+            defaultValue,
+        } = this.props
+
+        if (defaultValue) {
+            this.onSearch(defaultValue)
+        }
+    }
+
     /////////////////////////////////
     // Event handlers
     /////////////////////////////////

diff --git a/resources/js/support/filters/index.js b/resources/js/support/filters/index.js
@@ -4,3 +4,4 @@ export { Injected as Echo } from './EchoFilter'
 export { Injected as Env } from './EnvFilter'
 export { Injected as ProjectCategory } from './project_category/ProjectCategoryFilter'
 export { Injected as ResourceFilter } from './ResourceFilter'
+export { Injected as Search } from './Search'
diff --git a/resources/js/widgets/projects/ProjectsOverview.js b/resources/js/widgets/projects/ProjectsOverview.js
@@ -8,7 +8,7 @@ import Project from "widgets/projects/Project";
 import ViewToggle from "widgets/projects/ViewToggle";
 import Link from "widgets/navigation/Link";
 import * as Auth from "@morningtrain/react-auth";
-import { Env } from '@morningtrain/helpers'
+import { Env, router } from '@morningtrain/helpers'
 import {inject} from "@morningtrain/react-decorators";
 import VideoBot from 'widgets/video-bot/VideoBot';
 
@@ -106,7 +106,7 @@ export default class ProjectsOverview extends Widget {
                             <span className={'subtitle'}>showcase</span>
                             <div className={'filter-bar__filters filter-bar__filters--inputs'}>
                                 <div className="search-wrap">
-                                    <Filters.Search/>
+                                    <Filters.Search defaultValue={router.parameter('search')}/>
                                 </div>
                                 <div className="select-wrap">
                                     <Filters.Enum constraint={'$order'} enum={'generic_order_type'} />