Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Tke
Commits
71c0ccc6
Commit
71c0ccc6
authored
4 years ago
by
jianzhuang
Committed by
tke-robot
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix(registry): modify chart version restapi
parent
dfba17f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
web/console/src/modules/application/WebAPI.ts
+7
-3
web/console/src/modules/application/WebAPI.ts
web/console/src/modules/registry/WebAPI.ts
+15
-8
web/console/src/modules/registry/WebAPI.ts
web/console/src/modules/registry/components/chart/detail/FileTreePanel.tsx
+2
-1
...odules/registry/components/chart/detail/FileTreePanel.tsx
with
24 additions
and
12 deletions
+24
-12
web/console/src/modules/application/WebAPI.ts
+
7
-
3
View file @
71c0ccc6
...
...
@@ -270,7 +270,7 @@ export async function fetchChartList(query: QueryState<ChartFilter>) {
*/
export
async
function
fetchChartInfo
(
filter
:
ChartInfoFilter
)
{
const
queryObj
=
{
version
:
filter
.
chartVersion
,
//
version: filter.chartVersion,
cluster
:
filter
.
cluster
,
namespace
:
filter
.
namespace
};
...
...
@@ -279,11 +279,15 @@ export async function fetchChartInfo(filter: ChartInfoFilter) {
resourceInfo
,
namespace
:
filter
.
metadata
.
namespace
,
specificName
:
filter
.
metadata
.
name
,
extraResource
:
'
info
'
,
extraResource
:
'
version
'
,
isSpecialNamespace
:
true
});
const
queryString
=
reduceK8sQueryString
({
k8sQueryObj
:
queryObj
});
let
rr
:
RequestResult
=
await
GET
({
url
:
url
+
queryString
,
tipErr
:
true
,
projectId
:
filter
.
projectID
});
let
rr
:
RequestResult
=
await
GET
({
url
:
url
+
'
/
'
+
filter
.
chartVersion
+
queryString
,
tipErr
:
true
,
projectId
:
filter
.
projectID
});
return
rr
.
data
;
}
...
...
This diff is collapsed.
Click to expand it.
web/console/src/modules/registry/WebAPI.ts
+
15
-
8
View file @
71c0ccc6
...
...
@@ -746,9 +746,10 @@ export async function deleteChartVersion([chartVersion]: ChartVersion[], filter:
// let rr: RequestResult = await DELETE({ url });
// return operationResult(rr.data, rr.error);
const
resourceInfo
:
ResourceInfo
=
resourceConfig
()[
'
chart
'
];
const
queryObj
=
{
version
:
filter
.
chartVersion
};
// const queryObj = {
// version: filter.chartVersion
// };
// const queryString = reduceK8sQueryString({ k8sQueryObj: queryObj });
const
url
=
reduceK8sRestfulPath
({
resourceInfo
,
namespace
:
filter
.
chartDetailFilter
.
namespace
,
...
...
@@ -756,8 +757,10 @@ export async function deleteChartVersion([chartVersion]: ChartVersion[], filter:
extraResource
:
'
version
'
,
isSpecialNamespace
:
true
});
const
queryString
=
reduceK8sQueryString
({
k8sQueryObj
:
queryObj
});
let
rr
:
RequestResult
=
await
DELETE
({
url
:
url
+
queryString
,
projectId
:
filter
.
chartDetailFilter
.
projectID
});
let
rr
:
RequestResult
=
await
DELETE
({
url
:
url
+
'
/
'
+
filter
.
chartVersion
,
projectId
:
filter
.
chartDetailFilter
.
projectID
});
return
operationResult
(
rr
.
data
,
rr
.
error
);
}
...
...
@@ -777,7 +780,7 @@ export async function fetchChartVersionFile(filter: ChartVersionFilter) {
*/
export
async
function
fetchChartInfo
(
filter
:
ChartInfoFilter
)
{
const
queryObj
=
{
version
:
filter
.
chartVersion
,
//
version: filter.chartVersion,
cluster
:
filter
.
cluster
};
const
resourceInfo
:
ResourceInfo
=
resourceConfig
()[
'
chart
'
];
...
...
@@ -785,11 +788,15 @@ export async function fetchChartInfo(filter: ChartInfoFilter) {
resourceInfo
,
namespace
:
filter
.
metadata
.
namespace
,
specificName
:
filter
.
metadata
.
name
,
extraResource
:
'
info
'
,
extraResource
:
'
version
'
,
isSpecialNamespace
:
true
});
const
queryString
=
reduceK8sQueryString
({
k8sQueryObj
:
queryObj
});
let
rr
:
RequestResult
=
await
GET
({
url
:
url
+
queryString
,
tipErr
:
true
,
projectId
:
filter
.
projectID
});
let
rr
:
RequestResult
=
await
GET
({
url
:
url
+
'
/
'
+
filter
.
chartVersion
+
queryString
,
tipErr
:
true
,
projectId
:
filter
.
projectID
});
return
rr
.
data
;
}
...
...
This diff is collapsed.
Click to expand it.
web/console/src/modules/registry/components/chart/detail/FileTreePanel.tsx
+
2
-
1
View file @
71c0ccc6
...
...
@@ -110,7 +110,7 @@ export class FileTreePanel extends React.Component<RootProps, AppCreateState> {
displayField
:
'
text
'
,
options
:
versionOptions
,
onChange
:
value
=>
{
this
.
setState
({
selectedVersion
:
value
,
content
:
''
});
this
.
setState
({
selectedVersion
:
value
,
content
:
''
,
selectedTreeID
:
'
values.yaml
'
});
//加载文件
if
(
chartEditor
)
{
actions
.
chart
.
detail
.
chartInfo
.
applyFilter
({
...
...
@@ -134,6 +134,7 @@ export class FileTreePanel extends React.Component<RootProps, AppCreateState> {
data
=
{
treeData
}
activable
=
{
true
}
defaultActiveIds
=
{
[
'
values.yaml
'
]
}
activeIds
=
{
[
this
.
state
.
selectedTreeID
]
}
defaultExpandedIds
=
{
chartInfo
.
object
.
data
&&
chartInfo
.
object
.
data
.
fileTree
?
[
chartInfo
.
object
.
data
.
fileTree
.
fullPath
]
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help