diff --git a/package.json b/package.json index 0b486f88d25..b70519ef834 100644 --- a/package.json +++ b/package.json @@ -185,9 +185,9 @@ "style-loader": "1.1.3", "terser-webpack-plugin": "2.3.5", "ts-jest": "26.4.4", - "ts-node": "8.8.1", - "tslib": "2.0.1", - "typescript": "4.0.2", + "ts-node": "9.0.0", + "tslib": "2.0.3", + "typescript": "4.1.2", "webpack": "4.41.5", "webpack-bundle-analyzer": "3.6.0", "webpack-cleanup-plugin": "0.5.1", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 9077511ba08..0583d7281e6 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -53,6 +53,6 @@ "rollup-plugin-typescript2": "0.26.0", "rollup-plugin-visualizer": "3.3.1", "sinon": "8.1.1", - "typescript": "4.0.2" + "typescript": "4.1.2" } } diff --git a/packages/grafana-data/src/field/fieldDisplay.ts b/packages/grafana-data/src/field/fieldDisplay.ts index 5d24df79091..ec207cfd289 100644 --- a/packages/grafana-data/src/field/fieldDisplay.ts +++ b/packages/grafana-data/src/field/fieldDisplay.ts @@ -160,7 +160,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi }); values.push({ - name, + name: '', field: config, display: displayValue, view, diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index fe57a9a3799..5f2c017127a 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -36,14 +36,14 @@ "rollup-plugin-typescript2": "0.26.0", "rollup-plugin-visualizer": "3.3.1", "ts-loader": "6.2.1", - "ts-node": "8.8.1" + "ts-node": "9.0.0" }, "types": "src/index.ts", "dependencies": { "@grafana/tsconfig": "^1.0.0-rc1", "commander": "5.0.0", "execa": "4.0.0", - "typescript": "4.0.2", + "typescript": "4.1.2", "yaml": "^1.8.3" } } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 5fe5fc38a2c..60468634930 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -54,7 +54,7 @@ "execa": "4.0.0", "resolve-as-bin": "2.1.0", "ts-loader": "6.2.1", - "typescript": "4.0.2", + "typescript": "4.1.2", "yaml": "^1.8.3" } } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 4082933318f..6c276ba0f37 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -41,7 +41,7 @@ "rollup-plugin-terser": "5.3.0", "rollup-plugin-typescript2": "0.26.0", "rollup-plugin-visualizer": "3.3.1", - "typescript": "4.0.2" + "typescript": "4.1.2" }, "types": "src/index.ts" } diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index d6aeff9d55e..e8557dd9136 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -103,9 +103,9 @@ "terser-webpack-plugin": "2.3.5", "ts-jest": "26.4.4", "ts-loader": "6.2.1", - "ts-node": "8.8.1", - "tslib": "2.0.1", - "typescript": "4.0.2", + "ts-node": "9.0.0", + "tslib": "2.0.3", + "typescript": "4.1.2", "url-loader": "^2.0.1", "webpack": "4.41.5" }, diff --git a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts index aac41cf1392..4bfd09e6fe4 100644 --- a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts @@ -22,7 +22,7 @@ const compile = () => const savePackage = ({ path, pkg }: { path: string; pkg: {} }) => useSpinner('Updating package.json', async () => { - new Promise((resolve, reject) => { + new Promise((resolve, reject) => { fs.writeFile(path, JSON.stringify(pkg, null, 2), err => { if (err) { reject(err); @@ -61,7 +61,7 @@ const copyFiles = () => { return useSpinner(`Moving ${files.join(', ')} files`, async () => { const promises = files.map(file => { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { const basedir = path.dirname(`${distDir}/${file}`); if (!fs.existsSync(basedir)) { fs.mkdirSync(basedir, { recursive: true }); @@ -85,7 +85,7 @@ const copySassFiles = () => { return useSpinner(`Copy scss files ${files.join(', ')} files`, async () => { const sassDir = path.resolve(cwd, '../../public/sass/'); const promises = files.map(file => { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { const name = file.replace('.generated', ''); fs.copyFile(`${sassDir}/${file}`, `${distDir}/sass/${name}`, err => { if (err) { diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 5f9febd2444..b7f41516666 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -111,7 +111,7 @@ "rollup-plugin-visualizer": "4.2.0", "storybook-dark-mode": "1.0.3", "ts-loader": "8.0.11", - "typescript": "4.0.2", + "typescript": "4.1.2", "webpack-filter-warnings-plugin": "1.2.1" }, "types": "src/index.ts" diff --git a/packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap b/packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap index 049d927b50e..0d5632f1989 100644 --- a/packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap +++ b/packages/grafana-ui/src/components/FormField/__snapshots__/FormField.test.tsx.snap @@ -4,11 +4,11 @@ exports[`FormField should render component with custom inputEl 1`] = `
- Test - + Input @@ -22,11 +22,11 @@ exports[`FormField should render component with default inputEl 1`] = `
- Test - + { const validateAsync = (shouldPass: boolean) => async () => { try { - await new Promise((resolve, reject) => { + await new Promise((resolve, reject) => { setTimeout(() => { if (shouldPass) { resolve(); diff --git a/packages/grafana-ui/src/components/Select/utils.ts b/packages/grafana-ui/src/components/Select/utils.ts index 39bb33baf71..daa255722ec 100644 --- a/packages/grafana-ui/src/components/Select/utils.ts +++ b/packages/grafana-ui/src/components/Select/utils.ts @@ -1,10 +1,13 @@ import { SelectableValue } from '@grafana/data'; -import { SelectOptions } from './types'; +import { SelectableOptGroup } from './types'; /** * Normalize the value format to SelectableValue[] | []. Only used for single select */ -export const cleanValue = (value: any, options: SelectOptions): SelectableValue[] | [] => { +export const cleanValue = ( + value: any, + options: Array +): SelectableValue[] | [] => { if (Array.isArray(value)) { return value.filter(Boolean); } @@ -23,7 +26,10 @@ export const cleanValue = (value: any, options: SelectOptions): SelectableValue[ /** * Find the label for a string|number value inside array of options or optgroups */ -export const findSelectedValue = (value: string | number, options: SelectOptions): SelectableValue | null => { +export const findSelectedValue = ( + value: string | number, + options: Array +): SelectableValue | null => { for (const option of options) { if ('options' in option) { let found = findSelectedValue(value, option.options); diff --git a/packages/grafana-ui/src/components/ThemeColors/ThemeColors.tsx b/packages/grafana-ui/src/components/ThemeColors/ThemeColors.tsx index 19ccfe239a6..6f8f332c7f9 100644 --- a/packages/grafana-ui/src/components/ThemeColors/ThemeColors.tsx +++ b/packages/grafana-ui/src/components/ThemeColors/ThemeColors.tsx @@ -13,7 +13,7 @@ interface DemoBoxProps { const DemoBox: FC = ({ bg, border, children }) => { const style = cx( css` - padding: 16px 32px; + padding: 32px 32px 16px 32px; background: ${bg}; width: 100%; `, @@ -24,18 +24,7 @@ const DemoBox: FC = ({ bg, border, children }) => { : null ); - return ( -
-
- {name} -
- {children} -
- ); + return
{children}
; }; const DemoText: FC<{ color?: string; bold?: boolean; size?: number }> = ({ color, bold, size, children }) => { diff --git a/packages/grafana-ui/src/components/TimePicker/TimeRangePicker/__snapshots__/TimePickerContent.test.tsx.snap b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker/__snapshots__/TimePickerContent.test.tsx.snap index db1ee65bf98..7201deedbfd 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimeRangePicker/__snapshots__/TimePickerContent.test.tsx.snap +++ b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker/__snapshots__/TimePickerContent.test.tsx.snap @@ -57,7 +57,7 @@ exports[`TimePickerContent renders correctly in full screen 1`] = ` } visible={false} /> - -
- @@ -158,7 +158,7 @@ exports[`TimePickerContent renders correctly in narrow screen 1`] = ` } visible={true} /> - - - -
- diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 473837ee699..e2da7dc5f28 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -11,7 +11,7 @@ "devDependencies": { "enzyme": "^3.8.0", "enzyme-adapter-react-16": "^1.2.0", - "typescript": "4.0.2" + "typescript": "4.1.2" }, "dependencies": { "@grafana/data": "7.4.0-pre.0", diff --git a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap index c1220d90a25..98be19581a9 100644 --- a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap +++ b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap @@ -7,7 +7,7 @@ exports[`Render should render component 1`] = `
- { expect(fetchSpy).toHaveBeenCalledTimes(1); // wait out the retry-after and call again - great success - await new Promise(resolve => setTimeout(() => resolve(), 1001)); + await new Promise(resolve => setTimeout(() => resolve(null), 1001)); await expect(transport.sendEvent(event)).resolves.toBeTruthy(); expect(fetchSpy).toHaveBeenCalledTimes(2); }); diff --git a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap index 635471e0d48..1417adbade2 100644 --- a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap +++ b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap @@ -13,7 +13,7 @@ exports[`Render should render alert rules 1`] = `
- - `; diff --git a/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap b/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap index 6b83de8b8cc..586d1c01cb5 100644 --- a/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap +++ b/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap @@ -43,7 +43,7 @@ exports[`Render should render CTA if there are no API keys 1`] = ` proTip="Remember you can provide view-only API access to other applications." title="You haven't added any API Keys yet." /> -
- Time to live - +
- + `; diff --git a/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap b/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap index 16e27a47d2a..6e7cc12cdb7 100644 --- a/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap +++ b/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap @@ -15,7 +15,7 @@ exports[`Render should render component 1`] = ` onPasteCopiedPanel={[Function]} />
- - +
diff --git a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap index fc6f9437980..579adc1e802 100644 --- a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap +++ b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap @@ -337,22 +337,22 @@ exports[`DashboardPage Dashboard is fetching slowly Should render slow init stat
- - - Fetching - + - @@ -364,8 +364,8 @@ exports[`DashboardPage Dashboard is fetching slowly Should render slow init stat > Cancel loading dashboard - - + +
`; diff --git a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap index 7fd90bb03c5..e9ee2a6f705 100644 --- a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap +++ b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap @@ -16,11 +16,11 @@ exports[`Render should render component 1`] = ` } } > - Name - + @@ -29,5 +29,5 @@ exports[`ErrorContainer should render component 1`] = ` - + `; diff --git a/public/app/features/explore/__snapshots__/Explore.test.tsx.snap b/public/app/features/explore/__snapshots__/Explore.test.tsx.snap index 3b9641966c5..1b67a99f918 100644 --- a/public/app/features/explore/__snapshots__/Explore.test.tsx.snap +++ b/public/app/features/explore/__snapshots__/Explore.test.tsx.snap @@ -37,7 +37,7 @@ exports[`Explore should render component 1`] = ` richHistoryButtonActive={false} /> - ; + abstract getChannelSupport(namespace: string): Promise; /** * List the possible values within this scope */ - abstract async listNamespaces(): Promise>>; + abstract listNamespaces(): Promise>>; } export interface CoreGrafanaLiveFeature { diff --git a/public/app/features/manage-dashboards/state/selectors.ts b/public/app/features/manage-dashboards/state/selectors.ts index 7113dc88913..4f9223b289d 100644 --- a/public/app/features/manage-dashboards/state/selectors.ts +++ b/public/app/features/manage-dashboards/state/selectors.ts @@ -14,7 +14,7 @@ export const getDashboardNavModel = (state: StoreState): NavModel => { } // This needs to be copied to avoid mutating the store in a selector - nav.main.children = [...navModel.main.children]; + nav.main.children = [...(navModel.main.children ?? [])]; for (const item of nav.main.children) { item.active = false; diff --git a/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap b/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap index 95b79ec31ad..682c28d0482 100644 --- a/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap +++ b/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap @@ -35,7 +35,7 @@ exports[`Render should render organization and preferences 1`] = ` - + - + `; diff --git a/public/app/features/plugins/PluginDashboards.tsx b/public/app/features/plugins/PluginDashboards.tsx index 5dbebc5c7a6..ee5461f1866 100644 --- a/public/app/features/plugins/PluginDashboards.tsx +++ b/public/app/features/plugins/PluginDashboards.tsx @@ -44,7 +44,7 @@ export class PluginDashboards extends PureComponent { const { dashboards } = this.state; return this.import(dashboards[index], true).then(() => { if (index + 1 < dashboards.length) { - return new Promise(resolve => { + return new Promise(resolve => { setTimeout(() => { this.importNext(index + 1).then(() => { resolve(); diff --git a/public/app/features/query/components/QueryGroupOptions.tsx b/public/app/features/query/components/QueryGroupOptions.tsx index dc0e27bbda1..b4166436fa5 100644 --- a/public/app/features/query/components/QueryGroupOptions.tsx +++ b/public/app/features/query/components/QueryGroupOptions.tsx @@ -171,7 +171,6 @@ export class QueryGroupOptionsEditor extends PureComponent { type="text" className="width-6" placeholder="60" - name={name} spellCheck={false} onBlur={this.onCacheTimeoutBlur} defaultValue={options.cacheTimeout ?? ''} @@ -205,7 +204,6 @@ export class QueryGroupOptionsEditor extends PureComponent { type="number" className="width-6" placeholder={`${realMd}`} - name={name} spellCheck={false} onBlur={this.onMaxDataPointsBlur} defaultValue={value} @@ -246,7 +244,6 @@ export class QueryGroupOptionsEditor extends PureComponent { type="text" className="width-6" placeholder={`${minIntervalOnDs}`} - name={name} spellCheck={false} onBlur={this.onMinIntervalBlur} defaultValue={options.minInterval ?? ''} diff --git a/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap index cccf6538e73..666898ba725 100644 --- a/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamGroupSync.test.tsx.snap @@ -23,7 +23,7 @@ exports[`Render should render component 1`] = ` className="page-action-bar__spacer" /> -
- + -
- +
diff --git a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap index 5f9fdbbbf11..8c12eb61fd2 100644 --- a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap @@ -41,7 +41,7 @@ exports[`Render should render teams table 1`] = `
- - - - - - - - - - testName -
- + - testName -
- + - testName - - + - testName - - + - - -
- +
@@ -72,13 +72,13 @@ exports[`Render should render component 1`] = ` Name - Permission - + -
-
- +
@@ -166,13 +166,13 @@ exports[`Render should render team members 1`] = ` Name - Permission - + - + `; @@ -66,7 +66,7 @@ exports[`Render when feature toggle editorsCanAdmin is turned on should render s - + `; diff --git a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap index 1967d04e1ca..a8e44c8514d 100644 --- a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Render should render component 1`] = ` - - +
-
+
- + `; diff --git a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap index 484356e654d..81da5fe74d5 100644 --- a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap +++ b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap @@ -7,7 +7,7 @@ exports[`Render should render component 1`] = `
- - - - - @@ -126,7 +126,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - - @@ -195,7 +195,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - - @@ -264,7 +264,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - - @@ -333,7 +333,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - - @@ -402,7 +402,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - - @@ -471,7 +471,7 @@ exports[`Render should render users table 1`] = ` size="sm" variant="destructive" /> - { + await new Promise(resolve => { const unsubscribe = store.subscribe(() => { if (!isWaitingForDependencies(dependencies, store.getState())) { unsubscribe(); diff --git a/public/app/plugins/datasource/cloudwatch/components/__snapshots__/ConfigEditor.test.tsx.snap b/public/app/plugins/datasource/cloudwatch/components/__snapshots__/ConfigEditor.test.tsx.snap index 8fe9f7103e6..53fd134e641 100644 --- a/public/app/plugins/datasource/cloudwatch/components/__snapshots__/ConfigEditor.test.tsx.snap +++ b/public/app/plugins/datasource/cloudwatch/components/__snapshots__/ConfigEditor.test.tsx.snap @@ -16,12 +16,12 @@ exports[`Render should disable access key id field 1`] = `
- Authentication Provider - + - Custom Metrics - + - Authentication Provider - + - Custom Metrics - + - Authentication Provider - + - Custom Metrics - + - Authentication Provider - + - Custom Metrics - + - Authentication Provider - + - Custom Metrics - + - Default Workspace - +
@@ -129,12 +129,12 @@ exports[`Render should enable azure log analytics load workspaces button 1`] = `
- Default Workspace - +
@@ -225,12 +225,12 @@ exports[`Render should render component 1`] = `
- Default Workspace - +
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap index caf4a184fea..b7b4795554e 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap @@ -11,12 +11,12 @@ exports[`Render should disable azure monitor secret input 1`] = `
- Azure Cloud - + - Default Subscription - +
@@ -228,12 +228,12 @@ exports[`Render should enable azure monitor load subscriptions button 1`] = `
- Azure Cloud - + - Directory (tenant) ID - +
@@ -523,11 +523,11 @@ exports[`Render should render component 1`] = `
- Application (client) ID - +
@@ -546,11 +546,11 @@ exports[`Render should render component 1`] = `
- Client Secret - +
@@ -569,11 +569,11 @@ exports[`Render should render component 1`] = `
- Default Subscription - +
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap index 89b735c5299..b2e1b769d2a 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap @@ -16,11 +16,11 @@ exports[`Render should disable insights api key input 1`] = `
- API Key - + - Application ID - +
@@ -84,11 +84,11 @@ exports[`Render should enable insights api key input 1`] = `
- API Key - +
@@ -106,11 +106,11 @@ exports[`Render should enable insights api key input 1`] = `
- Application ID - +
@@ -141,11 +141,11 @@ exports[`Render should render component 1`] = `
- API Key - +
@@ -163,11 +163,11 @@ exports[`Render should render component 1`] = `
- Application ID - +
diff --git a/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap b/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap index fd4dce305c6..b311ad46086 100644 --- a/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap +++ b/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap @@ -72,7 +72,7 @@ exports[`Render should disable basic auth password input 1`] = `
- - Database - +
@@ -139,11 +139,11 @@ exports[`Render should disable basic auth password input 1`] = `
- User - +
@@ -177,14 +177,14 @@ exports[`Render should disable basic auth password input 1`] = `
- HTTP Method - + - Min time interval - +
@@ -648,7 +648,7 @@ exports[`Render should hide white listed cookies input when browser access chose
- - Database - +
@@ -715,11 +715,11 @@ exports[`Render should hide white listed cookies input when browser access chose
- User - +
@@ -753,14 +753,14 @@ exports[`Render should hide white listed cookies input when browser access chose
- HTTP Method - + - Min time interval - +
diff --git a/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap b/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap index aa142f94ec3..644a78e2d2a 100644 --- a/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap +++ b/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`LokiExploreQueryEditor should render component 1`] = ` - - Legend - + - Legend - + - Legend - + - An additional lower limit for the step parameter of the Prometheus query and for the @@ -62,7 +62,7 @@ exports[`Render PromQueryEditor with basic options should render 1`] = ` width={7} > Min step - + - @@ -180,7 +180,7 @@ exports[`Render PromQueryEditor with basic options should render 1`] = ` } } /> - +
diff --git a/public/app/plugins/datasource/zipkin/utils/transforms.ts b/public/app/plugins/datasource/zipkin/utils/transforms.ts index 048d8106af0..2e4f29f7025 100644 --- a/public/app/plugins/datasource/zipkin/utils/transforms.ts +++ b/public/app/plugins/datasource/zipkin/utils/transforms.ts @@ -52,7 +52,7 @@ function transformSpan(span: ZipkinSpan): TraceSpanData { type: 'string', value: span.kind, }, - ...jaegerSpan.tags, + ...(jaegerSpan.tags ?? []), ]; } diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index 3de95db23d4..abd78aa5bca 100644 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -273,7 +273,7 @@ class GraphElement { const hasLinksValue = hasLinks(field); if (hasLinksValue) { // Append the configured links to the panel datalinks - links = [...links, ...field.config.links]; + links = [...links, ...field.config.links!]; } const fieldConfig = { decimals: yAxisConfig.decimals, diff --git a/yarn.lock b/yarn.lock index e7d88186539..5305760c52c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16797,6 +16797,17 @@ jest-util@^24.0.0, jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" +jest-util@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz#31c63b5d6e901274d264a4fec849230aa3fa35b0" + integrity sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA== + dependencies: + "@jest/types" "^25.5.0" + chalk "^3.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + make-dir "^3.0.0" + jest-util@^26.1.0, jest-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" @@ -25510,6 +25521,23 @@ ts-jest@26.4.4: semver "7.x" yargs-parser "20.x" +ts-jest@26.4.4: + version "26.4.4" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49" + integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg== + dependencies: + "@types/jest" "26.x" + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + jest-util "^26.1.0" + json5 "2.x" + lodash.memoize "4.x" + make-error "1.x" + mkdirp "1.x" + semver "7.x" + yargs-parser "20.x" + ts-loader@6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.1.tgz#67939d5772e8a8c6bdaf6277ca023a4812da02ef" @@ -25532,15 +25560,15 @@ ts-loader@8.0.11: micromatch "^4.0.0" semver "^6.0.0" -ts-node@8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.8.1.tgz#7c4d3e9ed33aa703b64b28d7f9d194768be5064d" - integrity sha512-10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg== +ts-node@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== dependencies: arg "^4.1.0" diff "^4.0.1" make-error "^1.1.1" - source-map-support "^0.5.6" + source-map-support "^0.5.17" yn "3.1.1" ts-pnp@^1.1.6: @@ -25553,12 +25581,7 @@ tslib@1.10.0, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e" - integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ== - -tslib@^2.0.0, tslib@^2.0.1: +tslib@2.0.3, tslib@^2.0.0, tslib@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== @@ -25681,6 +25704,11 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== +typescript@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" + integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== + typescript@~3.9.7: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" @@ -26968,6 +26996,11 @@ yargs-parser@20.x, yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== +yargs-parser@20.x: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + yargs-parser@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"