Skip to content

Commit 46f67d0

Browse files
committed
refactor: common out common types, add sticky header for table
1 parent 9825971 commit 46f67d0

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.58-beta-9",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.58-beta-10",
88
"@rjsf/core": "^5.13.3",
99
"@rjsf/utils": "^5.13.3",
1010
"@rjsf/validator-ajv8": "^5.13.3",

src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const PermissionGroupList = () => {
117117
)}
118118
{isLoading || (result.totalCount && result.permissionGroups.length) ? (
119119
<div className="flexbox-col flex-grow-1">
120-
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom">
120+
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0">
121121
<span />
122122
<SortableTableHeaderCell
123123
title="Name"

src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const UserPermissionList = () => {
120120
<div
121121
className={`user-permission__header ${
122122
showStatus ? 'user-permission__header--with-status' : ''
123-
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom`}
123+
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0`}
124124
>
125125
<span />
126126
<SortableTableHeaderCell

src/Pages/GlobalConfigurations/Authorization/constants.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
export enum UserStatus {
2-
active = 'active',
3-
inactive = 'inactive',
4-
}
5-
1+
/**
2+
* Permission types for users and permission groups
3+
*/
64
export enum PermissionType {
75
SUPER_ADMIN = 'SUPER_ADMIN',
86
SPECIFIC = 'SPECIFIC',

src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
createClusterEnvGroup,
1717
} from '../../../../../../components/common'
1818
import { getAllWorkflowsForAppNames } from '../../../../../../services/service'
19-
import { DirectPermissionsRoleFilter, ChartGroupPermissionsFilter, ActionTypes, EntityTypes } from './userGroups.types'
19+
import { ChartGroupPermissionsFilter, ActionTypes, EntityTypes, DirectPermissionRow, ChartPermissionRow } from './userGroups.types'
2020
import { ACCESS_TYPE_MAP, HELM_APP_UNASSIGNED_PROJECT } from '../../../../../../config'
2121
import { ReactComponent as CloseIcon } from '../../../../../../assets/icons/ic-close.svg'
2222
import {
@@ -59,13 +59,6 @@ const allEnvironmentsOption = {
5959
export const APPROVER_ACTION = { label: 'approver', value: 'approver' }
6060
export const CONFIG_APPROVER_ACTION = { label: 'configApprover', value: 'configApprover' }
6161

62-
interface DirectPermissionRow {
63-
permission: DirectPermissionsRoleFilter
64-
handleDirectPermissionChange: (...rest) => void
65-
index: number
66-
removeRow: (index: number) => void
67-
}
68-
6962
export const DirectPermission: React.FC<DirectPermissionRow> = ({
7063
permission,
7164
handleDirectPermissionChange,
@@ -722,11 +715,7 @@ const AppOption = ({ props, permission }) => {
722715
)
723716
}
724717

725-
interface ChartPermissionRow {
726-
chartPermission: ChartGroupPermissionsFilter
727-
setChartPermission: any
728-
hideInfoLegend?: boolean
729-
}
718+
730719

731720
export const ChartPermission: React.FC<ChartPermissionRow> = React.memo(
732721
({ chartPermission, setChartPermission, hideInfoLegend }) => {

src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,3 +211,16 @@ export const ViewChartGroupPermission:APIRoleFilter = {
211211
entity: EntityTypes.CHART_GROUP,
212212
action: ActionTypes.VIEW,
213213
}
214+
215+
export interface DirectPermissionRow {
216+
permission: DirectPermissionsRoleFilter
217+
handleDirectPermissionChange: (...rest) => void
218+
index: number
219+
removeRow: (index: number) => void
220+
}
221+
222+
export interface ChartPermissionRow {
223+
chartPermission: ChartGroupPermissionsFilter
224+
setChartPermission: any
225+
hideInfoLegend?: boolean
226+
}

src/Pages/GlobalConfigurations/Authorization/types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ReactNode } from 'react'
2-
import { SortingParams } from '@devtron-labs/devtron-fe-common-lib'
2+
import { SortingParams, UserStatusDto } from '@devtron-labs/devtron-fe-common-lib'
33
import { APIRoleFilter } from './shared/components/userGroups/userGroups.types'
4-
import { UserStatus } from './constants'
54

65
export interface UserAndGroupPermissionsWrapProps {
76
children: ReactNode
@@ -57,7 +56,7 @@ export interface UserDto {
5756
*
5857
* @default 'active'
5958
*/
60-
userStatus?: UserStatus
59+
userStatus?: UserStatusDto
6160
/**
6261
* Last login time of the user
6362
*

0 commit comments

Comments
 (0)