Skip to content

Commit 58b4245

Browse files
kyle-ssgkyle-ssg
committed
Refactor permission descriptions
1 parent d329c91 commit 58b4245

21 files changed

+66
-97
lines changed

‎frontend/package-lock.json‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"react-refresh": "^0.14.2",
183183
"ssgrtk": "^0.3.5",
184184
"testcafe": "^3.2.0",
185-
"typescript": "4.6.4"
185+
"typescript": "^5.9.3"
186186
},
187187
"lint-staged": {
188188
"*.{js,ts,tsx}": "eslint --fix"

‎frontend/web/components/CompareIdentities.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ import IdentityOverridesIcon from './IdentityOverridesIcon'
2323
import Tooltip from './Tooltip'
2424
import PageTitle from './PageTitle'
2525
import { getDarkMode } from 'project/darkMode'
26-
import {
27-
EnvironmentPermission,
28-
EnvironmentPermissionDescriptions,
29-
} from 'common/types/permissions.types'
26+
import { EnvironmentPermission } from 'common/types/permissions.types'
3027

3128
type CompareIdentitiesType = {
3229
projectId: string
@@ -122,12 +119,13 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({
122119
const isEdge = Utils.getIsEdge()
123120

124121
const goUser = (user: IdentitySelectType['value'], feature: string) => {
122+
if (!user) return
125123
window.open(
126124
`${
127125
document.location.origin
128126
}/project/${projectId}/environment/${environmentId}/users/${encodeURIComponent(
129-
user!.label,
130-
)}/${user!.value}?flag=${encodeURIComponent(feature)}`,
127+
user.label,
128+
)}/${user.value}?flag=${encodeURIComponent(feature)}`,
131129
'_blank',
132130
)
133131
}
@@ -194,7 +192,7 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({
194192
<div
195193
dangerouslySetInnerHTML={{
196194
__html: Constants.environmentPermissions(
197-
EnvironmentPermissionDescriptions.VIEW_IDENTITIES,
195+
EnvironmentPermission.VIEW_IDENTITIES,
198196
),
199197
}}
200198
/>

‎frontend/web/components/IdentityTraits.tsx‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import {
1414
useGetIdentityTraitsQuery,
1515
} from 'common/services/useIdentityTrait'
1616
import { IdentityTrait } from 'common/types/responses'
17-
import {
18-
EnvironmentPermission,
19-
EnvironmentPermissionDescriptions,
20-
} from 'common/types/permissions.types'
17+
import { EnvironmentPermission } from 'common/types/permissions.types'
2118

2219
type IdentityTraitsType = {
2320
projectId: string | number
@@ -46,8 +43,7 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
4643
use_edge_identities,
4744
})
4845

49-
const [deleteTrait, { isLoading: deletingTrait }] =
50-
useDeleteIdentityTraitMutation({})
46+
const [deleteTrait] = useDeleteIdentityTraitMutation({})
5147

5248
const onTraitSaved = () => {
5349
closeModal?.()
@@ -130,7 +126,7 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
130126
{Utils.renderWithPermission(
131127
manageUserPermission,
132128
Constants.environmentPermissions(
133-
EnvironmentPermissionDescriptions.MANAGE_IDENTITIES,
129+
EnvironmentPermission.MANAGE_IDENTITIES,
134130
),
135131
<Button
136132
disabled={!manageUserPermission}
@@ -187,7 +183,7 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
187183
{Utils.renderWithPermission(
188184
manageUserPermission,
189185
Constants.environmentPermissions(
190-
EnvironmentPermissionDescriptions.MANAGE_IDENTITIES,
186+
EnvironmentPermission.MANAGE_IDENTITIES,
191187
),
192188
<Button
193189
id='remove-feature'
@@ -212,7 +208,7 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
212208
{Utils.renderWithPermission(
213209
manageUserPermission,
214210
Constants.environmentPermissions(
215-
EnvironmentPermissionDescriptions.MANAGE_IDENTITIES,
211+
EnvironmentPermission.MANAGE_IDENTITIES,
216212
),
217213
<Button
218214
disabled={!manageUserPermission}

‎frontend/web/components/RolesTable.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Utils from 'common/utils/utils'
1212
import Constants from 'common/constants'
1313
import { useHasPermission } from 'common/providers/Permission'
1414
import { withRouter, useHistory, RouteComponentProps } from 'react-router-dom'
15-
import { ADMIN_PERMISSION_DESCRIPTION } from 'common/types/permissions.types'
15+
import { ADMIN_PERMISSION } from 'common/types/permissions.types'
1616
const rolesWidths = [250, 100]
1717

1818
interface RolesTableType extends RouteComponentProps {
@@ -84,7 +84,7 @@ const RolesTable: FC<RolesTableType> = ({ organisationId, users }) => {
8484
<h5 className='m-b-0'>Roles</h5>
8585
{Utils.renderWithPermission(
8686
isAdmin,
87-
Constants.organisationPermissions(ADMIN_PERMISSION_DESCRIPTION),
87+
Constants.organisationPermissions(ADMIN_PERMISSION),
8888
<Button
8989
disabled={!isAdmin}
9090
className='mr-2'

‎frontend/web/components/feature-summary/FeatureAction.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ import { getTagColor } from 'components/tags/Tag'
1111
import ActionButton from 'components/ActionButton'
1212
import ActionItem from 'components/shared/ActionItem'
1313
import { calculateListPosition } from 'common/utils/calculateListPosition'
14-
import {
15-
ProjectPermission,
16-
ProjectPermissionDescriptions,
17-
} from 'common/types/permissions.types'
14+
import { ProjectPermission } from 'common/types/permissions.types'
1815

1916
export interface FeatureActionProps {
2017
projectId: string
@@ -150,7 +147,7 @@ export const FeatureAction: FC<FeatureActionProps> = ({
150147
Utils.renderWithPermission(
151148
removeFeaturePermission,
152149
Constants.projectPermissions(
153-
ProjectPermissionDescriptions.DELETE_FEATURE,
150+
ProjectPermission.DELETE_FEATURE,
154151
),
155152
<Tooltip
156153
title={

‎frontend/web/components/import-export/ImportPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import FeatureImport from './FeatureImport'
1616
import AccountStore from 'common/stores/account-store'
1717
import Constants from 'common/constants'
1818
import { useHistory } from 'react-router-dom'
19-
import { ADMIN_PERMISSION_DESCRIPTION } from 'common/types/permissions.types'
19+
import { ADMIN_PERMISSION } from 'common/types/permissions.types'
2020

2121
type ImportPageType = {
2222
projectId: string
@@ -104,7 +104,7 @@ const ImportPage: FC<ImportPageType> = ({ projectId, projectName }) => {
104104
<div
105105
dangerouslySetInnerHTML={{
106106
__html: Constants.organisationPermissions(
107-
ADMIN_PERMISSION_DESCRIPTION,
107+
ADMIN_PERMISSION,
108108
),
109109
}}
110110
className='mt-4'

‎frontend/web/components/modals/CreateSegmentRulesTabForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Constants from 'common/constants'
1010
import JSONReference from 'components/JSONReference'
1111
import { Segment } from 'common/types/responses'
1212
import ChangeRequestModal from './ChangeRequestModal'
13-
import { ADMIN_PERMISSION_DESCRIPTION } from 'common/types/permissions.types'
13+
import { ADMIN_PERMISSION } from 'common/types/permissions.types'
1414

1515
type DefaultSegmentType = Omit<Segment, 'id' | 'project' | 'uuid'> & {
1616
id?: number
@@ -223,7 +223,7 @@ const CreateSegmentRulesTabForm: React.FC<CreateSegmentRulesTabFormProps> = ({
223223
}
224224
place='left'
225225
>
226-
{Constants.projectPermissions(ADMIN_PERMISSION_DESCRIPTION)}
226+
{Constants.projectPermissions(ADMIN_PERMISSION)}
227227
</Tooltip>
228228
</div>
229229
) : (

‎frontend/web/components/modals/create-feature/tabs/FeatureSettings.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import Utils from 'common/utils/utils'
1616
import FormGroup from 'components/base/grid/FormGroup'
1717
import Row from 'components/base/grid/Row'
1818
import AccountStore from 'common/stores/account-store'
19-
import {
20-
ProjectPermission,
21-
ProjectPermissionDescriptions,
22-
} from 'common/types/permissions.types'
19+
import { ProjectPermission } from 'common/types/permissions.types'
2320

2421
type FeatureSettingsTabProps = {
2522
projectAdmin: boolean
@@ -51,7 +48,7 @@ const FeatureSettings: FC<FeatureSettingsTabProps> = ({
5148
<div
5249
dangerouslySetInnerHTML={{
5350
__html: Constants.projectPermissions(
54-
ProjectPermissionDescriptions.CREATE_FEATURE,
51+
ProjectPermission.CREATE_FEATURE,
5552
),
5653
}}
5754
/>

‎frontend/web/components/modals/create-feature/tabs/FeatureValue.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Icon from 'components/Icon'
1111
import Switch from 'components/Switch'
1212
import Utils from 'common/utils/utils'
1313
import { FeatureState, ProjectFlag } from 'common/types/responses'
14-
import { ProjectPermissionDescriptions } from 'common/types/permissions.types'
14+
import { ProjectPermission } from 'common/types/permissions.types'
1515

1616
function isNegativeNumberString(str: any) {
1717
if (typeof Utils.getTypedValue(str) !== 'number') {
@@ -278,7 +278,7 @@ const FeatureValue: FC<EditFeatureValueProps> = ({
278278
{Utils.renderWithPermission(
279279
createFeature,
280280
Constants.projectPermissions(
281-
ProjectPermissionDescriptions.CREATE_FEATURE,
281+
ProjectPermission.CREATE_FEATURE,
282282
),
283283
<AddVariationButton
284284
multivariateOptions={multivariate_options}

0 commit comments

Comments
 (0)