Skip to content

Commit 015c3ce

Browse files
arunjaindevarunjaindev
committed
chore: rename isAppView check
1 parent f21c3eb commit 015c3ce

File tree

8 files changed

+36
-41
lines changed

8 files changed

+36
-41
lines changed

‎src/components/app/details/appDetails/AppDetails.components.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import {
1212
import { AppEnvDropdownProps, AppEnvSelectorProps } from './appDetails.type'
1313
import { getEnvOptions } from './utils'
1414

15-
const AppEnvDropdown = ({ isAppDetailsType = false, options, value }: AppEnvDropdownProps) => {
15+
const AppEnvDropdown = ({ isAppView = false, options, value }: AppEnvDropdownProps) => {
1616
const { push } = useHistory()
1717
const { path } = useRouteMatch()
1818
const { appId, envId } = useParams<Pick<BaseURLParams, 'appId' | 'envId'>>()
1919

2020
const handleOnChange = (option: SelectPickerOptionType) => {
2121
const newUrl = generatePath(path, {
22-
appId: isAppDetailsType ? appId : option.value,
23-
envId: isAppDetailsType ? option.value : envId,
22+
appId: isAppView ? appId : option.value,
23+
envId: isAppView ? option.value : envId,
2424
})
2525
push(newUrl)
2626
}
@@ -40,13 +40,13 @@ const AppEnvDropdown = ({ isAppDetailsType = false, options, value }: AppEnvDrop
4040
className="bcb-5 br-10 cn-0 pl-8 pr-8"
4141
style={{ position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)' }}
4242
>
43-
{isAppDetailsType ? 'ENV' : 'APP'}
43+
{isAppView ? 'ENV' : 'APP'}
4444
</div>
4545
</div>
4646
<div data-testid="app-deployed-env-name" className="app-details__selector w-200 dc__zi-12">
4747
<SelectPicker
4848
inputId="app-environment-select"
49-
placeholder={`Select ${isAppDetailsType ? 'Environment' : 'Application'}`}
49+
placeholder={`Select ${isAppView ? 'Environment' : 'Application'}`}
5050
options={options}
5151
value={value}
5252
onChange={handleOnChange}
@@ -103,14 +103,14 @@ const EnvSelector = ({ environments }: { environments: AppEnvironment[] }) => {
103103

104104
return (
105105
<AppEnvDropdown
106-
isAppDetailsType
106+
isAppView
107107
options={envOptions}
108108
value={envId ? { label: envIdVsNameMap[+envId], value: +envId } : null}
109109
/>
110110
)
111111
}
112112

113-
const AppEnvSelector = ({ isAppDetailsType, environments, applications }: AppEnvSelectorProps) =>
114-
isAppDetailsType ? <EnvSelector environments={environments} /> : <AppSelector applications={applications} />
113+
const AppEnvSelector = ({ isAppView, environments, applications }: AppEnvSelectorProps) =>
114+
isAppView ? <EnvSelector environments={environments} /> : <AppSelector applications={applications} />
115115

116116
export default AppEnvSelector

‎src/components/app/details/appDetails/AppDetails.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ const Details: React.FC<DetailsType> = ({
239239
deploymentUserActionState,
240240
appDetails,
241241
setAppDetails,
242-
isAppDetailsType,
242+
isAppView,
243243
applications,
244244
}) => {
245245
const params = useParams<{ appId: string; envId: string }>()
@@ -261,7 +261,7 @@ const Details: React.FC<DetailsType> = ({
261261
monitoringTools: [],
262262
})
263263

264-
const primaryResourceList = isAppDetailsType ? environments : applications
264+
const primaryResourceList = isAppView ? environments : applications
265265

266266
// NOTE: this might seem like a duplicate of loadingResourceTree
267267
// but its not since loadingResourceTree runs a loader on the whole page
@@ -623,9 +623,7 @@ const Details: React.FC<DetailsType> = ({
623623
{primaryResourceList.length && (
624624
<div className="flex left ml-20 mt-16">
625625
<AppEnvSelector
626-
{...(isAppDetailsType
627-
? { isAppDetailsType, environments }
628-
: { isAppDetailsType: false, applications })}
626+
{...(isAppView ? { isAppView, environments } : { isAppView: false, applications })}
629627
/>
630628
{isAppDeleted && appDetails?.deploymentAppDeleteRequest && (
631629
<div data-testid="deleteing-argocd-pipeline" className="flex left">
@@ -726,7 +724,7 @@ const Details: React.FC<DetailsType> = ({
726724
appDetails={appDetails}
727725
setDetailed={toggleDetailedStatus}
728726
environment={environment}
729-
isAppDetailsType={isAppDetailsType}
727+
isAppView={isAppView}
730728
environments={environments}
731729
showCommitInfo={showCommitInfo}
732730
showUrlInfo={setUrlInfo}
@@ -825,7 +823,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
825823
const { environmentId, setEnvironmentId } = useAppContext() // global state for app to synchronise environments
826824
const [isAppDeleted, setIsAppDeleted] = useState(false)
827825

828-
const isAppDetailsType = detailsType === 'app-details'
826+
const isAppView = detailsType === 'app'
829827

830828
const [otherEnvsLoading, otherEnvsResult] = useAsync(
831829
() => getAppOtherEnvironmentMin(params.appId, false),
@@ -836,7 +834,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
836834
const [, otherAppsResult] = useAsync(
837835
() => getAppsInfoForEnv({ envId: +params.envId }),
838836
[params.envId],
839-
!!params.envId && !isAppDetailsType,
837+
!!params.envId && !isAppView,
840838
)
841839

842840
const [commitInfo, showCommitInfo] = useState<boolean>(false)
@@ -864,7 +862,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
864862
)
865863

866864
useEffect(() => {
867-
if (isAppDetailsType) {
865+
if (isAppView) {
868866
const userDefinedEnvId = +params.envId || environmentId
869867
const selectedEnvId =
870868
userDefinedEnvId && envList.some((env) => env.environmentId === userDefinedEnvId)
@@ -877,7 +875,6 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
877875
} else {
878876
setEnvironmentId(null)
879877
}
880-
setEnvironmentId(null)
881878
}
882879

883880
const selectedAppId =
@@ -894,7 +891,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
894891
return
895892
}
896893
// Setting environmentId in app context only in cse of app details and not env details
897-
if (isAppDetailsType) {
894+
if (isAppView) {
898895
setEnvironmentId(Number(params.envId))
899896
}
900897
setIsAppDeleted(false)
@@ -936,7 +933,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
936933
environments={envList}
937934
environment={environment}
938935
refetchDeploymentStatus={noop}
939-
isAppDetailsType={isAppDetailsType}
936+
isAppView={isAppView}
940937
/>
941938
</div>
942939
)}
@@ -958,7 +955,7 @@ const AppDetail = ({ detailsType, filteredResourceIds }: AppDetailProps) => {
958955
appDetails={appDetails}
959956
setAppDetails={setAppDetails}
960957
applications={appList}
961-
isAppDetailsType={isAppDetailsType}
958+
isAppView={isAppView}
962959
/>
963960
</Route>
964961
{otherEnvsResult && !otherEnvsLoading && !isVirtualEnvRef.current && renderAppNotConfigured()}

‎src/components/app/details/appDetails/AppDetailsCDButton.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
ButtonVariantType,
2525
ComponentSizeType,
2626
DeploymentNodeType,
27+
Icon,
2728
stopPropagation,
2829
useSearchString,
2930
VisibleModal,
@@ -79,13 +80,15 @@ const AppDetailsCDButton = ({
7980
history.push({ search: '' })
8081
}
8182

83+
const iconName = getDeployButtonIcon(deploymentUserActionState, isForEmptyState)
84+
8285
const renderDeployButton = () => (
8386
<Button
8487
dataTestId="deploy-button"
8588
size={isForEmptyState ? ComponentSizeType.large : ComponentSizeType.small}
8689
variant={ButtonVariantType.primary}
8790
text={isForEmptyState ? 'Select Image to Deploy' : BUTTON_TITLE[DeploymentNodeType.CD]}
88-
startIcon={getDeployButtonIcon(deploymentUserActionState, isForEmptyState)}
91+
startIcon={iconName && <Icon name={iconName} color={null} />}
8992
onClick={onClickDeployButton}
9093
component={ButtonComponentType.button}
9194
style={getDeployButtonStyle(deploymentUserActionState)}

‎src/components/app/details/appDetails/SourceInfo.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export const SourceInfo = ({
8484
deploymentUserActionState,
8585
setHibernationPatchChartName,
8686
applications,
87-
isAppDetailsType,
87+
isAppView,
8888
}: SourceInfoType) => {
8989
const params = useParams<{ appId: string; envId?: string }>()
9090

@@ -172,11 +172,7 @@ export const SourceInfo = ({
172172

173173
return (
174174
<div className="flex left w-100">
175-
<AppEnvSelector
176-
{...(isAppDetailsType
177-
? { isAppDetailsType, environments }
178-
: { isAppDetailsType: false, applications })}
179-
/>
175+
<AppEnvSelector {...(isAppView ? { isAppView, environments } : { isAppView: false, applications })} />
180176
{appDetails?.deploymentAppType && (
181177
<Tooltip
182178
placement="top"
@@ -309,7 +305,7 @@ export const SourceInfo = ({
309305
placement: 'bottom',
310306
}}
311307
linkProps={{
312-
to: isAppDetailsType
308+
to: isAppView
313309
? `${getAppComposeURL(params.appId, APP_COMPOSE_STAGE.ENV_OVERRIDE, false, false)}/${params.envId}`
314310
: `${URLS.APPLICATION_GROUP}/${envId}/${CommonURLS.APP_CONFIG}/${appDetails?.appId}`,
315311
}}

‎src/components/app/details/appDetails/appDetails.type.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export interface DetailsType {
220220
onCloseHideDeploymentWindowConfirmationModal?: () => void
221221
appDetails: any
222222
setAppDetails: React.Dispatch<React.SetStateAction<AppDetails>>
223-
isAppDetailsType: boolean
223+
isAppView: boolean
224224
applications: EnvAppsMetaDTO['apps']
225225
}
226226

@@ -305,23 +305,23 @@ export enum HibernationModalTypes {
305305
CONFIGURE_PATCH = 'configurePatch',
306306
}
307307

308-
type AppEnvDetailsType = 'app-details' | 'app-group'
308+
type AppEnvDetailsType = 'app' | 'app-group'
309309

310310
export interface AppDetailProps {
311311
detailsType: AppEnvDetailsType
312312
filteredResourceIds: string
313313
}
314314

315-
export type AppEnvDropdownProps = Pick<SelectPickerProps, 'options' | 'value'> & { isAppDetailsType?: boolean }
315+
export type AppEnvDropdownProps = Pick<SelectPickerProps, 'options' | 'value'> & { isAppView?: boolean }
316316

317317
export type AppEnvSelectorProps =
318318
| {
319-
isAppDetailsType: true
319+
isAppView: true
320320
environments: AppEnvironment[]
321321
applications?: never
322322
}
323323
| {
324-
isAppDetailsType: false
324+
isAppView: false
325325
applications: EnvAppsMetaDTO['apps']
326326
environments?: never
327327
}

‎src/components/app/details/appDetails/utils.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ import {
3030
prefixZeroIfSingleDigit,
3131
AppEnvironment,
3232
SelectPickerOptionType,
33-
Icon,
33+
IconsProps,
3434
} from '@devtron-labs/devtron-fe-common-lib'
3535
import { GetIFrameSrcParamsType } from './types'
36-
import { ReactComponent as ICDeploy } from '@Icons/ic-nav-rocket.svg'
3736

3837
export function getAggregator(nodeType: NodeType, defaultAsOtherResources?: boolean): AggregationKeys {
3938
switch (nodeType) {
@@ -390,11 +389,11 @@ export const getDeployButtonStyle = (actionState: ACTION_STATE): ButtonStyleType
390389
}
391390
}
392391

393-
export const getDeployButtonIcon = (actionState: ACTION_STATE, isForEmptyState: boolean): JSX.Element => {
392+
export const getDeployButtonIcon = (actionState: ACTION_STATE, isForEmptyState: boolean): IconsProps['name'] => {
394393
if (actionState === ACTION_STATE.BLOCKED) {
395-
return <Icon name="ic-info-outline" color={null} />
394+
return 'ic-info-outline'
396395
}
397-
return isForEmptyState ? <Icon name="ic-hand-pointing" color={null} /> : <ICDeploy />
396+
return isForEmptyState ? 'ic-hand-pointing' : 'ic-rocket-launch'
398397
}
399398

400399
export const getEnvOptions = (env: AppEnvironment): SelectPickerOptionType<number> => ({

‎src/components/app/details/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ export default function AppDetailsPage() {
382382
<Switch>
383383
<Route
384384
path={`${path}/${URLS.APP_DETAILS}/:envId(\\d+)?`}
385-
render={() => <AppDetails detailsType="app-details" filteredResourceIds={_filteredEnvIds} />}
385+
render={() => <AppDetails detailsType="app" filteredResourceIds={_filteredEnvIds} />}
386386
/>
387387
<Route path={`${path}/${URLS.APP_OVERVIEW}`}>
388388
<Overview

‎src/components/app/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ export interface TagChipsContainerType {
566566
*/
567567
whiteBackground?: boolean
568568
}
569-
export interface SourceInfoType extends Pick<DetailsType, 'isAppDetailsType'>, Partial<Pick<DetailsType, 'applications'>> {
569+
export interface SourceInfoType extends Pick<DetailsType, 'isAppView'>, Partial<Pick<DetailsType, 'applications'>> {
570570
appDetails: AppDetails
571571
setDetailed?: React.Dispatch<React.SetStateAction<boolean>>
572572
environment: AppEnvironment

0 commit comments

Comments
 (0)