feat: Move versioned feature history into feature details modal

frontend/e2e/helpers.cafe.ts

@@ -264,9 +264,8 @@ export const logout = async (t) => {
 }
 
 export const goToFeatureVersions = async (featureIndex:number) =>{
-  await gotoFeatures()
-  await click(byId(`feature-action-${featureIndex}`))
-  await click(byId(`feature-history-${featureIndex}`))
+  await gotoFeature(featureIndex)
+  await click(byId('change-history'))
 }
 
 export const compareVersion = async (
@@ -294,10 +293,12 @@ export const compareVersion = async (
   if(newValue) {
     await assertTextContent(byId(`old-value`), `${oldValue}`)
   }
+  await closeModal()
 }
 export const assertNumberOfVersions = async (index:number, versions:number) =>{
   await goToFeatureVersions(index)
   await waitForElementVisible(byId(`history-item-${versions-2}-compare`))
+  await closeModal()
 }
 
 export const createRemoteConfig = async (

frontend/web/components/pages/FeatureHistoryPage.tsx → frontend/web/components/FeatureHistory.tsx

@@ -1,50 +1,33 @@
 import React, { FC, useState } from 'react'
-import FlagSelect from 'components/FlagSelect'
 import ConfigProvider from 'common/providers/ConfigProvider'
-import { RouterChildContext } from 'react-router'
-import Utils from 'common/utils/utils'
-import ProjectStore from 'common/stores/project-store'
 import { useGetFeatureVersionsQuery } from 'common/services/useFeatureVersion'
 import { useGetUsersQuery } from 'common/services/useUser'
 import AccountStore from 'common/stores/account-store'
-import PanelSearch from 'components/PanelSearch'
-import {
-  Environment,
-  FeatureVersion as TFeatureVersion,
-} from 'common/types/responses'
-import PageTitle from 'components/PageTitle'
-import Button from 'components/base/forms/Button'
-import FeatureVersion from 'components/FeatureVersion'
-import InlineModal from 'components/InlineModal'
-import TableFilterItem from 'components/tables/TableFilterItem'
+import { FeatureVersion as TFeatureVersion } from 'common/types/responses'
+import Button from './base/forms/Button'
+import FeatureVersion from './FeatureVersion'
+import InlineModal from './InlineModal'
+import TableFilterItem from './tables/TableFilterItem'
 import moment from 'moment'
-import { Link } from 'react-router-dom'
-import DateList from 'components/DateList'
+import DateList from './DateList'
+import PlanBasedBanner from './PlanBasedAccess'
 import classNames from 'classnames'
-import PlanBasedBanner from 'components/PlanBasedAccess'
 
 const widths = [250, 150]
 type FeatureHistoryPageType = {
-  router: RouterChildContext['router']
-
-  match: {
-    params: {
-      environmentId: string
-      projectId: string
-    }
-  }
+  environmentId: string
+  environmentApiKey: string
+  projectId: string
+  feature: number
 }
 
-const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
-  const feature = Utils.fromParam(router.route.location.search)?.feature
+const FeatureHistory: FC<FeatureHistoryPageType> = ({
+  environmentApiKey,
+  environmentId,
+  feature,
+  projectId,
+}) => {
   const [open, setOpen] = useState(false)
-
-  const env: Environment | undefined = ProjectStore.getEnvironment(
-    match.params.environmentId,
-  ) as any
-  // @ts-ignore
-  const environmentId = `${env?.id}`
-  const environmentApiKey = `${env?.api_key}`
   const { data: users } = useGetUsersQuery({
     organisationId: AccountStore.getOrganisation().id,
   })
@@ -56,57 +39,37 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
       is_live: true,
       page,
     },
-    { skip: !env || !feature },
+    { skip: !environmentId || !feature },
   )
   const [selected, setSelected] = useState<TFeatureVersion | null>(null)
   const live = data?.results?.[0]
   const [compareToLive, setCompareToLive] = useState(false)
   const [diff, setDiff] = useState<null | string>(null)
   const versionLimit = 3
   return (
-    <div className='container app-container'>
-      <PageTitle title={'History'}>
-        <div>
-          View and rollback history of feature values, multivariate values and
-          segment overrides.
-        </div>
-      </PageTitle>
-      <div className='row'>
-        <div className='col-md-4'>
-          <div className='flex-row'>
-            <label className='mb-0'>Feature</label>
-            <div className='flex-fill ml-2'>
-              <FlagSelect
-                placeholder='Select a Feature...'
-                projectId={match.params.projectId}
-                onChange={(flagId: string) => {
-                  router.history.replace(
-                    `${document.location.pathname}?feature=${flagId}`,
-                  )
-                }}
-                value={feature ? parseInt(feature) : null}
-              />
-            </div>
-          </div>
-        </div>
+    <div>
+      <h5>Change History</h5>
+      <div>
+        View and rollback history of feature values, multivariate values and
+        segment overrides.
       </div>
       <div className='mt-4'>
-        {!!versionLimit && (
-          <PlanBasedBanner
-            className='mb-4'
-            force
-            feature={'VERSIONING'}
-            theme={'page'}
-          />
-        )}
+        {/*{!!versionLimit && (*/}
+        {/*  <PlanBasedBanner*/}
+        {/*    className='mb-4'*/}
+        {/*    force*/}
+        {/*    feature={'VERSIONING'}*/}
+        {/*    theme={'page'}*/}
+        {/*  />*/}
+        {/*)}*/}
         <DateList<TFeatureVersion>
           items={data}
           isLoading={isLoading}
           nextPage={() => setPage(page + 1)}
           prevPage={() => setPage(page + 1)}
           goToPage={setPage}
           renderRow={(v: TFeatureVersion, i: number) => {
-            const isOverLimit = !!versionLimit && i + 1 > versionLimit
+            const isOverLimit = false
             const user = users?.find((user) => v.published_by === user.id)
 
             return (
@@ -115,7 +78,11 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
                   'blur no-pointer': isOverLimit,
                 })}
               >
-                <div className='flex-fill'>
+                <div
+                  className={classNames('flex-fill', {
+                    'overflow-hidden': !open,
+                  })}
+                >
                   <div className='flex-row flex-fill'>
                     <div
                       className='table-column flex-fill'
@@ -134,8 +101,10 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
                       </div>
                     </div>
                     <div className='table-column' style={{ width: widths[1] }}>
-                      <Link
-                        to={`/project/${match.params.projectId}/environment/${environmentApiKey}/history/${v.uuid}/`}
+                      <a
+                        href={`/project/${projectId}/environment/${environmentApiKey}/history/${v.uuid}/`}
+                        target='_blank'
+                        rel='noreferrer'
                       >
                         <Button
                           theme='text'
@@ -144,7 +113,7 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
                         >
                           View Details
                         </Button>
-                      </Link>
+                      </a>
                     </div>
                     <div className='table-column' style={{ width: widths[1] }}>
                       {i + 1 !== data!.results.length && (
@@ -229,7 +198,7 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
                   </div>
                   {diff === v.uuid && (
                     <FeatureVersion
-                      projectId={`${match.params.projectId}`}
+                      projectId={`${projectId}`}
                       featureId={feature}
                       environmentId={environmentId}
                       newUUID={compareToLive ? live!.uuid : v.uuid}
@@ -250,4 +219,4 @@ const FeatureHistoryPage: FC<FeatureHistoryPageType> = ({ match, router }) => {
   )
 }
 
-export default ConfigProvider(FeatureHistoryPage)
+export default ConfigProvider(FeatureHistory)

frontend/web/components/FeatureRow.js

@@ -392,9 +392,7 @@ class TheComponent extends Component {
             hideHistory={!environment?.use_v2_feature_versioning}
             onShowHistory={() => {
               if (disableControls) return
-              this.context.router.history.push(
-                `/project/${projectId}/environment/${environmentId}/history?feature=${projectFlag.id}`,
-              )
+              this.editFeature(projectFlag, environmentFlags[id], 'history')
             }}
             onShowAudit={() => {
               if (disableControls) return

frontend/web/components/base/forms/TabItem.tsx

@@ -4,6 +4,7 @@ type TabItemType = {
   tabLabelString?: string
   tabLabel: ReactNode
   children: ReactNode
+  className?: string
 }
 
 const TabItem: FC<TabItemType> = ({ children }) => {

frontend/web/components/base/forms/Tabs.js

@@ -41,7 +41,7 @@ const Tabs = class extends React.Component {
     return (
       <div className={`tabs ${this.props.className || ''}`}>
         <div
-          className={`tabs-nav ${this.props.theme}`}
+          className={`${hideNav ? '' : 'tabs-nav'} ${this.props.theme}`}
           style={isMobile ? { flexWrap: 'wrap' } : {}}
         >
           {!hideNav &&
@@ -97,7 +97,7 @@ const Tabs = class extends React.Component {
                 key={`content${i}`}
                 className={`tab-item ${isSelected ? ' tab-active' : ''} ${
                   this.props.isRoles && 'p-0'
-                }`}
+                } ${child.props.className || ''}`}
               >
                 {child}
               </div>

frontend/web/components/diff/DiffFeature.tsx

@@ -76,7 +76,7 @@ const DiffFeature: FC<FeatureDiffType> = ({
   const hideValue =
     !totalChanges && (diff.newValue === null || diff.newValue === undefined)
   return (
-    <div className='p-2'>
+    <div>
       {!feature ? (
         <div className='text-center'>
           <Loader />
@@ -94,6 +94,7 @@ const DiffFeature: FC<FeatureDiffType> = ({
             value={value}
           >
             <TabItem
+              className={'p-0'}
               tabLabel={
                 <div className='d-flex justify-content-center gap-1 align-items-center'>
                   Value
@@ -105,8 +106,8 @@ const DiffFeature: FC<FeatureDiffType> = ({
               }
             >
               {!totalChanges && (
-                <div className='mt-4'>
-                  <InfoMessage>No Changes Found</InfoMessage>
+                <div className='mb-3 text-center fw-semibold'>
+                  No Changes Found
                 </div>
               )}
               {!!valueConflict && (
@@ -169,6 +170,7 @@ const DiffFeature: FC<FeatureDiffType> = ({
             </TabItem>
             {!!variationDiffs?.diffs?.length && (
               <TabItem
+                className={'p-0'}
                 tabLabel={
                   <div>
                     Variations{' '}
@@ -185,6 +187,7 @@ const DiffFeature: FC<FeatureDiffType> = ({
             )}
             {!!segmentDiffs?.diffs.length && (
               <TabItem
+                className={'p-0'}
                 tabLabel={
                   <div className='d-flex justify-content-center gap-1 align-items-center'>
                     Segment Overrides

frontend/web/components/diff/DiffSegments.tsx

@@ -116,6 +116,7 @@ const DiffSegments: FC<DiffSegmentsType> = ({
     <Tabs className='mt-4' uncontrolled theme='pill'>
       {!!created.length && (
         <TabItem
+          className='p-0'
           tabLabel={
             <div>
               Created <div className='unread'>{created.length}</div>
@@ -135,6 +136,7 @@ const DiffSegments: FC<DiffSegmentsType> = ({
       )}
       {!!deleted.length && (
         <TabItem
+          className='p-0'
           tabLabel={
             <div>
               Deleted <div className='unread'>{deleted.length}</div>
@@ -154,6 +156,7 @@ const DiffSegments: FC<DiffSegmentsType> = ({
       )}
       {!!modified.length && (
         <TabItem
+          className='p-0'
           tabLabel={
             <div>
               Modified <div className='unread'>{modified.length}</div>
@@ -173,6 +176,7 @@ const DiffSegments: FC<DiffSegmentsType> = ({
       )}
       {!!unChanged.length && (
         <TabItem
+          className='p-0'
           tabLabel={
             <div>
               Unchanged <div className='unread'>{unChanged.length}</div>