Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
17e20e07
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
17e20e07
编写于
6月 10, 2016
作者:
B
bryk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Auto-select namespace in deploy form and add namespace to deamonsetlist
Fixes #853
上级
1c659b22
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
6 deletion
+36
-6
src/app/frontend/daemonsetlist/daemonsetlist_stateconfig.js
src/app/frontend/daemonsetlist/daemonsetlist_stateconfig.js
+3
-2
src/app/frontend/deploy/deployfromsettings_controller.js
src/app/frontend/deploy/deployfromsettings_controller.js
+3
-2
src/test/frontend/daemonsetlist/daemonsetlist_stateconfig_test.js
.../frontend/daemonsetlist/daemonsetlist_stateconfig_test.js
+14
-2
src/test/frontend/deploy/deployfromsettings_controller_test.js
...est/frontend/deploy/deployfromsettings_controller_test.js
+16
-0
未找到文件。
src/app/frontend/daemonsetlist/daemonsetlist_stateconfig.js
浏览文件 @
17e20e07
...
...
@@ -53,12 +53,13 @@ export default function stateConfig($stateProvider) {
/**
* @param {!angular.$resource} $resource
* @param {!./../chrome/chrome_state.StateParams} $stateParams
* @return {!angular.$q.Promise}
* @ngInject
*/
export
function
resolveDaemonSetList
(
$resource
)
{
export
function
resolveDaemonSetList
(
$resource
,
$stateParams
)
{
/** @type {!angular.Resource<!backendApi.DaemonSetList>} */
let
resource
=
$resource
(
'
api/v1/daemonset
'
);
let
resource
=
$resource
(
`api/v1/daemonset/
${
$stateParams
.
namespace
||
''
}
`
);
return
resource
.
get
().
$promise
;
}
src/app/frontend/deploy/deployfromsettings_controller.js
浏览文件 @
17e20e07
...
...
@@ -38,9 +38,10 @@ export default class DeployFromSettingsController {
* @param {!angular.$resource} $resource
* @param {!angular.$q} $q
* @param {!md.$dialog} $mdDialog
* @param {!./../chrome/chrome_state.StateParams} $stateParams
* @ngInject
*/
constructor
(
namespaces
,
protocols
,
$log
,
$state
,
$resource
,
$q
,
$mdDialog
)
{
constructor
(
namespaces
,
protocols
,
$log
,
$state
,
$resource
,
$q
,
$mdDialog
,
$stateParams
)
{
/**
* Initialized from the template.
* @export {!angular.FormController}
...
...
@@ -140,7 +141,7 @@ export default class DeployFromSettingsController {
* Currently chosen namespace.
* @export {string}
*/
this
.
namespace
=
this
.
namespaces
[
0
];
this
.
namespace
=
$stateParams
.
namespace
||
this
.
namespaces
[
0
];
/**
* @export {?number}
...
...
src/test/frontend/daemonsetlist/daemonsetlist_stateconfig_test.js
浏览文件 @
17e20e07
...
...
@@ -24,9 +24,21 @@ describe('StateConfig for daemon set list', () => {
let
resource
=
jasmine
.
createSpy
(
'
$resource
'
);
resource
.
and
.
returnValue
({
get
:
function
()
{
return
{
$promise
:
promise
};
}});
let
actual
=
resolveDaemonSetList
(
resource
);
let
actual
=
resolveDaemonSetList
(
resource
,
{
namespace
:
'
foo
'
}
);
expect
(
resource
).
toHaveBeenCalledWith
(
'
api/v1/daemonset
'
);
expect
(
resource
).
toHaveBeenCalledWith
(
'
api/v1/daemonset/foo
'
);
expect
(
actual
).
toBe
(
promise
);
}));
it
(
'
should resolve daemon sets with no namespace
'
,
angular
.
mock
.
inject
((
$q
)
=>
{
let
promise
=
$q
.
defer
().
promise
;
let
resource
=
jasmine
.
createSpy
(
'
$resource
'
);
resource
.
and
.
returnValue
({
get
:
function
()
{
return
{
$promise
:
promise
};
}});
let
actual
=
resolveDaemonSetList
(
resource
,
{});
expect
(
resource
).
toHaveBeenCalledWith
(
'
api/v1/daemonset/
'
);
expect
(
actual
).
toBe
(
promise
);
}));
});
src/test/frontend/deploy/deployfromsettings_controller_test.js
浏览文件 @
17e20e07
...
...
@@ -66,6 +66,22 @@ describe('DeployFromSettings controller', () => {
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should select initial namespace
'
,
angular
.
mock
.
inject
((
$controller
)
=>
{
ctrl
=
$controller
(
DeployFromSettingController
,
{
namespaces
:
{
namespaces
:
[
'
foo
'
,
'
bar
'
]},
protocols
:
{
protocols
:
[]},
$stateParams
:
{}});
expect
(
ctrl
.
namespace
).
toBe
(
'
foo
'
);
ctrl
=
$controller
(
DeployFromSettingController
,
{
namespaces
:
{
namespaces
:
[
'
foo
'
,
'
bar
'
]},
protocols
:
{
protocols
:
[]},
$stateParams
:
{
namespace
:
'
bar
'
},
});
expect
(
ctrl
.
namespace
).
toBe
(
'
bar
'
);
}));
it
(
'
should return empty string when containerImage is empty
'
,
()
=>
{
// given
ctrl
.
containerImage
=
''
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录