diff --git a/package.json b/package.json index 9b659aa5..4a0c9e5a 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@babel/runtime": "^7.10.5", "axios": "^0.21.1", "bootstrap": "3.4.1", + "bootstrap-select": "^1.13.18", "d3": "^3.3.8", "icanhaz": "0.10.3", "jquery": "^3.5.0", diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 05793475..4dd479b0 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -52,6 +52,7 @@ "selectorList_add_selector_button": { "message": "Add new selector" }, "selector_edit_id_field": { "message": "ID" }, "selector_edit_type_placeholder": { "message": "Type" }, + "selector_edit_kb_type": { "message": "Attach KB Type" }, "selector_edit_selector_css_field": { "message": "Selector" }, "selector_edit_data_preview_button": { "message": "Data preview" }, "selector_edit_scroll_selector": { "message": "Scroll to selector" }, @@ -110,6 +111,7 @@ "selector_edit_type_of_html_outer": { "message": "Outer HTML" }, "selector_edit_type_of_html_inner": { "message": "Inner HTML" }, "selector_edit_merge_into_list": { "message": "Merge collected items into list" }, + "selector_edit_dont_flatten": { "message": "Dont flatten results" }, "sitemap_scrape_config_request_interval_label": { "message": "Request interval (ms)" }, "sitemap_scrape_config_request_interval_randomness_label": { "message": "Request interval randomness (ms)" @@ -343,5 +345,13 @@ }, "popup_ws_version": { "message": "Web Scraper version: " - } + }, + + "link_types_for_concept_type": { "message": "Link types for concept type" }, + "concept_types_for_link_type": { "message": "Concept types for link type" }, + "prop_types_for_concept_type": { "message": "Property types for concept type" }, + "prop_types_for_link_type": { "message": "Property types for link type" }, + "all_concept_types": { "message": "All concept types" }, + "incompatible_kb_parent_type": { "message": "There are incompatible parent KB types" }, + "kb_type_none_option": { "message": "None" } } diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 2a1b0b2d..c9210ff3 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -114,6 +114,7 @@ "selector_edit_type_of_html_outer": { "message": "Внешний HTML" }, "selector_edit_type_of_html_inner": { "message": "Внутренний HTML" }, "selector_edit_merge_into_list": { "message": "Объединить собранные элементы в список" }, + "selector_edit_dont_flatten": { "message": "Не приводить данные к плоскому виду" }, "sitemap_scrape_config_requestInterval": { "message": "Интервал между запросами" }, "sitemap_scrape_config_requestIntervalRandomness": { "message": "Случайность между запросами" }, @@ -379,5 +380,15 @@ }, "popup_ws_version": { "message": "Версия Web Scraper: " - } + }, + + "link_types_for_concept_type": { "message": "Типы связей для типа концепта" }, + "concept_types_for_link_type": { "message": "Типы концептов для типа связи" }, + "prop_types_for_concept_type": { "message": "Типы характеристик для типа концепта" }, + "prop_types_for_link_type": { "message": "Типы характеристик для типа связи" }, + "all_concept_types": { "message": "Все типы концептов" }, + "incompatible_kb_parent_type": { + "message": "Среди селекторов-предков есть несовместимые типы БЗ" + }, + "kb_type_none_option": { "message": "Нет" } } diff --git a/src/background/background.js b/src/background/background.js index 81d69f05..41479815 100644 --- a/src/background/background.js +++ b/src/background/background.js @@ -140,6 +140,18 @@ browser.runtime.onMessage.addListener(async request => { return store.getSitemapData(Sitemap.sitemapFromObj(request.sitemap)); } + if (request.listAllConceptTypes) { + return store.listAllConceptTypes(); + } + + if (request.getConceptType) { + return store.getConceptType(request.id); + } + + if (request.getLinkType) { + return store.getLinkType(request.id); + } + if (request.scrapeSitemap) { const sitemap = Sitemap.sitemapFromObj(request.sitemap); const queue = new Queue(); diff --git a/src/devtools/panel.css b/src/devtools/panel.css index 02cf403e..7e381220 100644 --- a/src/devtools/panel.css +++ b/src/devtools/panel.css @@ -182,3 +182,7 @@ select[size] { font-style: normal; font-weight: normal; } + +.bootstrap-select .dropdown-menu { + font-size: 12px; +} diff --git a/src/devtools/views/SelectorEdit.html b/src/devtools/views/SelectorEdit.html index f7757abc..9567883e 100644 --- a/src/devtools/views/SelectorEdit.html +++ b/src/devtools/views/SelectorEdit.html @@ -1,4 +1,8 @@