You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by jc...@apache.org on 2022/06/09 15:18:05 UTC
[brooklyn-ui] 01/01: Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not inyecting the factory in all the modules
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch fix/add-brUtilGeneral
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit f2a98b88ef32c329cbdeba61d7e47b2e70d8d745
Author: Juan Cabrerizo <ju...@cabrerizo.es>
AuthorDate: Thu Jun 9 17:17:40 2022 +0200
Fix issue generated in https://github.com/apache/brooklyn-ui/pull/325 not inyecting the factory in all the modules
---
ui-modules/blueprint-importer/app/index.js | 5 ++++-
ui-modules/groovy-console/app/index.js | 5 +++--
ui-modules/location-manager/app/index.js | 6 +++++-
ui-modules/rest-api-docs/app/index.js | 5 ++++-
ui-modules/utils/utils/general.js | 4 ++--
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ui-modules/blueprint-importer/app/index.js b/ui-modules/blueprint-importer/app/index.js
index fc9ccd36..a376c47c 100644
--- a/ui-modules/blueprint-importer/app/index.js
+++ b/ui-modules/blueprint-importer/app/index.js
@@ -23,6 +23,7 @@ import ngResource from 'angular-resource';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
import brInterstitialSpinner from 'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner';
import brooklynModuleLinks from 'brooklyn-ui-utils/module-links/module-links';
@@ -36,7 +37,9 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
-angular.module('brooklynBlueprintImporter', [ngAnimate, ngCookies, ngResource, brCore, brServerStatus, brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, uiRouter, mainState, brandAngularJs])
+angular.module('brooklynBlueprintImporter', [ngAnimate, ngCookies, ngResource, brCore, brServerStatus,
+ brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, uiRouter, mainState, brUtilsGeneral,
+ brandAngularJs])
.config(['$logProvider', '$compileProvider', appConfig])
.config(['$urlRouterProvider', routerConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
diff --git a/ui-modules/groovy-console/app/index.js b/ui-modules/groovy-console/app/index.js
index 7c660bd9..96ab04d0 100644
--- a/ui-modules/groovy-console/app/index.js
+++ b/ui-modules/groovy-console/app/index.js
@@ -21,6 +21,7 @@ import ngAnimate from 'angular-animate';
import ngCookies from 'angular-cookies';
import uiRouter from 'angular-ui-router';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brLogbook from 'brooklyn-ui-utils/logbook/logbook';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
@@ -35,8 +36,8 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
angular.module('brooklynGroovyConsole', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus,
- brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, brLogbook, mainState, brandAngularJs
- ])
+ brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, brLogbook, mainState, brUtilsGeneral,
+ brandAngularJs])
.config(['$logProvider', '$compileProvider', appConfig])
.config(['$urlRouterProvider', '$stateProvider', routerConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
diff --git a/ui-modules/location-manager/app/index.js b/ui-modules/location-manager/app/index.js
index 17d7374e..105d4117 100644
--- a/ui-modules/location-manager/app/index.js
+++ b/ui-modules/location-manager/app/index.js
@@ -23,6 +23,7 @@ import uiRouter from 'angular-ui-router';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
import brAutoFocus from 'brooklyn-ui-utils/autofocus/autofocus';
import brInterstitialSpinner from 'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner';
@@ -43,7 +44,10 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
-angular.module('brooklynLocationManager', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus, brAutoFocus, brInterstitialSpinner, brooklynModuleLinks, brSensitiveField, brooklynUserManagement, brooklynApi, brooklynCatalogDeleter, locationsState, detailState, wizardState, wizardAdvancedState, wizardByonState, wizardCloudState, brandAngularJs])
+angular.module('brooklynLocationManager', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus,
+ brAutoFocus, brInterstitialSpinner, brooklynModuleLinks, brSensitiveField, brooklynUserManagement, brooklynApi,
+ brooklynCatalogDeleter, locationsState, detailState, wizardState, wizardAdvancedState, wizardByonState,
+ wizardCloudState,brUtilsGeneral, brandAngularJs])
.config(['$urlRouterProvider', '$logProvider', '$compileProvider', applicationConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
.run(['$http', httpConfig]);
diff --git a/ui-modules/rest-api-docs/app/index.js b/ui-modules/rest-api-docs/app/index.js
index 72e5aeea..12a6d5ee 100644
--- a/ui-modules/rest-api-docs/app/index.js
+++ b/ui-modules/rest-api-docs/app/index.js
@@ -23,6 +23,7 @@ import uiRouter from 'angular-ui-router';
import brCore from 'brooklyn-ui-utils/br-core/br-core';
+import brUtilsGeneral from "brooklyn-ui-utils/utils/general";
import brServerStatus from 'brooklyn-ui-utils/server-status/server-status';
import brInterstitialSpinner from 'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner';
import brooklynModuleLinks from 'brooklyn-ui-utils/module-links/module-links';
@@ -34,7 +35,9 @@ import brandAngularJs from 'brand-angular-js';
const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false;
-angular.module('brooklynRestApiDocs', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus, brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, mainState, brandAngularJs])
+angular.module('brooklynRestApiDocs', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus,
+ brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, mainState, brUtilsGeneral,
+ brandAngularJs])
.config(['$logProvider', '$compileProvider', appConfig])
.config(['$urlRouterProvider', routerConfig])
.run(['$rootScope', '$state', 'brSnackbar', errorHandler])
diff --git a/ui-modules/utils/utils/general.js b/ui-modules/utils/utils/general.js
index ff84eb6b..cff70a0e 100644
--- a/ui-modules/utils/utils/general.js
+++ b/ui-modules/utils/utils/general.js
@@ -21,7 +21,7 @@ import angular from 'angular';
const MODULE_NAME = 'br.utils.general';
angular.module(MODULE_NAME, [])
- .factory("brUtilsGeneral", brUtilsGeneralProvider)
+ .factory("brUtilsGeneral", brUtilsGeneralFactory)
.filter('capitalize', capitalizeFilter);
export default MODULE_NAME;
@@ -63,7 +63,7 @@ export function uiModuleComparator(moduleA, moduleB) {
// If no order implemented or is the same, order by name
return moduleA.name.localeCompare(moduleB.name);
}
-export function brUtilsGeneralProvider() {
+export function brUtilsGeneralFactory() {
return {
isNonEmpty,
capitalize,