Skip to content

[ISSUE #12017] Fix console backend and frontend bugs #12795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KomachiSion merged 2 commits into from
Oct 29, 2024
Merged

[ISSUE #12017] Fix console backend and frontend bugs #12795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5b303
[ISSUE #12017] Fix backend bugs
RickonZhang0929 Oct 25, 2024
abe84fd
[ISSUE #12017] Fix frontend bugs
RickonZhang0929 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions console-ui/src/components/EditorNameSpace/EditorNameSpace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,12 @@ class EditorNameSpace extends React.Component {
url: 'v3/console/core/namespace',
contentType: 'application/x-www-form-urlencoded',
data: {
namespaceId: values.namespace,
customNamespaceId: values.namespace,
namespaceName: values.namespaceShowName,
namespaceDesc: values.namespaceDesc,
},
success: res => {
// res = res.data;
console.log(3);
if (res.code === 0) {
res = res.data;
if (res.data === true) {
this.closeDialog();
this.props.getNameSpaces();
this.refreshNameSpace(); // 刷新全局namespace
Expand All @@ -137,7 +134,6 @@ class EditorNameSpace extends React.Component {
type: 'get',
url: 'v3/console/core/namespace',
success: res => {
console.log(res);
if (res.code === 0) {
window.namespaceList = res.data;
}
Expand Down
14 changes: 6 additions & 8 deletions console-ui/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,13 @@ class ConfigDetail extends React.Component {
self.openLoading();
},
success(result) {
if (result != null) {
const result = result.data;
let rightvalue = result.content;
if (result.code === 0 && result.data != null) {
let rightvalue = result.data.content;
leftvalue = leftvalue.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
rightvalue = rightvalue.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
self.diffEditorDialog.current.getInstance().openDialog(leftvalue, rightvalue);
} else {
Dialog.alert({ title: locale.error, content: result.message });
Dialog.alert({ title: locale.error, content: locale.configNotFind });
}
},
complete() {
Expand All @@ -260,14 +259,13 @@ class ConfigDetail extends React.Component {
namespaceId,
};
requestUtils.get('v3/console/cs/config', { params }).then(res => {
if (res != null && res !== '' && res.code === 0) {
res = res.data;
let rightvalue = res.content;
if (res.code === 0 && res.data != null && res.data !== '') {
let rightvalue = res.data.content;
leftvalue = leftvalue.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
rightvalue = rightvalue.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
self.compareEditorDialog.current.getInstance().openDialog(leftvalue, rightvalue);
} else {
Dialog.alert({ title: locale.error, content: locale.configNotFind });
Dialog.alert({ title: locale.error, content: locale.configNotFind });
}
});
};
Expand Down
15 changes: 5 additions & 10 deletions console-ui/src/pages/ConfigurationManagement/ConfigEditor/NewConfigEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class ConfigEditor extends React.Component {
},
() => {
this.getConfig(true).then(res => {
if (!res) {
if (res.code !== 200 || !res.data) {
this.getConfig();
return;
}
Expand Down Expand Up @@ -316,9 +316,8 @@ class ConfigEditor extends React.Component {
const { dataId, group } = this.state.form;
const namespaceId = getParams('namespace');
return request
.delete('v3/console/cs/config', {
.delete('v3/console/cs/config/beta', {
params: {
beta: true,
dataId,
group,
namespaceId,
Expand Down Expand Up @@ -395,13 +394,9 @@ class ConfigEditor extends React.Component {
namespaceId: namespace,
tenant: namespace,
};
if (beta) {
params.beta = true;
} else {
params.show = 'all';
}
return request.get('v3/console/cs/config', { params }).then(res => {
const form = beta ? res.data : res;
const url = beta ? 'v3/console/cs/config/beta' : 'v3/console/cs/config';
return request.get(url, { params }).then(res => {
const form = res.data;
if (!form) return false;
const { type, content, configTags, betaIps, md5 } = form;
this.setState({ betaIps });
Expand Down
41 changes: 19 additions & 22 deletions ...e-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ class ConfigurationManagement extends React.Component {
config_tags: this.state.config_tags.join(','),
pageNo: prePageNo ? prePageNo : pageNo,
pageSize: prePageSize ? prePageSize : this.state.pageSize,
tenant: this.tenant,
namespaceId: this.tenant,
types: this.state.types.join(','),
};
setParams('pageSize', null);
Expand Down Expand Up @@ -380,7 +380,7 @@ class ConfigurationManagement extends React.Component {
</div>
),
onOk: () => {
const url = `v1/cs/configs?dataId=${record.dataId}&group=${record.group}`;
const url = `v3/console/cs/config?dataId=${record.dataId}&group=${record.group}`;
request({
url,
type: 'delete',
Expand All @@ -391,7 +391,7 @@ class ConfigurationManagement extends React.Component {
_payload.content = '';
_payload.dataId = record.dataId;
_payload.group = record.group;
if (res === true) {
if (res.data === true) {
_payload.isok = true;
} else {
_payload.isok = false;
Expand Down Expand Up @@ -614,9 +614,8 @@ class ConfigurationManagement extends React.Component {
exportData() {
const { group, appName, dataId, openUri } = this;
const { accessToken = '', username = '' } = JSON.parse(localStorage.token || '{}');
openUri('v1/cs/configs', {
export: 'true',
tenant: getParams('namespace'),
openUri('v3/console/cs/config/export', {
namespaceId: getParams('namespace'),
group,
appName,
dataId,
Expand All @@ -629,9 +628,8 @@ class ConfigurationManagement extends React.Component {
exportDataNew() {
const { group, appName, dataId, openUri } = this;
const { accessToken = '', username = '' } = JSON.parse(localStorage.token || '{}');
openUri('v1/cs/configs', {
exportV2: 'true',
tenant: getParams('namespace'),
openUri('v3/console/cs/config/export2', {
namespaceId: getParams('namespace'),
group,
appName,
dataId,
Expand All @@ -654,19 +652,17 @@ class ConfigurationManagement extends React.Component {
}
configsTableSelected.forEach((value, key, map) => ids.push(key));
if (newVersion) {
this.openUri('v1/cs/configs', {
exportV2: 'true',
tenant: getParams('namespace'),
this.openUri('v3/console/cs/config/export2', {
namespaceId: getParams('namespace'),
group: '',
appName: '',
ids: ids.join(','),
accessToken,
username,
});
} else {
this.openUri('v1/cs/configs', {
export: 'true',
tenant: getParams('namespace'),
this.openUri('v3/console/cs/config/export', {
namespaceId: getParams('namespace'),
group: '',
appName: '',
ids: ids.join(','),
Expand Down Expand Up @@ -705,9 +701,9 @@ class ConfigurationManagement extends React.Component {
),
onOk: () => {
const url =
`v1/cs/configs?delType=ids&ids=${Array.from(configsTableSelected.keys()).join(
`v3/console/cs/config/batchDelete?&ids=${Array.from(configsTableSelected.keys()).join(
','
)}&tenant=` + self.state.nownamespace_id;
)}&namespaceId=` + self.state.nownamespace_id;
request({
url,
type: 'delete',
Expand All @@ -734,13 +730,14 @@ class ConfigurationManagement extends React.Component {
return;
}
request({
url: 'v1/console/namespaces?namespaceId=',
url: 'v3/console/core/namespace/list?namespaceId=',
beforeSend() {
self.openLoading();
},
success(data) {
data = data.data;
self.closeLoading();
if (!data || data.code !== 200 || !data.data) {
if (!data || data.code !== 0 || !data.data) {
Dialog.alert({
title: locale.getNamespaceFailed,
content: locale.getNamespaceFailed,
Expand Down Expand Up @@ -935,7 +932,7 @@ class ConfigurationManagement extends React.Component {
let cloneTargetSpace = self.field.getValue('cloneTargetSpace');
let sameConfigPolicy = self.field.getValue('sameConfigPolicy');
request({
url: `v1/cs/configs?clone=true&tenant=${cloneTargetSpace}&policy=${sameConfigPolicy}&namespaceId=`,
url: `v3/console/cs/config/clone?targetNamespaceId=${cloneTargetSpace}&policy=${sameConfigPolicy}&namespaceId=`,
method: 'post',
data: JSON.stringify(clonePostData),
contentType: 'application/json',
Expand Down Expand Up @@ -997,7 +994,7 @@ class ConfigurationManagement extends React.Component {

processImportAndCloneResult(ret, locale, confirm, isImport) {
const resultCode = ret.code;
if (resultCode === 200) {
if (resultCode === 0) {
confirm.hide();
let failCount = ret.data.failData ? ret.data.failData.length : 0;
let skipCount = ret.data.skipData ? ret.data.skipData.length : 0;
Expand Down Expand Up @@ -1117,7 +1114,7 @@ class ConfigurationManagement extends React.Component {
const { accessToken = '', username = '' } = token;
const uploadProps = {
accept: 'application/zip',
action: `v1/cs/configs?import=true&namespace=${getParams(
action: `v3/console/cs/config/import?namespaceId=${getParams(
'namespace'
)}&accessToken=${accessToken}&username=${username}&tenant=${getParams('namespace')}`,
headers: Object.assign({}, {}, { accessToken }),
Expand Down
7 changes: 4 additions & 3 deletions console-ui/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ class ListeningToQuery extends React.Component {
beforeSend() {
self.openLoading();
},
success(res) {
if (res.code === 0) {
success(data) {
const res = data.data;
if (res.collectStatus === 200) {
const dataSoureTmp = [];
const status = res.data;
const status = res.lisentersGroupkeyStatus;
for (const key in status) {
if (type === 1) {
const obj = {};
Expand Down
2 changes: 1 addition & 1 deletion console-ui/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class EditClusterDialog extends React.Component {
useInstancePort4Check: useIPPort4Check,
healthChecker: JSON.stringify(healthChecker),
},
dataType: 'text',
dataType: 'json',
beforeSend: () => openLoading(),
success: res => {
if (res.data !== 'ok') {
Expand Down
2 changes: 1 addition & 1 deletion console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class EditInstanceDialog extends React.Component {
enabled,
metadata: metadataText,
},
dataType: 'text',
dataType: 'json',
beforeSend: () => openLoading(),
success: res => {
if (res.data !== 'ok') {
Expand Down
6 changes: 3 additions & 3 deletions console-ui/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ class EditServiceDialog extends React.Component {
metadata: metadataText,
selector: JSON.stringify(selector),
},
dataType: 'text',
dataType: 'json',
beforeSend: () => this.setState({ loading: true }),
success: res => {
if (res.data !== 'ok') {
Message.error(res);
if (res.code !== 0 || res.data !== 'ok') {
Message.error(res.message);
return;
}
if (isCreate) {
Expand Down
11 changes: 9 additions & 2 deletions console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ class InstanceTable extends React.Component {
pageNo: pageNum,
},
beforeSend: () => this.openLoading(),
success: ({ data: instance }) => this.setState({ instance }),
success: ({ data }) => {
const instance = {
list: data.instances || [],
count: data.count || 0,
};
this.setState({ instance });
},
error: e => Message.error(e.responseText || 'error'),
complete: () => this.closeLoading(),
});
}
Expand All @@ -105,7 +112,7 @@ class InstanceTable extends React.Component {
enabled: !enabled,
metadata: JSON.stringify(metadata),
},
dataType: 'text',
dataType: 'json',
beforeSend: () => this.openLoading(),
success: ({ data }) => {
const newVal = Object.assign({}, instance);
Expand Down
10 changes: 9 additions & 1 deletion console-ui/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,15 @@ class ServiceDetail extends React.Component {
request({
url: `v3/console/ns/service?serviceName=${serviceName}&groupName=${groupName}`,
beforeSend: () => this.openLoading(),
success: ({ data: { clusters = [], service = {} } }) => this.setState({ service, clusters }),
success: res => {
if (res.code === 0) {
// 确保 res.data 存在并且 clusters 是数组
const { clusters = [], service = {} } = res.data || { clusters: [], service: {} };
this.setState({ service, clusters: Array.isArray(clusters) ? clusters : [] });
} else {
Message.error(res.message || '请求失败');
}
},
error: e => Message.error(e.responseText || 'error'),
complete: () => this.closeLoading(),
});
Expand Down
15 changes: 9 additions & 6 deletions console-ui/src/pages/ServiceManagement/ServiceList/ServiceList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,19 @@ class ServiceList extends React.Component {
request({
method: 'DELETE',
url: `v3/console/ns/service?serviceName=${service.name}&groupName=${service.groupName}`,
dataType: 'text',
dataType: 'json',
beforeSend: () => this.openLoading(),
success: res => {
if (res.data !== 'ok') {
Message.error(res);
return;
if (res.code !== 0) {
Message.error(res.message || '删除服务失败');
} else {
Message.success('服务删除成功');
this.queryServiceList();
}
this.queryServiceList();
},
error: res => Message.error(res.data.responseText || res.data.statusText),
error: res => {
Message.error(res.data?.responseText || res.statusText || '请求失败');
},
complete: () => this.closeLoading(),
});
},
Expand Down
Loading