From c6104195f6e4f9b2c6c440930072377064c8c4de Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Thu, 3 Feb 2022 10:26:50 +0000 Subject: [PATCH] add search options dropdown to regular search --- .../editor-client/locales/de/editor.json | 18 ++++++++-------- .../editor-client/locales/en-US/editor.json | 21 ++++++++++--------- .../editor-client/locales/ja/editor.json | 20 +++++++++--------- .../editor-client/locales/ru/editor.json | 18 ++++++++-------- .../editor-client/locales/zh-CN/editor.json | 18 ++++++++-------- .../editor-client/locales/zh-TW/editor.json | 18 ++++++++-------- .../editor-client/src/js/ui/search.js | 19 +++++++++++++---- .../src/js/ui/tab-info-outliner.js | 9 +------- 8 files changed, 73 insertions(+), 68 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json index 8e1b86cf8..222606df0 100755 --- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json @@ -634,14 +634,7 @@ "empty": "leer", "globalConfig": "Globale Konfigurations-Nodes", "triggerAction": "Auslösen", - "find": "Suche im Arbeitsbereich", - "search": { - "configNodes": "Konfigurations-Nodes", - "unusedConfigNodes": "Unbenutzte Konfigurations-Nodes", - "invalidNodes": "Ungültige Nodes", - "uknownNodes": "Unbekannte Nodes", - "unusedSubflows": "Unbenutzte Subflows" - } + "find": "Suche im Arbeitsbereich" }, "help": { "name": "Hilfe", @@ -863,7 +856,14 @@ }, "search": { "empty": "Keine Übereinstimmungen gefunden", - "addNode": "Node hinzufügen ..." + "addNode": "Node hinzufügen ...", + "options": { + "configNodes": "Konfigurations-Nodes", + "unusedConfigNodes": "Unbenutzte Konfigurations-Nodes", + "invalidNodes": "Ungültige Nodes", + "uknownNodes": "Unbekannte Nodes", + "unusedSubflows": "Unbenutzte Subflows" + } }, "expressionEditor": { "functions": "Funktionen", diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index 1ab148217..1554d9133 100755 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -667,15 +667,7 @@ "empty": "empty", "globalConfig": "Global Configuration Nodes", "triggerAction": "Trigger action", - "find": "Find in workspace", - "search": { - "configNodes": "Configuration nodes", - "unusedConfigNodes": "Unused configuration nodes", - "invalidNodes": "Invalid nodes", - "uknownNodes": "Unknown nodes", - "unusedSubflows": "Unused subflows", - "hiddenFlows": "Hidden flows" - } + "find": "Find in workspace" }, "help": { "name": "Help", @@ -899,7 +891,16 @@ "history": "Search history", "clear": "clear all", "empty": "No matches found", - "addNode": "add a node..." + "addNode": "add a node...", + "options": { + "configNodes": "Configuration nodes", + "unusedConfigNodes": "Unused configuration nodes", + "invalidNodes": "Invalid nodes", + "uknownNodes": "Unknown nodes", + "unusedSubflows": "Unused subflows", + "hiddenFlows": "Hidden flows", + "modifiedNodes": "Modified nodes and flows" + } }, "expressionEditor": { "functions": "Functions", diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index 04818601e..c45162246 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -667,15 +667,7 @@ "empty": "空", "globalConfig": "グローバル設定ノード", "triggerAction": "アクションを実行", - "find": "ワークスペース内を検索", - "search": { - "configNodes": "設定ノード", - "unusedConfigNodes": "未使用の設定ノード", - "invalidNodes": "不正なノード", - "uknownNodes": "未知のノード", - "unusedSubflows": "未使用のサブフロー", - "hiddenFlows": "非表示のフロー" - } + "find": "ワークスペース内を検索" }, "help": { "name": "ヘルプ", @@ -899,7 +891,15 @@ "history": "検索履歴", "clear": "全て削除", "empty": "一致したものが見つかりませんでした", - "addNode": "ノードを追加..." + "addNode": "ノードを追加...", + "options": { + "configNodes": "設定ノード", + "unusedConfigNodes": "未使用の設定ノード", + "invalidNodes": "不正なノード", + "uknownNodes": "未知のノード", + "unusedSubflows": "未使用のサブフロー", + "hiddenFlows": "非表示のフロー" + } }, "expressionEditor": { "functions": "関数", diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json index 04ff361ba..7f4a000a9 100755 --- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json @@ -650,14 +650,7 @@ "empty": "пусто", "globalConfig": "Глобальные конфиг узлы", "triggerAction": "Вызвать действие", - "find": "Найти в рабочей области", - "search": { - "configNodes": "Узлы конфигурации", - "unusedConfigNodes": "Неиспользуемые узлы конфигурации", - "invalidNodes": "Недействительные узлы", - "uknownNodes": "Неизвестные узлы", - "unusedSubflows": "Неиспользуемые подпотоки" - } + "find": "Найти в рабочей области" }, "help": { "name": "Справка", @@ -888,7 +881,14 @@ }, "search": { "empty": "Ничего не найдено", - "addNode": "добавить узел..." + "addNode": "добавить узел...", + "options": { + "configNodes": "Узлы конфигурации", + "unusedConfigNodes": "Неиспользуемые узлы конфигурации", + "invalidNodes": "Недействительные узлы", + "uknownNodes": "Неизвестные узлы", + "unusedSubflows": "Неиспользуемые подпотоки" + } }, "expressionEditor": { "functions": "Функции", diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json index 3252563b7..17323875f 100644 --- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json @@ -614,14 +614,7 @@ "empty": "空的", "globalConfig": "全局配置节点", "triggerAction": "触发动作", - "find": "在工作区中查找", - "search": { - "configNodes": "配置节点", - "unusedConfigNodes": "未使用的配置节点", - "invalidNodes": "无效的节点", - "uknownNodes": "未知的节点", - "unusedSubflows": "未使用的子流程" - } + "find": "在工作区中查找" }, "help": { "name": "帮助", @@ -842,7 +835,14 @@ }, "search": { "empty": "找不到匹配", - "addNode": "添加一个节点..." + "addNode": "添加一个节点...", + "options": { + "configNodes": "配置节点", + "unusedConfigNodes": "未使用的配置节点", + "invalidNodes": "无效的节点", + "uknownNodes": "未知的节点", + "unusedSubflows": "未使用的子流程" + } }, "expressionEditor": { "functions": "功能", diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json index 54b884682..bbc9328a8 100644 --- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json @@ -614,14 +614,7 @@ "empty": "空的", "globalConfig": "全局配置節點", "triggerAction": "觸發動作", - "find": "在工作區中查找", - "search": { - "configNodes": "配置節點", - "unusedConfigNodes": "未使用的配置節點", - "invalidNodes": "無效的節點", - "uknownNodes": "未知的節點", - "unusedSubflows": "未使用的子流程" - } + "find": "在工作區中查找" }, "help": { "name": "幫助", @@ -842,7 +835,14 @@ }, "search": { "empty": "找不到匹配", - "addNode": "添加一個節點..." + "addNode": "添加一個節點...", + "options": { + "configNodes": "配置節點", + "unusedConfigNodes": "未使用的配置節點", + "invalidNodes": "無效的節點", + "uknownNodes": "未知的節點", + "unusedSubflows": "未使用的子流程" + } }, "expressionEditor": { "functions": "功能", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index 52eee6c67..e460224c1 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -261,9 +261,8 @@ RED.search = (function() { } else { searchResults.editableList('addItem',{}); } - - - } + }, + options: getSearchOptions() }); var copySearchContainer = $('').appendTo(searchDiv).on('click', function(evt) { evt.preventDefault(); @@ -498,6 +497,17 @@ RED.search = (function() { addItemToIndex(item); } + function getSearchOptions() { + return [ + {label:RED._("search.options.configNodes"), value:"is:config"}, + {label:RED._("search.options.unusedConfigNodes"), value:"is:config is:unused"}, + {label:RED._("search.options.modifiedNodes"), value:"is:modified"}, + {label:RED._("search.options.invalidNodes"), value: "is:invalid"}, + {label:RED._("search.options.uknownNodes"), value: "type:unknown"}, + {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"}, + {label:RED._("search.options.hiddenFlows"), value:"is:hidden"}, + ] + } function init() { RED.actions.add("core:search",show); @@ -541,7 +551,8 @@ RED.search = (function() { init: init, show: show, hide: hide, - search: search + search: search, + getSearchOptions: getSearchOptions }; })(); diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js index fb393156e..81744e83b 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js @@ -268,14 +268,7 @@ RED.sidebar.info.outliner = (function() { } }, - options: [ - {label:RED._("sidebar.info.search.configNodes"), value:"is:config"}, - {label:RED._("sidebar.info.search.unusedConfigNodes"), value:"is:config is:unused"}, - {label:RED._("sidebar.info.search.invalidNodes"), value: "is:invalid"}, - {label:RED._("sidebar.info.search.uknownNodes"), value: "type:unknown"}, - {label:RED._("sidebar.info.search.unusedSubflows"), value:"is:subflow is:unused"}, - {label:RED._("sidebar.info.search.hiddenFlows"), value:"is:hidden"}, - ] + options: RED.search.getSearchOptions() }); projectInfo = $('
').hide().appendTo(container)