This is an automated email from the ASF dual-hosted git repository. swapan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit a954a3ad4aa9308f5cc8082d50abebe3eae28f2e Merge: 5be3604 ab121da Author: swapanshridhar <shridhar.swa...@gmail.com> AuthorDate: Fri Mar 9 16:26:09 2018 -0800 Ambari 23193. Merge UI branch 'branch-feature-AMBARI-14714-ui' into 'branch-feature-AMBARI-14714'. .gitignore | 1 + .../server/orm/entities/RepoDefinitionEntity.java | 1 + .../KAFKA/0.8.1/package/scripts/kafka_broker.py | 2 +- .../ZEPPELIN/0.6.0.3.0/metainfo.xml | 103 ++ ambari-web/app/app.js | 3 +- .../app/assets/data/users/privileges_admin.json | 58 +- ambari-web/app/assets/index.html | 8 +- ambari-web/app/assets/test/tests.js | 19 + ambari-web/app/controllers.js | 15 + ambari-web/app/controllers/installer.js | 461 +++++-- .../mpackUpgrade/downloadMpacks_controller.js} | 23 +- .../mpackUpgrade/downloadOptions_controller.js} | 23 +- .../mpackUpgrade/reviewConfigs_controller.js} | 23 +- .../selectUpgradeOptions_controller.js} | 23 +- .../mpackUpgrade/selectUpgradeType_controller.js} | 23 +- .../mpackUpgrade/upgradeSummary_controller.js} | 23 +- .../main/admin/mpack_upgrade_controller.js | 176 +++ .../main/admin/serviceGroups_controller.js | 253 ++++ .../app/controllers/main/host/add_controller.js | 2 +- .../app/controllers/main/service/add_controller.js | 4 +- ambari-web/app/controllers/wizard.js | 78 +- .../wizard/configureDownload_controller.js | 82 ++ .../wizard/customMpackRepos_controller.js | 50 + .../wizard/customProductRepos_controller.js | 285 +++++ .../wizard/downloadMpacks_controller.js | 157 +++ .../controllers/wizard/selectMpacks_controller.js | 612 ++++++++++ .../app/controllers/wizard/step0_controller.js | 5 +- .../app/controllers/wizard/step10_controller.js | 7 +- .../app/controllers/wizard/step1_controller.js | 5 +- .../app/controllers/wizard/step2_controller.js | 212 +++- .../app/controllers/wizard/step3_controller.js | 26 +- .../app/controllers/wizard/step4_controller.js | 9 +- .../app/controllers/wizard/step5_controller.js | 13 +- .../app/controllers/wizard/step6_controller.js | 24 +- .../app/controllers/wizard/step7_controller.js | 28 +- .../app/controllers/wizard/step8_controller.js | 208 ++-- .../app/controllers/wizard/step9_controller.js | 25 +- .../wizard/verifyProducts_controller.js | 162 +++ ...tep5_controller.js => wizardStep_controller.js} | 37 +- .../data/configs/wizards/kerberos_identities.js | 6 +- ambari-web/app/mappers.js | 3 +- .../configs/stack_config_properties_mapper.js | 36 +- ambari-web/app/mappers/mpack_service_mapper.js | 114 ++ ambari-web/app/mappers/stack_mapper.js | 14 +- ambari-web/app/messages.js | 679 +++++----- .../app/mixins/common/configs/enhanced_configs.js | 36 +- .../hosts/host_component_recommendation_mixin.js | 16 +- .../hosts/host_component_validation_mixin.js | 16 +- .../app/mixins/wizard/assign_master_components.js | 43 +- ambari-web/app/mixins/wizard/wizard_menu_view.js | 74 +- ambari-web/app/models/repository.js | 8 +- ambari-web/app/models/stack.js | 2 - ambari-web/app/router.js | 25 +- ambari-web/app/routes/installer.js | 581 +++++++-- ambari-web/app/routes/main.js | 25 +- ambari-web/app/routes/mpack_upgrade_routes.js | 225 ++++ ambari-web/app/styles/application.less | 469 ++++++- ambari-web/app/styles/bootstrap_overrides.less | 147 ++- ambari-web/app/styles/common.less | 8 +- ambari-web/app/styles/dashrow.less | 98 ++ ambari-web/app/styles/modal_popups.less | 12 + ambari-web/app/styles/stack_versions.less | 2 +- ambari-web/app/styles/theme/bootstrap-ambari.css | 28 +- ambari-web/app/styles/widgets.less | 4 +- ambari-web/app/styles/wizard.less | 474 +++++-- ambari-web/app/templates.js | 1 + .../templates/common/assign_master_components.hbs | 10 +- ambari-web/app/templates/common/dashrow.hbs | 61 + ambari-web/app/templates/common/modal_popup.hbs | 2 +- .../app/templates/common/mpackComparison.hbs | 39 + ambari-web/app/templates/common/pagination.hbs | 2 +- ambari-web/app/templates/common/timeline.hbs | 34 + ambari-web/app/templates/installer.hbs | 34 +- .../main/admin/mpackUpgrade/downloadMpacks.hbs | 41 + .../main/admin/mpackUpgrade/downloadOptions.hbs | 35 + .../main/admin/mpackUpgrade/reviewConfigs.hbs | 41 + .../admin/mpackUpgrade/selectUpgradeOptions.hbs | 41 + .../main/admin/mpackUpgrade/selectUpgradeType.hbs | 41 + .../main/admin/mpackUpgrade/upgradeSummary.hbs | 35 + .../app/templates/main/admin/mpack_upgrade.hbs | 34 + .../app/templates/main/admin/serviceGroups.hbs | 87 ++ .../main/admin/serviceGroups/serviceGroup.hbs | 19 + .../main/admin/serviceGroups/serviceGroupBody.hbs | 39 + .../admin/serviceGroups/serviceGroupHeader.hbs | 19 + .../main/admin/serviceGroups/serviceGroupMenu.hbs | 24 + .../main/admin/serviceGroups/startUpgradePlan.hbs | 42 + .../main/admin/serviceGroups/upgradeStatusBody.hbs | 45 + .../admin/serviceGroups/upgradeStatusHeader.hbs | 35 + .../main/admin/serviceGroups/upgradeStatusMenu.hbs | 22 + .../app/templates/wizard/configureDownload.hbs | 92 ++ .../app/templates/wizard/customMpackRepos.hbs | 73 ++ .../app/templates/wizard/customProductRepos.hbs | 121 ++ ambari-web/app/templates/wizard/downloadMpacks.hbs | 93 ++ ambari-web/app/templates/wizard/selectMpacks.hbs | 138 +++ .../app/templates/wizard/selectMpacks/mpack.hbs | 46 + .../wizard/selectMpacks/selectedMpackVersion.hbs | 40 + .../app/templates/wizard/selectMpacks/service.hbs | 36 + .../app/templates/wizard/selectMpacks/usecase.hbs | 28 + ambari-web/app/templates/wizard/step0.hbs | 18 +- ambari-web/app/templates/wizard/step1.hbs | 4 +- ambari-web/app/templates/wizard/step10.hbs | 6 +- ambari-web/app/templates/wizard/step2.hbs | 151 ++- ambari-web/app/templates/wizard/step3.hbs | 205 ++-- ambari-web/app/templates/wizard/step4.hbs | 2 +- ambari-web/app/templates/wizard/step6.hbs | 7 +- ambari-web/app/templates/wizard/step7.hbs | 2 +- ambari-web/app/templates/wizard/step8.hbs | 16 +- ambari-web/app/templates/wizard/step9.hbs | 15 +- ambari-web/app/templates/wizard/verifyProducts.hbs | 108 ++ ambari-web/app/utils.js | 1 + ambari-web/app/utils/ajax/ajax.js | 115 +- ambari-web/app/utils/config.js | 3 - .../step5_controller.js => utils/constants.js} | 27 +- ambari-web/app/utils/date/date.js | 25 +- ambari-web/app/utils/db.js | 1 + ambari-web/app/utils/handlebars_helpers.js | 13 +- ambari-web/app/views.js | 29 +- ambari-web/app/views/common/breadcrumbs_view.js | 3 + ambari-web/app/views/common/dashrow_view.js | 72 ++ .../common/helpers/format_date_view.js} | 27 +- ambari-web/app/views/common/modal_popup.js | 39 +- ambari-web/app/views/common/timeline_view.js | 63 + .../main/admin/mpackUpgrade/downloadMpacks_view.js | 26 + .../admin/mpackUpgrade/downloadOptions_view.js | 26 + .../main/admin/mpackUpgrade/reviewConfigs_view.js | 26 + .../mpackUpgrade/selectUpgradeOptions_view.js | 26 + .../admin/mpackUpgrade/selectUpgradeType_view.js | 26 + .../main/admin/mpackUpgrade/upgradeSummary_view.js | 26 + .../main/admin/mpack_upgrade_view.js} | 21 +- .../main/admin/serviceGroups/serviceGroup_view.js | 44 + .../main/admin/serviceGroups/upgradeStatus_view.js | 73 ++ .../app/views/main/admin/serviceGroups_view.js | 51 + ambari-web/app/views/main/menu.js | 10 +- .../app/views/wizard/configureDownload_view.js | 103 ++ .../app/views/wizard/customMpackRepos_view.js | 35 + .../app/views/wizard/customProductRepos_view.js | 73 ++ ambari-web/app/views/wizard/downloadMpacks_view.js | 44 + ambari-web/app/views/wizard/selectMpacks_view.js | 194 +++ ambari-web/app/views/wizard/step2_view.js | 13 +- ambari-web/app/views/wizard/step3_view.js | 15 +- ambari-web/app/views/wizard/step6_view.js | 1 + ambari-web/app/views/wizard/verifyProducts_view.js | 42 + ambari-web/test/controllers/installer_test.js | 266 ++-- .../downloadMpacks_controller_test.js} | 21 +- .../downloadOptions_controller_test.js} | 21 +- .../mpackUpgrade/reviewConfigs_controller_test.js} | 21 +- .../selectUpgradeOptions_controller_test.js} | 21 +- .../selectUpgradeType_controller_test.js} | 21 +- .../upgradeSummary_controller_test.js} | 21 +- .../main/admin/mpack_upgrade_controller_test.js} | 21 +- .../controllers/main/host/add_controller_test.js | 2 +- .../main/service/add_controller_test.js | 2 +- .../controllers/wizard/configureDownload_test.js | 85 ++ .../controllers/wizard/customProductRepos_test.js | 80 ++ .../test/controllers/wizard/downloadMpacks_test.js | 128 ++ .../test/controllers/wizard/selectMpacks_test.js | 1291 ++++++++++++++++++++ ambari-web/test/controllers/wizard/step2_test.js | 117 +- ambari-web/test/controllers/wizard/step3_test.js | 23 - ambari-web/test/controllers/wizard/step5_test.js | 1 + ambari-web/test/controllers/wizard/step6_test.js | 31 +- ambari-web/test/controllers/wizard/step8_test.js | 225 ++-- ambari-web/test/controllers/wizard/step9_test.js | 6 +- .../test/controllers/wizard/verifyProducts_test.js | 54 + .../test/controllers/wizard/wizardStep_test.js | 51 + ambari-web/test/controllers/wizard_test.js | 108 ++ .../test/mixins/routers/redirections_test.js | 8 +- ambari-web/test/utils/config_test.js | 3 - ambari-web/test/utils/date/date_test.js | 32 + .../views/common/dashrow_view_test.js} | 32 +- .../helpers/format_date_view_test.js} | 34 +- ambari-web/test/views/common/timeline_view_test.js | 220 ++++ ambari-web/test/views/installer_test.js | 16 +- .../views/wizard/configureDownload_view_test.js | 139 +++ .../customMpackRepos_view_test.js} | 48 +- .../views/wizard/customProductRepos_view_test.js | 185 +++ ambari-web/test/views/wizard/step2_view_test.js | 35 +- ambari-web/test/views/wizard/step3_view_test.js | 46 + ambari-web/test/views/wizard/step6_view_test.js | 5 +- 178 files changed, 11324 insertions(+), 1787 deletions(-) -- To stop receiving notification emails like this one, please contact swa...@apache.org.