Repository: ignite Updated Branches: refs/heads/master c8f60b27b -> 134174f1e
IGNITE-9556 Web Console: Refactored DI from class names to string tokens. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/134174f1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/134174f1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/134174f1 Branch: refs/heads/master Commit: 134174f1ee6d961a51b03b4e92f7a97504c88f58 Parents: c8f60b2 Author: Ilya Borisov <[email protected]> Authored: Thu Sep 13 16:17:17 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Sep 13 16:17:17 2018 +0700 ---------------------------------------------------------------------- modules/web-console/frontend/app/app.js | 6 ++--- .../connected-clusters-badge/controller.js | 2 +- .../components/cell-logout/index.js | 2 +- .../app/components/grid-export/component.js | 2 +- .../components/list-editable-one-way/index.js | 2 +- .../list-editable-save-on-changes/index.js | 6 ++--- .../list-editable-transclude/index.js | 2 +- .../components/model-edit-form/controller.js | 3 ++- .../controller.js | 7 +++--- .../page-configure-advanced-caches/index.js | 2 +- .../controller.js | 2 +- .../page-configure-advanced-igfs/controller.js | 3 ++- .../controller.js | 3 ++- .../page-configure-basic/controller.js | 2 +- .../page-configure-overview/controller.js | 10 ++++---- .../components/formUICanExitGuard.js | 2 +- .../components/modal-import-models/component.js | 3 ++- .../components/modal-import-models/index.js | 12 ++++----- .../component.js | 2 +- .../step-indicator/component.js | 1 - .../tables-action-cell/component.js | 1 - .../components/modal-preview-project/index.js | 2 +- .../app/components/page-configure/index.js | 6 ++--- .../services/ConfigChangesGuard.js | 2 +- .../page-configure/services/PageConfigure.js | 3 ++- .../components/page-configure/store/effects.js | 17 +++++++------ .../components/queries-notebook/controller.js | 2 +- .../app/modules/agent/AgentManager.service.js | 2 +- .../frontend/app/modules/agent/agent.module.js | 4 +-- .../agent/components/cluster-login/component.js | 1 - .../agent/components/cluster-login/index.js | 7 +++--- modules/web-console/frontend/package.json | 26 ++++++++++---------- 32 files changed, 75 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/app.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js index 4a049d4..20bcbff 100644 --- a/modules/web-console/frontend/app/app.js +++ b/modules/web-console/frontend/app/app.js @@ -261,7 +261,7 @@ export default angular.module('ignite-console', [ progressLine.name, formField.name ]) -.service($exceptionHandler.name, $exceptionHandler) +.service('$exceptionHandler', $exceptionHandler) // Directives. .directive(...igniteAutoFocus) .directive(...igniteBsAffixUpdate) @@ -290,7 +290,7 @@ export default angular.module('ignite-console', [ .service('SqlTypes', SqlTypes) .service(...ChartColors) .service(...IgniteConfirm) -.service(Confirm.name, Confirm) +.service('Confirm', Confirm) .service('IgniteConfirmBatch', ConfirmBatch) .service(...CopyToClipboard) .service(...Countries) @@ -305,7 +305,7 @@ export default angular.module('ignite-console', [ .service(...UnsavedChangesGuard) .service('IgniteActivitiesUserDialog', IgniteActivitiesUserDialog) .service('Caches', Caches) -.service(CSV.name, CSV) +.service('CSV', CSV) .service('IGFSs', IGFSs) .service('Models', Models) // Filters. http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js b/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js index 64b23cf..8a622d9 100644 --- a/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js +++ b/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js @@ -18,7 +18,7 @@ import AgentManager from 'app/modules/agent/AgentManager.service'; export default class { - static $inject = [AgentManager.name, 'ConnectedClustersDialog']; + static $inject = ['AgentManager', 'ConnectedClustersDialog']; /** @type {Number} */ connectedClusters = 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js b/modules/web-console/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js index 26f2b12..1f7af80 100644 --- a/modules/web-console/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js +++ b/modules/web-console/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js @@ -20,7 +20,7 @@ import template from './template.pug'; import AgentManager from 'app/modules/agent/AgentManager.service'; class controller { - static $inject = [AgentManager.name]; + static $inject = ['AgentManager']; /** * @param {AgentManager} agentMgr http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/grid-export/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/grid-export/component.js b/modules/web-console/frontend/app/components/grid-export/component.js index d8e9232..d4cfb29 100644 --- a/modules/web-console/frontend/app/components/grid-export/component.js +++ b/modules/web-console/frontend/app/components/grid-export/component.js @@ -21,7 +21,7 @@ import {CSV} from 'app/services/CSV'; export default { template, controller: class { - static $inject = ['$scope', 'uiGridGroupingConstants', 'uiGridExporterService', 'uiGridExporterConstants', CSV.name]; + static $inject = ['$scope', 'uiGridGroupingConstants', 'uiGridExporterService', 'uiGridExporterConstants', 'CSV']; /** * @param {CSV} CSV http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/index.js b/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/index.js index 3c49003..652ac0a 100644 --- a/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/index.js +++ b/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/index.js @@ -21,4 +21,4 @@ import directive from './directive'; export default angular .module('ignite-console.list-editable.one-way', []) - .directive(directive.name, directive); + .directive('listEditableOneWay', directive); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.js b/modules/web-console/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.js index 642e84a..18e26db 100644 --- a/modules/web-console/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.js +++ b/modules/web-console/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.js @@ -19,6 +19,6 @@ import angular from 'angular'; import {ngModel, listEditableTransclude} from './directives'; export default angular -.module('list-editable.save-on-changes', []) -.directive(ngModel.name, ngModel) -.directive(listEditableTransclude.name, listEditableTransclude); + .module('list-editable.save-on-changes', []) + .directive('ngModel', ngModel) + .directive('listEditableTransclude', listEditableTransclude); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/index.js b/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/index.js index 39d5b73..6d681a4 100644 --- a/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/index.js +++ b/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/index.js @@ -20,4 +20,4 @@ import {listEditableTransclude} from './directive'; export default angular .module('list-editable.transclude', []) - .directive(listEditableTransclude.name, listEditableTransclude); + .directive('listEditableTransclude', listEditableTransclude); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/controller.js index b7d4ebe..2b53d97 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/controller.js @@ -31,7 +31,8 @@ export default class ModelEditFormController { /** @type {ng.ICompiledExpression} */ onSave; - static $inject = ['ModalImportModels', 'IgniteErrorPopover', 'IgniteLegacyUtils', Confirm.name, 'ConfigChangesGuard', IgniteVersion.name, '$scope', Models.name, 'IgniteFormUtils']; + static $inject = ['ModalImportModels', 'IgniteErrorPopover', 'IgniteLegacyUtils', 'Confirm', 'ConfigChangesGuard', 'IgniteVersion', '$scope', 'Models', 'IgniteFormUtils']; + /** * @param {ModalImportModels} ModalImportModels * @param {Confirm} Confirm http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/controller.js index ecb7a15..da17c67 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/controller.js @@ -27,16 +27,17 @@ import Caches from 'app/services/Caches'; // Controller for Caches screen. export default class Controller { static $inject = [ - ConfigSelectors.name, + 'ConfigSelectors', 'configSelectionManager', '$uiRouter', '$transitions', - ConfigureState.name, + 'ConfigureState', '$state', 'IgniteFormUtils', 'IgniteVersion', - Caches.name + 'Caches' ]; + /** * @param {ConfigSelectors} ConfigSelectors * @param {object} configSelectionManager http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/index.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/index.js index 818c263..c6c751c 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/index.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-caches/index.js @@ -20,4 +20,4 @@ import component from './component'; export default angular .module('ignite-console.page-configure-advanced.caches', []) - .component(component.name, component); + .component('pageConfigureAdvancedCaches', component); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.js index 2b05940..f0348c3 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.js @@ -22,7 +22,7 @@ import 'rxjs/add/operator/publishReplay'; // Controller for Clusters screen. export default class PageConfigureAdvancedCluster { - static $inject = ['$uiRouter', ConfigSelectors.name, ConfigureState.name]; + static $inject = ['$uiRouter', 'ConfigSelectors', 'ConfigureState']; /** * @param {uirouter.UIRouter} $uiRouter http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.js index dd0e5da..50eee7c 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.js @@ -27,7 +27,8 @@ import ConfigSelectors from 'app/components/page-configure/store/selectors'; import IGFSs from 'app/services/IGFSs'; export default class PageConfigureAdvancedIGFS { - static $inject = [ConfigSelectors.name, ConfigureState.name, '$uiRouter', IGFSs.name, '$state', 'configSelectionManager']; + static $inject = ['ConfigSelectors', 'ConfigureState', '$uiRouter', 'IGFSs', '$state', 'configSelectionManager']; + /** * @param {ConfigSelectors} ConfigSelectors * @param {ConfigureState} ConfigureState http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-models/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-models/controller.js b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-models/controller.js index d2a07e8..fd1ccaa 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-models/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/page-configure-advanced-models/controller.js @@ -32,7 +32,8 @@ import {default as ConfigureState} from 'app/components/page-configure/services/ import {default as Models} from 'app/services/Models'; export default class PageConfigureAdvancedModels { - static $inject = [ConfigSelectors.name, ConfigureState.name, '$uiRouter', Models.name, '$state', 'configSelectionManager']; + static $inject = ['ConfigSelectors', 'ConfigureState', '$uiRouter', 'Models', '$state', 'configSelectionManager']; + /** * @param {ConfigSelectors} ConfigSelectors * @param {ConfigureState} ConfigureState http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-basic/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-basic/controller.js b/modules/web-console/frontend/app/components/page-configure-basic/controller.js index 105765a..6d116e8 100644 --- a/modules/web-console/frontend/app/components/page-configure-basic/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-basic/controller.js @@ -40,7 +40,7 @@ export default class PageConfigureBasicController { form; static $inject = [ - Confirm.name, '$uiRouter', ConfigureState.name, ConfigSelectors.name, Clusters.name, Caches.name, IgniteVersion.name, '$element', 'ConfigChangesGuard', 'IgniteFormUtils', '$scope' + 'Confirm', '$uiRouter', 'ConfigureState', 'ConfigSelectors', 'Clusters', 'Caches', 'IgniteVersion', '$element', 'ConfigChangesGuard', 'IgniteFormUtils', '$scope' ]; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure-overview/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-overview/controller.js b/modules/web-console/frontend/app/components/page-configure-overview/controller.js index db21d9a..e49e5c6 100644 --- a/modules/web-console/frontend/app/components/page-configure-overview/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-overview/controller.js @@ -39,11 +39,11 @@ import {confirmClustersRemoval} from '../page-configure/store/actionCreators'; export default class PageConfigureOverviewController { static $inject = [ '$uiRouter', - ModalPreviewProject.name, - Clusters.name, - ConfigureState.name, - ConfigSelectors.name, - ConfigurationDownload.name + 'ModalPreviewProject', + 'Clusters', + 'ConfigureState', + 'ConfigSelectors', + 'ConfigurationDownload' ]; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/formUICanExitGuard.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/formUICanExitGuard.js b/modules/web-console/frontend/app/components/page-configure/components/formUICanExitGuard.js index c962161..ce1f73d 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/formUICanExitGuard.js +++ b/modules/web-console/frontend/app/components/page-configure/components/formUICanExitGuard.js @@ -18,7 +18,7 @@ import {default as ConfigChangesGuard} from '../services/ConfigChangesGuard'; class FormUICanExitGuardController { - static $inject = ['$element', ConfigChangesGuard.name]; + static $inject = ['$element', 'ConfigChangesGuard']; /** * @param {JQLite} $element http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/component.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/component.js index 73a8daa..3c302ff 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/component.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/component.js @@ -93,7 +93,8 @@ export class ModalImportModels { /** @type {ng.ICompiledExpression} */ onHide; - static $inject = ['$uiRouter', ConfigSelectors.name, ConfigEffects.name, ConfigureState.name, '$http', 'IgniteConfirm', IgniteConfirmBatch.name, 'IgniteFocus', SqlTypes.name, JavaTypes.name, 'IgniteMessages', '$scope', '$rootScope', 'AgentManager', 'IgniteActivitiesData', 'IgniteLoading', 'IgniteFormUtils', 'IgniteLegacyUtils']; + static $inject = ['$uiRouter', 'ConfigSelectors', 'ConfigEffects', 'ConfigureState', '$http', 'IgniteConfirm', 'IgniteConfirmBatch', 'IgniteFocus', 'SqlTypes', 'JavaTypes', 'IgniteMessages', '$scope', '$rootScope', 'AgentManager', 'IgniteActivitiesData', 'IgniteLoading', 'IgniteFormUtils', 'IgniteLegacyUtils']; + /** * @param {UIRouter} $uiRouter * @param {ConfigSelectors} ConfigSelectors http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/index.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/index.js index b75c89a..3bc71da 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/index.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/index.js @@ -23,9 +23,9 @@ import {component as tablesActionCell} from './tables-action-cell/component'; import {component as amountIndicator} from './selected-items-amount-indicator/component'; export default angular -.module('configuration.modal-import-models', []) -.service(service.name, service) -.component(tablesActionCell.name, tablesActionCell) -.component(stepIndicator.name, stepIndicator) -.component(amountIndicator.name, amountIndicator) -.component(component.name, component); + .module('configuration.modal-import-models', []) + .service('ModalImportModels', service) + .component('tablesActionCell', tablesActionCell) + .component('modalImportModelsStepIndicator', stepIndicator) + .component('selectedItemsAmountIndicator', amountIndicator) + .component('modalImportModels', component); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/selected-items-amount-indicator/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/selected-items-amount-indicator/component.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/selected-items-amount-indicator/component.js index 26a6ea0..abee6b0 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/selected-items-amount-indicator/component.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/selected-items-amount-indicator/component.js @@ -17,8 +17,8 @@ import template from './template.pug'; import './style.scss'; + export const component = { - name: 'selectedItemsAmountIndicator', template, bindings: { selectedAmount: '<', http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/step-indicator/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/step-indicator/component.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/step-indicator/component.js index 4f2b141..c37662c 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/step-indicator/component.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/step-indicator/component.js @@ -25,7 +25,6 @@ export class ModalImportModelsStepIndicator { } export const component = { - name: 'modalImportModelsStepIndicator', template, controller: ModalImportModelsStepIndicator, bindings: { http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/tables-action-cell/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/tables-action-cell/component.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/tables-action-cell/component.js index 7fde5ba..17d4dc1 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/tables-action-cell/component.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/tables-action-cell/component.js @@ -59,7 +59,6 @@ export class TablesActionCell { } export const component = { - name: 'tablesActionCell', controller: TablesActionCell, bindings: { onEditStart: '&', http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/index.js b/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/index.js index a0dc92e..a8aebb5 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/index.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/index.js @@ -23,5 +23,5 @@ import service from './service'; export default angular .module('ignite-console.page-configure.modal-preview-project', []) - .service(service.name, service) + .service('ModalPreviewProject', service) .component(component.name, component); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/index.js b/modules/web-console/frontend/app/components/page-configure/index.js index 6dee704..c1d51ee 100644 --- a/modules/web-console/frontend/app/components/page-configure/index.js +++ b/modules/web-console/frontend/app/components/page-configure/index.js @@ -177,9 +177,9 @@ export default angular ConfigEffects.connect(); }]) .component('pageConfigure', component) - .directive(isInCollection.name, isInCollection) - .directive(fakeUiCanExit.name, fakeUiCanExit) - .directive(formUICanExitGuard.name, formUICanExitGuard) + .directive('pcIsInCollection', isInCollection) + .directive('fakeUiCanExit', fakeUiCanExit) + .directive('formUiCanExitGuard', formUICanExitGuard) .factory('configSelectionManager', ConfigSelectionManager) .service('IgniteSummaryZipper', SummaryZipper) .service('IgniteConfigurationResource', ConfigurationResource) http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/services/ConfigChangesGuard.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/services/ConfigChangesGuard.js b/modules/web-console/frontend/app/components/page-configure/services/ConfigChangesGuard.js index cca0e9e..a84b120 100644 --- a/modules/web-console/frontend/app/components/page-configure/services/ConfigChangesGuard.js +++ b/modules/web-console/frontend/app/components/page-configure/services/ConfigChangesGuard.js @@ -52,7 +52,7 @@ export class IgniteObjectDiffer { } export default class ConfigChangesGuard { - static $inject = [Confirm.name, '$sce']; + static $inject = ['Confirm', '$sce']; /** * @param {Confirm} Confirm. http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js b/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js index 35c1c01..d81921e 100644 --- a/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js +++ b/modules/web-console/frontend/app/components/page-configure/services/PageConfigure.js @@ -38,7 +38,8 @@ import {default as ConfigureState} from 'app/components/page-configure/services/ import {default as ConfigSelectors} from 'app/components/page-configure/store/selectors'; export default class PageConfigure { - static $inject = [ConfigureState.name, ConfigSelectors.name]; + static $inject = ['ConfigureState', 'ConfigSelectors']; + /** * @param {ConfigureState} ConfigureState * @param {ConfigSelectors} ConfigSelectors http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-configure/store/effects.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/store/effects.js b/modules/web-console/frontend/app/components/page-configure/store/effects.js index 9647461..014076b 100644 --- a/modules/web-console/frontend/app/components/page-configure/store/effects.js +++ b/modules/web-console/frontend/app/components/page-configure/store/effects.js @@ -85,18 +85,19 @@ export const ofType = (type) => (s) => s.filter((a) => a.type === type); export default class ConfigEffects { static $inject = [ - ConfigureState.name, - Caches.name, - IGFSs.name, - Models.name, - ConfigSelectors.name, - Clusters.name, + 'ConfigureState', + 'Caches', + 'IGFSs', + 'Models', + 'ConfigSelectors', + 'Clusters', '$state', 'IgniteMessages', 'IgniteConfirm', - Confirm.name, - ConfigurationDownload.name + 'Confirm', + 'ConfigurationDownload' ]; + /** * @param {ConfigureState} ConfigureState * @param {Caches} Caches http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js index d6a8271..10904dc 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js @@ -251,7 +251,7 @@ class Paragraph { // Controller for SQL notebook screen. export class NotebookCtrl { - static $inject = ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval', '$animate', '$location', '$anchorScroll', '$state', '$filter', '$modal', '$popover', 'IgniteLoading', 'IgniteLegacyUtils', 'IgniteMessages', 'IgniteConfirm', 'AgentManager', 'IgniteChartColors', 'IgniteNotebook', 'IgniteNodes', 'uiGridExporterConstants', 'IgniteVersion', 'IgniteActivitiesData', 'JavaTypes', 'IgniteCopyToClipboard', CSV.name, 'IgniteErrorParser']; + static $inject = ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval', '$animate', '$location', '$anchorScroll', '$state', '$filter', '$modal', '$popover', 'IgniteLoading', 'IgniteLegacyUtils', 'IgniteMessages', 'IgniteConfirm', 'AgentManager', 'IgniteChartColors', 'IgniteNotebook', 'IgniteNodes', 'uiGridExporterConstants', 'IgniteVersion', 'IgniteActivitiesData', 'JavaTypes', 'IgniteCopyToClipboard', 'CSV', 'IgniteErrorParser']; /** * @param {CSV} CSV http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/modules/agent/AgentManager.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js index 22079c1..85f94de 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -118,7 +118,7 @@ class ConnectionState { } export default class AgentManager { - static $inject = ['$rootScope', '$q', '$transitions', 'igniteSocketFactory', AgentModal.name, 'UserNotifications', 'IgniteVersion', ClusterLoginService.name]; + static $inject = ['$rootScope', '$q', '$transitions', 'igniteSocketFactory', 'AgentModal', 'UserNotifications', 'IgniteVersion', 'ClusterLoginService']; /** @type {ng.IScope} */ $root; http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/modules/agent/agent.module.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/agent.module.js b/modules/web-console/frontend/app/modules/agent/agent.module.js index 1812af0..9189d92 100644 --- a/modules/web-console/frontend/app/modules/agent/agent.module.js +++ b/modules/web-console/frontend/app/modules/agent/agent.module.js @@ -26,5 +26,5 @@ angular .module('ignite-console.agent', [ clusterLogin.name ]) - .service(AgentModal.name, AgentModal) - .service(AgentManager.name, AgentManager); + .service('AgentModal', AgentModal) + .service('AgentManager', AgentManager); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/modules/agent/components/cluster-login/component.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/component.js b/modules/web-console/frontend/app/modules/agent/components/cluster-login/component.js index a8311ed..5f1d9e3 100644 --- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/component.js +++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/component.js @@ -19,7 +19,6 @@ import template from './template.pug'; import {ClusterSecrets} from '../../types/ClusterSecrets'; export const component = { - name: 'clusterLogin', bindings: { secrets: '=', onLogin: '&', http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/app/modules/agent/components/cluster-login/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/index.js b/modules/web-console/frontend/app/modules/agent/components/cluster-login/index.js index 24cce4f..177ccda 100644 --- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/index.js +++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/index.js @@ -20,7 +20,6 @@ import {component} from './component'; import service from './service'; export default angular - .module('ignite-console.agent.cluster-login', [ - ]) - .service(service.name, service) - .component(component.name, component); + .module('ignite-console.agent.cluster-login', []) + .service('ClusterLoginService', service) + .component('clusterLogin', component); http://git-wip-us.apache.org/repos/asf/ignite/blob/134174f1/modules/web-console/frontend/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index 724888e..2b4fafa 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -73,11 +73,11 @@ "tf-metatags": "2.0.0" }, "devDependencies": { - "@babel/core": "7.0.0-rc.1", - "@babel/plugin-proposal-class-properties": "7.0.0-rc.1", - "@babel/plugin-proposal-object-rest-spread": "7.0.0-rc.1", - "@babel/plugin-syntax-dynamic-import": "7.0.0-rc.1", - "@babel/preset-env": "7.0.0-rc.1", + "@babel/core": "7.0.1", + "@babel/plugin-proposal-class-properties": "7.0.0", + "@babel/plugin-proposal-object-rest-spread": "7.0.0", + "@babel/plugin-syntax-dynamic-import": "7.0.0", + "@babel/preset-env": "7.0.0", "@types/angular": "1.6.48", "@types/angular-animate": "1.5.10", "@types/angular-mocks": "1.5.12", @@ -97,7 +97,7 @@ "angular-mocks": "1.6.9", "app-root-path": "2.0.1", "babel-eslint": "8.2.6", - "babel-loader": "8.0.0-beta.6", + "babel-loader": "8.0.2", "bootstrap-sass": "3.3.7", "chai": "4.1.0", "chalk": "2.1.0", @@ -106,7 +106,7 @@ "eslint": "4.19.1", "eslint-friendly-formatter": "3.0.0", "eslint-loader": "2.1.0", - "eslint-plugin-babel": "5.1.0", + "eslint-plugin-babel": "5.2.0", "expose-loader": "0.7.5", "file-loader": "1.1.11", "glob": "7.1.2", @@ -122,12 +122,12 @@ "karma-mocha": "1.3.0", "karma-mocha-reporter": "2.2.3", "karma-teamcity-reporter": "1.0.0", - "karma-webpack": "4.0.0-beta.0", - "mini-css-extract-plugin": "0.4.1", + "karma-webpack": "4.0.0-rc.2", + "mini-css-extract-plugin": "0.4.2", "mocha": "3.4.2", "mocha-teamcity-reporter": "1.1.1", "node-fetch": "1.7.3", - "node-sass": "4.9.0", + "node-sass": "4.9.3", "progress": "2.0.0", "progress-bar-webpack-plugin": "1.11.0", "pug-html-loader": "1.1.0", @@ -139,10 +139,10 @@ "style-loader": "0.19.0", "svg-sprite-loader": "3.9.2", "teamcity-service-messages": "0.1.9", - "uglifyjs-webpack-plugin": "1.2.4", - "webpack": "4.12.0", + "uglifyjs-webpack-plugin": "1.3.0", + "webpack": "4.18.0", "webpack-cli": "3.1.0", - "webpack-dev-server": "3.1.5", + "webpack-dev-server": "3.1.8", "webpack-merge": "4.1.4", "worker-loader": "2.0.0", "yargs": "9.0.1"
