[brooklyn-ui] branch master updated: Support entityId and taskId as parameters

[jcabrerizo]

This is an automated email from the ASF dual-hosted git repository.

jcabrerizo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 05a1377  Support entityId and taskId as parameters
     new 7c7f671  Merge pull request #275 from jcabrerizo/fix/logbook/queryByIds
05a1377 is described below

commit 05a13775381493d2c739616dd69ad3a275ce0bf9
Author: Juan Cabrerizo <j...@cloudsoft.io>
AuthorDate: Tue Aug 31 11:30:02 2021 +0100

    Support entityId and taskId as parameters
---
 .../app/views/main/inspect/activities/detail/detail.template.html  | 2 +-
 .../app/views/main/inspect/summary/summary.template.html           | 2 +-
 ui-modules/utils/logbook/logbook.js                                | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
 
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
index 572c791..b7ded9d 100644
--- 
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
+++ 
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.template.html
@@ -181,7 +181,7 @@
 
                     <br-collapsible state="vm.model.accordion.logbookOpen">
                         <heading> Logbook (activity)</heading>
-                        <br-logbook 
search-id="{{vm.model.activityId}}"></br-logbook>
+                        <br-logbook 
task-id="{{vm.model.activityId}}"></br-logbook>
                     </br-collapsible>
                 </div>
             </div>
diff --git 
a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html 
b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
index d8dee1f..cbb4226 100644
--- 
a/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
+++ 
b/ui-modules/app-inspector/app/views/main/inspect/summary/summary.template.html
@@ -189,6 +189,6 @@
 
     <br-collapsible state="vm.model.accordion.logbookOpen">
         <heading> Logbook (entity)</heading>
-        <br-logbook search-id="{{vm.entity.id}}"></br-logbook>
+        <br-logbook entity-id="{{vm.entity.id}}"></br-logbook>
     </br-collapsible>
 </div>
diff --git a/ui-modules/utils/logbook/logbook.js 
b/ui-modules/utils/logbook/logbook.js
index 5a8f686..b0c2b8a 100644
--- a/ui-modules/utils/logbook/logbook.js
+++ b/ui-modules/utils/logbook/logbook.js
@@ -34,7 +34,8 @@ export function logbook() {
         template: template,
         restrict: 'E',
         scope: {
-            searchId: '@',
+            taskId: '@',
+            entityId: '@',
         },
         controller: ['$scope', '$element', '$interval', 'brBrandInfo', 
'logbookApi', controller],
         controllerAs: 'vm'
@@ -233,7 +234,9 @@ export function logbook() {
             const params = {
                 levels: levels,
                 tail: $scope.search.latest,
-                searchPhrases: [$scope.search.phrase, 
$scope.searchId].filter(phrase => phrase),
+                searchPhrase: $scope.search.phrase,
+                taskId: $scope.taskId,
+                entityId: $scope.entityId,
                 numberOfItems: $scope.search.numberOfItems,
                 dateTimeFrom: dateTimeFrom,
                 dateTimeTo: dateTimeTo,