fix: Logic in segment overrides readonly with the manage_segment_over…

…rides permission (#2973)
Flagsmith · Nov 14, 2023 · 37879b2 · 37879b2 · vercel · Nov 14, 2023
1 parent 3993823
commit 37879b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/frontend/web/components/SegmentOverrides.js b/frontend/web/components/SegmentOverrides.js
@@ -559,7 +559,7 @@ class TheComponent extends Component {
     const isLimitReached =
       segmentOverrideLimitAlert.percentage &&
       segmentOverrideLimitAlert.percentage >= 100
-    const manageSegmentsEnabled = Utils.getFlagsmithHasFeature(
+    const manageSegmentOverridesEnabled = Utils.getFlagsmithHasFeature(
       'manage_segment_overrides_env_role',
     )
     return (
@@ -603,7 +603,7 @@ class TheComponent extends Component {
                         theme='outline'
                         disabled={
                           !!isLimitReached ||
-                          (manageSegmentsEnabled && !manageSegments)
+                          (manageSegmentOverridesEnabled && !manageSegments)
                         }
                       >
                         Create Feature-Specific Segment

diff --git a/frontend/web/components/modals/CreateFlag.js b/frontend/web/components/modals/CreateFlag.js
@@ -479,7 +479,7 @@ const CreateFlag = class extends Component {
     const existingChangeRequest = this.props.changeRequest
     const hideIdentityOverridesTab = Utils.getShouldHideIdentityOverridesTab()
     const noPermissions = this.props.noPermissions
-    const manageSegmentsEnabled = Utils.getFlagsmithHasFeature(
+    const manageSegmentOverridesEnabled = Utils.getFlagsmithHasFeature(
       'manage_segment_overrides_env_role',
     )
     let regexValid = true
@@ -1141,8 +1141,8 @@ const CreateFlag = class extends Component {
                                                   manageSegmentOverrides,
                                               }) => {
                                                 const isReadOnly =
-                                                  manageSegmentsEnabled
-                                                    ? manageSegmentOverrides
+                                                  manageSegmentOverridesEnabled
+                                                    ? !manageSegmentOverrides
                                                     : noPermissions
                                                 return (
                                                   <SegmentOverrides
@@ -1261,7 +1261,7 @@ const CreateFlag = class extends Component {
                                                                 !name ||
                                                                 invalid ||
                                                                 !savePermission ||
-                                                                (manageSegmentsEnabled &&
+                                                                (manageSegmentOverridesEnabled &&
                                                                   !manageSegmentsOverrides)
                                                               }
                                                             >

diff --git a/frontend/web/components/modals/CreateSegment.tsx b/frontend/web/components/modals/CreateSegment.tsx
@@ -509,16 +509,19 @@ const CreateSegment: FC<CreateSegmentType> = ({
                 id={environmentId}
               >
                 {({ permission: manageSegmentOverrides }) => {
-                  const manageSegmentsEnabled = Utils.getFlagsmithHasFeature(
-                    'manage_segment_overrides_env_role',
-                  )
+                  const manageSegmentOverridesEnabled =
+                    Utils.getFlagsmithHasFeature(
+                      'manage_segment_overrides_env_role',
+                    )
                   const isReadOnly = !manageSegmentOverrides
                   return (
                     <AssociatedSegmentOverrides
                       feature={segment.feature}
                       projectId={projectId}
                       id={segment.id}
-                      readOnly={manageSegmentsEnabled ? isReadOnly : false}
+                      readOnly={
+                        manageSegmentOverridesEnabled ? isReadOnly : false
+                      }
                     />
                   )
                 }}