RTK identity traits

Author: kyle-ssg

frontend/common/code-help/create-user/create-user-php.js

@@ -7,7 +7,8 @@ module.exports = (
 ) => `use Flagsmith\\Flagsmith;
 
 $flagsmith = new Flagsmith('${envId}'${
-  Constants.isCustomFlagsmithUrl() && `,\n  '${Constants.getFlagsmithSDKUrl()}'\n`
+  Constants.isCustomFlagsmithUrl() &&
+  `,\n  '${Constants.getFlagsmithSDKUrl()}'\n`
 });
 
 // Identify the user

frontend/common/code-help/init/init-dotnet.js

@@ -9,7 +9,9 @@ module.exports = (
 static FlagsmithClient _flagsmithClient;
 
 _flagsmithClient = new("${envId}"${
-  Constants.isCustomFlagsmithUrl() ? `, apiUrl: "${Constants.getFlagsmithSDKUrl()}"` : ''
+  Constants.isCustomFlagsmithUrl()
+    ? `, apiUrl: "${Constants.getFlagsmithSDKUrl()}"`
+    : ''
 });
 
 var flags = await _flagsmithClient.GetEnvironmentFlags();  # This method triggers a network request

frontend/common/code-help/init/init-js.js

@@ -6,7 +6,11 @@ module.exports = (
 ) => `import ${LIB_NAME} from "${NPM_CLIENT}"; // Add this line if you're using ${LIB_NAME} via npm
 
 ${LIB_NAME}.init({
-    environmentID: "${envId}",${Constants.isCustomFlagsmithUrl() ? `\n    api: "${Constants.getFlagsmithSDKUrl()}",` : ''}
+    environmentID: "${envId}",${
+  Constants.isCustomFlagsmithUrl()
+    ? `\n    api: "${Constants.getFlagsmithSDKUrl()}",`
+    : ''
+}
     onChange: (oldFlags, params) => { // Occurs whenever flags are changed
         // Determines if the update came from the server or local cached storage
         const { isFromServer } = params;

frontend/common/code-help/traits/traits-node.js

@@ -2,7 +2,7 @@ import Constants from 'common/constants'
 
 module.exports = (
   envId,
-  { FEATURE_NAME, TRAIT_NAME, LIB_NAME, NPM_NODE_CLIENT, USER_ID },
+  { FEATURE_NAME, LIB_NAME, NPM_NODE_CLIENT, TRAIT_NAME, USER_ID },
   userId,
 ) => `import Flagsmith from "${NPM_NODE_CLIENT}"; // Add this line if you're using ${LIB_NAME} via npm
 

frontend/common/code-help/traits/traits-php.js

@@ -2,7 +2,8 @@ import Constants from 'common/constants'
 module.exports = (envId, { TRAIT_NAME }, userId) => `use Flagsmith\\Flagsmith;
 
 $flagsmith = new Flagsmith('${envId}'${
-  Constants.isCustomFlagsmithUrl() && `,\n  '${Constants.getFlagsmithSDKUrl()}'\n`
+  Constants.isCustomFlagsmithUrl() &&
+  `,\n  '${Constants.getFlagsmithSDKUrl()}'\n`
 });
 
 $traits = (object) [ '${TRAIT_NAME}' => 42 ];

frontend/common/dispatcher/action-constants.js

@@ -9,7 +9,6 @@ const Actions = Object.assign({}, require('./base/_action-constants'), {
   'CREATE_PROJECT': 'CREATE_PROJECT',
   'DELETE_CHANGE_REQUEST': 'DELETE_CHANGE_REQUEST',
   'DELETE_ENVIRONMENT': 'DELETE_ENVIRONMENT',
-  'DELETE_IDENTITY_TRAIT': 'DELETE_IDENTITY_TRAIT',
   'DELETE_INVITE': 'DELETE_INVITE',
   'DELETE_ORGANISATION': 'DELETE_ORGANISATION',
   'DELETE_PROJECT': 'DELETE_PROJECT',
@@ -23,7 +22,6 @@ const Actions = Object.assign({}, require('./base/_action-constants'), {
   'EDIT_FEATURE_MV': 'EDIT_FEATURE_MV',
   'EDIT_ORGANISATION': 'EDIT_ORGANISATION',
   'EDIT_PROJECT': 'EDIT_PROJECT',
-  'EDIT_TRAIT': 'EDIT_TRAIT',
   'EDIT_USER_FLAG': 'EDIT_USER_FLAG',
   'ENABLE_TWO_FACTOR': 'ENABLE_TWO_FACTOR',
   'GET_CHANGE_REQUEST': 'GET_CHANGE_REQUEST',

frontend/common/dispatcher/app-actions.js

@@ -70,14 +70,6 @@ const AppActions = Object.assign({}, require('./base/_app-actions'), {
       env,
     })
   },
-  deleteIdentityTrait(envId, identity, id) {
-    Dispatcher.handleViewAction({
-      actionType: Actions.DELETE_IDENTITY_TRAIT,
-      envId,
-      id,
-      identity,
-    })
-  },
   deleteInvite(id) {
     Dispatcher.handleViewAction({
       actionType: Actions.DELETE_INVITE,
@@ -188,12 +180,6 @@ const AppActions = Object.assign({}, require('./base/_app-actions'), {
       project,
     })
   },
-  editTrait(params) {
-    Dispatcher.handleViewAction({
-      actionType: Actions.EDIT_TRAIT,
-      ...params,
-    })
-  },
   editUserFlag(params) {
     Dispatcher.handleViewAction({
       actionType: Actions.EDIT_USER_FLAG,

frontend/common/providers/IdentityProvider.js

@@ -24,7 +24,6 @@ const IdentityProvider = class extends React.Component {
         identityFlags: IdentityStore.getIdentityFlags(),
         isLoading: IdentityStore.isLoading || FeatureListStore.isLoading,
         isSaving: IdentityStore.isSaving,
-        traits: IdentityStore.getTraits(),
       })
     })
     this.listenTo(FeatureListStore, 'change', () => {
@@ -72,14 +71,6 @@ const IdentityProvider = class extends React.Component {
     })
   }
 
-  editTrait = ({ environmentId, identity, trait }) => {
-    AppActions.editTrait({ environmentId, identity, trait })
-  }
-
-  createTrait = ({ environmentId, identity, isCreate, trait }) => {
-    AppActions.editTrait({ environmentId, identity, isCreate, trait })
-  }
-
   removeFlag = ({ environmentId, identity, identityFlag }) => {
     AppActions.removeUserFlag({ environmentId, identity, identityFlag })
   }
@@ -94,21 +85,12 @@ const IdentityProvider = class extends React.Component {
   }
 
   render() {
-    const {
-      changeUserFlag,
-      createTrait,
-      editFeatureValue,
-      editTrait,
-      removeFlag,
-      toggleFlag,
-    } = this
+    const { changeUserFlag, editFeatureValue, removeFlag, toggleFlag } = this
     return this.props.children(
       { ...this.state },
       {
         changeUserFlag,
-        createTrait,
         editFeatureValue,
-        editTrait,
         removeFlag,
         toggleFlag,
       },

frontend/common/providers/Permission.tsx

@@ -3,8 +3,8 @@ import { useGetPermissionQuery } from 'common/services/usePermission'
 import { PermissionLevel } from 'common/types/requests'
 import AccountStore from 'common/stores/account-store'
 import intersection from 'lodash/intersection'
-import { add } from 'ionicons/icons';
-import { cloneDeep } from 'lodash'; // we need this to make JSX compile
+import { add } from 'ionicons/icons'
+import { cloneDeep } from 'lodash' // we need this to make JSX compile
 
 type PermissionType = {
   id: any

frontend/common/service.ts

@@ -16,8 +16,8 @@ export const baseApiOptions = (queryArgs?: Partial<FetchBaseQueryArgs>) => {
     | 'extractRehydrationInfo'
   > = {
     baseQuery: fetchBaseQuery({
-      credentials: Project.cookieAuthEnabled ? 'include' : undefined,
       baseUrl: Project.api,
+      credentials: Project.cookieAuthEnabled ? 'include' : undefined,
       prepareHeaders: async (headers, { endpoint, getState }) => {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const state = getState() as StoreStateType
@@ -33,7 +33,7 @@ export const baseApiOptions = (queryArgs?: Partial<FetchBaseQueryArgs>) => {
             if (token && !Project.cookieAuthEnabled) {
               headers.set('Authorization', `Token ${token}`)
             }
-          } catch (e) { }
+          } catch (e) {}
         }
 
         return headers