From fac5b7e3d557193740808cd5edc79ceb4bada339 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Tue, 5 May 2026 17:43:58 +0200 Subject: [PATCH 01/41] feat: reset tree visual selection state on change tab (Element/Template) --- js/pi-system_treecontroller.js | 38 ++-------------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index aee05d8..b2aa0d9 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -133,10 +133,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.outputSelectedAttributes = $scope.config.outputSelectedAttributes || []; // la liste des attributs qui sont séléctionnés pour être dans l'output dataset $scope.config.searchMatchedElementPaths = $scope.config.searchMatchedElementPaths || []; // la liste pour highlighter les elements de la recherche $scope.config.lastSearchedElementName = $scope.config.lastSearchedElementName || ""; - $scope.config.pendingTabContextReset = $scope.config.pendingTabContextReset || false; // indique le changement de tab template/element $scope.config.selectedTemplateNames = $scope.config.selectedTemplateNames || []; // la liste des templates sélectionnés (checkbox cochée) parmi ceux affichés - $scope.config.selectAllWithoutTemplateAttributes = $scope.config.selectAllWithoutTemplateAttributes || false; // select all des attributs standalone - $scope.config.selectAllTemplateAttributes = $scope.config.selectAllTemplateAttributes || false; // select all des attributs groupés par template $scope.aggregateDataTypeFields = aggregateDataTypeFields; $scope.attributeGroupSections = [ @@ -266,7 +263,6 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.outputSelectedAttributes = []; $scope.config.searchMatchedElementPaths = []; $scope.config.lastSearchedElementName = ""; - $scope.config.pendingTabContextReset = false; $scope.config.selectedTemplateNames = []; $scope.config.selectAllWithoutTemplateAttributes = false; $scope.config.selectAllTemplateAttributes = false; @@ -406,18 +402,10 @@ app.controller('AfExplorerFormCtrl', [ } } - function consumePendingTabContextReset() { // reset la main view après changement de tab + action sur le new tab - if (!$scope.config.pendingTabContextReset) { - return; - } - resetRightPanelForCurrentTabContext(); - $scope.config.pendingTabContextReset = false; - } - $scope.setTab = function(tab) { const previousTab = $scope.config.activeTab; if (tab !== previousTab) { - $scope.config.pendingTabContextReset = true; + resetRightPanelForCurrentTabContext(); } $scope.config.activeTab = tab; }; @@ -437,7 +425,6 @@ app.controller('AfExplorerFormCtrl', [ } $scope.doSearch = function(element_name, attribute_name) { - consumePendingTabContextReset(); const hasElementFilter = !!(element_name?.trim()); const hadPreviousElementFilter = !!($scope.config.lastSearchedElementName?.trim()); @@ -751,7 +738,7 @@ app.controller('AfExplorerFormCtrl', [ // TODO: check this makes sense, since selectedOutput is persisted and so newly loaded attributes should not be found in it const selectedAttribute = $scope.config.outputSelectedAttributes.find(attr => attr.path === attribute.path); attribute.checked = !!(selectedAttribute); - attribute.parent_element = parentNode.title; + attribute.parent_element = parentNode?.title; attribute.data_type = selectedAttribute?.data_type ? selectedAttribute.data_type : $scope.aggregateDataTypeFields.data_type.defaultValue; Object.entries($scope.aggregateDataTypeFields.aggregates).forEach(([aggregateName, aggregate]) => { if ((selectedAttribute?.[aggregateName] === undefined || selectedAttribute?.[aggregateName] === null) && aggregate.isVisible(attribute)) { @@ -1048,26 +1035,6 @@ app.component('treeNode', { controller: function() { const ctrl = this; - function consumePendingTabContextReset() { - if (!ctrl.config?.pendingTabContextReset) { - return; - } - - ctrl.config.attribute_name = ""; - ctrl.config.clickedNodes = []; - ctrl.config.attributeList = []; - ctrl.config.selectAllWithoutTemplateAttributes = false; - ctrl.config.selectAllTemplateAttributes = false; - ctrl.config.searchMatchedElementPaths = []; - - if (ctrl.config.activeTab === "element") { - ctrl.config.template = "-- Any --"; - } else if (ctrl.config.activeTab === "template") { - ctrl.config.element_name = ""; - } - - ctrl.config.pendingTabContextReset = false; - } function findNodeByUrl(nodes, targetUrl) { if (!Array.isArray(nodes) || !targetUrl) { @@ -1139,7 +1106,6 @@ app.component('treeNode', { }; ctrl.onNodeClick = function(node) { - consumePendingTabContextReset(); // TODO: factorize this check const hasActiveAttributeSearch = !!( From 3e34dca92753b08c1a2a615a551a08c2cbde7dc4 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 13:59:57 +0200 Subject: [PATCH 02/41] feat: attribute search (empty sections still show) --- js/pi-system_treecontroller.js | 12 ++++++++++++ resource/pi-system_af-explorer.html | 22 +++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index f89b757..9393e9f 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -134,6 +134,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.searchMatchedElementPaths = $scope.config.searchMatchedElementPaths || []; // la liste pour highlighter les elements de la recherche $scope.config.lastSearchedElementName = $scope.config.lastSearchedElementName || ""; $scope.config.selectedTemplateNames = $scope.config.selectedTemplateNames || []; // la liste des templates sélectionnés (checkbox cochée) parmi ceux affichés + $scope.config.attributeSearch = $scope.config.attributeSearch || ""; $scope.aggregateDataTypeFields = aggregateDataTypeFields; $scope.attributeGroupSections = [ @@ -803,6 +804,12 @@ app.controller('AfExplorerFormCtrl', [ }); }; + function attributeMatchesSearch(attribute_name, template_name) { + const templateNameMatches = template_name.toLowerCase().includes($scope.config.attributeSearch.toLowerCase()); + const attributeNameMatches = attribute_name.toLowerCase().includes($scope.config.attributeSearch.toLowerCase()); + return (templateNameMatches || attributeNameMatches) + } + function groupDuplicatedAttributesAcrossGroup(groupKey) { return (acc, attr) => { // TODO: switch to id @@ -822,6 +829,7 @@ app.controller('AfExplorerFormCtrl', [ paths: [], data_type: attr.data_type, data_types: [], + matchesSearch: attributeMatchesSearch(attr.title, attr[groupKey]), }; getAggregateNames().forEach(aggregateName => { @@ -940,6 +948,10 @@ app.controller('AfExplorerFormCtrl', [ $scope.groupedAttributes = $scope.buildGroupedAttributes(); }, true); + $scope.refreshAttributeSection = function() { + $scope.groupedAttributes = $scope.buildGroupedAttributes(); + } + function attributeMatchesCurrentSearch(attribute) { const rawFilter = ($scope.config.attribute_name || "").trim(); diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index b01977b..7bbed87 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -79,20 +79,15 @@
Attributes and templates
- - + -
- Filter by category -
Date: Sat, 9 May 2026 14:04:44 +0200 Subject: [PATCH 03/41] refacto: improve naming and performance comment --- js/pi-system_treecontroller.js | 8 ++++---- resource/pi-system_af-explorer.html | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 9393e9f..921dcff 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -810,7 +810,7 @@ app.controller('AfExplorerFormCtrl', [ return (templateNameMatches || attributeNameMatches) } - function groupDuplicatedAttributesAcrossGroup(groupKey) { + function conflateAttributes(groupKey) { return (acc, attr) => { // TODO: switch to id const key = attr[groupKey] + "::" + attr.title; @@ -868,7 +868,7 @@ app.controller('AfExplorerFormCtrl', [ } } - function groupAttributes() { + function groupAttributesIntoSections() { return (acc, attr) => { const key = attr.group; if (!acc[key]) { @@ -890,8 +890,8 @@ app.controller('AfExplorerFormCtrl', [ } function buildAggregatedAttributes(attributes, groupKey) { - const deduplicatedAttributes = Object.values(attributes.reduce(groupDuplicatedAttributesAcrossGroup(groupKey), {})); - return Object.values(deduplicatedAttributes.reduce(groupAttributes(), {})); + const deduplicatedAttributes = Object.values(attributes.reduce(conflateAttributes(groupKey), {})); + return Object.values(deduplicatedAttributes.reduce(groupAttributesIntoSections(), {})); } function splitAttributesByTemplatePresence(attributes) { diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 7bbed87..76b3c11 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -79,6 +79,7 @@
Attributes and templates
+
From 00803bf471efe3b4846d5502c3c511e3442ea89a Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 14:13:32 +0200 Subject: [PATCH 04/41] feat: hide section (template group for ex) if no search match in them --- js/pi-system_treecontroller.js | 7 ++++++- resource/pi-system_af-explorer.html | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 921dcff..dc1b4b9 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -805,6 +805,9 @@ app.controller('AfExplorerFormCtrl', [ }; function attributeMatchesSearch(attribute_name, template_name) { + if ($scope.config.attributeSearch === "") { + return true; + } const templateNameMatches = template_name.toLowerCase().includes($scope.config.attributeSearch.toLowerCase()); const attributeNameMatches = attribute_name.toLowerCase().includes($scope.config.attributeSearch.toLowerCase()); return (templateNameMatches || attributeNameMatches) @@ -877,7 +880,8 @@ app.controller('AfExplorerFormCtrl', [ allChecked: attr.checked, checked: CheckboxStatus.UNCHECKED, // Used to determine UI checkbox state attributes: [], - checkStates: [] + checkStates: [], + noSearchMatch: !attr.matchesSearch } } @@ -885,6 +889,7 @@ app.controller('AfExplorerFormCtrl', [ acc[key].checked = getCheckboxStatus(acc[key].checkStates); acc[key].allChecked = acc[key].allChecked && attr.allChecked; acc[key].attributes.push(attr); + acc[key].noSearchMatch = acc[key].noSearchMatch && !attr.matchesSearch; return acc; } } diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 76b3c11..dd9e4be 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -114,9 +114,11 @@ {{section.emptyMessage}} - - - + + From 4ff9c8e1b7881730f8cf629bae3cc98b5544cf1d Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 14:45:15 +0200 Subject: [PATCH 05/41] feat: empty state when all attrbutes have been searched out --- js/pi-system_treecontroller.js | 10 ++++++++-- resource/pi-system_af-explorer.html | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index dc1b4b9..998b1ed 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -141,12 +141,12 @@ app.controller('AfExplorerFormCtrl', [ { key: 'attributesWithoutTemplate', title: 'Elements', - emptyMessage: 'No attributes without template' + emptyMessage: 'No attributes without template matched your selection' }, { key: 'attributesGroupedByTemplate', title: 'Templates', - emptyMessage: 'No templated attributes' + emptyMessage: 'No templated attributes matched your selection' } ]; @@ -813,6 +813,9 @@ app.controller('AfExplorerFormCtrl', [ return (templateNameMatches || attributeNameMatches) } + // Attributes are shared between templates + // Meaning all elements with the same template will share the attributes in this template + // If multiple elements with the same template are selected, we only show the attribute once function conflateAttributes(groupKey) { return (acc, attr) => { // TODO: switch to id @@ -915,9 +918,12 @@ app.controller('AfExplorerFormCtrl', [ function buildGroupedAttributesResult(attributes, groupKey) { const groups = buildAggregatedAttributes(attributes, groupKey); + // TODO: probably turn this into a reduce return { allChecked: groups.length > 0 && groups.every(group => group.allChecked), checked: getCheckboxStatus(groups.reduce((acc, group) => acc.concat(group.checkStates), [])), + // a table can be empty because all it's attributes have been filtered out OR there are no elements to show + empty: groups.length === 0 || groups.every(group => group.noSearchMatch), groups: groups } } diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index dd9e4be..cdb731d 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -109,7 +109,7 @@ Aggregates - + {{section.emptyMessage}} From 39e6644ef1edff16d72185a8b930e0aee52a440c Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 14:58:22 +0200 Subject: [PATCH 06/41] feat: removed max count from aggregates --- js/pi-system_treecontroller.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 998b1ed..e9c947f 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -74,15 +74,6 @@ const aggregateDataTypeFields = Object.freeze({ return attribute.data_type === 'SummaryData'; }, }, - max_count: { - label: 'Max count', - type: 'number', - dependsOn: ['data_type'], - defaultValue: 10000, - isVisible: function(attribute) { - return ['PlotData', 'InterpolatedData', 'RecordedData'].includes(attribute.data_type); - }, - }, } }); From 4ecfa9b9481af99dd6dcb122848b3e975d3ee6fd Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 14:58:47 +0200 Subject: [PATCH 07/41] feat: reset attribute search on template change --- js/pi-system_treecontroller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index e9c947f..9bac16e 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -383,6 +383,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.attributeList = []; $scope.config.searchMatchedElementPaths = []; $scope.config.selectedTemplateNames = []; + $scope.config.attributeSearch = ""; if ($scope.config.activeTab === "element") { $scope.config.template = "-- Any --"; } else if ($scope.config.activeTab === "template") { From 41b40e37bb04280970acafb016ac9e81805802bb Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Sat, 9 May 2026 14:59:12 +0200 Subject: [PATCH 08/41] feat: hide filter by category dropdowns temporarily --- resource/pi-system_af-explorer.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index cdb731d..d716106 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -83,13 +83,13 @@
-
- Filter by category - -
+ + + + +
  • Date: Mon, 11 May 2026 11:33:26 +0200 Subject: [PATCH 09/41] feat: add missing aggregate types + removed dependsOn from the data structure --- js/pi-system_treecontroller.js | 36 ++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 9bac16e..2289f11 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -15,10 +15,41 @@ const aggregateDataTypeFields = Object.freeze({ ] }, aggregates: { + start_time: { + label: 'Start time', + type: 'text', + defaultValue: '', + isVisible: function(attribute) { + return ['InterpolatedData', 'PlotData', 'RecordedData', 'SummaryData'].includes(attribute.data_type); + }, + }, + end_time: { + label: 'End time', + type: 'text', + defaultValue: '', + isVisible: function(attribute) { + return ['InterpolatedData', 'PlotData', 'RecordedData', 'SummaryData'].includes(attribute.data_type); + }, + }, + interval: { + label: 'Interval', + type: 'text', + defaultValue: '', + isVisible: function(attribute) { + return attribute.data_type === 'InterpolatedData'; + }, + }, + sync_time: { + label: 'Sync time', + type: 'text', + defaultValue: '', + isVisible: function(attribute) { + return attribute.data_type === 'InterpolatedData'; + }, + }, summary_type: { label: 'Summary type', type: 'multiselect', - dependsOn: ['data_type'], defaultValue: [], isVisible: function(attribute) { return attribute.data_type === 'SummaryData'; @@ -41,7 +72,6 @@ const aggregateDataTypeFields = Object.freeze({ boundary_type: { label: 'Boundary type', type: 'select', - dependsOn: ['data_type'], defaultValue: 'Inside', isVisible: function(attribute) { return attribute.data_type === 'InterpolatedData'; @@ -54,7 +84,6 @@ const aggregateDataTypeFields = Object.freeze({ record_boundary_type: { label: 'Boundary type', type: 'select', - dependsOn: ['data_type'], defaultValue: 'Inside', isVisible: function(attribute) { return attribute.data_type === 'RecordedData'; @@ -68,7 +97,6 @@ const aggregateDataTypeFields = Object.freeze({ summary_duration: { label: 'Summary duration', type: 'text', - dependsOn: ['data_type'], defaultValue: '', isVisible: function(attribute) { return attribute.data_type === 'SummaryData'; From a652d74431666b754254aa937062a1bc63139649 Mon Sep 17 00:00:00 2001 From: Alex Bourret Date: Mon, 11 May 2026 13:19:50 +0200 Subject: [PATCH 10/41] adding get attribute from template endpoint --- resource/browse_af_tree.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index bea164a..6932c24 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -107,6 +107,26 @@ def do(payload, config, plugin_config, inputs): "get_element_categories_from_db", lambda: get_items_from_db(client, parent, "ElementCategories", database_name=database_name) ) + if method=="get_attribute_for_template": + database_name = config.get("database_name") + template_name = config.get("template", None) + if template_name is None: + return {"choices": [], "attributes": []} + # when searching for template : attribute_name=None, element_category=None, attribute_category=None + elements_max_count, attributes_max_count = get_max_counts(config) + for result in client.batched_search( + database_name, None, None, + None, None, template_name, [], + elements_max_count=elements_max_count, attributes_max_count=attributes_max_count + ): + attributes.append(result) + attributes = split_real_from_linked_paths(attributes) + items = [] + for attribute in attributes: + item = get_item_details(attribute) + items.append(item) + items = expand_items_by_paths(items) + return {"choices": [], "attributes": items} if method == "do_search": template_name = config.get("template", None) category_name = config.get("element_category", None) From 13ce5674611d8d54ea0658f9d9ee3e3b765d2ad2 Mon Sep 17 00:00:00 2001 From: Alex Bourret Date: Mon, 11 May 2026 14:49:53 +0200 Subject: [PATCH 11/41] fix --- resource/browse_af_tree.py | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index 6932c24..a34c43b 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -114,6 +114,7 @@ def do(payload, config, plugin_config, inputs): return {"choices": [], "attributes": []} # when searching for template : attribute_name=None, element_category=None, attribute_category=None elements_max_count, attributes_max_count = get_max_counts(config) + attributes = [] for result in client.batched_search( database_name, None, None, None, None, template_name, [], From 201a46371d6f055488f61c581d4f48186830490f Mon Sep 17 00:00:00 2001 From: Alex Bourret Date: Mon, 11 May 2026 15:58:26 +0200 Subject: [PATCH 12/41] add get_elements_for_template endpoint --- python-lib/osisoft_client.py | 5 +++-- resource/browse_af_tree.py | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-lib/osisoft_client.py b/python-lib/osisoft_client.py index 1f06024..d43438c 100644 --- a/python-lib/osisoft_client.py +++ b/python-lib/osisoft_client.py @@ -758,14 +758,15 @@ def search_attributes(self, database_webid, **kwargs): else: json_response = None - def search_elements(self, database_webid, name=None, description=None, category=None, template=None, full_search=True): + def search_elements(self, database, name=None, description=None, category=None, template=None, full_search=True): headers = self.get_requests_headers() tempo_maxcount = OSIsoftConstants.DEFAULT_MAXCOUNT params = { "maxCount": tempo_maxcount, "associations": "Paths", } - url = self.endpoint.get_base_url() + "/assetdatabases/{}/elements".format(database_webid) + # url = self.endpoint.get_base_url() + "/assetdatabases/{}/elements".format(database_webid) + url = "{}/elements".format(database) if name: params["nameFilter"] = name if description: diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index a34c43b..83e7523 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -77,6 +77,7 @@ def do(payload, config, plugin_config, inputs): ) method = payload.get("method") + logger.info("Running do for method '{}'".format(method)) if method == "get_query_catalogs": return get_query_catalogs(None, config) if method == "get_children_from_db": @@ -107,6 +108,13 @@ def do(payload, config, plugin_config, inputs): "get_element_categories_from_db", lambda: get_items_from_db(client, parent, "ElementCategories", database_name=database_name) ) + if method == "get_elements_for_template": + database_name = config.get("database_name") + template_name = config.get("template", None) + elements = [] + for element in client.search_elements(database_name, name=None, description=None, category=None, template=template_name, full_search=True): + elements.append(get_item_details(element)) + return {"choices": [], "elements": elements} if method=="get_attribute_for_template": database_name = config.get("database_name") template_name = config.get("template", None) From c47e7ebe8072fd1521cfac59a7308a392c338b79 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:29:52 +0200 Subject: [PATCH 13/41] feat: load template attributes as children --- js/pi-system_treecontroller.js | 39 ++++++++++++++++------------------ resource/browse_af_tree.py | 2 +- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 2289f11..229c2aa 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -382,6 +382,9 @@ app.controller('AfExplorerFormCtrl', [ } $scope.getChildrenFromDB = function(item) { + if (item.type === "template") { + return getAttributesForTemplate(item); + } console.log("ALX:gcfd:" + JSON.stringify(item)); return $scope.callPythonDo({ method: "get_children_from_db", parent: item }) .then(function(data) { @@ -500,6 +503,18 @@ app.controller('AfExplorerFormCtrl', [ ); }; + function getAttributesForTemplate(node) { + return $scope.callPythonDo({ method: "get_attribute_for_template", template_name: node.title}).then( + function(data) { + node.children = data.attributes; + node.children.forEach(child => { + child.expanded = false; + }); + return node; + } + ); + } + function applySearchAttributesToList(attributes) { const seen = new Set(); const deduped = []; @@ -705,31 +720,13 @@ app.controller('AfExplorerFormCtrl', [ stopDisplayingAttributes(node); return; } - // TODO: refacto - if (node.type === "element" && !hasAttributeChildren(node)) { - $scope.config.template = "-- Any --"; + if (!hasAttributeChildren(node)) { $scope.getChildrenFromDB(node).then(newNode => { processNode(newNode); }); - } else if (node.type === "template") { - const selectedTemplateNames = getSelectedTemplateNamesFromClickedNodes(); - if (!selectedTemplateNames.length) { - $scope.config.template = "-- Any --"; - $scope.config.attributeList = []; - $scope.config.searchMatchedElementPaths = []; - return; - } - - // Keep previous single-template behavior in config when only one is selected. - // For multi-select, backend will use selectedTemplateNames. - $scope.config.template = selectedTemplateNames.length === 1 - ? selectedTemplateNames[0] - : "-- Any --"; - $scope.config.element_name = "*"; - $scope.doSearch($scope.config.element_name, $scope.config.attribute_name); - } else { - processNode(node); + return; } + processNode(node); } // Merge frontend data and saved output with loaded attributes diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index 83e7523..4b8d7e8 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -117,7 +117,7 @@ def do(payload, config, plugin_config, inputs): return {"choices": [], "elements": elements} if method=="get_attribute_for_template": database_name = config.get("database_name") - template_name = config.get("template", None) + template_name = payload.get("template_name", None) if template_name is None: return {"choices": [], "attributes": []} # when searching for template : attribute_name=None, element_category=None, attribute_category=None From 9a1486db9a04b155b7d75561828a23da3bb84da8 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:38:55 +0200 Subject: [PATCH 14/41] feat: display template attributes in the right table --- js/pi-system_treecontroller.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 229c2aa..877db43 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -734,7 +734,11 @@ app.controller('AfExplorerFormCtrl', [ // TODO: check this makes sense, since selectedOutput is persisted and so newly loaded attributes should not be found in it const selectedAttribute = $scope.config.outputSelectedAttributes.find(attr => attr.path === attribute.path); attribute.checked = !!(selectedAttribute); - attribute.parent_element = parentNode?.title; + if (parentNode.type === "element") { + attribute.parent_element = parentNode?.title; + } else if (parentNode.type === "template") { + attribute.template_name = parentNode?.title; + } attribute.data_type = selectedAttribute?.data_type ? selectedAttribute.data_type : $scope.aggregateDataTypeFields.data_type.defaultValue; Object.entries($scope.aggregateDataTypeFields.aggregates).forEach(([aggregateName, aggregate]) => { if ((selectedAttribute?.[aggregateName] === undefined || selectedAttribute?.[aggregateName] === null) && aggregate.isVisible(attribute)) { From d7b7fd4ce65714a8ac9900916b095e59088e348f Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:44:20 +0200 Subject: [PATCH 15/41] feat: don't display element table in template mode --- js/pi-system_treecontroller.js | 8 ++++++-- resource/pi-system_af-explorer.html | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 877db43..c8b1bc5 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -154,18 +154,22 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.lastSearchedElementName = $scope.config.lastSearchedElementName || ""; $scope.config.selectedTemplateNames = $scope.config.selectedTemplateNames || []; // la liste des templates sélectionnés (checkbox cochée) parmi ceux affichés $scope.config.attributeSearch = $scope.config.attributeSearch || ""; + // TODO: get categories from backend for attributes + // $scope.config.attributeCategoryFilter = $scope.config.attributeCategoryFilter || "" $scope.aggregateDataTypeFields = aggregateDataTypeFields; $scope.attributeGroupSections = [ { key: 'attributesWithoutTemplate', title: 'Elements', - emptyMessage: 'No attributes without template matched your selection' + emptyMessage: 'No attributes without template matched your selection', + shouldDisplay: () => $scope.config.activeTab === "element" }, { key: 'attributesGroupedByTemplate', title: 'Templates', - emptyMessage: 'No templated attributes matched your selection' + emptyMessage: 'No templated attributes matched your selection', + shouldDisplay: () => true } ]; diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index d716106..713eeeb 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -92,7 +92,8 @@
+ ng-repeat="section in attributeGroupSections track by section.key" + ng-if="section.shouldDisplay()">
{{section.title}}
From d9a2d1de69afc7e3072c9059c28b73f4e664c957 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:44:54 +0200 Subject: [PATCH 16/41] comment --- resource/pi-system_af-explorer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 713eeeb..20fd205 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -74,6 +74,7 @@ +
From ea4de2fd48221c35b47d3893c36ff7807c6c0005 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:49:22 +0200 Subject: [PATCH 17/41] feat: untoggle templates in template mode (alignment with element mode) --- js/pi-system_treecontroller.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index c8b1bc5..5550965 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -1151,14 +1151,6 @@ app.component('treeNode', { ctrl.config.clickedNodes.push(node.url); } - // TODO: split element/template logic - if (node?.type === "template") { - // Template clicks should always rebuild right-side content from the full template selection. - ctrl.toggleDisplayAttributes(node); - console.log("ctrl.config.clickedNodes: " + JSON.stringify(ctrl.config.clickedNodes)); - return; - } - // TODO: understand why this is mutually exclusive if (hasActiveAttributeSearch) { rebuildAttributesFromClickedNodes(); From 4a73be34341cbb02348fdf90ff57aaaf540b2f8c Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 11 May 2026 18:59:16 +0200 Subject: [PATCH 18/41] feat: temporary checkbox to display the path column --- js/pi-system_treecontroller.js | 2 ++ resource/attribute-table-row.html | 2 +- resource/pi-system_af-explorer.html | 14 ++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 5550965..bee4f0d 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -154,6 +154,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.lastSearchedElementName = $scope.config.lastSearchedElementName || ""; $scope.config.selectedTemplateNames = $scope.config.selectedTemplateNames || []; // la liste des templates sélectionnés (checkbox cochée) parmi ceux affichés $scope.config.attributeSearch = $scope.config.attributeSearch || ""; + $scope.config.displayPath = $scope.config.displayPath || false; // TODO: get categories from backend for attributes // $scope.config.attributeCategoryFilter = $scope.config.attributeCategoryFilter || "" @@ -1179,6 +1180,7 @@ app.directive('attributeTableRow', function() { restrict: 'A', scope: { mergedAttribute: '=', + displayPath: '<', aggregateDataTypeFields: '<', onCheckAttribute: '&', onUpdateDataType: '&', diff --git a/resource/attribute-table-row.html b/resource/attribute-table-row.html index c480ff3..9aeae59 100644 --- a/resource/attribute-table-row.html +++ b/resource/attribute-table-row.html @@ -5,7 +5,7 @@
- - + - + - + Date: Tue, 12 May 2026 11:04:45 +0200 Subject: [PATCH 19/41] fix for attributes' template names --- resource/browse_af_tree.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index 4b8d7e8..aec13ca 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -302,14 +302,6 @@ def get_children_from_db(client, parent_node, database_name=None): attributes_url = links.get("Attributes") elements_url = links.get("Elements") children = [] - if elements_url: - elements = client.get_next_item_from_url(elements_url, params={"associations": "Paths"}) - for element in elements: - child = get_item_details(element) - # child["title"] = "🧩{}".format(child.get("title")) - child["type"] = "element" - child["children"] = [] - children.append(child) if attributes_url: attributes = client.get_next_item_from_url(attributes_url, params={"associations": "Paths"}) templates_urls = [] @@ -327,6 +319,14 @@ def get_children_from_db(client, parent_node, database_name=None): for child, template_name in zip(children, templates_names): if template_name: child["template_name"] = template_name + if elements_url: + elements = client.get_next_item_from_url(elements_url, params={"associations": "Paths"}) + for element in elements: + child = get_item_details(element) + # child["title"] = "🧩{}".format(child.get("title")) + child["type"] = "element" + child["children"] = [] + children.append(child) return {"choices": children} From 95a0489481d8a4a68c0ef8db870b3eaf4f47c036 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Wed, 13 May 2026 14:07:59 +0200 Subject: [PATCH 20/41] feat: basic element dropdown functionality + moved onNodeClick to main controller --- js/pi-system_treecontroller.js | 246 +++++++++++++++++++--------- resource/browse_af_tree.py | 2 +- resource/pi-system_af-explorer.html | 22 ++- resource/tree-node.html | 5 +- 4 files changed, 188 insertions(+), 87 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index bee4f0d..1e4f734 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -155,18 +155,22 @@ app.controller('AfExplorerFormCtrl', [ $scope.config.selectedTemplateNames = $scope.config.selectedTemplateNames || []; // la liste des templates sélectionnés (checkbox cochée) parmi ceux affichés $scope.config.attributeSearch = $scope.config.attributeSearch || ""; $scope.config.displayPath = $scope.config.displayPath || false; + $scope.config.elementsByTemplate = $scope.config.elementsByTemplate || {}; + // TODO: get categories from backend for attributes // $scope.config.attributeCategoryFilter = $scope.config.attributeCategoryFilter || "" $scope.aggregateDataTypeFields = aggregateDataTypeFields; $scope.attributeGroupSections = [ { + type: 'element', key: 'attributesWithoutTemplate', title: 'Elements', emptyMessage: 'No attributes without template matched your selection', shouldDisplay: () => $scope.config.activeTab === "element" }, { + type: 'template', key: 'attributesGroupedByTemplate', title: 'Templates', emptyMessage: 'No templated attributes matched your selection', @@ -520,6 +524,81 @@ app.controller('AfExplorerFormCtrl', [ ); } + $scope.isTemplateAssociatedElementSelected = function(element) { + return $scope.config.clickedNodes.includes(element.url); + } + + $scope.getElementsForTemplate = function (templateName) { + return $scope.callPythonDo({ method: "get_elements_for_template", template_name: templateName}).then( + function(data) { + $scope.config.elementsByTemplate[templateName] = data.elements; + } + ); + } + + function refreshSelectedElementsByTemplate(templateName) { + $scope.selectedElementsByTemplate[templateName] = $scope.config.elementsByTemplate[templateName].filter(element => { + return $scope.config.clickedNodes.includes(element.url); + } + ).map(element => element.url); + $scope.selectedElementsByTemplateUI[templateName] = $scope.selectedElementsByTemplate[templateName] + } + + $scope.selectedElementsByTemplateUI = {}; + $scope.selectedElementsByTemplate = {}; + + $scope.setupElementsDropdown = function($element, templateName) { + let initialized = false; + const dropdown = $element.next(); + + dropdown.on('click', function() { + // console.log("triggered click") + if (initialized) { + return; + } else if (!initialized && $scope.config.elementsByTemplate[templateName]?.length > 0) { + refreshSelectedElementsByTemplate(templateName); + return; + } + + $scope.$applyAsync(() => { + $scope.getElementsForTemplate(templateName).then(() => { + refreshSelectedElementsByTemplate(templateName); + initialized = true; + $scope.$broadcast('selectPickerRefresh'); + } + ) + }); + }); + + + $element.on('change', function() { + + if (!initialized) { + return; + } + + $scope.$applyAsync(() => { + const options = $scope.config.elementsByTemplate[templateName]; + const previouslySelected = new Set($scope.selectedElementsByTemplate[templateName]); + const currentlySelected = new Set($scope.selectedElementsByTemplateUI[templateName]); + + options.forEach(element => { + const elementKey = String(element.url); + const wasSelected = previouslySelected.has(elementKey); + const isSelected = currentlySelected.has(elementKey); + + if (!wasSelected && isSelected) { + $scope.onNodeClick(element); + } else if (wasSelected && !isSelected) { + $scope.onNodeClick(element); + } + }); + + $scope.selectedElementsByTemplate = angular.copy($scope.selectedElementsByTemplateUI); + }); + }); + } + function applySearchAttributesToList(attributes) { const seen = new Set(); const deduped = []; @@ -590,6 +669,90 @@ app.controller('AfExplorerFormCtrl', [ return Array.from(selectedTemplateNames); } + function findNodeByUrl(nodes, targetUrl) { + if (!Array.isArray(nodes) || !targetUrl) { + return null; + } + + for (let i = 0; i < nodes.length; i += 1) { + const node = nodes[i]; + if (!node) { + continue; + } + if (node.url === targetUrl) { + return node; + } + const childMatch = findNodeByUrl(node.children, targetUrl); + if (childMatch) { + return childMatch; + } + } + + return null; + } + + // TODO: understand why the logic is different from toggleDisplayAttributes (merge them if possible) + function rebuildAttributesFromClickedNodes() { + const clickedUrls = Array.isArray($scope.config?.clickedNodes) + ? $scope.config.clickedNodes + : []; + + $scope.config.attributeList = []; + + if (!clickedUrls.length) { + return; + } + + clickedUrls.forEach(function(url) { + const node = + findNodeByUrl($scope.config.treeData, url) || + findNodeByUrl($scope.config.templateTreeData, url); + if (node) { + $scope.toggleDisplayAttributes(node); + } + }); + } + + $scope.onNodeClick = function(node) { + console.log("clicked on ", node) + + // TODO: factorize this check + const hasActiveAttributeSearch = !!( + $scope.config?.attribute_name?.trim() + ); + + // Keep right-side attribute search when active so multi-node clicks can + // enrich results with the same filter (ex: "Load" on California + Fresno). + // TODO: understand why we need a reset if the attribute search is empty + if (!hasActiveAttributeSearch) { + $scope.config.attribute_name = ""; + } + if (node?.type === "element") { + // TODO: factorize this reset + $scope.config.template = "-- Any --"; + } + + const indexClickedNode = $scope.config.clickedNodes.indexOf(node.url); + const nodeAlreadySelected = indexClickedNode > -1; + // If the node is already clicked, remove it from clicked nodes - else add it + if (nodeAlreadySelected) { + console.log("node already selected") + $scope.config.clickedNodes.splice(indexClickedNode, 1); + } else { + console.log("node not already selected") + $scope.config.clickedNodes.push(node.url); + } + + // TODO: understand why this is mutually exclusive + if (hasActiveAttributeSearch) { + rebuildAttributesFromClickedNodes(); + } else { + $scope.toggleDisplayAttributes(node, !nodeAlreadySelected); + } + + console.log("clickedNodes: " + JSON.stringify($scope.config.clickedNodes)); + }; + function markSearchResults(nodes, matchedElementPaths) { if (!Array.isArray(nodes)) { return; @@ -851,6 +1014,7 @@ app.controller('AfExplorerFormCtrl', [ acc[key] = { title: attr.title, description: attr.description, + groupKey: groupKey, group: attr[groupKey], template_names: [], parent_elements: [], @@ -1051,6 +1215,7 @@ app.component('treeNode', { getChildrenFromDb: '<', toggleDisplayAttributes: '<', config: '<', + onNodeClick: '&', }, controllerAs: 'ctrl', @@ -1058,50 +1223,6 @@ app.component('treeNode', { controller: function() { const ctrl = this; - function findNodeByUrl(nodes, targetUrl) { - if (!Array.isArray(nodes) || !targetUrl) { - return null; - } - - for (let i = 0; i < nodes.length; i += 1) { - const node = nodes[i]; - if (!node) { - continue; - } - if (node.url === targetUrl) { - return node; - } - const childMatch = findNodeByUrl(node.children, targetUrl); - if (childMatch) { - return childMatch; - } - } - - return null; - } - - // TODO: understand why the logic is different from toggleDisplayAttributes (merge them if possible) - function rebuildAttributesFromClickedNodes() { - const clickedUrls = Array.isArray(ctrl.config?.clickedNodes) - ? ctrl.config.clickedNodes - : []; - - ctrl.config.attributeList = []; - - if (!clickedUrls.length) { - return; - } - - clickedUrls.forEach(function(url) { - const node = - findNodeByUrl(ctrl.config.treeData, url) || - findNodeByUrl(ctrl.config.templateTreeData, url); - if (node) { - ctrl.toggleDisplayAttributes(node); - } - }); - } - ctrl.hasRenderableChildren = function(node) { if (!node || !Array.isArray(node.children) || !node.children.length) { return false; @@ -1125,43 +1246,6 @@ app.component('treeNode', { node.expanded = !node.expanded; }; - ctrl.onNodeClick = function(node) { - - // TODO: factorize this check - const hasActiveAttributeSearch = !!( - ctrl.config?.attribute_name?.trim() - ); - - // Keep right-side attribute search when active so multi-node clicks can - // enrich results with the same filter (ex: "Load" on California + Fresno). - // TODO: understand why we need a reset if the attribute search is empty - if (!hasActiveAttributeSearch) { - ctrl.config.attribute_name = ""; - } - if (node?.type === "element") { - // TODO: factorize this reset - ctrl.config.template = "-- Any --"; - } - - const indexClickedNode = ctrl.config.clickedNodes.indexOf(node.url); - const nodeAlreadySelected = indexClickedNode > -1; - // If the node is already clicked, remove it from clicked nodes - else add it - if (nodeAlreadySelected) { - ctrl.config.clickedNodes.splice(indexClickedNode, 1); - } else { - ctrl.config.clickedNodes.push(node.url); - } - - // TODO: understand why this is mutually exclusive - if (hasActiveAttributeSearch) { - rebuildAttributesFromClickedNodes(); - } else { - ctrl.toggleDisplayAttributes(node, !nodeAlreadySelected); - } - - console.log("ctrl.config.clickedNodes: " + JSON.stringify(ctrl.config.clickedNodes)); - }; - ctrl.isNodeClicked = function(node) { // the click is entirely based on node.url return ctrl.config.clickedNodes.includes(node.url); diff --git a/resource/browse_af_tree.py b/resource/browse_af_tree.py index aec13ca..9962a98 100644 --- a/resource/browse_af_tree.py +++ b/resource/browse_af_tree.py @@ -110,7 +110,7 @@ def do(payload, config, plugin_config, inputs): ) if method == "get_elements_for_template": database_name = config.get("database_name") - template_name = config.get("template", None) + template_name = payload.get("template_name", None) elements = [] for element in client.search_elements(database_name, name=None, description=None, category=None, template=template_name, full_search=True): elements.append(get_item_details(element)) diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 3052ea7..43afa9f 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -130,7 +130,23 @@ - +
  • + config="config" clicked-nodes="config.clickedNodes" on-node-click="onNodeClick(node)">
    • + config="config" clicked-nodes="config.clickedNodes" on-node-click="onNodeClick(node)">
    diff --git a/resource/tree-node.html b/resource/tree-node.html index 4e2a198..9af25c4 100644 --- a/resource/tree-node.html +++ b/resource/tree-node.html @@ -12,7 +12,7 @@ - \ No newline at end of file + From a2cb946884086a145c5d7bb1a3e59de8d67ed96e Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Wed, 13 May 2026 14:21:46 +0200 Subject: [PATCH 21/41] feat: elements dropdown refreshes on tree interaction --- js/pi-system_treecontroller.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 1e4f734..a838a69 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -536,6 +536,15 @@ app.controller('AfExplorerFormCtrl', [ ); } + function fullRefreshSelectedElementsByTemplate() { + Object.keys($scope.selectedElementsByTemplate).forEach(templateName => { + if (!$scope.config.elementsByTemplate[templateName]) { + return; + } + refreshSelectedElementsByTemplate(templateName); + }); + } + function refreshSelectedElementsByTemplate(templateName) { $scope.selectedElementsByTemplate[templateName] = $scope.config.elementsByTemplate[templateName].filter(element => { return $scope.config.clickedNodes.includes(element.url); @@ -750,6 +759,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.toggleDisplayAttributes(node, !nodeAlreadySelected); } + fullRefreshSelectedElementsByTemplate(); console.log("clickedNodes: " + JSON.stringify($scope.config.clickedNodes)); }; From ca6c395beee999a87048b27d36b4ae13926f80bf Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Wed, 13 May 2026 14:25:39 +0200 Subject: [PATCH 22/41] feat: improve empty element dropdown state --- resource/pi-system_af-explorer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 43afa9f..678cfe6 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -134,6 +134,7 @@ {{group.group_name}} +
    Date: Mon, 18 May 2026 18:14:47 +0200 Subject: [PATCH 39/41] feat: TMP CSS active state for template/element tabs --- resource/pi-system_af-explorer.css | 59 +++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/resource/pi-system_af-explorer.css b/resource/pi-system_af-explorer.css index d950cdc..66205ef 100644 --- a/resource/pi-system_af-explorer.css +++ b/resource/pi-system_af-explorer.css @@ -165,39 +165,70 @@ margin-bottom: 6px; } -.tree-view__tabs{ +.tree-view__tabs { display: flex; align-items: center; + flex-direction: row; align-self: stretch; + padding: 0; + width: 228px; + height: 42px; + box-sizing: border-box; border: 1px solid #BBB; } .tree-view__tab { + box-sizing: border-box; display: flex; + flex-direction: row; align-items: flex-start; - flex: 1 0 0; - border-top: 1px solid #BBB; - border-right: 0.5px solid #BBB; - border-bottom: 1px solid #BBB; - border-left: 1px solid #BBB; - &:hover, &:active { - background-color: #E7F3FF; - } + flex: 1 1 0; + height: 42px; + min-width: 0; + background: #FFF; + cursor: pointer; + transition: background-color 0.16s ease; +} + +.tree-view__tab:first-child { + border-width: 1px 0.5px 1px 1px; + border-style: solid; + border-color: #BBB; +} + +.tree-view__tab:last-child { + border-width: 1px 1px 1px 0.5px; + border-style: solid; + border-color: #BBB; +} + +.tree-view__tab:hover { + background: #F2F8FF; +} + +.tree-view__tab.active:hover { + background: #E7F3FF; +} + +.tree-view__tab.active { + background: #E7F3FF; } .tree-view__tab-content { display: flex; - padding: 12px 23px; + flex-direction: row; justify-content: center; align-items: center; + padding: 12px 23px; gap: 4px; - flex: 1 0 0; + flex: 1 1 0; + height: 42px; + box-sizing: border-box; color: #000; - font-family: "Source Sans Pro"; + font: inherit; font-size: 14px; - font-style: normal; font-weight: 600; - line-height: normal; + line-height: 18px; } .tree-view__content { From 73bc039e029440ab99d917d32963ff09f63d7cb9 Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Mon, 18 May 2026 18:32:04 +0200 Subject: [PATCH 40/41] cleanup: removed old template commented code --- resource/pi-system_af-explorer.html | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index bd183c2..512ca0d 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -193,23 +193,6 @@ Clear search -
    From e73bb1cb704e6992dcb71d4059ec89fb7247fadf Mon Sep 17 00:00:00 2001 From: Mathilde Kaploun Date: Tue, 19 May 2026 14:38:01 +0200 Subject: [PATCH 41/41] feat: mostly working element dropdown in template mode + renamings --- js/pi-system_treecontroller.js | 87 +++++++++++++++++++++-------- resource/pi-system_af-explorer.html | 4 +- resource/tree-node.html | 4 +- 3 files changed, 68 insertions(+), 27 deletions(-) diff --git a/js/pi-system_treecontroller.js b/js/pi-system_treecontroller.js index 8de2b87..c69692a 100644 --- a/js/pi-system_treecontroller.js +++ b/js/pi-system_treecontroller.js @@ -457,12 +457,25 @@ app.controller('AfExplorerFormCtrl', [ }); } + function getElementNameFromPath(elementPath) { + const splitPath = elementPath.split('\\'); + return splitPath?.[splitPath.length - 1]; + } + + function getElementPathFromAttributePath(attributePath) { + return attributePath.split('|')?.[0]; + } + function getAttributesForTemplate(node) { return $scope.callPythonDo({ method: "get_attribute_for_template", template_name: node.title}).then( function(data) { node.children = data.attributes; node.children.forEach(child => { + // TODO: do the same for the normal getChild + const elementPath = getElementPathFromAttributePath(child.path); child.expanded = false; + child.parent_element = getElementNameFromPath(elementPath); + child.parent_element_path = elementPath; }); return node; } @@ -481,35 +494,45 @@ app.controller('AfExplorerFormCtrl', [ ); } - function fullRefreshSelectedElementsByTemplate() { + // Called whenever the element selection change + function refreshSelectedElementsByTemplatesAllTemplates() { Object.keys($scope.selectedElementsByTemplate).forEach(templateName => { if (!$scope.config.elementsByTemplate[templateName]) { return; } - refreshSelectedElementsByTemplate(templateName); + setSelectedElementsByTemplate(templateName); }); } - function refreshSelectedElementsByTemplate(templateName) { - $scope.selectedElementsByTemplate[templateName] = $scope.config.elementsByTemplate[templateName].filter(element => { - return $scope.config.clickedNodes.includes(element.url); - } - ).map(element => element.url); + function setSelectedElementsByTemplate(templateName) { + if ($scope.config.activeTab === 'element') { + // Sets selected elements for the elements dropdown to all visualized elements + $scope.selectedElementsByTemplate[templateName] = $scope.config.elementsByTemplate[templateName].filter(element => { + return $scope.config.clickedNodes.includes(element.url); + } + ).map(element => element.url); + } else if ($scope.config.activeTab === 'template') { + $scope.selectedElementsByTemplate[templateName] = $scope.config.elementsByTemplate[templateName].map(element => element.url); + } $scope.selectedElementsByTemplateUI[templateName] = $scope.selectedElementsByTemplate[templateName] } $scope.selectedElementsByTemplateUI = {}; $scope.selectedElementsByTemplate = {}; + $scope.templateModeExcludedAttributes = {}; $scope.setupElementsDropdown = function($element, templateName) { let initialized = false; const dropdown = $element.next(); + // if not initialized but elements by template is already populated + // refresh the state, and set to initialized if (!initialized && $scope.config.elementsByTemplate[templateName]?.length > 0) { - refreshSelectedElementsByTemplate(templateName); + setSelectedElementsByTemplate(templateName); initialized = true; } + // TODO: maybe unhook this dropdown.on('click', function() { // console.log("triggered click") if (initialized) { @@ -518,7 +541,7 @@ app.controller('AfExplorerFormCtrl', [ $scope.$applyAsync(() => { $scope.getElementsForTemplate(templateName).then(() => { - refreshSelectedElementsByTemplate(templateName); + setSelectedElementsByTemplate(templateName); initialized = true; $scope.$broadcast('selectPickerRefresh'); } @@ -526,7 +549,6 @@ app.controller('AfExplorerFormCtrl', [ }); }); - $element.on('change', function() { if (!initialized) { @@ -534,6 +556,7 @@ app.controller('AfExplorerFormCtrl', [ } $scope.$applyAsync(() => { + // TODO: redo everything by templateID const options = $scope.config.elementsByTemplate[templateName]; const previouslySelected = new Set($scope.selectedElementsByTemplate[templateName]); const currentlySelected = new Set($scope.selectedElementsByTemplateUI[templateName]); @@ -543,10 +566,27 @@ app.controller('AfExplorerFormCtrl', [ const wasSelected = previouslySelected.has(elementKey); const isSelected = currentlySelected.has(elementKey); - if (!wasSelected && isSelected) { - $scope.onNodeClick(element); - } else if (wasSelected && !isSelected) { - $scope.onNodeClick(element); + if (wasSelected !== isSelected) { + if ($scope.config.activeTab === 'element') { + $scope.toggleNodeVisualization(element); + } else if ($scope.config.activeTab === 'template') { + // TODO: if selection becomes empty because of this do something + // like unselecting the template altogether + if (wasSelected && !isSelected) { + if (!$scope.templateModeExcludedAttributes[templateName]) { + $scope.templateModeExcludedAttributes[templateName] = {} + } + $scope.templateModeExcludedAttributes[templateName][element.path] = $scope.config.attributeList.filter(attribute => { + return attribute.parent_element_path === element.path; + }); + $scope.config.attributeList = $scope.config.attributeList.filter(attribute => { + return attribute.parent_element_path !== element.path; + }); + } else if (!wasSelected && isSelected) { + const attributesToAdd = $scope.templateModeExcludedAttributes[templateName]?.[element.path]; + $scope.config.attributeList.push(...attributesToAdd) + } + } } }); @@ -568,7 +608,7 @@ app.controller('AfExplorerFormCtrl', [ return Array.from(matchedPathSet); } - $scope.onNodeClick = function(node) { + $scope.toggleNodeVisualization = function(node) { console.log("clicked on ", node) // Keep right-side attribute search when active so multi-node clicks can @@ -583,17 +623,17 @@ app.controller('AfExplorerFormCtrl', [ const nodeAlreadySelected = indexClickedNode > -1; // If the node is already clicked, remove it from clicked nodes - else add it if (nodeAlreadySelected) { - console.log("node already selected") $scope.config.clickedNodes.splice(indexClickedNode, 1); } else { - console.log("node not already selected") $scope.config.clickedNodes.push(node.url); } - // TODO: understand why this is mutually exclusive $scope.toggleDisplayAttributes(node, !nodeAlreadySelected); - fullRefreshSelectedElementsByTemplate(); + // In element node, the visualized nodes are reflected on the elements dropdown + if ($scope.config.activeTab === 'element') { + refreshSelectedElementsByTemplatesAllTemplates(); + } console.log("clickedNodes: " + JSON.stringify($scope.config.clickedNodes)); }; @@ -730,11 +770,11 @@ app.controller('AfExplorerFormCtrl', [ } if (!hasAttributeChildren(node)) { $scope.getChildrenFromDB(node).then(newNode => { - processNode(newNode); + addChildrenToAttributeList(newNode); }); return; } - processNode(node); + addChildrenToAttributeList(node); } // Merge frontend data and saved output with loaded attributes @@ -760,7 +800,8 @@ app.controller('AfExplorerFormCtrl', [ return attribute; } - function processNode(node) { + // Put node children in the displayed attribute list + function addChildrenToAttributeList(node) { const parentTemplateName = node?.template_name; node.children.forEach(child => { @@ -1039,7 +1080,7 @@ app.component('treeNode', { getChildrenFromDb: '<', toggleDisplayAttributes: '<', config: '<', - onNodeClick: '&', + toggleNodeVisualization: '&', }, controllerAs: 'ctrl', diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 512ca0d..997c5da 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -202,14 +202,14 @@
    • + config="config" clicked-nodes="config.clickedNodes" toggle-node-visualization="toggleNodeVisualization(node)">
    • + config="config" clicked-nodes="config.clickedNodes" toggle-node-visualization="toggleNodeVisualization(node)">
    diff --git a/resource/tree-node.html b/resource/tree-node.html index 9af25c4..2c01738 100644 --- a/resource/tree-node.html +++ b/resource/tree-node.html @@ -12,7 +12,7 @@
    {{ctrl.mergedAttribute.title}} {{ctrl.mergedAttribute.description}} + {{path}}
     diff --git a/resource/pi-system_af-explorer.html b/resource/pi-system_af-explorer.html index 20fd205..3052ea7 100644 --- a/resource/pi-system_af-explorer.html +++ b/resource/pi-system_af-explorer.html @@ -82,7 +82,12 @@
    - +
    +
    +
    @@ -106,14 +111,14 @@     		Title DescriptionPathPath Data type Aggregates
    {{section.emptyMessage}}{{section.emptyMessage}}
    {{group.group_name}}{{group.group_name}}
    {{group.group_name}} + {{group.group_name}} + +
    - {{group.group_name}} + + {{group.group_name}} + + + - ({{group.nbSearchMatches}}/{{group.attributes.length}} attributes shown) +
    + ng-change="toggleGroupedAttributes(group)" indeterminate="group.checked"> @@ -156,7 +156,7 @@