From 5d9e9cede7ffe9a776fa6bb6fff4b3642b38bd27 Mon Sep 17 00:00:00 2001
From: David Cho-Lerat <david.cho-lerat@sonarsource.com>
Date: Tue, 21 Nov 2023 11:14:40 +0100
Subject: SONAR-21017 TypeScript: properly extend interfaces

---
 .../src/main/js/apps/web-api-v2/components/ApiResponseSchema.tsx        | 2 +-
 server/sonar-web/src/main/js/components/controls/ConfirmButton.tsx      | 2 +-
 server/sonar-web/src/main/js/components/controls/SimpleModal.tsx        | 2 +-
 server/sonar-web/src/main/js/components/controls/ValidationModal.tsx    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'server')

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;
-- 
cgit v1.2.3