Skip to content

Commit 43e9dc8

Browse files
authored
Merge pull request #1725 from RedisInsight/fe/feature/RI-4174_remove-recommendations-highlighting
#RI-4174 - remove recommendations highlighting
2 parents ec2b91d + c4ffe2c commit 43e9dc8

File tree

3 files changed

+4
-63
lines changed

3 files changed

+4
-63
lines changed

redisinsight/ui/src/components/analytics-tabs/constants.tsx

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import React, { ReactNode } from 'react'
2-
import { useSelector } from 'react-redux'
1+
import { ReactNode } from 'react'
32

43
import { AnalyticsViewTab } from 'uiSrc/slices/interfaces/analytics'
5-
import { appFeatureHighlightingSelector } from 'uiSrc/slices/app/features'
6-
import HighlightedFeature from 'uiSrc/components/hightlighted-feature/HighlightedFeature'
7-
import { BUILD_FEATURES } from 'uiSrc/constants/featuresHighlighting'
8-
import { getHighlightingFeatures } from 'uiSrc/utils/highlighting'
94
import { OnboardingTourOptions } from 'uiSrc/components/onboarding-tour'
105
import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
116

@@ -15,26 +10,6 @@ interface AnalyticsTabs {
1510
onboard?: OnboardingTourOptions
1611
}
1712

18-
const DatabaseAnalyticsTab = () => {
19-
const { features } = useSelector(appFeatureHighlightingSelector)
20-
const { recommendations: recommendationsHighlighting } = getHighlightingFeatures(features)
21-
22-
return (
23-
<>
24-
<HighlightedFeature
25-
title={BUILD_FEATURES.recommendations?.title}
26-
content={BUILD_FEATURES.recommendations?.content}
27-
type={BUILD_FEATURES.recommendations?.type}
28-
isHighlight={BUILD_FEATURES.recommendations && recommendationsHighlighting}
29-
dotClassName="tab-highlighting-dot"
30-
wrapperClassName="inner-highlighting-wrapper"
31-
>
32-
Database Analysis
33-
</HighlightedFeature>
34-
</>
35-
)
36-
}
37-
3813
export const analyticsViewTabs: AnalyticsTabs[] = [
3914
{
4015
id: AnalyticsViewTab.ClusterDetails,
@@ -43,7 +18,7 @@ export const analyticsViewTabs: AnalyticsTabs[] = [
4318
},
4419
{
4520
id: AnalyticsViewTab.DatabaseAnalysis,
46-
label: <DatabaseAnalyticsTab />,
21+
label: 'Database Analysis',
4722
onboard: ONBOARDING_FEATURES.ANALYTICS_DATABASE_ANALYSIS
4823
},
4924
{
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react'
2-
import { PageNames } from 'uiSrc/constants/pages'
32

43
export type FeaturesHighlightingType = 'plain' | 'tooltip' | 'popover'
54

@@ -10,10 +9,5 @@ interface BuildHighlightingFeature {
109
page?: string
1110
}
1211
export const BUILD_FEATURES: { [key: string]: BuildHighlightingFeature } = {
13-
recommendations: {
14-
type: 'tooltip',
15-
title: 'Database Recommendations',
16-
content: 'Run database analysis to get recommendations for optimizing your database.',
17-
page: PageNames.analytics
18-
}
12+
1913
}

redisinsight/ui/src/pages/databaseAnalysis/components/data-nav-tabs/constants.tsx

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
import React, { ReactNode } from 'react'
2-
import { useDispatch, useSelector } from 'react-redux'
32

43
import { DatabaseAnalysisViewTab } from 'uiSrc/slices/interfaces/analytics'
5-
import {
6-
appFeatureHighlightingSelector,
7-
removeFeatureFromHighlighting
8-
} from 'uiSrc/slices/app/features'
9-
import { BUILD_FEATURES } from 'uiSrc/constants/featuresHighlighting'
10-
import HighlightedFeature from 'uiSrc/components/hightlighted-feature/HighlightedFeature'
11-
12-
import { getHighlightingFeatures } from 'uiSrc/utils/highlighting'
134
import { OnboardingTourOptions } from 'uiSrc/components/onboarding-tour'
145
import { ONBOARDING_FEATURES } from 'uiSrc/components/onboarding-features'
156

@@ -23,25 +14,6 @@ interface DatabaseAnalysisTabs {
2314
onboard?: OnboardingTourOptions
2415
}
2516

26-
const RecommendationsTab = ({ count }: { count?: number }) => {
27-
const { features } = useSelector(appFeatureHighlightingSelector)
28-
const { recommendations: recommendationsHighlighting } = getHighlightingFeatures(features)
29-
30-
const dispatch = useDispatch()
31-
32-
return (
33-
<HighlightedFeature
34-
type="plain"
35-
isHighlight={BUILD_FEATURES.recommendations && recommendationsHighlighting}
36-
onClick={() => dispatch(removeFeatureFromHighlighting('recommendations'))}
37-
dotClassName="tab-highlighting-dot"
38-
wrapperClassName="inner-highlighting-wrapper"
39-
>
40-
{count ? <>Recommendations ({count})</> : <>Recommendations</>}
41-
</HighlightedFeature>
42-
)
43-
}
44-
4517
export const databaseAnalysisTabs: DatabaseAnalysisTabs[] = [
4618
{
4719
id: DatabaseAnalysisViewTab.DataSummary,
@@ -50,7 +22,7 @@ export const databaseAnalysisTabs: DatabaseAnalysisTabs[] = [
5022
},
5123
{
5224
id: DatabaseAnalysisViewTab.Recommendations,
53-
name: (count) => <RecommendationsTab count={count} />,
25+
name: (count?: number) => (count ? `Recommendations (${count})` : 'Recommendations'),
5426
content: <Recommendations />,
5527
onboard: ONBOARDING_FEATURES.ANALYTICS_RECOMMENDATIONS
5628
},

0 commit comments

Comments
 (0)