Skip to content

Commit e2816d6

Browse files
Elessar1802Elessar1802
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/app-details-chat
2 parents 53afc67 + 2dce2a5 commit e2816d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1228
-712
lines changed

‎.eslintignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,9 @@ src/components/CIPipelineN/ciPipeline.utils.tsx
5252
src/components/ClusterNodes/ClusterEvents.tsx
5353
src/components/ClusterNodes/ClusterManifest.tsx
5454
src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
55-
src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
56-
src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
57-
src/components/ClusterNodes/NodeActions/validationRules.ts
5855
src/components/ClusterNodes/NodeDetails.tsx
5956
src/components/ClusterNodes/__tests__/ClusterManifest.test.tsx
6057
src/components/ClusterNodes/__tests__/NodeList.test.tsx
61-
src/components/ClusterNodes/constants.ts
6258
src/components/Hotjar/Hotjar.tsx
6359
src/components/Jobs/ExpandedRow/ExpandedRow.tsx
6460
src/components/Jobs/JobDetails/JobDetails.tsx

‎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-5",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

‎src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/SelectMergeStrategy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const SelectMergeStrategy = ({
103103
{PatchStrategyTooltipInfo && <PatchStrategyTooltipInfo />}
104104
</OverrideStrategyTippyContent>
105105
}
106-
documentationLink="HOME_PAGE"
106+
documentationLink="DOC_HOME_PAGE"
107107
/>
108108

109109
{renderContent()}

‎src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/Sidebar.tsx

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { generatePath, NavLink, useParams, useRouteMatch } from 'react-router-dom'
1818

19-
import { Icon, IconName, ModalSidebarPanel } from '@devtron-labs/devtron-fe-common-lib'
19+
import { Icon, IconName, ModalSidebarPanel, SERVER_MODE, useMainContext } from '@devtron-labs/devtron-fe-common-lib'
2020

2121
import { importComponentFromFELibrary } from '@Components/common'
2222

@@ -27,47 +27,53 @@ const isFELibAvailable = importComponentFromFELibrary('isFELibAvailable', null,
2727

2828
const Sidebar = () => {
2929
const { path } = useRouteMatch()
30+
const { serverMode } = useMainContext()
3031
const { type } = useParams<CreateClusterParams>()
3132

3233
const selectedSidebarElement = SIDEBAR_CONFIG[type]
3334

3435
return (
3536
<div className="w-250 p-20 flexbox-col dc__gap-24 dc__no-shrink dc__overflow-auto">
3637
<div className="flexbox-col">
37-
{Object.entries(SIDEBAR_CONFIG).map(([key, { title, iconName, isEnterprise, dataTestId }]) => {
38-
const isSelected = type.toLowerCase() === key.toLowerCase()
38+
{Object.entries(SIDEBAR_CONFIG).map(
39+
([key, { title, iconName, isEnterprise, dataTestId, hideInEAMode }]) => {
40+
if (hideInEAMode && serverMode === SERVER_MODE.EA_ONLY) {
41+
return null
42+
}
43+
const isSelected = type.toLowerCase() === key.toLowerCase()
3944

40-
return (
41-
<NavLink
42-
data-testid={dataTestId}
43-
key={key}
44-
className={`dc__transparent flex left dc__gap-8 py-6 px-8 br-4 ${isSelected ? 'bcb-1' : 'dc__hover-n50'}`}
45-
to={generatePath(path, { type: key })}
46-
>
47-
<span className="dc__fill-available-space dc__no-shrink icon-dim-16">
48-
<Icon name={iconName as IconName} color={isSelected ? 'B500' : 'N600'} />
49-
</span>
50-
51-
<span
52-
className={`fs-13 lh-20 dc__truncate flex-grow-1 ${isSelected ? 'cb-5 fw-6' : 'cn-9'}`}
45+
return (
46+
<NavLink
47+
data-testid={dataTestId}
48+
key={key}
49+
className={`dc__transparent flex left dc__gap-8 py-6 px-8 br-4 ${isSelected ? 'bcb-1' : 'dc__hover-n50'}`}
50+
to={generatePath(path, { type: key })}
5351
>
54-
{title}
55-
</span>
52+
<span className="dc__fill-available-space dc__no-shrink icon-dim-16">
53+
<Icon name={iconName as IconName} color={isSelected ? 'B500' : 'N600'} />
54+
</span>
55+
56+
<span
57+
className={`fs-13 lh-20 dc__truncate flex-grow-1 ${isSelected ? 'cb-5 fw-6' : 'cn-9'}`}
58+
>
59+
{title}
60+
</span>
5661

57-
{isEnterprise && !isFELibAvailable && (
58-
<Icon
59-
name="ic-enterprise-feat"
60-
color="Y700"
61-
tooltipProps={{
62-
content: 'This is an enterprise only feature',
63-
placement: 'right',
64-
alwaysShowTippyOnHover: true,
65-
}}
66-
/>
67-
)}
68-
</NavLink>
69-
)
70-
})}
62+
{isEnterprise && !isFELibAvailable && (
63+
<Icon
64+
name="ic-enterprise-feat"
65+
color="Y700"
66+
tooltipProps={{
67+
content: 'This is an enterprise only feature',
68+
placement: 'right',
69+
alwaysShowTippyOnHover: true,
70+
}}
71+
/>
72+
)}
73+
</NavLink>
74+
)
75+
},
76+
)}
7177
</div>
7278

7379
<div className="divider__secondary--horizontal" />

‎src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/constants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ export const SIDEBAR_CONFIG: SidebarConfigType = {
4444
</>
4545
),
4646
isEnterprise: true,
47+
hideInEAMode: true,
4748
},
4849
} as const

‎src/Pages/GlobalConfigurations/ClustersAndEnvironments/CreateCluster/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export type SidebarConfigType = Record<
1515
dataTestId: string
1616
documentationHeader?: string
1717
isEnterprise?: true
18+
hideInEAMode?: true
1819
}
1920
>
2021

‎src/Pages/GlobalConfigurations/DeploymentCharts/List/UploadChartModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,14 @@ const UploadChartModal = ({ closeUploadPopup }: UploadChartModalType) => {
199199
2. Image descriptor template file - .image_descriptor_template.json.
200200
</div>
201201
<div className="cn-7 fw-4 fs-14 cn-7 mb-20">3. Custom chart packaged in the *.tgz format.</div>
202-
<div className="flexbox-col dc__align-start">
202+
<div className="flexbox-col dc__align-start pt-20">
203203
<div className="fw-6 fs-13 cn-9 mb-8">
204204
📙 Need help?&nbsp;
205205
<DocLink
206206
docLinkKey="GLOBAL_CONFIG_CUSTOM_CHART_PRE_REQUISITES"
207207
text="View documentation"
208208
dataTestId="learn-more-about-custom-chart-pre-requisites-link"
209+
openInNewTab
209210
/>
210211
</div>
211212
</div>

‎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/PluginDetailHeader/PluginDetailHeader.component.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ const PluginDetailHeader = ({ handlePluginVersionChange }: PluginDetailHeaderPro
111111
interactive
112112
documentationLink={docLink as keyof typeof DOCUMENTATION}
113113
documentationLinkText="View documentation"
114-
isExternalLink
114+
isExternalLink={stepType !== PluginType.INLINE}
115+
openInNewTab
115116
>
116117
<button
117118
type="button"

0 commit comments

Comments
 (0)