Skip to content

Commit 796b9e9

Browse files
Merge pull request #1605 from devtron-labs/unassigned-project-all-apps-selection-permission-fix
fix: Helm app unassigned project all app selection fix
2 parents 039f8f3 + 50da6a2 commit 796b9e9

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

src/components/userGroups/AppPermissions.tsx

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ export default function AppPermissions({
468468
}),
469469
]
470470
} else {
471-
tempPermissions[index][name] = [{ label: 'Select all', value: '*' }]
471+
tempPermissions[index]['entityName'] = [{ label: 'Select all', value: '*' }]
472472
}
473473
tempPermissions[index]['entityNameError'] = null
474474
} else {
@@ -605,16 +605,18 @@ export default function AppPermissions({
605605
Helm Apps
606606
</NavLink>
607607
</li>
608-
<li className="tab-list__tab">
609-
<NavLink
610-
to={_getNavLinkUrl('jobs')}
611-
data-testid="jobs-permission-tab"
612-
className="tab-list__tab-link"
613-
activeClassName="active"
614-
>
615-
Jobs
616-
</NavLink>
617-
</li>
608+
{serverMode !== SERVER_MODE.EA_ONLY && (
609+
<li className="tab-list__tab">
610+
<NavLink
611+
to={_getNavLinkUrl('jobs')}
612+
data-testid="jobs-permission-tab"
613+
className="tab-list__tab-link"
614+
activeClassName="active"
615+
>
616+
Jobs
617+
</NavLink>
618+
</li>
619+
)}
618620
{superAdmin && (
619621
<li className="tab-list__tab">
620622
<NavLink
@@ -664,16 +666,18 @@ export default function AppPermissions({
664666
hideInfoLegend={hideInfoLegend}
665667
/>
666668
</Route>
667-
<Route path={`${path}/jobs`}>
668-
<AppPermissionDetail
669-
accessType={ACCESS_TYPE_MAP.JOBS}
670-
removeDirectPermissionRow={removeDirectPermissionRow}
671-
handleDirectPermissionChange={handleDirectPermissionChange}
672-
AddNewPermissionRow={AddNewPermissionRowLocal}
673-
directPermission={directPermission}
674-
hideInfoLegend={hideInfoLegend}
675-
/>
676-
</Route>
669+
{serverMode !== SERVER_MODE.EA_ONLY && (
670+
<Route path={`${path}/jobs`}>
671+
<AppPermissionDetail
672+
accessType={ACCESS_TYPE_MAP.JOBS}
673+
removeDirectPermissionRow={removeDirectPermissionRow}
674+
handleDirectPermissionChange={handleDirectPermissionChange}
675+
AddNewPermissionRow={AddNewPermissionRowLocal}
676+
directPermission={directPermission}
677+
hideInfoLegend={hideInfoLegend}
678+
/>
679+
</Route>
680+
)}
677681
{superAdmin && (
678682
<Route path={`${path}/kubernetes-objects`}>
679683
<K8sPermissons k8sPermission={k8sPermission} setK8sPermission={setK8sPermission} />

0 commit comments

Comments
 (0)