diff --git a/.betterer.results b/.betterer.results index cbb8cc5c8c0..a633d89cd76 100644 --- a/.betterer.results +++ b/.betterer.results @@ -7879,10 +7879,6 @@ exports[`no gf-form usage`] = { [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"] ], - "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx:5381": [ - [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"], - [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"] - ], "public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx:5381": [ [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"] ], diff --git a/package.json b/package.json index 2d940f7f7d6..a28f7bfb133 100644 --- a/package.json +++ b/package.json @@ -245,7 +245,7 @@ "@floating-ui/react": "0.26.20", "@formatjs/intl-durationformat": "^0.2.4", "@glideapps/glide-data-grid": "^6.0.0", - "@grafana/aws-sdk": "0.3.3", + "@grafana/aws-sdk": "0.4.1", "@grafana/azure-sdk": "0.0.3", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx index dc28e7913cf..be9122b2f0b 100644 --- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx @@ -96,7 +96,6 @@ export const ConfigEditor = (props: Props) => { )} { @@ -147,7 +146,6 @@ export const ConfigEditor = (props: Props) => { > {datasource ? ( { diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx index ed9c2dee2ec..cdfb6bdaa98 100644 --- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableTextField.tsx @@ -12,7 +12,6 @@ interface Props { placeholder?: string; tooltip?: PopoverContent; interactive?: boolean; - newFormStylingEnabled?: boolean; } export const VariableTextField = ({ interactive, label, onBlur, placeholder, value, tooltip }: Props) => { diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx index d904873cd0b..85c4cf74336 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx @@ -20,15 +20,10 @@ type Props = { logGroups?: LogGroup[]; region: string; maxNoOfVisibleLogGroups?: number; - newFormStylingEnabled?: boolean; onBeforeOpen?: () => void; }; -const rowGap = css({ - gap: 3, -}); - -const logGroupNewStyles = css({ +const logGroupStyles = css({ display: 'flex', flexDirection: 'column', marginTop: 8, @@ -44,7 +39,6 @@ export const LogGroupsField = ({ logGroups, region, maxNoOfVisibleLogGroups, - newFormStylingEnabled, onBeforeOpen, }: Props) => { const accountState = useAccountOptions(datasource?.resources, region); @@ -84,7 +78,7 @@ export const LogGroupsField = ({ }, [datasource, legacyLogGroupNames, logGroups, onChange, region, loadingLogGroupsStarted]); return ( -
+
) => datasource?.resources.getLogGroups({ region: region, ...params }) ?? [] @@ -114,7 +108,6 @@ type WrapperProps = { region: string; maxNoOfVisibleLogGroups?: number; onBeforeOpen?: () => void; - newFormStylingEnabled?: boolean; // Legacy Props, can remove once we remove support for Legacy Log Group Selector legacyOnChange: (logGroups: string[]) => void; diff --git a/yarn.lock b/yarn.lock index 58d9c0833b8..eca4932d2d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3010,22 +3010,22 @@ __metadata: languageName: unknown linkType: soft -"@grafana/async-query-data@npm:0.1.4": - version: 0.1.4 - resolution: "@grafana/async-query-data@npm:0.1.4" +"@grafana/async-query-data@npm:0.2.0": + version: 0.2.0 + resolution: "@grafana/async-query-data@npm:0.2.0" dependencies: tslib: "npm:^2.4.1" - checksum: 10/634dfe91c6bbc9742bf296062ead0414055b5e003da5ac776896d2ee22c8674476dd84c77637cc01a618906ab68531dfa9a45f971b0ffa78400943fe61378ab7 + checksum: 10/8ca53cff8b9dd058e5701316d9839b99882d901964472f8a8e4e8be2c3a884f19d42c052403c4994ef22894c2f56a71f08758181a415ff89408e7c6ba143602f languageName: node linkType: hard -"@grafana/aws-sdk@npm:0.3.3": - version: 0.3.3 - resolution: "@grafana/aws-sdk@npm:0.3.3" +"@grafana/aws-sdk@npm:0.4.1": + version: 0.4.1 + resolution: "@grafana/aws-sdk@npm:0.4.1" dependencies: - "@grafana/async-query-data": "npm:0.1.4" - "@grafana/experimental": "npm:1.7.0" - checksum: 10/794de025e6c852ed77bd2bcc76f2b9bbe75af73e92c5d092824b4f053df23f1d4085a5710fe3851a158087283722f2b4b73a73c4b7a46c27fa879899d243bea9 + "@grafana/async-query-data": "npm:0.2.0" + "@grafana/experimental": "npm:1.7.12" + checksum: 10/a8d4c6c979f62931982326e996f797002af291f52642e9e4eff8416908e73a4c285863f7766dd1bc1141123aad8874eb4777077e7c689cd852a758c503f00c22 languageName: node linkType: hard @@ -3153,25 +3153,6 @@ __metadata: languageName: unknown linkType: soft -"@grafana/experimental@npm:1.7.0": - version: 1.7.0 - resolution: "@grafana/experimental@npm:1.7.0" - dependencies: - "@types/uuid": "npm:^8.3.3" - uuid: "npm:^8.3.2" - peerDependencies: - "@emotion/css": 11.1.3 - "@grafana/data": ^10.0.0 - "@grafana/runtime": ^10.0.0 - "@grafana/ui": ^10.0.0 - react: 17.0.2 - react-dom: 17.0.2 - react-select: ^5.2.1 - rxjs: 7.8.0 - checksum: 10/1d30e266d3b2b26f66ff8981ebd0f9804574349079e205b70690cff6f5e742a26096dc90fa90e8faa44cf4bc91a2650cae7994b5eb396663f8b7e73beaccda9b - languageName: node - linkType: hard - "@grafana/experimental@npm:1.7.12": version: 1.7.12 resolution: "@grafana/experimental@npm:1.7.12" @@ -17091,7 +17072,7 @@ __metadata: "@floating-ui/react": "npm:0.26.20" "@formatjs/intl-durationformat": "npm:^0.2.4" "@glideapps/glide-data-grid": "npm:^6.0.0" - "@grafana/aws-sdk": "npm:0.3.3" + "@grafana/aws-sdk": "npm:0.4.1" "@grafana/azure-sdk": "npm:0.0.3" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*"