Skip to content

Commit b92eb94

Browse files
Merge pull request #3495 from RedisInsight/fe/feature/RI-5760_update_rdi_links
update rdi links
2 parents 9a82cf1 + c634fb9 commit b92eb94

File tree

11 files changed

+50
-29
lines changed

11 files changed

+50
-29
lines changed

redisinsight/ui/src/components/recommendation/constants.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ export const badgesContent = [
1010
{ id: 'configuration_changes', icon: <ConfigurationIcon className={styles.badgeIcon} />, name: 'Configuration Changes' },
1111
{ id: 'upgrade', icon: <UpgradeIcon className={styles.badgeIcon} />, name: 'Upgrade' },
1212
]
13-
14-
export const utmMedium = 'recommendation'

redisinsight/ui/src/components/recommendation/content-element/ContentElement.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { getUtmExternalLink } from 'uiSrc/utils/links'
88
import { replaceVariables } from 'uiSrc/utils/recommendation'
99
import { IRecommendationContent } from 'uiSrc/slices/interfaces/recommendations'
1010
import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
11+
import { UTM_MEDIUMS } from 'uiSrc/constants/links'
1112
import InternalLink from '../internal-link'
1213
import RecommendationBody from '../recommendation-body'
13-
import { utmMedium } from '../constants'
1414

1515
import styles from '../styles.module.scss'
1616

@@ -73,7 +73,7 @@ const ContentElement = (props: Props) => {
7373
external={false}
7474
data-testid={`link-${telemetryName}-${idx}`}
7575
target="_blank"
76-
href={getUtmExternalLink(value.href, { medium: utmMedium, campaign: telemetryName })}
76+
href={getUtmExternalLink(value.href, { medium: UTM_MEDIUMS.Recommendation, campaign: telemetryName })}
7777
onClick={() => onLinkClick?.()}
7878
>
7979
{value.name}
@@ -94,7 +94,7 @@ const ContentElement = (props: Props) => {
9494
action: OAuthSocialAction.Create
9595
})
9696
}}
97-
href={getUtmExternalLink(value.href, { medium: utmMedium, campaign: telemetryName })}
97+
href={getUtmExternalLink(value.href, { medium: UTM_MEDIUMS.Recommendation, campaign: telemetryName })}
9898
>
9999
{value.name}
100100
</EuiLink>
@@ -112,7 +112,7 @@ const ContentElement = (props: Props) => {
112112
external={false}
113113
data-testid={`code-link-${telemetryName}-${idx}`}
114114
target="_blank"
115-
href={getUtmExternalLink(value.href, { medium: utmMedium, campaign: telemetryName })}
115+
href={getUtmExternalLink(value.href, { medium: UTM_MEDIUMS.Recommendation, campaign: telemetryName })}
116116
>
117117
<EuiTextColor
118118
className={cx(styles.code, { [styles.insights]: insights })}

redisinsight/ui/src/constants/links.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ export const EXTERNAL_LINKS = {
1212
cloudConsole: 'https://app.redislabs.com/#/databases',
1313
tryFree: 'https://redis.io/try-free',
1414
docker: 'https://redis.io/docs/install/install-stack/docker',
15-
rdiQuickStart: 'https://docs.redis.com/latest/rdi/quickstart/',
16-
rdiTransformation: 'https://docs.redis.com/latest/rdi/data-transformation/data-transformation-pipeline/',
15+
rdiQuickStart: 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/quick-start-guide/',
16+
rdiPipeline: 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/data-pipelines/data-pipelines/',
17+
rdiPipelineTransforms: 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/data-pipelines/transform-examples/',
1718
}
1819

1920
export const UTM_CAMPAINGS: Record<any, string> = {
@@ -23,3 +24,9 @@ export const UTM_CAMPAINGS: Record<any, string> = {
2324
[CloudSsoUtmCampaign.BrowserFilter]: 'browser_filter',
2425
[OAuthSocialSource.EmptyDatabasesList]: 'empty_db_list',
2526
}
27+
28+
export const UTM_MEDIUMS = {
29+
App: 'app',
30+
Rdi: 'rdi',
31+
Recommendation: 'recommendation',
32+
}

redisinsight/ui/src/packages/redistimeseries-app/src/components/Chart/interfaces.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ export interface ChartConfig {
4747
export type ChartImageExportOption = 'png' | 'svg'
4848

4949
export interface ChartProps {
50-
data: TimeSeries[]
51-
chartConfig: ChartConfig
52-
onRelayout: () => void
53-
onDoubleClick: () => void
50+
data: TimeSeries[]
51+
chartConfig: ChartConfig
52+
onRelayout: () => void
53+
onDoubleClick: () => void
5454
}
5555

56-
5756
export enum PlotlyEvents {
5857
PLOTLY_HOVER = 'plotly_hover',
5958
PLOTLY_RELAYOUT = 'plotly_relayout',

redisinsight/ui/src/pages/rdi/home/empty-message/EmptyMessage.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiImage, EuiLink, EuiSpacer, EuiText } from '@elastic/eui'
22
import React, { useContext } from 'react'
33

4+
import { EXTERNAL_LINKS, UTM_MEDIUMS } from 'uiSrc/constants/links'
5+
import { getUtmExternalLink } from 'uiSrc/utils/links'
46
import EmptyListDarkIcon from 'uiSrc/assets/img/rdi/empty_list_dark.svg'
57
import EmptyListLightIcon from 'uiSrc/assets/img/rdi/empty_list_light.svg'
68
import NewTabIcon from 'uiSrc/assets/img/rdi/new_tab.svg'
@@ -35,7 +37,13 @@ const EmptyMessage = ({ onAddInstanceClick }: Props) => {
3537
data-testid="empty-rdi-quickstart-button"
3638
target="_blank"
3739
external={false}
38-
href="https://docs.redis.com/rdi-preview/rdi/quickstart/"
40+
href={getUtmExternalLink(
41+
EXTERNAL_LINKS.rdiQuickStart,
42+
{
43+
medium: UTM_MEDIUMS.Rdi,
44+
campaign: 'rdi_list '
45+
}
46+
)}
3947
>
4048
RDI Quickstart <EuiIcon type={NewTabIcon} />
4149
</EuiLink>

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { get, throttle } from 'lodash'
88

99
import yaml from 'js-yaml'
1010
import { sendPageViewTelemetry, sendEventTelemetry, TelemetryPageView, TelemetryEvent } from 'uiSrc/telemetry'
11-
import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
11+
import { EXTERNAL_LINKS, UTM_MEDIUMS } from 'uiSrc/constants/links'
12+
import { getUtmExternalLink } from 'uiSrc/utils/links'
1213
import { rdiPipelineSelector, setChangedFile, deleteChangedFile } from 'uiSrc/slices/rdi/pipeline'
1314
import { FileChangeType, IPipeline, RdiPipelineTabs } from 'uiSrc/slices/interfaces'
1415
import MonacoYaml from 'uiSrc/components/monaco-editor/components/monaco-yaml'
@@ -110,7 +111,13 @@ const Config = () => {
110111
external={false}
111112
data-testid="rdi-pipeline-config-link"
112113
target="_blank"
113-
href={EXTERNAL_LINKS.rdiQuickStart}
114+
href={getUtmExternalLink(
115+
EXTERNAL_LINKS.rdiPipeline,
116+
{
117+
medium: UTM_MEDIUMS.Rdi,
118+
campaign: 'config_file'
119+
}
120+
)}
114121
>
115122
connection details
116123
</EuiLink>

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/Job.spec.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ describe('Job', () => {
6868
expect(pushMock).not.toBeCalled()
6969
})
7070

71-
it('should render proper link', () => {
72-
render(<Job {...instance(mockedProps)} />)
73-
74-
expect(screen.getByTestId('rdi-pipeline-transformation-link')).toHaveAttribute('href', 'https://docs.redis.com/latest/rdi/data-transformation/data-transformation-pipeline/')
75-
})
76-
7771
it('should render Panel and disable dry run btn', () => {
7872
const { queryByTestId } = render(<Job {...instance(mockedProps)} />)
7973

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/Job.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import cx from 'classnames'
77
import { monaco as monacoEditor } from 'react-monaco-editor'
88

99
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
10-
import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
10+
import { EXTERNAL_LINKS, UTM_MEDIUMS } from 'uiSrc/constants/links'
1111
import { deleteChangedFile, rdiPipelineSelector, setChangedFile } from 'uiSrc/slices/rdi/pipeline'
1212
import { FileChangeType, IPipeline, RdiPipelineTabs } from 'uiSrc/slices/interfaces'
1313
import MonacoYaml from 'uiSrc/components/monaco-editor/components/monaco-yaml'
1414
import DryRunJobPanel from 'uiSrc/pages/rdi/pipeline-management/components/jobs-panel'
1515
import { DSL, KEYBOARD_SHORTCUTS } from 'uiSrc/constants'
1616
import TemplatePopover from 'uiSrc/pages/rdi/pipeline-management/components/template-popover'
1717
import { isEqualPipelineFile, Maybe } from 'uiSrc/utils'
18+
import { getUtmExternalLink } from 'uiSrc/utils/links'
1819
import { KeyboardShortcut } from 'uiSrc/components'
1920

2021
import styles from './styles.module.scss'
@@ -179,7 +180,13 @@ const Job = (props: Props) => {
179180
external={false}
180181
data-testid="rdi-pipeline-transformation-link"
181182
target="_blank"
182-
href={EXTERNAL_LINKS.rdiTransformation}
183+
href={getUtmExternalLink(
184+
EXTERNAL_LINKS.rdiPipelineTransforms,
185+
{
186+
medium: UTM_MEDIUMS.Rdi,
187+
campaign: 'job_file'
188+
}
189+
)}
183190
>
184191
transformation logic
185192
</EuiLink>

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/JobsWrapper.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe('JobWrapper', () => {
104104
it('should render proper link', () => {
105105
render(<JobWrapper />)
106106

107-
expect(screen.getByTestId('rdi-pipeline-transformation-link')).toHaveAttribute('href', 'https://docs.redis.com/latest/rdi/data-transformation/data-transformation-pipeline/')
107+
expect(screen.getByTestId('rdi-pipeline-transformation-link')).toHaveAttribute('href', 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/data-pipelines/transform-examples/?utm_source=redisinsight&utm_medium=rdi&utm_campaign=job_file')
108108
})
109109

110110
it('should send telemetry event with proper data', () => {

redisinsight/ui/src/slices/interfaces/rdi.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Nullable } from 'uiSrc/utils'
2-
import { PageNames } from 'uiSrc/constants'
32
import { Rdi as RdiInstanceResponse } from 'apiSrc/modules/rdi/models/rdi'
43

54
// tabs for dry run job panel
@@ -10,8 +9,8 @@ export enum PipelineJobsTabs {
109

1110
// pipeline management page tabs
1211
export enum RdiPipelineTabs {
13-
Config = PageNames.rdiPipelineConfig,
14-
Jobs = PageNames.rdiPipelineJobs
12+
Config = 'config',
13+
Jobs = 'jobs'
1514
}
1615

1716
export interface IRdiPipelineJob {

0 commit comments

Comments
 (0)