Skip to content
Snippets Groups Projects
Commit 37c655a1 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '393-link-to-search-result' into 'master'

Resolve "link to search result"

Closes #393

See merge request !444
parents 7bd74c87 0a6e3c0c
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!444Resolve "link to search result"
Pipeline #6708 passed
...@@ -88,7 +88,7 @@ SessionData.prototype.setSearchQuery = function (value) { ...@@ -88,7 +88,7 @@ SessionData.prototype.setSearchQuery = function (value) {
* *
* @param {Object} param * @param {Object} param
* @param {string} param.type * @param {string} param.type
* @param {Object} param.query * @param {string} param.query
*/ */
SessionData.prototype.setQuery = function (param) { SessionData.prototype.setQuery = function (param) {
if (param.type === "drug") { if (param.type === "drug") {
...@@ -106,7 +106,7 @@ SessionData.prototype.setQuery = function (param) { ...@@ -106,7 +106,7 @@ SessionData.prototype.setQuery = function (param) {
/** /**
* *
* @returns {any} * @returns {string}
*/ */
SessionData.prototype.getSearchQuery = function () { SessionData.prototype.getSearchQuery = function () {
var key = this.getKey(SessionObjectType.SEARCH_QUERY); var key = this.getKey(SessionObjectType.SEARCH_QUERY);
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
var Promise = require("bluebird"); var Promise = require("bluebird");
var AbstractDbOverlay = require('../../map/overlay/AbstractDbOverlay');
var GuiConnector = require('../../GuiConnector'); var GuiConnector = require('../../GuiConnector');
var Panel = require('../Panel'); var Panel = require('../Panel');
var PanelControlElementType = require('../PanelControlElementType'); var PanelControlElementType = require('../PanelControlElementType');
...@@ -79,6 +80,11 @@ AbstractDbPanel.prototype._createEventHandlers = function () { ...@@ -79,6 +80,11 @@ AbstractDbPanel.prototype._createEventHandlers = function () {
searchInput.value = ""; searchInput.value = "";
}); });
self.getOverlayDb().addListener("onSearch", function (data) {
if (data.arg.type === AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES) {
$(searchInput).val("");
}
});
}; };
/** /**
......
...@@ -15,9 +15,16 @@ var assert = chai.assert; ...@@ -15,9 +15,16 @@ var assert = chai.assert;
var logger = require('../../logger'); var logger = require('../../logger');
describe('GenericSearchPanel', function () { describe('GenericSearchPanel', function () {
var createPanel = function () { /**t
var map = helper.createCustomMap(); *
map.getModel().setId(15781); * @param {CustomMap} [map]
* @returns {GenericSearchPanel}
*/
var createPanel = function (map) {
if (map===undefined) {
map = helper.createCustomMap();
map.getModel().setId(15781);
}
helper.createSearchDbOverlay(map); helper.createSearchDbOverlay(map);
return new GenericSearchPanel({ return new GenericSearchPanel({
...@@ -243,6 +250,23 @@ describe('GenericSearchPanel', function () { ...@@ -243,6 +250,23 @@ describe('GenericSearchPanel', function () {
}); });
}); });
it('clear after search by coordinates', function () {
var map = helper.createCustomMap();
map.getModel().setId(15781);
var panel = createPanel(map);
$("[name='searchInput']", panel.getElement()).val("some input");
var searchParams = {
modelId: map.getModel().getId(),
coordinates: new Point(553.10, 479.18),
zoom: 4
};
return panel.getOverlayDb().searchByCoordinates(searchParams).then(function () {
assert.equal("", $("[name='searchInput']", panel.getElement()).val());
});
});
describe("getAutocomplete", function () { describe("getAutocomplete", function () {
it("without initialization", function () { it("without initialization", function () {
var panel = createPanel(); var panel = createPanel();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment