diff --git a/src/core/js/ext_bookmarks.js b/src/core/js/ext_bookmarks.js index 53212a19d6746177787d141b5880d3ff112700a6..cf044a8735611167761e9be6c562cb3cea7f30e9 100644 --- a/src/core/js/ext_bookmarks.js +++ b/src/core/js/ext_bookmarks.js @@ -23,6 +23,8 @@ */ 'use strict'; + + /** * Keep track of bookmarked entities and provide functions for export, viewing * all entities and resetting the bookmarks. @@ -747,4 +749,4 @@ $(document).ready(function () { ext_bookmarks = ext_bookmarks($, log.getLogger("ext_bookmarks"), config); caosdb_modules.register(ext_bookmarks); } -}); \ No newline at end of file +}); diff --git a/test/core/js/modules/ext_bookmarks.js.js b/test/core/js/modules/ext_bookmarks.js.js index f92c51dfd6aee5b27767649cdbcd2c2335740d2c..29c4d23d856fd8b8483ead20afdcdc40e59cbec2 100644 --- a/test/core/js/modules/ext_bookmarks.js.js +++ b/test/core/js/modules/ext_bookmarks.js.js @@ -42,16 +42,18 @@ QUnit.module("ext_bookmarks.js", { } }); -QUnit.test("parse_uri", function(assert) { +QUnit.test("parse_uri", function (assert) { assert.equal(typeof ext_bookmarks.parse_uri(""), "undefined"); assert.equal(typeof ext_bookmarks.parse_uri("asdf"), "undefined"); assert.equal(typeof ext_bookmarks.parse_uri("https://localhost:1234/Entity/sada?sadfasd#sdfgdsf"), "undefined"); - assert.propEqual(ext_bookmarks.parse_uri("safgsa/123&456&789?sadfasdf#_bm_1"), - {bookmarks: ["123", "456", "789"], collection_id: "1"}); + assert.propEqual(ext_bookmarks.parse_uri("safgsa/123&456&789?sadfasdf#_bm_1"), { + bookmarks: ["123", "456", "789"], + collection_id: "1" + }); }); -QUnit.test("get_bookmarks, clear_bookmark_storage", function(assert) { +QUnit.test("get_bookmarks, clear_bookmark_storage", function (assert) { assert.propEqual(ext_bookmarks.get_bookmarks(), []); ext_bookmarks.bookmark_storage[ext_bookmarks.get_key("sdfg")] = "3456" @@ -67,9 +69,9 @@ QUnit.test("get_export_table", async function (assert) { const NEWL = "%0A"; const context_root = connection.getBasePath() + "Entity/"; var table = await ext_bookmarks.get_export_table( - ["123@ver1", "456@ver2", "789@ver3", "101112", "@131415"]); + ["123@ver1", "456@ver2", "789@ver3", "101112", "@131415"]); assert.equal(table, - `data:text/csv;charset=utf-8,ID${TAB}Version${TAB}URI${TAB}Path${TAB}Name${TAB}RecordType${NEWL}123${TAB}ver1${TAB}${context_root}123@ver1${TAB}testpath_123@ver1${TAB}${TAB}${NEWL}456${TAB}ver2${TAB}${context_root}456@ver2${TAB}testpath_456@ver2${TAB}${TAB}${NEWL}789${TAB}ver3${TAB}${context_root}789@ver3${TAB}testpath_789@ver3${TAB}${TAB}${NEWL}101112${TAB}abcHead${TAB}${context_root}101112@abcHead${TAB}testpath_101112${TAB}${TAB}${NEWL}${TAB}131415${TAB}${context_root}@131415${TAB}testpath_@131415${TAB}${TAB}`); + `data:text/csv;charset=utf-8,ID${TAB}Version${TAB}URI${TAB}Path${TAB}Name${TAB}RecordType${NEWL}123${TAB}ver1${TAB}${context_root}123@ver1${TAB}testpath_123@ver1${TAB}${TAB}${NEWL}456${TAB}ver2${TAB}${context_root}456@ver2${TAB}testpath_456@ver2${TAB}${TAB}${NEWL}789${TAB}ver3${TAB}${context_root}789@ver3${TAB}testpath_789@ver3${TAB}${TAB}${NEWL}101112${TAB}abcHead${TAB}${context_root}101112@abcHead${TAB}testpath_101112${TAB}${TAB}${NEWL}${TAB}131415${TAB}${context_root}@131415${TAB}testpath_@131415${TAB}${TAB}`); }); @@ -115,7 +117,7 @@ QUnit.test("update_export_link", function (assert) { QUnit.test("update_collection_link", function (assert) { const collection_link = $( - `<div id="caosdb-f-bookmarks-collection-link"><a/></div>`); + `<div id="caosdb-f-bookmarks-collection-link"><a/></div>`); const a = collection_link.find("a")[0]; $("body").append(collection_link); @@ -148,7 +150,8 @@ QUnit.test("bookmark buttons", function (assert) { const non_button = $(`<div data-bla="sadf"/>)`); const outside_button = $(`<div data-bmval="id3"/>`); const inside_buttons = $("<div/>").append([inactive_button, active_button, - broken_button, non_button]); + broken_button, non_button + ]); // get_bookmark_buttons assert.equal(ext_bookmarks.get_bookmark_buttons("body").length, 0); @@ -174,15 +177,24 @@ QUnit.test("bookmark buttons", function (assert) { assert.ok(inactive_button.is(".active")); ext_bookmarks.clear_bookmark_storage(); - assert.notOk(inactive_button.is(".active"), "clear_bookmark_storage removes active class"); inside_buttons.remove(); outside_button.remove(); }); QUnit.test("select-query transformation", function (assert) { - assert.equal(ext_bookmarks.get_select_id_query_string("FIND analysis"), "SELECT ID FROM analysis"); - assert.equal(ext_bookmarks.get_select_id_query_string("FIND RECORD analysis WHICH HAS A date > 2012"), "SELECT ID FROM RECORD analysis WHICH HAS A date > 2012"); - assert.equal(ext_bookmarks.get_select_id_query_string("SELECT name, date FROM analysis"), "SELECT ID FROM analysis"); - assert.equal(ext_bookmarks.get_select_id_query_string("COUNT analysis"), "SELECT ID FROM analysis"); + assert.equal( + ext_bookmarks.get_select_id_query_string("FIND analysis"), + "SELECT ID FROM analysis"); + assert.equal( + ext_bookmarks.get_select_id_query_string( + "FIND RECORD analysis WHICH HAS A date > 2012"), + "SELECT ID FROM RECORD analysis WHICH HAS A date > 2012"); + assert.equal( + ext_bookmarks.get_select_id_query_string( + "SELECT name, date FROM analysis"), + "SELECT ID FROM analysis"); + assert.equal( + ext_bookmarks.get_select_id_query_string("COUNT analysis"), + "SELECT ID FROM analysis"); });