Commit 71c0ccc6 authored by jianzhuang's avatar jianzhuang Committed by tke-robot
Browse files

fix(registry): modify chart version restapi

parent dfba17f0
Showing with 24 additions and 12 deletions
+24 -12
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment