Skip to content
Snippets Groups Projects
Verified Commit 5c6390c6 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

DOC: update CHANGELOG

parent 9657c688
Branches
Tags
2 merge requests!6Release 0.2.0,!4F map bundle
...@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### ### Added ###
* Map component @indiscale/caosdb-webui-ext-map
### Changed ### ### Changed ###
### Deprecated ### ### Deprecated ###
......
...@@ -2,28 +2,22 @@ import React from "react"; ...@@ -2,28 +2,22 @@ import React from "react";
import ReactDOM from "react-dom/client"; import ReactDOM from "react-dom/client";
import "regenerator-runtime/runtime"; import "regenerator-runtime/runtime";
import { TransactionService } from "@indiscale/caosdb-webui-entity-service"; import { TransactionService } from "@indiscale/caosdb-webui-entity-service";
import { import { Map, ToggleMapButton } from "@indiscale/caosdb-webui-ext-map";
Map,
ToggleMapButton
} from "@indiscale/caosdb-webui-ext-map";
import { queryCallback } from "./queryCallback"; import { queryCallback } from "./queryCallback";
const caosdb_map_2 = { const caosdb_map_2 = {
/** /**
* Initialize the map panel. * Create the map panel (div.caosdb-f-map-panel) and insert it into the dom
* * tree. Then return the map panel.
* The map panel is the HTMLElement which contains the map. Is is
* hidden or shown when the user clicks on the toggle map button.
*
* @param {boolean} show - show this panel immediately.
*/ */
init_map_panel: function () { init_map_panel: function () {
// remove old // remove old
if (document.querySelector('.caosdb-f-map-panel')) { if (document.querySelector(".caosdb-f-map-panel")) {
document.querySelector('.caosdb-f-map-panel').remove(); document.querySelector(".caosdb-f-map-panel").remove();
} }
let panel = this.create_map_panel(); const panel = document.createElement("div");
panel.classList = "caosdb-f-map-panel container mb-2";
document.querySelector("nav").after(panel); document.querySelector("nav").after(panel);
...@@ -31,15 +25,11 @@ const caosdb_map_2 = { ...@@ -31,15 +25,11 @@ const caosdb_map_2 = {
}, },
/** /**
* Create map panel (div.caosdb-f-map-panel). * Create a button item in the navbar and return it.
*
* The button contains a dummy link tag which is to be removed/overriden when
* React inserts the ToggleMapButton component.
*/ */
create_map_panel: function () {
let panel = document.createElement("div");
panel.classList = "caosdb-f-map-panel container mb-2";
return panel;
},
create_navbar_item: function () { create_navbar_item: function () {
const dummy = document.createElement("a"); const dummy = document.createElement("a");
return navbar.add_button(dummy); return navbar.add_button(dummy);
...@@ -65,8 +55,8 @@ const caosdb_map_2 = { ...@@ -65,8 +55,8 @@ const caosdb_map_2 = {
<ToggleMapButton className="nav-link" /> <ToggleMapButton className="nav-link" />
</React.StrictMode> </React.StrictMode>
); );
} },
} };
$(document).ready(function () { $(document).ready(function () {
caosdb_modules.register(caosdb_map_2); caosdb_modules.register(caosdb_map_2);
......
...@@ -63,9 +63,13 @@ function resolveDefaultTab(tabs, defaultTab) { ...@@ -63,9 +63,13 @@ function resolveDefaultTab(tabs, defaultTab) {
async function initQueryPanel() { async function initQueryPanel() {
if (!document.getElementById("caosdb-navbar-query")) { if (!document.getElementById("caosdb-navbar-query")) {
// document not ready, retrigger when ready // document not ready, retrigger when ready
document.addEventListener('DOMContentLoaded', function () { document.addEventListener(
"DOMContentLoaded",
function () {
initQueryPanel(); initQueryPanel();
}, false); },
false
);
return; return;
} }
......
const queryCallback = (queryString, pageSize) => { const queryCallback = (queryString, pageSize) => {
const paging = pageSize < 1 ? "" : `&P=0L${pageSize || 10}`; const paging = pageSize < 1 ? "" : `&P=0L${pageSize || 10}`;
const newHref = connection.getEntityUri([]) + `?query=${encodeURIComponent(queryString)}${paging}`; const newHref =
connection.getEntityUri([]) +
`?query=${encodeURIComponent(queryString)}${paging}`;
window.location.href = newHref; window.location.href = newHref;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment