Skip to content

Commit 09cc919

Browse files
committed
Merge branch 'main' of github.com:devtron-labs/dashboard into feat/inactive-user
2 parents 45e23ea + 796b9e9 commit 09cc919

File tree

1 file changed

+35
-30
lines changed

1 file changed

+35
-30
lines changed

src/Pages/GlobalConfigurations/Authorization/shared/components/AppPermissions.tsx

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ export default function AppPermissions({
9393
(directRolefilter.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
9494
? appsList
9595
: isJobs
96-
? jobsList
97-
: appsListHelmApps
96+
? jobsList
97+
: appsListHelmApps
9898
).get(projectId)?.result || []
9999
).map((app) => {
100100
return {
@@ -449,8 +449,8 @@ export default function AppPermissions({
449449
...(tempPermissions[index].accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
450450
? appsList
451451
: tempPermissions[index].accessType === ACCESS_TYPE_MAP.JOBS
452-
? jobsList
453-
: appsListHelmApps
452+
? jobsList
453+
: appsListHelmApps
454454
)
455455
.get(projectId)
456456
.result.map((app) => {
@@ -462,7 +462,7 @@ export default function AppPermissions({
462462
}),
463463
]
464464
} else {
465-
tempPermissions[index][name] = [{ label: 'Select all', value: '*' }]
465+
tempPermissions[index]['entityName'] = [{ label: 'Select all', value: '*' }]
466466
}
467467
tempPermissions[index]['entityNameError'] = null
468468
} else {
@@ -512,8 +512,8 @@ export default function AppPermissions({
512512
tempPermissions[index].accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
513513
? fetchAppList([projectId])
514514
: tempPermissions[index].accessType === ACCESS_TYPE_MAP.JOBS
515-
? fetchJobsList([projectId])
516-
: fetchAppListHelmApps([projectId])
515+
? fetchJobsList([projectId])
516+
: fetchAppListHelmApps([projectId])
517517
}
518518
} else if (name === APPROVER_ACTION.label) {
519519
tempPermissions[index][name] = !tempPermissions[index][name]
@@ -601,16 +601,19 @@ export default function AppPermissions({
601601
Helm Apps
602602
</NavLink>
603603
</li>
604-
<li className="tab-list__tab">
605-
<NavLink
606-
to={_getNavLinkUrl('jobs')}
607-
data-testid="jobs-permission-tab"
608-
className={NAV_LINK_CLASS}
609-
activeClassName="active"
610-
>
611-
Jobs
612-
</NavLink>
613-
</li>
604+
{serverMode !== SERVER_MODE.EA_ONLY && (
605+
<li className="tab-list__tab">
606+
<NavLink
607+
to={_getNavLinkUrl('jobs')}
608+
data-testid="jobs-permission-tab"
609+
className={NAV_LINK_CLASS}
610+
activeClassName="active"
611+
>
612+
Jobs
613+
</NavLink>
614+
</li>
615+
)}
616+
614617
{superAdmin && (
615618
<li className="tab-list__tab">
616619
<NavLink
@@ -658,15 +661,17 @@ export default function AppPermissions({
658661
directPermission={directPermission}
659662
/>
660663
</Route>
661-
<Route path={`${path}/jobs`}>
662-
<AppPermissionDetail
663-
accessType={ACCESS_TYPE_MAP.JOBS}
664-
removeDirectPermissionRow={removeDirectPermissionRow}
665-
handleDirectPermissionChange={handleDirectPermissionChange}
666-
AddNewPermissionRow={AddNewPermissionRowLocal}
667-
directPermission={directPermission}
668-
/>
669-
</Route>
664+
{serverMode !== SERVER_MODE.EA_ONLY && (
665+
<Route path={`${path}/jobs`}>
666+
<AppPermissionDetail
667+
accessType={ACCESS_TYPE_MAP.JOBS}
668+
removeDirectPermissionRow={removeDirectPermissionRow}
669+
handleDirectPermissionChange={handleDirectPermissionChange}
670+
AddNewPermissionRow={AddNewPermissionRowLocal}
671+
directPermission={directPermission}
672+
/>
673+
</Route>
674+
)}
670675
{superAdmin && (
671676
<Route path={`${path}/kubernetes-objects`}>
672677
<K8sPermissons k8sPermission={k8sPermission} setK8sPermission={setK8sPermission} />
@@ -709,8 +714,8 @@ const AppPermissionDetail = ({
709714
accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
710715
? '1fr 1fr 1fr 1fr 24px'
711716
: accessType === ACCESS_TYPE_MAP.HELM_APPS
712-
? '1fr 2fr 1fr 1fr 24px'
713-
: '1fr 1fr 1fr 1fr 1fr 24px',
717+
? '1fr 2fr 1fr 1fr 24px'
718+
: '1fr 1fr 1fr 1fr 1fr 24px',
714719
}}
715720
>
716721
<label className={PERMISSION_LABEL_CLASS}>Project</label>
@@ -755,8 +760,8 @@ const AppPermissionDetail = ({
755760
accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
756761
? '1fr 1fr 1fr 1fr 24px'
757762
: accessType === ACCESS_TYPE_MAP.HELM_APPS
758-
? '1fr 2fr 1fr 1fr 24px'
759-
: '1fr 1fr 1fr 1fr 1fr 24px',
763+
? '1fr 2fr 1fr 1fr 24px'
764+
: '1fr 1fr 1fr 1fr 1fr 24px',
760765
}}
761766
>
762767
<DirectPermission

0 commit comments

Comments
 (0)