fix: hide view features from associated segment overrides (#4786)

Flagsmith · Oct 30, 2024 · 49ff569 · 49ff569
1 parent f72c764
commit 49ff569
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/frontend/web/components/SegmentOverrideActions.tsx b/frontend/web/components/SegmentOverrideActions.tsx
@@ -13,12 +13,13 @@ interface SegmentOverrideActionProps {
   canRemove: boolean
   onRemove: () => void
   onEdit: () => void
+  hideViewSegment?: void
   onCopyValue: () => void
   canEdit: boolean
   canCopyValue: boolean
 }
 
-type ActionType = 'edit' | 'remove'
+type ActionType = 'edit' | 'remove' | 'copy'
 
 function calculateListPosition(
   btnEl: HTMLElement,
@@ -33,6 +34,7 @@ export const SegmentOverrideAction: FC<SegmentOverrideActionProps> = ({
   canCopyValue,
   canEdit,
   canRemove,
+  hideViewSegment,
   onCopyValue,
   onEdit,
   onRemove,
@@ -80,7 +82,7 @@ export const SegmentOverrideAction: FC<SegmentOverrideActionProps> = ({
     )
   }
 
-  if (!!canEdit && !canRemove) {
+  if (!!canEdit && !canRemove && !hideViewSegment) {
     return (
       <Button onClick={() => handleActionClick('edit')} size='small'>
         View Segment
@@ -111,7 +113,7 @@ export const SegmentOverrideAction: FC<SegmentOverrideActionProps> = ({
           ref={listRef}
           className='feature-action__list'
         >
-          {!!canEdit && (
+          {!!canEdit && !hideViewSegment && (
             <div
               className='feature-action__item'
               onClick={(e) => {

diff --git a/frontend/web/components/SegmentOverrides.js b/frontend/web/components/SegmentOverrides.js
@@ -47,6 +47,7 @@ const SegmentOverrideInner = class Override extends React.Component {
       confirmRemove,
       controlValue,
       disabled,
+      hideViewSegment,
       index,
       multivariateOptions,
       name,
@@ -185,6 +186,7 @@ const SegmentOverrideInner = class Override extends React.Component {
                       Constants.projectPermissions('Manage Segments'),
                       <>
                         <SegmentOverrideActions
+                          hideViewSegment={hideViewSegment}
                           onCopyValue={() => {
                             this.setState({ changed: true })
                             setValue(
@@ -346,6 +348,7 @@ const SegmentOverrideListInner = ({
   controlValue,
   disabled,
   environmentId,
+  hideViewSegment,
   id,
   items,
   multivariateOptions,
@@ -370,6 +373,7 @@ const SegmentOverrideListInner = ({
             id={id}
             name={name}
             segment={value.segment}
+            hideViewSegment={hideViewSegment}
             onSortEnd={onSortEnd}
             disabled={disabled}
             showEditSegment={showEditSegment}
@@ -705,6 +709,7 @@ class TheComponent extends Component {
                       setSegmentEditId={this.setSegmentEditId}
                       onSortEnd={this.onSortEnd}
                       projectFlag={this.props.projectFlag}
+                      hideViewSegment={this.props.hideViewSegment}
                     />
                     <div className='text-left mt-4'>
                       <JSONReference

diff --git a/frontend/web/components/modals/AssociatedSegmentOverrides.js b/frontend/web/components/modals/AssociatedSegmentOverrides.js
@@ -297,6 +297,7 @@ export default class SegmentOverridesInner extends Component {
         <UncontrolledSegmentOverrides
           feature={projectFlag.id}
           readOnly
+          hideViewSegment
           projectId={projectId}
           multivariateOptions={_.cloneDeep(projectFlag.multivariate_options)}
           environmentId={environmentId}
@@ -397,6 +398,7 @@ export default class SegmentOverridesInner extends Component {
                 name=' '
                 disableCreate
                 projectId={projectId}
+                hideViewSegment
                 onRemove={this.props.onRemove}
                 multivariateOptions={_.cloneDeep(
                   projectFlag.multivariate_options,