Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Clone identities (FE) #3725

Merged
merged 11 commits into from
Apr 30, 2024
Merged

feat: Clone identities (FE) #3725

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
85e999a
feat: Clone identities (FE)
novakzaballa Apr 5, 2024
e3763d9
Merge branch 'main' into feat/clone-identities-fe
novakzaballa Apr 5, 2024
0f472fc
Use clone-flag-states-from endpoint
novakzaballa Apr 8, 2024
d264d76
Determine whether the project uses Edge or Core
novakzaballa Apr 8, 2024
2e4c304
Add Flag
novakzaballa Apr 8, 2024
b708ad0
Update endpoint
novakzaballa Apr 16, 2024
33ac2d6
Change texts
novakzaballa Apr 18, 2024
f7bcb11
Merge branch 'main' into feat/clone-identities-fe
novakzaballa Apr 24, 2024
e202e3f
Update text, and add validation into the Clone Features states button
novakzaballa Apr 24, 2024
40c0e6c
Merge branch 'main' into feat/clone-identities-fe
novakzaballa Apr 24, 2024
08f14e7
Merge branch 'main' into feat/clone-identities-fe
novakzaballa Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions frontend/common/services/useIdentityFeatureState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,29 @@ export const identityFeatureStateService = service
.enhanceEndpoints({ addTagTypes: ['IdentityFeatureState'] })
.injectEndpoints({
endpoints: (builder) => ({
getIdentityFeatureStates: builder.query<
createCloneIdentityFeatureStates: builder.mutation<
Res['cloneidentityFeatureStates'],
Req['createCloneIdentityFeatureStates']
>({
invalidatesTags: [{ type: 'IdentityFeatureState' }],
query: (query: Req['createCloneIdentityFeatureStates']) => ({
body: query.body,
method: 'POST',
url: `environments/${
query.environment_id
}/${Utils.getIdentitiesEndpoint()}/${
query.identity_id
}/${Utils.getFeatureStatesEndpoint()}/clone-from-given-identity/`,
}),
}),
getIdentityFeatureStatesAll: builder.query<
Res['identityFeatureStates'],
Req['getIdentityFeatureStates']
Req['getIdentityFeatureStatesAll']
>({
providesTags: (res, _, req) => [
{ id: req.user, type: 'IdentityFeatureState' },
],
query: (query: Req['getIdentityFeatureStates']) => ({
query: (query: Req['getIdentityFeatureStatesAll']) => ({
url: `environments/${
query.environment
}/${Utils.getIdentitiesEndpoint()}/${
Expand All @@ -26,15 +41,30 @@ export const identityFeatureStateService = service
}),
})

export async function getIdentityFeatureStates(
export async function getIdentityFeatureStateAll(
store: any,
data: Req['getIdentityFeatureStatesAll'],
options?: Parameters<
typeof identityFeatureStateService.endpoints.getIdentityFeatureStatesAll.initiate
>[1],
) {
return store.dispatch(
identityFeatureStateService.endpoints.getIdentityFeatureStatesAll.initiate(
data,
options,
),
)
}

export async function createIdentityFeatureStates(
store: any,
data: Req['getIdentityFeatureStates'],
data: Req['createCloneIdentityFeatureStates'],
options?: Parameters<
typeof identityFeatureStateService.endpoints.getIdentityFeatureStates.initiate
typeof identityFeatureStateService.endpoints.createCloneIdentityFeatureStates.initiate
>[1],
) {
return store.dispatch(
identityFeatureStateService.endpoints.getIdentityFeatureStates.initiate(
identityFeatureStateService.endpoints.createCloneIdentityFeatureStates.initiate(
data,
options,
),
Expand All @@ -43,12 +73,13 @@ export async function getIdentityFeatureStates(
// END OF FUNCTION_EXPORTS

export const {
useGetIdentityFeatureStatesQuery,
useCreateCloneIdentityFeatureStatesMutation,
useGetIdentityFeatureStatesAllQuery,
// END OF EXPORTS
} = identityFeatureStateService

/* Usage examples:
const { data, isLoading } = useGetIdentityFeatureStatesQuery({ id: 2 }, {}) //get hook
const [createIdentityFeatureStates, { isLoading, data, isSuccess }] = useCreateIdentityFeatureStatesMutation() //create hook
identityFeatureStateService.endpoints.getIdentityFeatureStates.select({id: 2})(store.getState()) //access data from any function
identityFeatureStateService.endpoints.getIdentityFeatureStatesAll.select({id: 2})(store.getState()) //access data from any function
*/
10 changes: 8 additions & 2 deletions frontend/common/types/requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
Tag,
FeatureStateValue,
FeatureState,
Role,
ImportStrategy,
APIKey,
} from './responses'
Expand Down Expand Up @@ -159,7 +158,7 @@ export type Req = {
updateRolePermission: Req['createRolePermission'] & { id: number }
deleteRolePermission: { organisation_id: number; role_id: number }

getIdentityFeatureStates: {
getIdentityFeatureStatesAll: {
environment: string
user: string
}
Expand Down Expand Up @@ -308,5 +307,12 @@ export type Req = {
}
getProject: { id: string }
getUserGroupPermission: { project_id: string }
createCloneIdentityFeatureStates: {
environment_id: string
identity_id: string
body: {
source_identity_id: string
}
}
// END OF TYPES
}
5 changes: 4 additions & 1 deletion frontend/common/types/responses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ export type IdentityFeatureState = {
enabled: boolean
feature_state_value: FlagsmithValue
segment: null
overridden_by: string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing this is string|null

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Corrected

multivariate_feature_state_values?: {
multivariate_feature_option: {
value: number
Expand Down Expand Up @@ -466,7 +467,7 @@ export type Res = {
rolePermission: PagedResponse<UserPermission>
projectFlags: PagedResponse<ProjectFlag>
projectFlag: ProjectFlag
identityFeatureStates: IdentityFeatureState[]
identityFeatureStatesAll: IdentityFeatureState[]
createRolesPermissionUsers: RolePermissionUser
rolesPermissionUsers: PagedResponse<RolePermissionUser>
createRolePermissionGroup: RolePermissionGroup
Expand Down Expand Up @@ -497,5 +498,7 @@ export type Res = {
featureImports: PagedResponse<FeatureImport>
serversideEnvironmentKeys: APIKey[]
userGroupPermissions: GroupPermission[]
identityFeatureStates: PagedResponse<FeatureState>
cloneidentityFeatureStates: IdentityFeatureState
// END OF TYPES
}
79 changes: 75 additions & 4 deletions frontend/web/components/CompareIdentities.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import React, { FC, useEffect, useMemo, useState } from 'react'
import IdentitySelect, { IdentitySelectType } from './IdentitySelect'
import Utils from 'common/utils/utils'
import EnvironmentSelect from './EnvironmentSelect'
import { useGetIdentityFeatureStatesQuery } from 'common/services/useIdentityFeatureState'
import {
useGetIdentityFeatureStatesAllQuery,
useCreateCloneIdentityFeatureStatesMutation,
} from 'common/services/useIdentityFeatureState'
import { useGetProjectFlagsQuery } from 'common/services/useProjectFlag'
import Tag from './tags/Tag'
import PanelSearch from './PanelSearch'
Expand All @@ -17,6 +20,8 @@ import Button from './base/forms/Button'
import ProjectStore from 'common/stores/project-store'
import SegmentOverridesIcon from './SegmentOverridesIcon'
import IdentityOverridesIcon from './IdentityOverridesIcon'
import Tooltip from './Tooltip'
import PageTitle from './PageTitle'

type CompareIdentitiesType = {
projectId: string
Expand Down Expand Up @@ -66,14 +71,16 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({
permission: Utils.getViewIdentitiesPermission(),
})

const { data: leftUser } = useGetIdentityFeatureStatesQuery(
const { data: leftUser } = useGetIdentityFeatureStatesAllQuery(
{ environment: environmentId, user: `${leftId?.value}` },
{ skip: !leftId },
)
const { data: rightUser } = useGetIdentityFeatureStatesQuery(
const { data: rightUser } = useGetIdentityFeatureStatesAllQuery(
{ environment: environmentId, user: `${rightId?.value}` },
{ skip: !rightId },
)
const [createCloneIdentityFeatureStates] =
useCreateCloneIdentityFeatureStatesMutation()

useEffect(() => {
// Clear users whenever environment or project is changed
Expand Down Expand Up @@ -120,6 +127,39 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({
)
}

const clonedentityValues = (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cloneIdentityValues

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, was corrected

leftIdentityName: string,
rightIdentityName: string,
leftIdentityId: string,
rightIdentityId: string,
environmentId: string,
) => {
return openConfirm({
body: (
<div>
{'Are you sure you want to clone all the feature states from '}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does cloning clone overrides and traits?

If so I think that might read better

"Cloning an identity will copy any traits and identity overrides. Are you sure?"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't clone the traits.
Maybe could be: "Cloning {identityA} will copy any identity overrides in {identityB}. Are you sure?"

<strong>{leftIdentityName}</strong> {'to'}{' '}
<strong>{rightIdentityName}</strong>
{'?'}
</div>
),
destructive: true,
onYes: () => {
createCloneIdentityFeatureStates({
body: {
source_identity_id: leftIdentityId,
},
environment_id: environmentId,
identity_id: rightIdentityId,
}).then(() => {
toast('Clonation Completed!')
})
},
title: 'Clone the values',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clone identity might be better here ? Not clear what "The values" means

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

yesText: 'Confirm',
})
}

return (
<div>
<div className='col-md-8'>
Expand Down Expand Up @@ -179,9 +219,40 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({

{isReady && (
<>
<PageTitle
title={'Changed Flags'}
className='mt-3'
cta={
<>
{Utils.getFlagsmithHasFeature('clone_identities') && (
<>
<Tooltip
title={
<Button
onClick={() => {
clonedentityValues(
leftId?.label,
rightId?.label,
leftId?.value,
rightId?.value,
environmentId,
)
}}
className='ms-2 me-2'
>
{'Clone features states'}
Copy link
Member

@kyle-ssg kyle-ssg Apr 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clone identity overrides I think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This text was updated.

</Button>
}
>
{`Clone the features states from ${leftId?.label} to ${rightId?.label}`}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this text was updated.

</Tooltip>
</>
)}
</>
}
></PageTitle>
<PanelSearch
className='no-pad mt-4'
title={'Changed Flags'}
searchPanel={
<Row className='mb-2'>
<Tag
Expand Down
2 changes: 1 addition & 1 deletion frontend/web/components/ExistingChangeRequestAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FC, useRef } from 'react';
import { FC, useRef } from 'react'
import { useGetChangeRequestsQuery } from 'common/services/useChangeRequest'
import WarningMessage from './WarningMessage'
import moment from 'moment'
Expand Down
13 changes: 6 additions & 7 deletions frontend/web/components/GithubStar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ const GithubStar: FC<GithubStarType> = ({}) => {
useEffect(() => {
if (planName !== planNames.enterprise) {
fetch(`https://api.github.com/repos/flagsmith/flagsmith`)
.then(function (res) {
return res.json()
})
.then(function (res) {
setStars(res.stargazers_count)
})
.then(function (res) {
return res.json()
})
.then(function (res) {
setStars(res.stargazers_count)
})
}

}, [planName])

if (planName === planNames.enterprise) {
Expand Down