fix link from tasks list to task type (#2769)

scalableminds · Jun 19, 2018 · b5d8b9e · b5d8b9e
1 parent 3b2c155
commit b5d8b9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/assets/javascripts/admin/tasktype/task_type_list_view.js b/app/assets/javascripts/admin/tasktype/task_type_list_view.js
@@ -19,6 +19,7 @@ const { Search } = Input;
 
 type Props = {
   history: RouterHistory,
+  initialSearchValue?: string,
 };
 
 type State = {
@@ -41,6 +42,11 @@ class TaskTypeListView extends React.PureComponent<Props, State> {
 
   componentWillMount() {
     this.setState(persistence.load(this.props.history));
+    if (this.props.initialSearchValue && this.props.initialSearchValue !== "") {
+      this.setState({
+        searchQuery: this.props.initialSearchValue,
+      });
+    }
   }
 
   componentDidMount() {

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
@@ -262,7 +262,10 @@ class ReactRouter extends React.Component<Props> {
               <SecuredRoute
                 isAuthenticated={isAuthenticated}
                 path="/taskTypes"
-                component={TaskTypeListView}
+                render={({ location }: ContextRouter) => (
+                  // Strip the leading # away. If there is no hash, "".slice(1) will evaluate to "", too.
+                  <TaskTypeListView initialSearchValue={location.hash.slice(1)} />
+                )}
                 exact
               />
               <SecuredRoute