This is an automated email from the ASF dual-hosted git repository.
jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 71dc770 [AMBARI-24140] Send name, version, and registry ID when
registering mpacks.
71dc770 is described below
commit 71dc770625f9c59974e55ea7d8df4a8d2093a45f
Author: Jason Golieb <[email protected]>
AuthorDate: Mon Jun 18 13:21:16 2018 -0400
[AMBARI-24140] Send name, version, and registry ID when registering mpacks.
---
.../app/controllers/wizard/downloadMpacks_controller.js | 6 ++++--
ambari-web/app/controllers/wizard/selectMpacks_controller.js | 5 +++--
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/test/controllers/wizard/selectMpacks_test.js | 12 ++++++++----
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ambari-web/app/controllers/wizard/downloadMpacks_controller.js
b/ambari-web/app/controllers/wizard/downloadMpacks_controller.js
index 72a7bce..06764e9 100644
--- a/ambari-web/app/controllers/wizard/downloadMpacks_controller.js
+++ b/ambari-web/app/controllers/wizard/downloadMpacks_controller.js
@@ -35,6 +35,7 @@ App.WizardDownloadMpacksController =
App.WizardStepController.extend({
version: mpack.version,
displayName: mpack.displayName,
url: mpack.downloadUrl,
+ registryId: mpack.registryId,
inProgress: true,
failed: false,
succeeded: false,
@@ -54,11 +55,12 @@ App.WizardDownloadMpacksController =
App.WizardStepController.extend({
downloadMpack: function (mpack) {
console.log("downloading mpacks");
return App.ajax.send({
- name: 'mpack.download_by_url',
+ name: 'mpack.download',
sender: this,
data: {
name: mpack.name,
- url: mpack.url
+ version: mpack.version,
+ registryId: mpack.registryId
},
success: 'downloadMpackSuccess',
error: 'downloadMpackError',
diff --git a/ambari-web/app/controllers/wizard/selectMpacks_controller.js
b/ambari-web/app/controllers/wizard/selectMpacks_controller.js
index 3c67430..f19057a 100644
--- a/ambari-web/app/controllers/wizard/selectMpacks_controller.js
+++ b/ambari-web/app/controllers/wizard/selectMpacks_controller.js
@@ -51,6 +51,7 @@ App.WizardSelectMpacksController =
App.WizardStepController.extend({
name: mpack.RegistryMpackInfo.mpack_name,
displayName: mpack.RegistryMpackInfo.mpack_display_name,
description: mpack.RegistryMpackInfo.mpack_description,
+ registryId: mpack.RegistryMpackInfo.registry_id,
//this is the text that will be used to filter this mpack in the UI
//at this point, this is just the text that comes from this mpack
//but additional text will be appended to form the final filterOn
value
@@ -214,7 +215,6 @@ App.WizardSelectMpacksController =
App.WizardStepController.extend({
const mpackVersions = this.get('content.mpackVersions');
const mpackServices = this.get('content.mpackServices');
const mpackServiceVersions = this.get('content.mpackServiceVersions');
- const mpackUsecases = this.get('content.mpackUsecases');
if (!mpacks || mpacks.length === 0
|| !mpackVersions || mpackVersions.length === 0
@@ -586,10 +586,11 @@ App.WizardSelectMpacksController =
App.WizardStepController.extend({
const selectedMpack = {
id: `${mpackVersion.mpack.name}-${mpackVersion.version}`,
name: mpackVersion.mpack.name,
+ version: mpackVersion.version,
displayName: mpackVersion.mpack.displayName,
publicUrl: mpackVersion.mpackUrl,
downloadUrl: mpackVersion.mpackUrl,
- version: mpackVersion.version
+ registryId: mpackVersion.mpack.registryId
};
const oldSelectedMpacks = this.get('content.selectedMpacks');
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index b225aee..ab1897c 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3067,7 +3067,7 @@ var urls = {
"MpackInfo" : {
"mpack_name" : data.name,
"mpack_version" : data.version,
- "registry_id" : data.registry
+ "registry_id" : data.registryId
}
}
})
diff --git a/ambari-web/test/controllers/wizard/selectMpacks_test.js
b/ambari-web/test/controllers/wizard/selectMpacks_test.js
index e2305bc..fc3188e 100644
--- a/ambari-web/test/controllers/wizard/selectMpacks_test.js
+++ b/ambari-web/test/controllers/wizard/selectMpacks_test.js
@@ -1026,7 +1026,8 @@ describe('App.WizardSelectMpacksController', function () {
{
mpack: {
name: "mpackName1",
- displayName: "displayName1"
+ displayName: "displayName1",
+ registryId: 1
},
mpackUrl: "http://someurl.com/mpack1";,
version: "1.0.0.0"
@@ -1034,7 +1035,8 @@ describe('App.WizardSelectMpacksController', function () {
{
mpack: {
name: "mpackName2",
- displayName: "displayName2"
+ displayName: "displayName2",
+ registryId: 1
},
mpackUrl: "http://someurl.com/mpack2";,
version: "1.0.0.0"
@@ -1068,7 +1070,8 @@ describe('App.WizardSelectMpacksController', function () {
displayName: "displayName1",
publicUrl: "http://someurl.com/mpack1";,
downloadUrl: "http://someurl.com/mpack1";,
- version: "1.0.0.0"
+ version: "1.0.0.0",
+ registryId: 1
},
{
id: "mpackName2-1.0.0.0",
@@ -1076,7 +1079,8 @@ describe('App.WizardSelectMpacksController', function () {
displayName: "displayName2",
publicUrl: "http://someurl.com/mpack2";,
downloadUrl: "http://someurl.com/mpack2";,
- version: "1.0.0.0"
+ version: "1.0.0.0",
+ registryId: 1
}
];
