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 95b2f61a49e23a109819e713ccde2ec3141301e2 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Nov 4 22:02:42 2022 +0000 fix some glitches in quick deploy taking config from children, forcing a location. also change some colors to be not super-light gray. --- .../app-inspector/app/components/entity-effector/modal/modal.less | 2 +- .../app-inspector/app/views/main/inspect/management/management.less | 2 +- .../blueprint-data-manager/blueprint-data-manager.style.less | 2 +- .../blueprint-composer/app/components/spec-editor/spec-editor.less | 2 +- ui-modules/utils/quick-launch/quick-launch.html | 2 +- ui-modules/utils/quick-launch/quick-launch.js | 5 +++-- ui-modules/utils/quick-launch/quick-launch.less | 4 ++-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ui-modules/app-inspector/app/components/entity-effector/modal/modal.less b/ui-modules/app-inspector/app/components/entity-effector/modal/modal.less index 9660b01b..e554ef3b 100644 --- a/ui-modules/app-inspector/app/components/entity-effector/modal/modal.less +++ b/ui-modules/app-inspector/app/components/entity-effector/modal/modal.less @@ -48,7 +48,7 @@ } h3 { - color: @gray-lighter; + color: @gray-light-lighter; font-size: 14px; text-transform: uppercase; font-weight: bold; diff --git a/ui-modules/app-inspector/app/views/main/inspect/management/management.less b/ui-modules/app-inspector/app/views/main/inspect/management/management.less index 360bf6e8..4d81597f 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/management/management.less +++ b/ui-modules/app-inspector/app/views/main/inspect/management/management.less @@ -20,7 +20,7 @@ .delete-interaction() { cursor: pointer; transition: 0.3s ease all; - color: @gray-lighter; + color: @gray-light-lighter; &:hover { color: @brand-danger; }; diff --git a/ui-modules/blueprint-composer/app/components/blueprint-data-manager/blueprint-data-manager.style.less b/ui-modules/blueprint-composer/app/components/blueprint-data-manager/blueprint-data-manager.style.less index f7c4ec93..6137ad76 100644 --- a/ui-modules/blueprint-composer/app/components/blueprint-data-manager/blueprint-data-manager.style.less +++ b/ui-modules/blueprint-composer/app/components/blueprint-data-manager/blueprint-data-manager.style.less @@ -26,7 +26,7 @@ blueprint-data-manager { width: 40vw; height: 40vh; border: 10px dashed @gray-lighter; - color: @gray-lighter; + color: @gray-light-lighter; .file-drop-text { font-size: 50px; text-align: center; diff --git a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less index e02a3d61..3e0bc268 100644 --- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less +++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less @@ -803,7 +803,7 @@ spec-editor { font-family: FontAwesome; font-size: 4em; margin-bottom: 0.25em; - color: @gray-lighter; + color: @gray-light-lighter; } } } diff --git a/ui-modules/utils/quick-launch/quick-launch.html b/ui-modules/utils/quick-launch/quick-launch.html index e3f15051..c08465a9 100644 --- a/ui-modules/utils/quick-launch/quick-launch.html +++ b/ui-modules/utils/quick-launch/quick-launch.html @@ -53,7 +53,7 @@ uib-typeahead="location.id for location in locations | filter:$viewValue" typeahead-popup-template-url="DropdownTemplate.html" typeahead-template-url="LocationTemplate.html" typeahead-min-length="0" - required /> + /> <small class="help-block"> <span ng-if="deploy.location.$error.required && (deploy.$submitted || deploy.location.$touched)">You must select a location.</span> <span ng-if="!args.noCreateLocationLink">Alternatively, you can <a href="/brooklyn-ui-location-manager/#!/wizard">create a new location</a></span> diff --git a/ui-modules/utils/quick-launch/quick-launch.js b/ui-modules/utils/quick-launch/quick-launch.js index 0d0ea086..ef639631 100644 --- a/ui-modules/utils/quick-launch/quick-launch.js +++ b/ui-modules/utils/quick-launch/quick-launch.js @@ -97,7 +97,8 @@ export function quickLaunchDirective() { if (args.location) { // inline Location definition passed model.location = args.location; } else if (locations.length === 1) { - model.location = locations[0].id; // predefined/uploaded Location objects, ID prop is sufficient + // we could pre-fill the target location, but a single location pre-installed might not be relevant, so don't + // model.location = locations[0].id; // predefined/uploaded Location objects, ID prop is sufficient } }; @@ -149,7 +150,7 @@ export function quickLaunchDirective() { result[config.name] = config; let configValue = parseConfigValue((parsedPlan[BROOKLYN_CONFIG] || {})[config.name]); - if (typeof configValue == 'undefined') { + if (typeof configValue == 'undefined' && parsedPlan.services.length==1) { configValue = parseConfigValue((parsedPlan.services[0] && parsedPlan.services[0][BROOKLYN_CONFIG] || {})[config.name]); } diff --git a/ui-modules/utils/quick-launch/quick-launch.less b/ui-modules/utils/quick-launch/quick-launch.less index c56df13f..ed3911ee 100644 --- a/ui-modules/utils/quick-launch/quick-launch.less +++ b/ui-modules/utils/quick-launch/quick-launch.less @@ -19,7 +19,7 @@ .delete-interaction() { cursor: pointer; transition: 0.3s ease all; - color: @gray-lighter; + color: @gray-light-lighter; &:hover { color: @brand-danger; }; @@ -50,7 +50,7 @@ brooklyn-quick-launch { } .quick-launch-section-title { - color: @gray-lighter; + color: @gray-light-lighter; font-size: 15px; text-transform: uppercase; margin-top: 10px;
