diff --git a/shell/app/modules/dataCenter/common/custom-dashboard/custom-dashboard.tsx b/shell/app/modules/dataCenter/common/custom-dashboard/custom-dashboard.tsx index a6c007f074..113687dc6e 100644 --- a/shell/app/modules/dataCenter/common/custom-dashboard/custom-dashboard.tsx +++ b/shell/app/modules/dataCenter/common/custom-dashboard/custom-dashboard.tsx @@ -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'; @@ -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 }) => { diff --git a/shell/package-lock.json b/shell/package-lock.json index 3c524f3c15..d8e31e6078 100644 --- a/shell/package-lock.json +++ b/shell/package-lock.json @@ -2505,9 +2505,9 @@ } }, "@terminus/dashboard-configurator": { - "version": "1.2.2", - "resolved": "https://registry.npm.terminus.io/@terminus/dashboard-configurator/download/@terminus/dashboard-configurator-1.2.2.tgz", - "integrity": "sha1-tMBBv8taHS/fTvcEJwQ7kCGKiQc=", + "version": "1.2.3", + "resolved": "https://registry.npm.terminus.io/@terminus/dashboard-configurator/download/@terminus/dashboard-configurator-1.2.3.tgz", + "integrity": "sha1-E/eK59t2W+hMrEwB1knp131r+go=", "dev": true, "requires": { "@terminus/nusi": "^3.10.78", @@ -2617,9 +2617,9 @@ } }, "@terminus/nusi": { - "version": "3.10.96", - "resolved": "https://registry.npm.terminus.io/@terminus/nusi/download/@terminus/nusi-3.10.96.tgz", - "integrity": "sha1-2h1nd/pDoiFwJY36SdpgGTov1eA=", + "version": "3.10.101", + "resolved": "https://registry.npm.terminus.io/@terminus/nusi/download/@terminus/nusi-3.10.101.tgz", + "integrity": "sha1-YWgthF2uo52D/4y4iTXyPZSPRfo=", "dev": true, "requires": { "@emotion/core": "^10.0.10", @@ -2830,9 +2830,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -2857,9 +2857,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -2984,9 +2984,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -3011,9 +3011,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23560,9 +23560,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23656,9 +23656,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23731,9 +23731,9 @@ } }, "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23765,9 +23765,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23790,9 +23790,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", @@ -23978,9 +23978,9 @@ }, "dependencies": { "rc-util": { - "version": "5.12.2", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.12.2.tgz", - "integrity": "sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.13.0.tgz", + "integrity": "sha512-hDnFgTt7uLowVNAtWxkCrVdVipqt+4IFyvasMglk9iiWMz/zXB5RjYArPp8hZ6TrxtrdctExh0qTJB3AqwLLRQ==", "dev": true, "requires": { "@babel/runtime": "^7.12.5", diff --git a/shell/package.json b/shell/package.json index 24919d781b..72523a4944 100644 --- a/shell/package.json +++ b/shell/package.json @@ -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",