RTK identity traits

Author: kyle-ssg

frontend/common/services/useIdentityTrait.ts

@@ -18,7 +18,7 @@ function getUpdateTraitEndpoint(
   use_edge_identities: boolean,
   environmentId: string,
   userId: string,
-  id?: number,
+  id?: number | string,
 ) {
   if (use_edge_identities) {
     return `/environments/${environmentId}/edge-identities/${userId}/update-traits/`
@@ -75,11 +75,10 @@ export const identityTraitService = service
         query: (query: Req['deleteIdentityTrait']) => {
           if (query.use_edge_identities) {
             return {
-              body: getTraitBody(
-                query.use_edge_identities,
-                query.identity,
-                query.data,
-              ),
+              body: getTraitBody(query.use_edge_identities, query.identity, {
+                ...query.data,
+                trait_value: null,
+              }),
               method: 'PUT',
               url: getUpdateTraitEndpoint(
                 query.use_edge_identities,

frontend/common/stores/identity-store.js

@@ -219,9 +219,6 @@ store.dispatcherIndex = Dispatcher.register(store, (payload) => {
     case Actions.REMOVE_USER_FLAG:
       controller.removeUserFlag(identity, identityFlag, environmentId, cb)
       break
-    case Actions.DELETE_IDENTITY_TRAIT:
-      controller.deleteIdentityTrait(action.envId, action.identity, action.id)
-      break
     case Actions.CHANGE_USER_FLAG:
       controller.changeUserFlag(action.identity)
       break

frontend/web/components/IdentityTraits.tsx

@@ -14,6 +14,7 @@ import {
   useDeleteIdentityTraitMutation,
   useGetIdentityTraitsQuery,
 } from 'common/services/useIdentityTrait'
+import { IdentityTrait } from 'common/types/responses'
 
 type IdentityTraitsType = {
   projectId: string
@@ -27,18 +28,30 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
   identityId,
   identityName,
   projectId,
-    e
 }) => {
   const use_edge_identities = Utils.getIsEdge()
+
+  const { permission: manageUserPermission } = useHasPermission({
+    id: environmentId,
+    level: 'environment',
+    permission: Utils.getManageUserPermission(),
+  })
+
   const { data: traits } = useGetIdentityTraitsQuery({
     environmentId,
     identity: identityId,
     use_edge_identities,
   })
 
-  const [deleteTrait, { isLoading: deletingTrat }] =
+  const [deleteTrait, { isLoading: deletingTrait }] =
     useDeleteIdentityTraitMutation({})
 
+  //todo : https://github.com/Flagsmith/flagsmith/pull/5121 migrates this
+  const onTraitSaved = () => {
+    closeModal?.()
+    AppActions.getIdentitySegments(projectId, identityId)
+  }
+
   const createTrait = () => {
     API.trackEvent(Constants.events.VIEW_USER_FEATURE)
     openModal(
@@ -55,11 +68,7 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
     )
   }
 
-  const editTrait = (trait: {
-    id: string
-    trait_key: string
-    trait_value: string
-  }) => {
+  const editTrait = (trait: IdentityTrait) => {
     openModal(
       'Edit User Trait',
       <CreateTraitModal
@@ -96,22 +105,17 @@ const IdentityTraits: FC<IdentityTraitsType> = ({
           environmentId,
           identity: identityId,
           use_edge_identities,
+        }).then((res) => {
+          // @ts-ignore
+          if (!res?.error) {
+            onTraitSaved()
+          }
         }),
       title: 'Delete Trait',
       yesText: 'Confirm',
     })
   }
 
-  const onTraitSaved = () =>
-    //todo : https://github.com/Flagsmith/flagsmith/pull/5121 migrates this
-    AppActions.getIdentitySegments(projectId, identityId)
-  }
-
-  const { permission: manageUserPermission } = useHasPermission({
-    id: environmentId,
-    level: 'environment',
-    permission: Utils.getManageUserPermission(),
-  })
   return (
     <FormGroup>
       <PanelSearch

frontend/web/components/modals/CreateTrait.tsx

@@ -21,11 +21,12 @@ import {
   useCreateIdentityTraitMutation,
   useUpdateIdentityTraitMutation,
 } from 'common/services/useIdentityTrait'
+import { FlagsmithValue } from 'common/types/responses'
 
 type CreateTraitProps = {
-  id?: string
+  id?: number | string
   trait_key?: string
-  trait_value?: string
+  trait_value?: FlagsmithValue
   identityName: string
   onSave?: () => void
   identity: string

frontend/web/components/pages/UserPage.tsx

@@ -22,7 +22,6 @@ import ConfirmToggleFeature from 'components/modals/ConfirmToggleFeature'
 import Constants from 'common/constants'
 import CreateFlagModal from 'components/modals/CreateFlag'
 import CreateSegmentModal from 'components/modals/CreateSegment'
-import CreateTraitModal from 'components/modals/CreateTrait'
 import EditIdentity from 'components/EditIdentity'
 import FeatureListStore from 'common/stores/feature-list-store'
 import FeatureValue from 'components/FeatureValue'
@@ -49,6 +48,7 @@ import TableValueFilter from 'components/tables/TableValueFilter'
 import TagValues from 'components/tags/TagValues'
 import TryIt from 'components/TryIt'
 import Utils from 'common/utils/utils'
+// @ts-ignore
 import _data from 'common/data/base/_data'
 import classNames from 'classnames'
 import moment from 'moment'