Skip to content

Commit 53d17a5

Browse files
author
Mukul Tayal
committed
remove unnecessary prop drilling
1 parent 1b92cdf commit 53d17a5

File tree

12 files changed

+6
-26
lines changed

12 files changed

+6
-26
lines changed

src/components/ApplicationGroup/AppGroup.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ export interface AppGroupDetailDefaultType {
276276
description?: string
277277
getAppListData?: () => Promise<void>
278278
handleSaveDescription?: (description: string) => Promise<void>
279-
isSuperAdmin?: boolean
280279
}
281280

282281
interface CIPipeline {

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
394394
<EnvCDDetails filteredAppIds={_filteredAppsIds} />
395395
</Route>
396396
<Route path={`${path}/${URLS.APP_CONFIG}/:appId(\\d+)?`}>
397-
<EnvConfig filteredAppIds={_filteredAppsIds} envName={envName} isSuperAdmin={isSuperAdmin}/>
397+
<EnvConfig filteredAppIds={_filteredAppsIds} envName={envName} />
398398
</Route>
399399
<Redirect to={`${path}/${URLS.APP_OVERVIEW}`} />
400400
</Switch>

src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import ApplicationRoute from './ApplicationRoutes'
99

1010
const getEnvConfigProtections = importComponentFromFELibrary('getEnvConfigProtections', null, 'function')
1111

12-
export default function EnvConfig({ filteredAppIds, envName ,isSuperAdmin}: AppGroupDetailDefaultType) {
12+
export default function EnvConfig({ filteredAppIds, envName }: AppGroupDetailDefaultType) {
1313
const { envId, appId } = useParams<{ envId: string; appId: string }>()
1414
const { url } = useRouteMatch()
1515
const history = useHistory()
@@ -76,7 +76,6 @@ export default function EnvConfig({ filteredAppIds, envName ,isSuperAdmin}: AppG
7676
environments={[]}
7777
reloadEnvironments={noop}
7878
envName={envName}
79-
isSuperAdmin={isSuperAdmin}
8079
/>
8180
</div>
8281
</div>

src/components/EnvironmentOverride/DeploymentTemplateOverride.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ export default function DeploymentTemplateOverride({
3737
environmentName,
3838
isProtected,
3939
reloadEnvironments,
40-
isSuperAdmin
4140
}: DeploymentTemplateOverrideProps) {
42-
const { currentServerInfo } = useContext(mainContext)
41+
const { currentServerInfo, isSuperAdmin } = useContext(mainContext)
4342
const { appId, envId } = useParams<{ appId; envId }>()
4443
const [, grafanaModuleStatus] = useAsync(() => getModuleInfo(ModuleNameMap.GRAFANA), [appId])
4544
const [state, dispatch] = useReducer<Reducer<DeploymentConfigStateWithDraft, DeploymentConfigStateAction>>(

src/components/EnvironmentOverride/EnvironmentOverride.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export default function EnvironmentOverride({
1616
environments,
1717
reloadEnvironments,
1818
envName,
19-
isSuperAdmin,
2019
}: EnvironmentOverrideComponentProps) {
2120
const params = useParams<{ appId: string; envId: string }>()
2221
const [viewState, setViewState] = useState<ComponentStates>(null)
@@ -111,7 +110,6 @@ export default function EnvironmentOverride({
111110
environmentName={getEnvName()}
112111
isProtected={isProtected}
113112
reloadEnvironments={reloadEnvironments}
114-
isSuperAdmin={isSuperAdmin}
115113
/>
116114
</Route>
117115
<Route path={`${path}/${URLS.APP_CM_CONFIG}/:name?`}>

src/components/EnvironmentOverride/EnvironmentOverrides.type.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export interface EnvironmentOverrideComponentProps {
3737
environments?: any
3838
reloadEnvironments: () => void
3939
envName?: string
40-
isSuperAdmin: boolean
4140
}
4241

4342
export interface CommonEnvironmentOverridesProps {
@@ -55,7 +54,6 @@ export interface DeploymentTemplateOverrideProps extends CommonEnvironmentOverri
5554
environmentName: string
5655
isProtected: boolean
5756
reloadEnvironments: () => void
58-
isSuperAdmin?: boolean
5957
}
6058
export interface ListComponentType {
6159
name: string

src/components/app/details/appConfig/AppComposeRouter.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export default function AppComposeRouter({
6060
reloadEnvironments,
6161
configProtectionData,
6262
filteredEnvIds,
63-
isSuperAdmin
6463
}: AppComposeRouterProps) {
6564
const { path } = useRouteMatch()
6665
const renderJobViewRoutes = (): JSX.Element => {
@@ -117,7 +116,6 @@ export default function AppComposeRouter({
117116
environments={environments}
118117
isJobView={isJobView}
119118
reloadEnvironments={reloadEnvironments}
120-
isSuperAdmin={isSuperAdmin}
121119
/>
122120
)}
123121
/>,
@@ -165,7 +163,6 @@ export default function AppComposeRouter({
165163
environments={environments}
166164
isProtected={isBaseConfigProtected}
167165
reloadEnvironments={reloadEnvironments}
168-
isSuperAdmin={isSuperAdmin}
169166
/>
170167
</Route>
171168
)}
@@ -210,7 +207,7 @@ export default function AppComposeRouter({
210207
key={`${path}/${URLS.APP_ENV_OVERRIDE_CONFIG}`}
211208
path={`${path}/${URLS.APP_ENV_OVERRIDE_CONFIG}/:envId(\\d+)?`}
212209
render={(props) => (
213-
<EnvironmentOverride environments={environments} reloadEnvironments={reloadEnvironments} isSuperAdmin={isSuperAdmin}/>
210+
<EnvironmentOverride environments={environments} reloadEnvironments={reloadEnvironments} />
214211
)}
215212
/>,
216213
]}

src/components/app/details/appConfig/AppConfig.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ export default function AppConfig({ appName, isJobView, filteredEnvIds }: AppCon
399399
environmentList={state.environmentList}
400400
isBaseConfigProtected={state.isBaseConfigProtected}
401401
reloadEnvironments={reloadEnvironments}
402-
isSuperAdmin={userRole === UserRoleType.SuperAdmin}
403402
/>
404403
</div>
405404
<div className="app-compose__main">
@@ -423,7 +422,6 @@ export default function AppConfig({ appName, isJobView, filteredEnvIds }: AppCon
423422
reloadEnvironments={reloadEnvironments}
424423
configProtectionData={state.configProtectionData}
425424
filteredEnvIds={filteredEnvIds}
426-
isSuperAdmin={userRole === UserRoleType.SuperAdmin}
427425
/>
428426
</div>
429427
</div>
@@ -471,7 +469,6 @@ function Navigation({
471469
environmentList,
472470
isBaseConfigProtected,
473471
reloadEnvironments,
474-
isSuperAdmin,
475472
}: AppConfigNavigationProps) {
476473
const location = useLocation()
477474
const selectedNav = navItems.filter((navItem) => location.pathname.indexOf(navItem.href) >= 0)[0]
@@ -536,7 +533,6 @@ function Navigation({
536533
getWorkflows={getWorkflows}
537534
allEnvs={environmentList}
538535
reloadEnvironments={reloadEnvironments}
539-
isSuperAdmin={isSuperAdmin}
540536
/>
541537
)
542538
}

src/components/app/details/appConfig/appConfig.type.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export interface AppConfigNavigationProps {
7474
environmentList?: any[]
7575
isBaseConfigProtected?: boolean
7676
reloadEnvironments:()=> void
77-
isSuperAdmin?: boolean
7877
}
7978

8079
export interface AppComposeRouterProps {
@@ -97,7 +96,6 @@ export interface AppComposeRouterProps {
9796
reloadEnvironments:()=> void
9897
configProtectionData: any[]
9998
filteredEnvIds?: string
100-
isSuperAdmin?: boolean
10199
}
102100

103101
export interface EnvironmentOverridesProps {
@@ -119,7 +117,6 @@ export interface EnvironmentOverrideRouteProps {
119117
appId?: string
120118
workflowsRes?: WorkflowResult
121119
isEnvProtected?: boolean
122-
isSuperAdmin?: boolean
123120
}
124121

125122
export interface EnvironmentOverrideRouterProps {
@@ -128,7 +125,6 @@ export interface EnvironmentOverrideRouterProps {
128125
getWorkflows: () => void
129126
allEnvs?: any[]
130127
reloadEnvironments: ()=> void
131-
isSuperAdmin?: boolean
132128
}
133129

134130
export interface NextButtonProps {

src/components/common/navigation/NavigationRoutes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ export default function NavigationRoutes() {
303303
return <Reload />
304304
} else {
305305
const _isOnboardingPage = isOnboardingPage()
306-
307306
return (
308307
<mainContext.Provider
309308
value={{
@@ -323,6 +322,7 @@ export default function NavigationRoutes() {
323322
installedModuleMap,
324323
currentServerInfo,
325324
isAirgapped,
325+
isSuperAdmin
326326
}}
327327
>
328328
<main className={`${_isOnboardingPage ? 'no-nav' : ''}`}>

0 commit comments

Comments
 (0)