diff options
| author | David Cho-Lerat <david.cho-lerat@sonarsource.com> | 2023-11-21 11:14:40 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-11-24 20:02:44 +0000 |
| commit | 5d9e9cede7ffe9a776fa6bb6fff4b3642b38bd27 (patch) | |
| tree | c5d8e0533d4bbbb980e78f4ce7167195182544ce /server | |
| parent | d2f7829a70140f41168ec80179f9c737f33753ad (diff) | |
| download | sonarqube-5d9e9cede7ffe9a776fa6bb6fff4b3642b38bd27.tar.gz sonarqube-5d9e9cede7ffe9a776fa6bb6fff4b3642b38bd27.zip | |
SONAR-21017 TypeScript: properly extend interfaces
Diffstat (limited to 'server')
4 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiResponseSchema.tsx b/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiResponseSchema.tsx index 19bef2c7114..ffa716429c5 100644 --- a/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiResponseSchema.tsx +++ b/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiResponseSchema.tsx @@ -25,7 +25,7 @@ import { translate } from '../../../helpers/l10n'; import { ExcludeReferences } from '../types'; import { mapOpenAPISchema } from '../utils'; -interface Props extends HtmlHTMLAttributes<HTMLDivElement> { +interface Props extends Omit<HtmlHTMLAttributes<HTMLDivElement>, 'content'> { content?: Exclude<ExcludeReferences<OpenAPIV3.ResponseObject>['content'], undefined>; } diff --git a/server/sonar-web/src/main/js/components/controls/ConfirmButton.tsx b/server/sonar-web/src/main/js/components/controls/ConfirmButton.tsx index e1189009d29..977f88846f4 100644 --- a/server/sonar-web/src/main/js/components/controls/ConfirmButton.tsx +++ b/server/sonar-web/src/main/js/components/controls/ConfirmButton.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import ConfirmModal, { ConfirmModalProps } from './ConfirmModal'; import ModalButton, { ChildrenProps, ModalProps } from './ModalButton'; -interface Props<T> extends ConfirmModalProps<T> { +interface Props<T> extends Omit<ConfirmModalProps<T>, 'children'> { children: (props: ChildrenProps) => React.ReactNode; modalBody: React.ReactNode; modalHeader: string; diff --git a/server/sonar-web/src/main/js/components/controls/SimpleModal.tsx b/server/sonar-web/src/main/js/components/controls/SimpleModal.tsx index e1dd9dc69f5..0357e4fe93e 100644 --- a/server/sonar-web/src/main/js/components/controls/SimpleModal.tsx +++ b/server/sonar-web/src/main/js/components/controls/SimpleModal.tsx @@ -27,7 +27,7 @@ export interface ChildrenProps { submitting: boolean; } -interface Props extends ModalProps { +interface Props extends Omit<ModalProps, 'children'> { children: (props: ChildrenProps) => React.ReactNode; header: string; onClose: () => void; diff --git a/server/sonar-web/src/main/js/components/controls/ValidationModal.tsx b/server/sonar-web/src/main/js/components/controls/ValidationModal.tsx index a88956818dd..653f3ff4efc 100644 --- a/server/sonar-web/src/main/js/components/controls/ValidationModal.tsx +++ b/server/sonar-web/src/main/js/components/controls/ValidationModal.tsx @@ -25,7 +25,7 @@ import Modal, { ModalProps } from './Modal'; import ValidationForm, { ChildrenProps } from './ValidationForm'; import { ResetButtonLink, SubmitButton } from './buttons'; -interface Props<V> extends ModalProps { +interface Props<V> extends Omit<ModalProps, 'children'> { children: (props: ChildrenProps<V>) => React.ReactNode; confirmButtonText: string; header: string; |