From fb4b2e3fe74921dc3fba3638db28a64cd49c3c43 Mon Sep 17 00:00:00 2001 From: Bikram Choudhury Date: Thu, 13 Nov 2025 17:33:31 +0530 Subject: [PATCH] ts & eslint fix --- .../Components/AccountDropdown.tsx | 3 ++- .../Components/SubscriptionDropdown.tsx | 3 ++- .../Utils/selectAccountUtils.tsx | 22 ++++++++++--------- .../SelectSourceAndTargetContainers.tsx | 6 ++--- .../memoizedData.tsx | 16 ++++++++++++-- .../Utils/useCreateCopyJobScreensList.tsx | 1 - .../Components/CopyJobStatusWithIcon.tsx | 12 +++++++++- .../Components/CopyJobsList.tsx | 4 +++- .../MonitorCopyJobs/MonitorCopyJobs.tsx | 4 +++- 9 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx index 33ca7ec24..d25efc1cf 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/AccountDropdown.tsx @@ -26,5 +26,6 @@ export const AccountDropdown: React.FC = React.memo( onChange={onChange} /> - ), (prev, next) => prev.options.length === next.options.length + ), + (prev, next) => prev.options.length === next.options.length, ); diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx index 911938891..771592006 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Components/SubscriptionDropdown.tsx @@ -24,5 +24,6 @@ export const SubscriptionDropdown: React.FC = React.m onChange={onChange} /> - ), (prev, next) => prev.options.length === next.options.length + ), + (prev, next) => prev.options.length === next.options.length, ); diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Utils/selectAccountUtils.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Utils/selectAccountUtils.tsx index e03672206..0e558bfd4 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Utils/selectAccountUtils.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectAccount/Utils/selectAccountUtils.tsx @@ -11,17 +11,19 @@ export function useDropdownOptions( subscriptionOptions: DropdownOptionType[]; accountOptions: DropdownOptionType[]; } { - const subscriptionOptions = subscriptions?.map((sub) => ({ - key: sub.subscriptionId, - text: sub.displayName, - data: sub, - })) || []; + const subscriptionOptions = + subscriptions?.map((sub) => ({ + key: sub.subscriptionId, + text: sub.displayName, + data: sub, + })) || []; - const accountOptions = accounts?.map((account) => ({ - key: account.id, - text: account.name, - data: account, - })) || []; + const accountOptions = + accounts?.map((account) => ({ + key: account.id, + text: account.name, + data: account, + })) || []; return { subscriptionOptions, accountOptions }; } diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx index f3517c567..538bec234 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/SelectSourceAndTargetContainers.tsx @@ -14,9 +14,9 @@ const SelectSourceAndTargetContainers = () => { const { source, target, sourceDbParams, sourceContainerParams, targetDbParams, targetContainerParams } = useSourceAndTargetData(copyJobState); - if(!source) { - return null; - } + if (!source) { + return null; + } const sourceDatabases = useDatabases(...sourceDbParams); const sourceContainers = useDataContainers(...sourceContainerParams); diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.tsx index 7a100aadb..99977ed3a 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Screens/SelectSourceAndTargetContainers/memoizedData.tsx @@ -17,9 +17,21 @@ export function useSourceAndTargetData(copyJobState: CopyJobContextState) { } = getAccountDetailsFromResourceId(selectedTargetAccount?.id); const sourceDbParams = [sourceSubscriptionId, sourceResourceGroup, sourceAccountName, "SQL"] as DatabaseParams; - const sourceContainerParams = [sourceSubscriptionId, sourceResourceGroup, sourceAccountName, source?.databaseId, "SQL"] as DataContainerParams; + const sourceContainerParams = [ + sourceSubscriptionId, + sourceResourceGroup, + sourceAccountName, + source?.databaseId, + "SQL", + ] as DataContainerParams; const targetDbParams = [targetSubscriptionId, targetResourceGroup, targetAccountName, "SQL"] as DatabaseParams; - const targetContainerParams = [targetSubscriptionId, targetResourceGroup, targetAccountName, target?.databaseId, "SQL"] as DataContainerParams; + const targetContainerParams = [ + targetSubscriptionId, + targetResourceGroup, + targetAccountName, + target?.databaseId, + "SQL", + ] as DataContainerParams; return { source, target, sourceDbParams, sourceContainerParams, targetDbParams, targetContainerParams }; } diff --git a/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx b/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx index e90f28bf8..1b0c74f05 100644 --- a/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx +++ b/src/Explorer/ContainerCopy/CreateCopyJob/Utils/useCreateCopyJobScreensList.tsx @@ -85,4 +85,3 @@ function useCreateCopyJobScreensList() { } export { SCREEN_KEYS, useCreateCopyJobScreensList }; - diff --git a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobStatusWithIcon.tsx b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobStatusWithIcon.tsx index ff0e67d56..f4061a3b5 100644 --- a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobStatusWithIcon.tsx +++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobStatusWithIcon.tsx @@ -1,4 +1,5 @@ import { FontIcon, getTheme, mergeStyles, mergeStyleSets, Spinner, SpinnerSize, Stack, Text } from "@fluentui/react"; +import PropTypes from "prop-types"; import React from "react"; import ContainerCopyMessages from "../../ContainerCopyMessages"; import { CopyJobStatusType } from "../../Enums/CopyJobEnums"; @@ -34,7 +35,11 @@ const iconMap: Partial> = { [CopyJobStatusType.Completed]: "CompletedSolid", }; -const CopyJobStatusWithIcon: React.FC<{ status: CopyJobStatusType }> = React.memo(({ status }) => { +export interface CopyJobStatusWithIconProps { + status: CopyJobStatusType; +} + +const CopyJobStatusWithIcon: React.FC = React.memo(({ status }) => { const statusText = ContainerCopyMessages.MonitorJobs.Status[status] || "Unknown"; const isSpinnerStatus = [ @@ -59,4 +64,9 @@ const CopyJobStatusWithIcon: React.FC<{ status: CopyJobStatusType }> = React.mem ); }); +CopyJobStatusWithIcon.displayName = "CopyJobStatusWithIcon"; +CopyJobStatusWithIcon.propTypes = { + status: PropTypes.oneOf(Object.values(CopyJobStatusType)).isRequired, +}; + export default CopyJobStatusWithIcon; diff --git a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx index e3b29ae17..80127febd 100644 --- a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx +++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx @@ -1,9 +1,11 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable react/prop-types */ import { ConstrainMode, DetailsListLayoutMode, DetailsRow, IColumn, + IDetailsRowProps, ScrollablePane, ScrollbarVisibility, ShimmeredDetailsList, @@ -64,7 +66,7 @@ const CopyJobsList: React.FC = ({ jobs, handleActionClick, pa openCopyJobDetailsPanel(job); }; - const _onRenderRow = (props: any) => { + const _onRenderRow = (props: IDetailsRowProps) => { return (
diff --git a/src/Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobs.tsx b/src/Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobs.tsx index f9ad92dff..c8ca49af2 100644 --- a/src/Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobs.tsx +++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/MonitorCopyJobs.tsx @@ -106,7 +106,9 @@ const MonitorCopyJobs = forwardRef((_p return ( - {loading && } + {loading && ( + + )} {error && ( setError(null)}> {error}