Skip to content

Commit e263934

Browse files
authored
Merge pull request #925 from devtron-labs/feat/segment-control
feat: segment control
2 parents c667dc3 + 089f0a9 commit e263934

4 files changed

Lines changed: 13 additions & 20 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.20.5-pre-10",
3+
"version": "1.20.6-pre-2",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/Constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export const URLS = {
128128
// DATA PROTECTION
129129
DATA_PROTECTION: DATA_PROTECTION_ROOT,
130130
DATA_PROTECTION_OVERVIEW: `${DATA_PROTECTION_ROOT}/overview`,
131-
DATA_PROTECTION_BACKUP_AND_SCHEDULE: `${DATA_PROTECTION_ROOT}/backup-and-schedule/:view${Object.values(BackupAndScheduleListViewEnum).join('|')}`,
131+
DATA_PROTECTION_BACKUP_AND_SCHEDULE: `${DATA_PROTECTION_ROOT}/backup-and-schedule/:view(${Object.values(BackupAndScheduleListViewEnum).join('|')})`,
132132
DATA_PROTECTION_BACKUP_DETAIL: `${DATA_PROTECTION_ROOT}/backup/:name`,
133133
DATA_PROTECTION_BACKUP_SCHEDULE_DETAIL: `${DATA_PROTECTION_ROOT}/schedule/:name`,
134134
DATA_PROTECTION_RESTORES: `${DATA_PROTECTION_ROOT}/restores`,

src/Shared/Components/FeatureDescription/FeatureDescriptionModal.tsx

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ChangeEvent, useState } from 'react'
17+
import { useState } from 'react'
1818

1919
import { ComponentSizeType } from '@Shared/constants'
2020

21-
import { stopPropagation, StyledRadioGroup, VisibleModal } from '../../../Common'
21+
import { SegmentedControl, stopPropagation, VisibleModal } from '../../../Common'
2222
import { Button, ButtonVariantType } from '../Button'
2323
import { DocLink } from '../DocLink'
2424
import { BUTTON_TEXT } from './constant'
@@ -104,8 +104,8 @@ export const FeatureDescriptionModal = ({
104104
const [selectedTabId, setSelectedTabId] = useState(tabsConfig?.[0]?.id ?? null)
105105
const selectedTab = tabsConfig?.find((tab) => tab.id === selectedTabId) ?? null
106106

107-
const handleSelectedTabChange = (e: ChangeEvent<HTMLInputElement>) => {
108-
setSelectedTabId(e.target.value)
107+
const handleSegmentSelectedTabChange = (selectedSegment) => {
108+
setSelectedTabId(selectedSegment.value)
109109
}
110110

111111
return (
@@ -120,19 +120,12 @@ export const FeatureDescriptionModal = ({
120120
tabsConfig.length > 0 && (
121121
<>
122122
<div className="px-20 pb-8 flex left w-100">
123-
<StyledRadioGroup
124-
className="gui-yaml-switch"
123+
<SegmentedControl
124+
segments={tabsConfig.map((tab) => ({ label: tab.title, value: tab.id }))}
125+
value={selectedTabId}
126+
onChange={handleSegmentSelectedTabChange}
125127
name="feature-description-modal-tabs"
126-
initialTab={selectedTab.id}
127-
disabled={false}
128-
onChange={handleSelectedTabChange}
129-
>
130-
{tabsConfig.map((tab) => (
131-
<StyledRadioGroup.Radio value={tab.id} key={tab.id}>
132-
{tab.title}
133-
</StyledRadioGroup.Radio>
134-
))}
135-
</StyledRadioGroup>
128+
/>
136129
</div>
137130
<FeatureDescriptionModalContent
138131
SVGImage={selectedTab.SVGImage}

0 commit comments

Comments
 (0)