Skip to content
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

Jump to bottom

fix(console): update chart upload guide #747

Merged
merged 4 commits into from
Sep 25, 2020
Merged

fix(console): update chart upload guide #747

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55dd7f6
fix(console): update chart upload guide
Sep 21, 2020
663bb8b
fix(console): merge branch master
Sep 21, 2020
5839bdc
fix(console): update registry webapi projectid
Sep 25, 2020
f551373
fix(console): merge master
Sep 25, 2020
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
Prev Previous commit
Next Next commit
fix(console): update registry webapi projectid
  • Loading branch information
jianzhuang committed Sep 25, 2020
commit 5839bdc7943a7f1406151fda9dcb39f493e75beb
7 changes: 3 additions & 4 deletions web/console/src/modules/registry/WebAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import {
POST,
PUT,
PATCH,
DELETE,
getProjectName
DELETE
} from '../../../helpers';
import { resourceConfig } from '../../../config/resourceConfig';
import { RequestParams, ResourceInfo } from '../common/models';
Expand Down Expand Up @@ -511,7 +510,7 @@ export async function fetchChartGroupList(query: QueryState<ChartGroupFilter>) {
const queryString = reduceK8sQueryString({ k8sQueryObj: queryObj });
// TODO FIX
// reduceNetworkRequest设置了未传业务id则从cookie中读取的逻辑，传空的业务id是为了适配这段逻辑
let rr: RequestResult = await GET({ url: url + queryString, keyword: keyword, projectId: getProjectName() });
let rr: RequestResult = await GET({ url: url + queryString, keyword: keyword, projectId: '' });
let objs: ChartGroup[] = !rr.error && rr.data.items ? rr.data.items : [];
const result: RecordSet<ChartGroup> = {
recordCount: objs.length,
Expand Down Expand Up @@ -697,7 +696,7 @@ export async function fetchChartList(query: QueryState<ChartFilter>) {
// reduceNetworkRequest设置了未传业务id则从cookie中读取的逻辑，传空的业务id是为了适配这段逻辑
let rr: RequestResult = await GET({
url: url + queryString,
projectId: filter.projectID ? filter.projectID : getProjectName(),
projectId: filter.projectID ? filter.projectID : '',
keyword
});
let objs: Chart[] = !rr.error && rr.data.items ? rr.data.items : [];
Expand Down