Skip to content

Commit 7b3a85e

Browse files
author
hextraza
committed
Fix location navigation on search submit
1 parent 72d203b commit 7b3a85e

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

jbrowse/src/client/JBrowse/Browser/RefNameAutocompleteWrapper.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import BaseResult, { RefSequenceResult }from '@jbrowse/core/TextSearch/BaseResul
77

88
const RefNameAutocompleteWrapper = observer(({ viewState, sessionParam }: { viewState: ViewModel, sessionParam: any}) => {
99
function navigate() {
10-
window.location.href = "/home/jbrowse-jbrowse.view?session=" + sessionParam + "&location=" + op.getLocation();
10+
window.location.href = location.pathname.split('/').slice(0,-1).join('/') + '/jbrowse-jbrowse.view?session=' + sessionParam + '&location=' + op.getLocation()
1111
}
1212

1313
const { session } = viewState
@@ -41,7 +41,7 @@ const RefNameAutocompleteWrapper = observer(({ viewState, sessionParam }: { view
4141
/>
4242

4343
<button onClick={navigate}>
44-
Search
44+
Open
4545
</button>
4646
</span>
4747
)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
3+
4+
import Search from '../Search'
5+
import { Ajax, Utils, ActionURL } from '@labkey/api'
6+
7+
const queryParam = new URLSearchParams(window.location.search);
8+
const session = queryParam.get('session')
9+
10+
11+
// Need to wait for container element to be available in labkey wrapper before render
12+
window.addEventListener('DOMContentLoaded', (event) => {
13+
ReactDOM.render(<Search />, document.getElementById('app'))
14+
});

jbrowse/src/client/entryPoints.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@ module.exports = {
1010
permission: 'read',
1111
template: 'app',
1212
path: './src/client/JBrowse/Browser'
13+
},
14+
{
15+
name: 'search',
16+
title: 'JBrowse Search',
17+
permission: 'read',
18+
template: 'app',
19+
path: './src/client/JBrowse/Browser/Search'
1320
}]
1421
};

0 commit comments

Comments
 (0)