Skip to content

Commit

Permalink
fix dashboard data url with org (#229)
Browse files Browse the repository at this point in the history
* fix: fix dashboard data url with org

* fix: update dashboard version

* fix: fix package-lock

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
  • Loading branch information
laojun and daskyrk authored May 21, 2021
1 parent e34841b commit c854f4f
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { map, merge, reduce, isString, get } from 'lodash';
import { Choose, When, Otherwise } from 'tsx-control-statements/components';
import { CommonRangePicker, useUpdate, IF, BoardGrid, PureBoardGrid } from 'common';
import { registDiceDataConfigProps, createLoadDataFn } from '@terminus/dashboard-configurator';
import { goTo, getTimeSpan, setApiWithOrg } from 'common/utils';
import { goTo, getTimeSpan } from 'common/utils';
import moment from 'moment';
import { useMount } from 'react-use';
import routeInfoStore from 'common/stores/route';
Expand All @@ -42,8 +42,8 @@ const dataConfigMetaDataStoreMap = {
};

const dataUrlMap = {
[CustomDashboardScope.ORG]: setApiWithOrg('/api/orgCenter/metrics-query'),
[CustomDashboardScope.MICRO_SERVICE]: setApiWithOrg('/api/tmc/metrics-query'),
[CustomDashboardScope.ORG]: '/api/orgCenter/metrics-query',
[CustomDashboardScope.MICRO_SERVICE]: '/api/tmc/metrics-query',
};

export default ({ scope, scopeId }: { scope: CustomDashboardScope; scopeId: string }) => {
Expand Down
72 changes: 36 additions & 36 deletions shell/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"@paiva/translation-google": "^1.0.9",
"@phenomnomnominal/tsquery": "^4.1.1",
"@svgr/webpack": "^4.1.0",
"@terminus/dashboard-configurator": "^1.2.2",
"@terminus/dashboard-configurator": "^1.2.3",
"@types/classnames": "^2.2.6",
"@types/clipboard": "^2.0.1",
"@types/diff-match-patch": "^1.0.32",
Expand Down

0 comments on commit c854f4f

Please sign in to comment.