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 2018/08/20 15:06:27 UTC
[4/6] brooklyn-ui git commit: Merge branch 'master' into
composer-customizable
Merge branch 'master' into composer-customizable
fix added import in composer near where paths were tweaked
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/c3fc4afd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/c3fc4afd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/c3fc4afd
Branch: refs/heads/master
Commit: c3fc4afd5dd234395bb9205861ea0c4c630b0177
Parents: 300b014 57e9726
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Aug 20 10:41:09 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Aug 20 10:41:09 2018 +0100
----------------------------------------------------------------------
README.md | 2 +-
docs/customizations.md | 40 +++++
docs/vanilla-with-custom-widget.bom | 43 +++++
modularity-server/README.md | 23 +++
.../ui/modularity/ExternalUiModule.java | 29 +++-
.../BrooklynExternalUiModuleEnricher.java | 23 ++-
modularity-server/module-api/pom.xml | 12 ++
.../ui/modularity/module/api/UiModule.java | 13 +-
.../modularity/module/api/UiModuleListener.java | 156 ++++++++++++++++++-
.../module/api/internal/UiModuleImpl.java | 39 ++++-
.../suggestion-dropdown.html | 67 ++++++++
.../custom-config-widget/suggestion-dropdown.js | 58 +++++++
.../suggestion-dropdown.less | 68 ++++++++
.../providers/blueprint-service.provider.js | 16 ++
.../spec-editor/spec-editor.directive.js | 69 +++++++-
.../app/components/spec-editor/spec-editor.less | 40 ++++-
.../spec-editor/spec-editor.template.html | 56 ++++---
ui-modules/blueprint-composer/app/index.js | 6 +-
ui-modules/blueprint-composer/app/index.less | 1 +
.../home/app/views/main/main.controller.js | 4 +-
.../src/main/resources/ui-module/config.yaml | 20 +++
ui-modules/home/src/main/webapp/WEB-INF/web.xml | 4 +
.../module-links-drawer.template.html | 4 +-
.../module-links-navbar.template.html | 3 +-
ui-modules/utils/module-links/module-links.js | 4 +-
25 files changed, 737 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c3fc4afd/ui-modules/blueprint-composer/app/index.js
----------------------------------------------------------------------
diff --cc ui-modules/blueprint-composer/app/index.js
index 6dfbe5b,a970dc2..a9f2d87
--- a/ui-modules/blueprint-composer/app/index.js
+++ b/ui-modules/blueprint-composer/app/index.js
@@@ -46,28 -46,29 +46,29 @@@ import
catalogSelectorDirective,
catalogSelectorSearchFilter,
catalogSelectorSortFilter
-} from "components/catalog-selector/catalog-selector.directive";
+} from "./components/catalog-selector/catalog-selector.directive";
import customActionDirective from "./components/custom-action/custom-action.directive";
-import customConfigSuggestionDropdown from "components/custom-config-widget/suggestion-dropdown";
-import {onErrorDirective} from "components/catalog-selector/on-error.directive";
-import {breadcrumbsDirective} from "components/breacrumbs/breadcrumbs.directive";
-import {recursionHelperFactory} from "components/factories/recursion-helper.factory";
-import {objectCacheFactory} from 'components/factories/object-cache.factory';
-import {entityNameFilter, entityVersionFilter, entityTypesFilter} from "components/filters/entity.filter";
-import {locationsFilter} from "components/filters/locations.filter";
-import {blueprintServiceProvider} from "components/providers/blueprint-service.provider";
-import {dslServiceProvider} from "components/providers/dsl-service.provider";
-import {paletteDragAndDropServiceProvider} from "components/providers/palette-dragndrop.provider";
++import customConfigSuggestionDropdown from "./components/custom-config-widget/suggestion-dropdown";
+import {onErrorDirective} from "./components/catalog-selector/on-error.directive";
+import {breadcrumbsDirective} from "./components/breacrumbs/breadcrumbs.directive";
+import {recursionHelperFactory} from "./components/factories/recursion-helper.factory";
+import {objectCacheFactory} from './components/factories/object-cache.factory';
+import {entityNameFilter, entityVersionFilter, entityTypesFilter} from "./components/filters/entity.filter";
+import {locationsFilter} from "./components/filters/locations.filter";
+import {blueprintServiceProvider} from "./components/providers/blueprint-service.provider";
+import {dslServiceProvider} from "./components/providers/dsl-service.provider";
+import {paletteDragAndDropServiceProvider} from "./components/providers/palette-dragndrop.provider";
import {actionServiceProvider} from "./components/providers/action-service.provider";
-import {mainState} from "views/main/main.controller";
-import {yamlState} from "views/main/yaml/yaml.state";
-import {graphicalState} from "views/main/graphical/graphical.state";
-import {graphicalEditState} from "views/main/graphical/edit/edit.controller";
-import {graphicalEditAddState} from "views/main/graphical/edit/add/add";
-import {graphicalEditEntityState} from "views/main/graphical/edit/entity/edit.entity.controller";
-import {graphicalEditPolicyState} from "views/main/graphical/edit/policy/edit.policy.controller";
-import {graphicalEditEnricherState} from "views/main/graphical/edit/enricher/edit.enricher.controller";
-import {graphicalEditSpecState} from "views/main/graphical/edit/spec/edit.spec.controller";
-import {graphicalEditDslState, dslParamLabelFilter} from "views/main/graphical/edit/dsl/edit.dsl.controller";
+import {mainState} from "./views/main/main.controller";
+import {yamlState} from "./views/main/yaml/yaml.state";
+import {graphicalState} from "./views/main/graphical/graphical.state";
+import {graphicalEditState} from "./views/main/graphical/edit/edit.controller";
+import {graphicalEditAddState} from "./views/main/graphical/edit/add/add";
+import {graphicalEditEntityState} from "./views/main/graphical/edit/entity/edit.entity.controller";
+import {graphicalEditPolicyState} from "./views/main/graphical/edit/policy/edit.policy.controller";
+import {graphicalEditEnricherState} from "./views/main/graphical/edit/enricher/edit.enricher.controller";
+import {graphicalEditSpecState} from "./views/main/graphical/edit/spec/edit.spec.controller";
+import {graphicalEditDslState, dslParamLabelFilter} from "./views/main/graphical/edit/dsl/edit.dsl.controller";
import bottomSheet from "brooklyn-ui-utils/bottom-sheet/bottom-sheet";
import stackViewer from 'angular-java-stack-viewer';