Skip to content

Commit f94f49b

Browse files
Merge pull request #2720 from devtron-labs/fix/segment-control
feat: add .sr-only class and update common-lib to contain segment control fixes to enable keyboard navigation and animation
2 parents 76a4d0f + 0355204 commit f94f49b

File tree

12 files changed

+57
-24
lines changed

12 files changed

+57
-24
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.14.0-pre-0",
7+
"@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/assets/icons/ic-dot.svg

Lines changed: 3 additions & 5 deletions
Loading

src/assets/icons/ic-more-vertical.svg

Lines changed: 21 additions & 0 deletions
Loading

src/components/CIPipelineN/TaskList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { importComponentFromFELibrary } from '@Components/common'
3232
import TaskTitle from './TaskTitle'
3333
import { ReactComponent as Add } from '../../assets/icons/ic-add.svg'
3434
import { ReactComponent as Drag } from '../../assets/icons/drag.svg'
35-
import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
35+
import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
3636
import { ReactComponent as Trash } from '../../assets/icons/ic-delete-interactive.svg'
3737
import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-triangle.svg'
3838
import { ReactComponent as MoveToPre } from '../../assets/icons/ic-arrow-backward.svg'

src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
ValueContainerWithLoadingShimmer,
2828
} from '@devtron-labs/devtron-fe-common-lib'
2929

30-
import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
30+
import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
3131
import DeleteClusterConfirmationModal from '@Components/cluster/DeleteClusterConfirmationModal'
3232

3333
import { URLS } from '../../../config'

src/components/ResourceBrowser/ResourceList/NodeActionsMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { useHistory, useLocation, useRouteMatch } from 'react-router-dom'
1919

2020
import { noop, PopupMenu } from '@devtron-labs/devtron-fe-common-lib'
2121

22-
import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
22+
import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
2323
import { ReactComponent as UncordonIcon } from '@Icons/ic-play-outline.svg'
2424
import { TaintType } from '@Components/ClusterNodes/types'
2525
import { AppDetailsTabs } from '@Components/v2/appDetails/appDetails.store'

src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
useMainContext,
2929
} from '@devtron-labs/devtron-fe-common-lib'
3030

31-
import { ReactComponent as MenuDots } from '@Icons/ic-dot.svg'
31+
import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
3232

3333
import { ReactComponent as CalendarIcon } from '../../../assets/icons/ic-calendar.svg'
3434
import { ReactComponent as DeleteIcon } from '../../../assets/icons/ic-delete-interactive.svg'

src/components/charts/discoverChartDetail/ChartDeploymentList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { Td } from '../../common'
3636
import { Routes, URLS, ViewType, SERVER_MODE, DELETE_ACTION } from '../../../config'
3737
import { deleteInstalledChart } from '../charts.service'
3838
import AppNotDeployedIcon from '../../../assets/img/app-not-configured.png'
39-
import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
39+
import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
4040
import trash from '../../../assets/icons/ic-delete.svg'
4141
import { getAppId } from '../../v2/appDetails/k8Resource/nodeDetail/nodeDetail.api'
4242
import ClusterNotReachableDialog from '../../common/ClusterNotReachableDialog/ClusterNotReachableDialog'

src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { ReactComponent as LinkIcon } from '../../../../assets/icons/ic-link.svg
4040
import { ReactComponent as Trash } from '../../../../assets/icons/ic-delete-interactive.svg'
4141
import { deleteApplicationRelease } from '../../../external-apps/ExternalAppService'
4242
import { deleteInstalledChart } from '../../../charts/charts.service'
43-
import { ReactComponent as Dots } from '@Icons/ic-dot.svg'
43+
import { ReactComponent as Dots } from '@Icons/ic-more-vertical.svg'
4444
import { DELETE_ACTION, URLS, checkIfDevtronOperatorHelmRelease } from '../../../../config'
4545
import { ReactComponent as BinWithDots } from '../../../../assets/icons/ic-delete-dots.svg'
4646
import { DELETE_DEPLOYMENT_PIPELINE, DeploymentAppTypeNameMapping } from '../../../../config/constantMessaging'

src/components/v2/values/chartValuesDiff/ChartValuesView.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const ChartValuesView = ({
160160
presetValueId: string
161161
envId: string
162162
}>()
163-
const { serverMode } = useMainContext()
163+
const { serverMode, isManifestScanningEnabled } = useMainContext()
164164
const { handleDownload } = useDownload()
165165
const chartValuesAbortRef = useRef<AbortController>(new AbortController())
166166
const [chartValuesList, setChartValuesList] = useState<ChartValuesType[]>(chartValuesListFromParent || [])
@@ -1809,12 +1809,15 @@ const ChartValuesView = ({
18091809
/>
18101810
)}
18111811
</div>
1812-
{!isExternalApp && (isDeployChartView || isUpdateAppView) && ToggleSecurityScan && (
1813-
<ToggleSecurityScan
1814-
isManifestScanEnabled={commonState.isManifestScanEnabled}
1815-
handleToggleSecurityScan={handleToggleSecurityScan}
1816-
/>
1817-
)}
1812+
{!isExternalApp &&
1813+
isManifestScanningEnabled &&
1814+
(isDeployChartView || isUpdateAppView) &&
1815+
ToggleSecurityScan && (
1816+
<ToggleSecurityScan
1817+
isManifestScanEnabled={commonState.isManifestScanEnabled}
1818+
handleToggleSecurityScan={handleToggleSecurityScan}
1819+
/>
1820+
)}
18181821
{!isDeployChartView &&
18191822
chartValueId !== '0' &&
18201823
!(

0 commit comments

Comments
 (0)