fix: Disable segment override diffs for non versioned environments (#…

…3914)
Flagsmith · May 10, 2024 · e5b4313 · e5b4313
1 parent 99de926
commit e5b4313
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/frontend/web/components/diff/DiffChangeRequest.tsx b/frontend/web/components/diff/DiffChangeRequest.tsx
@@ -7,11 +7,13 @@ type DiffChangeRequestType = {
   changeRequest: ChangeRequest | null
   feature: number
   projectId: string
+  isVersioned: boolean
 }
 
 const DiffChangeRequest: FC<DiffChangeRequestType> = ({
   changeRequest,
   feature,
+  isVersioned,
   projectId,
 }) => {
   const { data, isLoading } = useGetFeatureStatesQuery(
@@ -36,6 +38,7 @@ const DiffChangeRequest: FC<DiffChangeRequestType> = ({
     <div className='col-md-8'>
       <DiffFeature
         featureId={feature}
+        disableSegments={!isVersioned}
         projectId={projectId}
         newState={changeRequest.feature_states}
         oldState={data?.results || []}

diff --git a/frontend/web/components/diff/DiffFeature.tsx b/frontend/web/components/diff/DiffFeature.tsx
@@ -22,9 +22,11 @@ type FeatureDiffType = {
   featureId: number
   projectId: string
   tabTheme?: string
+  disableSegments?: boolean
 }
 
 const DiffFeature: FC<FeatureDiffType> = ({
+  disableSegments,
   featureId,
   newState,
   noChangesMessage,
@@ -47,7 +49,9 @@ const DiffFeature: FC<FeatureDiffType> = ({
     projectId,
   })
 
-  const segmentDiffs = getSegmentDiff(oldState, newState, segments?.results)
+  const segmentDiffs = disableSegments
+    ? { diffs: [], totalChanges: 0 }
+    : getSegmentDiff(oldState, newState, segments?.results)
   const variationDiffs = getVariationDiff(oldEnv, newEnv, feature)
   const totalSegmentChanges = segmentDiffs?.totalChanges
   const totalVariationChanges = variationDiffs?.totalChanges

diff --git a/frontend/web/components/pages/ChangeRequestPage.js b/frontend/web/components/pages/ChangeRequestPage.js
@@ -501,6 +501,7 @@ const ChangeRequestsPage = class extends Component {
                         </div>
                       </Panel>
                       <DiffChangeRequest
+                        isVersioned={isVersioned}
                         changeRequest={changeRequest}
                         feature={projectFlag.id}
                         projectId={this.props.match.params.projectId}