You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/08/03 10:37:44 UTC
[brooklyn-ui] branch master updated (3ef0d11 -> 195de92)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 3ef0d11 Merge pull request #245 from jathanasiou/fix/quick-launch-dialog
new bb40a51 Display node ID in the Scope dropdown menu of the DSL editor
new df84ff5 Display tooltip on the left of the DSL edit search result
new a689956 Display ID for all items in DSL editor search result
new 195de92 This closes #256
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 8 +++-----
.../app/components/dsl-editor/dsl-editor.template.html | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
[brooklyn-ui] 04/04: This closes #256
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 195de925ed8b457c708d1eb2c46570ff3a23d3a4
Merge: 3ef0d11 a689956
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Aug 3 11:37:32 2021 +0100
This closes #256
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 8 +++-----
.../app/components/dsl-editor/dsl-editor.template.html | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
[brooklyn-ui] 03/04: Display ID for all items in DSL editor search
result
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit a6899562a7a127dac99f64040f90f8441bc7d305
Author: Mykola Mandra <my...@cloudsoft.io>
AuthorDate: Tue Aug 3 11:29:44 2021 +0100
Display ID for all items in DSL editor search result
Signed-off-by: Mykola Mandra <my...@cloudsoft.io>
---
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 10 +++-------
.../app/components/dsl-editor/dsl-editor.template.html | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
index 1cbcbb6..cf4b7b1 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
@@ -89,15 +89,11 @@ export function dslEditorDirective($rootScope, $filter, $log, brUtilsGeneral, bl
attrs.push('parent');
}
- let name = item.name;
- if (attrs.length > 0) {
- name += ` (${attrs.join(', ')})`;
- } else {
- name += ` (${item.entity.id || item.id})`;
- }
+ let { name, entity, id } = item;
+ name += attrs.length > 0 ? ` (${attrs.join(', ')})` : ` (${entity.id || id})`;
return {
- id: item.id,
+ id,
label: name,
scope: 'On specific entity'
};
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
index 1291ca3..e8a54a3 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
@@ -60,11 +60,11 @@
<h4 class="list-group-item-heading">
<i class="fa" ng-class="{'fa-cog': item.type === DSL_KINDS.CONFIG, 'fa-rss': item.type === DSL_KINDS.SENSOR, 'fa-crosshairs': item.type === DSL_KINDS.ENTITY}"></i>
{{item.name}}
- <span ng-if="item.type === DSL_KINDS.ENTITY && item.entity.id">(ID: {{item.entity.id}})</span>
</h4>
<p class="list-group-item-entity text-right text-muted">
<img ng-src="{{item.entity.icon}}" alt="{{item.entity.miscData.get('typeName') || (item.entity | entityName) || 'New application'}} logo" class="list-group-item-entity-icon" />
{{item.entity.miscData.get('typeName') || (item.entity | entityName) || 'New application'}}
+ <span ng-if="item.entity.id || item.entity._id">({{item.entity.id || item.entity._id}})</span>
</p>
</a>
[brooklyn-ui] 02/04: Display tooltip on the left of the DSL edit
search result
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit df84ff5e0c6347682bdcd7f41f7cc943ecbceca4
Author: Mykola Mandra <my...@cloudsoft.io>
AuthorDate: Tue Aug 3 11:06:12 2021 +0100
Display tooltip on the left of the DSL edit search result
Signed-off-by: Mykola Mandra <my...@cloudsoft.io>
---
.../app/components/dsl-editor/dsl-editor.template.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
index 13c0d91..1291ca3 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.template.html
@@ -56,7 +56,7 @@
<div class="list-group">
<a href="#" class="list-group-item" ng-repeat="item in items | filter:predicate | orderBy:state.orderBy.property as results track by $index" ng-click="selectItem(item, $event)" ng-class="{'active': item === state.item}"
- uib-tooltip="{{item.description}}" tooltip-placement="right" tooltip-append-to-body="true">
+ uib-tooltip="{{item.description}}" tooltip-placement="left" tooltip-append-to-body="true">
<h4 class="list-group-item-heading">
<i class="fa" ng-class="{'fa-cog': item.type === DSL_KINDS.CONFIG, 'fa-rss': item.type === DSL_KINDS.SENSOR, 'fa-crosshairs': item.type === DSL_KINDS.ENTITY}"></i>
{{item.name}}
[brooklyn-ui] 01/04: Display node ID in the Scope dropdown menu of
the DSL editor
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit bb40a51828b58f1b23f046548293c2b88bab6574
Author: Mykola Mandra <my...@cloudsoft.io>
AuthorDate: Mon Aug 2 13:49:38 2021 +0100
Display node ID in the Scope dropdown menu of the DSL editor
Signed-off-by: Mykola Mandra <my...@cloudsoft.io>
---
ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
index c7b9e16..1cbcbb6 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
@@ -92,6 +92,8 @@ export function dslEditorDirective($rootScope, $filter, $log, brUtilsGeneral, bl
let name = item.name;
if (attrs.length > 0) {
name += ` (${attrs.join(', ')})`;
+ } else {
+ name += ` (${item.entity.id || item.id})`;
}
return {