Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": "/dashboard",
"dependencies": {
"@devtron-labs/devtron-fe-common-lib": "1.20.3-pre-12",
"@devtron-labs/devtron-fe-common-lib": "1.20.5-pre-5",
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@rjsf/core": "^5.13.3",
"@rjsf/utils": "^5.13.3",
Expand Down
6 changes: 2 additions & 4 deletions src/Pages/GlobalConfigurations/BuildInfra/ProfileForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@ import React, { FunctionComponent, useMemo } from 'react'

import {
APIResponseHandler,
BUILD_INFRA_BREADCRUMB,
BUILD_INFRA_TEXT,
BuildInfraConfigForm,
BuildInfraDescriptor,
BuildInfraFooter,
DEFAULT_PROFILE_NAME,
useBreadcrumb,
FeatureTitleWithInfo,
useBuildInfraForm,
} from '@devtron-labs/devtron-fe-common-lib'

import './styles.scss'

const ProfileForm: FunctionComponent = () => {
const { breadcrumbs } = useBreadcrumb(BUILD_INFRA_BREADCRUMB)
const {
isLoading,
profileResponse,
Expand Down Expand Up @@ -68,7 +66,7 @@ const ProfileForm: FunctionComponent = () => {
onSubmit={handleSubmit}
>
<div className="flexbox-col dc__gap-24 pt pr pb pl h-100 dc__overflow-auto">
<BuildInfraDescriptor breadCrumbs={breadcrumbs} />
<BuildInfraDescriptor tooltipNode={<FeatureTitleWithInfo title={BUILD_INFRA_TEXT.HEADING} />} />

<APIResponseHandler
isLoading={isLoading}
Expand Down
3 changes: 1 addition & 2 deletions src/components/charts/ChartGroupAdvanceDeploy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import React, { useState, useEffect, useCallback } from 'react'
import { useState, useEffect, useCallback } from 'react'
import { useParams, useHistory, useLocation, useRouteMatch, Prompt } from 'react-router-dom'
import {
showError,
Expand All @@ -27,7 +27,6 @@ import {
ToastVariantType,
ToastManager,
getApplicationManagementBreadcrumb,
BreadcrumbText,
} from '@devtron-labs/devtron-fe-common-lib'
import Tippy from '@tippyjs/react'
import MultiChartSummary from './MultiChartSummary'
Expand Down
2 changes: 1 addition & 1 deletion src/components/charts/list/DiscoverCharts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ const DiscoverChartList = ({ isSuperAdmin }: { isSuperAdmin: boolean }) => {
},
},
},
[],
[isLoading, chartsList],
)

const renderBreadcrumbs = () => {
Expand Down
7 changes: 3 additions & 4 deletions src/components/scopedVariables/Descriptor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { DescriptorProps } from './types'
import { importComponentFromFELibrary, HiddenInput } from '../common'
import { ReadFileAs } from '../common/hooks/types'
import { ReactComponent as ICUpload } from '../../assets/icons/ic-upload-blue.svg'
import { ReactComponent as ICSearch } from '../../assets/icons/ic-search.svg'
import { HEADER_TEXT } from '@Config/constants'

export default function Descriptor({ children, showUploadButton, readFile, searchKey, onSearch }: DescriptorProps) {
Expand All @@ -32,7 +31,7 @@ export default function Descriptor({ children, showUploadButton, readFile, searc
}
}

const additonalTippyContent = importComponentFromFELibrary('scopedVariablesHelpTippyText')
const additionalTippyContent = importComponentFromFELibrary('scopedVariablesHelpTippyText')

return (
<>
Expand All @@ -45,9 +44,9 @@ export default function Descriptor({ children, showUploadButton, readFile, searc
<FeatureTitleWithInfo
title={HEADER_TEXT.SCOPED_VARIABLES.title}
renderDescriptionContent={() =>
additonalTippyContent ? null : HEADER_TEXT.SCOPED_VARIABLES.description
additionalTippyContent ? null : HEADER_TEXT.SCOPED_VARIABLES.description
}
additionalContent={additonalTippyContent?.()}
additionalContent={additionalTippyContent?.()}
docLink={HEADER_TEXT.SCOPED_VARIABLES.docLink}
showInfoIconTippy
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/v2/headers/EAHeader.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const EAHeaderComponent = ({
linked: false,
},
':clusterId': null,
':appId(\\d+)': null,
':appId': null,
},
},
[params.appName],
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1722,9 +1722,9 @@ __metadata:
languageName: node
linkType: hard

"@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-12":
version: 1.20.3-pre-12
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-12"
"@devtron-labs/devtron-fe-common-lib@npm:1.20.5-pre-5":
version: 1.20.5-pre-5
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.5-pre-5"
dependencies:
"@codemirror/autocomplete": "npm:6.18.6"
"@codemirror/lang-json": "npm:6.0.1"
Expand Down Expand Up @@ -1776,7 +1776,7 @@ __metadata:
react-select: 5.8.0
rxjs: ^7.8.1
yaml: ^2.4.1
checksum: 10c0/33b9aec93cc00f5aadd38ac8ff47f05aa5f0872360b96cec7f4cd97197914fd26da39a173bade82e723ab2661f7142b76291df60bac203643b4f6387143cab48
checksum: 10c0/44061f044e55c6cfa4c6a16002a246813c30f601565f1854d37a704e50f2c7bd384d3be29e7cb2c6959118ce8f4a51fcefbd1381b8e5df3676fbc7aa00d4dc78
languageName: node
linkType: hard

Expand Down Expand Up @@ -5581,7 +5581,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "dashboard@workspace:."
dependencies:
"@devtron-labs/devtron-fe-common-lib": "npm:1.20.3-pre-12"
"@devtron-labs/devtron-fe-common-lib": "npm:1.20.5-pre-5"
"@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
"@playwright/test": "npm:^1.32.1"
"@rjsf/core": "npm:^5.13.3"
Expand Down
Loading