From 7dcd47ce9560430244450cae80bfee441365f10b Mon Sep 17 00:00:00 2001 From: shivani170 Date: Mon, 13 Jan 2025 18:45:10 +0530 Subject: [PATCH 01/14] chore: scroll component fix --- src/components/app/details/AboutTagEditModal.tsx | 2 +- .../app/details/appDetails/DeploymentStatusDetailModal.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/app/details/AboutTagEditModal.tsx b/src/components/app/details/AboutTagEditModal.tsx index 384862fe3d..79dcf97a5c 100644 --- a/src/components/app/details/AboutTagEditModal.tsx +++ b/src/components/app/details/AboutTagEditModal.tsx @@ -132,7 +132,7 @@ export default function AboutTagEditModal({ return ( <>
diff --git a/src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx b/src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx index da91217cd5..c599f0c09b 100644 --- a/src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx +++ b/src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import React, { useEffect, useRef } from 'react' +import { useEffect, useRef } from 'react' import { useHistory } from 'react-router-dom' import { ReactComponent as Close } from '../../../../assets/icons/ic-close.svg' import { DeploymentStatusDetailModalType } from './appDetails.type' @@ -101,7 +101,7 @@ export default function DeploymentStatusDetailModal({
-
+
{isLoading ? ( ) : ( From 7495b60e36c2f54821358dbbcf3155e8343aebf0 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Tue, 14 Jan 2025 15:05:20 +0530 Subject: [PATCH 02/14] chore: application overflow scroll converted to auto --- .../DevtronApps/Details/AppConfigurations/AppConfig.tsx | 2 +- .../AppConfigurations/MainContent/ConfigDryRun.tsx | 2 +- .../MainContent/DeploymentTemplate/DeploymentTemplate.tsx | 8 ++++---- .../DeploymentTemplate/DeploymentTemplateForm.tsx | 8 ++++---- .../DeploymentTemplate/GUIView/GUIView.component.tsx | 2 +- .../__test__/EnvironmentOverview.test.tsx | 2 +- .../List/__tests__/EnvironmentListView.test.tsx | 4 ++-- .../CreatePluginModal/CreatePluginFormContent.tsx | 4 ++-- .../CreatePluginModal/CreatePluginModal.component.tsx | 2 +- src/components/CIPipelineN/PreBuild.tsx | 4 ++-- src/components/CIPipelineN/TaskDetailComponent.tsx | 2 +- src/components/app/details/cIDetails/CIDetails.tsx | 2 +- src/components/app/details/cdDetails/CDDetails.tsx | 2 +- src/components/app/details/main.tsx | 2 +- .../app/details/triggerView/BranchRegexModal.tsx | 2 +- .../app/details/triggerView/CiWebhookDebuggingModal.tsx | 2 +- src/components/app/details/triggerView/MaterialSource.tsx | 2 +- src/components/app/details/triggerView/cdMaterial.tsx | 8 ++++---- .../app/details/triggerView/workflow/Workflow.tsx | 2 +- src/components/app/list-new/AppList.tsx | 2 +- src/components/app/list/TriggerUrl.tsx | 2 +- src/components/ciPipeline/ciPipeline.scss | 2 +- src/components/common/Description/GenericDescription.tsx | 2 +- src/components/workflowEditor/Workflow.tsx | 2 +- src/css/base.scss | 4 ---- 25 files changed, 36 insertions(+), 40 deletions(-) diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx index 4ef57fdcae..60cb89c957 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx @@ -500,7 +500,7 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr <>
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx index 992adb2483..8c9897b17d 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx @@ -91,7 +91,7 @@ const ConfigDryRun = ({ } return ( -
+
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx index 5a973adbb7..3d155bcc30 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx @@ -1497,7 +1497,7 @@ const DeploymentTemplate = ({ const renderEditorComponent = () => { if (isResolvingVariables || isLoadingChangedChartDetails || !!isLoadingMergedTemplate) { return ( -
+
) @@ -1527,7 +1527,7 @@ const DeploymentTemplate = ({ if (isCompareView) { return ( ( -
+
{window._env_.ENABLE_SCOPED_VARIABLES && (
+
{renderBody()} {showDeleteOverrideDialog && ( diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplateForm.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplateForm.tsx index fe24c335cb..96094fe395 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplateForm.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplateForm.tsx @@ -87,19 +87,19 @@ const DeploymentTemplateForm = ({ } return ( -
+
{showReadMe && ( -
+
{`Readme ${selectedChart ? `(v${selectedChart.version})` : ''}`}
- +
)} -
+
+
{ expect(component.getByText('devtron-ns')).toBeInTheDocument() expect(component.getByText('default_cluster')).toBeInTheDocument() //right side component - const rightInfoComponent = component.container.querySelector('.dc__overflow-scroll') + const rightInfoComponent = component.container.querySelector('.dc__overflow-auto') expect(rightInfoComponent).toBeInTheDocument() const infoRightRowComponent = rightInfoComponent.querySelector('.app-deployments-info-body') expect(infoRightRowComponent).toBeInTheDocument() diff --git a/src/components/ApplicationGroup/List/__tests__/EnvironmentListView.test.tsx b/src/components/ApplicationGroup/List/__tests__/EnvironmentListView.test.tsx index fbe85a03d5..093239ee10 100644 --- a/src/components/ApplicationGroup/List/__tests__/EnvironmentListView.test.tsx +++ b/src/components/ApplicationGroup/List/__tests__/EnvironmentListView.test.tsx @@ -33,7 +33,7 @@ describe('EnvironmentList', () => { const appGroupLoaderContainer = container.querySelector('.flex.dc__border-top-n1') expect(appGroupLoaderContainer).toBeInTheDocument() - const appGroupListContainer = container.querySelector('.dc__overflow-scroll') + const appGroupListContainer = container.querySelector('.dc__overflow-auto') expect(appGroupListContainer).not.toBeInTheDocument() }) @@ -47,7 +47,7 @@ describe('EnvironmentList', () => { }) expect(component.container).toBeInTheDocument() - const appGroupListContainer = component.container.querySelector('.dc__overflow-scroll') + const appGroupListContainer = component.container.querySelector('.dc__overflow-auto') expect(appGroupListContainer).toBeInTheDocument() expect(component.getAllByText('a')[0]).toBeInTheDocument() expect(component.getByText('shubham')).toBeInTheDocument() diff --git a/src/components/CIPipelineN/CreatePluginModal/CreatePluginFormContent.tsx b/src/components/CIPipelineN/CreatePluginModal/CreatePluginFormContent.tsx index 6868eb1464..b1cbcb9444 100644 --- a/src/components/CIPipelineN/CreatePluginModal/CreatePluginFormContent.tsx +++ b/src/components/CIPipelineN/CreatePluginModal/CreatePluginFormContent.tsx @@ -146,7 +146,7 @@ const CreatePluginFormContent = ({ } const renderExistingPluginVersionList = () => ( -
+
{selectedPluginVersions.map((version) => (
@@ -191,7 +191,7 @@ const CreatePluginFormContent = ({ const showPluginDetailFields = currentTab !== CreatePluginFormViewType.EXISTING_PLUGIN || !!name return ( -
+
{ className="bg__primary dc__position-fixed dc__right-0 dc__top-0 h-100 flexbox-col dc__content-space w-800" onClick={stopPropagation} > -
+

Save as plugin

diff --git a/src/components/CIPipelineN/PreBuild.tsx b/src/components/CIPipelineN/PreBuild.tsx index 8f82c5fe5b..2f90c7f8e8 100644 --- a/src/components/CIPipelineN/PreBuild.tsx +++ b/src/components/CIPipelineN/PreBuild.tsx @@ -144,7 +144,7 @@ export const PreBuild: React.FC = ({ isJobView }) => { function renderPluginList(): JSX.Element { return ( -
+
What do you want this task to do?
setPluginType(PluginType.INLINE, 0)}> @@ -203,7 +203,7 @@ export const PreBuild: React.FC = ({ isJobView }) => { } return ( -
+
) diff --git a/src/components/CIPipelineN/TaskDetailComponent.tsx b/src/components/CIPipelineN/TaskDetailComponent.tsx index 2ec2787908..a71718945e 100644 --- a/src/components/CIPipelineN/TaskDetailComponent.tsx +++ b/src/components/CIPipelineN/TaskDetailComponent.tsx @@ -201,7 +201,7 @@ export const TaskDetailComponent = () => { <> -
+
Task name
diff --git a/src/components/app/details/cIDetails/CIDetails.tsx b/src/components/app/details/cIDetails/CIDetails.tsx index 4d0e27b17c..eccf6341db 100644 --- a/src/components/app/details/cIDetails/CIDetails.tsx +++ b/src/components/app/details/cIDetails/CIDetails.tsx @@ -243,7 +243,7 @@ export default function CIDetails({ isJobView, filteredEnvIds }: { isJobView?: b
)}
-
+
{!pipelineId ? ( // Empty state if there is no pipeline )}
-
+
{triggerHistory.size > 0 || fetchTriggerIdData ? ( 0 ? selectedAppList.map((app) => +app.value).join(',') : null return ( -
+
{!isV2 && ( ( -
+
{material.map((mat, index) => { const _regexValue = regexValue[mat.gitMaterialId] || {} diff --git a/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx b/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx index e2841cbced..a0e70b4ebd 100644 --- a/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx +++ b/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx @@ -257,7 +257,7 @@ export const CiWebhookModal = ({ ) const renderTimeStampDetailedDescription = () => ( -
+
{renderFilterTable()}
{renderReceivedPayloadCodeEditor()}
diff --git a/src/components/app/details/triggerView/MaterialSource.tsx b/src/components/app/details/triggerView/MaterialSource.tsx index 5e90bf8706..45291b9f97 100644 --- a/src/components/app/details/triggerView/MaterialSource.tsx +++ b/src/components/app/details/triggerView/MaterialSource.tsx @@ -97,7 +97,7 @@ export default function MaterialSource({ return (
{material.map((mat, index) => { diff --git a/src/components/app/details/triggerView/cdMaterial.tsx b/src/components/app/details/triggerView/cdMaterial.tsx index 68a11d6aab..a554658545 100644 --- a/src/components/app/details/triggerView/cdMaterial.tsx +++ b/src/components/app/details/triggerView/cdMaterial.tsx @@ -1466,7 +1466,7 @@ const CDMaterial = ({ ) const renderMaterialListBodyWrapper = (children: JSX.Element) => ( -
{children}
+
{children}
) const renderRuntimeParamsSidebar = (areTabsDisabled: boolean = false) => { @@ -1511,7 +1511,7 @@ const CDMaterial = ({ return (
{renderRuntimeParamsSidebar()} @@ -1906,11 +1906,11 @@ const CDMaterial = ({ )}
{renderRuntimeParamsSidebar(true)} -
+
diff --git a/src/components/app/details/triggerView/workflow/Workflow.tsx b/src/components/app/details/triggerView/workflow/Workflow.tsx index f0bd05c52d..bbeb629d71 100644 --- a/src/components/app/details/triggerView/workflow/Workflow.tsx +++ b/src/components/app/details/triggerView/workflow/Workflow.tsx @@ -403,7 +403,7 @@ export class Workflow extends Component {
{isExternalCiWorkflow && }
{this.renderEdgeList()} diff --git a/src/components/app/list-new/AppList.tsx b/src/components/app/list-new/AppList.tsx index 3cc9a544ba..46a989e652 100644 --- a/src/components/app/list-new/AppList.tsx +++ b/src/components/app/list-new/AppList.tsx @@ -419,7 +419,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => { } return ( -
+
-
+
{loading ? ( ) : Object.values(data).every((value) => !value.length) ? ( diff --git a/src/components/ciPipeline/ciPipeline.scss b/src/components/ciPipeline/ciPipeline.scss index b3b35e0051..8292063412 100644 --- a/src/components/ciPipeline/ciPipeline.scss +++ b/src/components/ciPipeline/ciPipeline.scss @@ -199,7 +199,7 @@ .ci-webhook-condition { display: grid; - grid-template-columns: 200px 500px 30px; + grid-template-columns: 200px 1fr 30px; gap: 16px; } diff --git a/src/components/common/Description/GenericDescription.tsx b/src/components/common/Description/GenericDescription.tsx index ea212ab7a7..588e1c6f15 100644 --- a/src/components/common/Description/GenericDescription.tsx +++ b/src/components/common/Description/GenericDescription.tsx @@ -339,7 +339,7 @@ export default function GenericDescription({ } return ( -
+
{ className={ configDiffView ? 'workflow__body' - : 'workflow__body dc__border-n1 bg__secondary dc__overflow-scroll br-4' + : 'workflow__body dc__border-n1 bg__secondary dc__overflow-auto br-4' } > {nodesWithBufferHeight.length === 0 && this.props.isJobView ? ( diff --git a/src/css/base.scss b/src/css/base.scss index 8b7c0f9b46..7404340989 100644 --- a/src/css/base.scss +++ b/src/css/base.scss @@ -4114,10 +4114,6 @@ textarea { overflow: auto !important; } -.dc__overflow-y-auto { - overflow: auto !important; -} - .dc__overflow-scroll { overflow: scroll !important; } From 1b09e147129df1951b50d83163bbc134a41a41dd Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 15 Jan 2025 08:05:50 +0530 Subject: [PATCH 03/14] chore: App group overflow scroll replaced to auto --- .../Authorization/APITokens/APITokenList.tsx | 2 +- .../Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx | 2 +- .../ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx | 2 +- .../ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx | 2 +- .../ApplicationGroup/List/EnvironmentListView.tsx | 2 +- src/components/ApplicationGroup/List/EnvironmentsList.tsx | 2 +- src/components/ClusterNodes/ClusterOverview.tsx | 4 ++-- src/components/charts/list/ChartListPopUp.tsx | 2 +- src/components/ciConfig/CIConfigDiffView.tsx | 2 +- .../common/FloatingVariablesSuggestions/Suggestions.tsx | 6 +++--- src/components/externalLinks/ExternalLinks.tsx | 2 +- .../globalConfigurations/globalConfigurations.scss | 4 ++-- src/components/notifications/WebhookConfigModal.tsx | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Pages/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx b/src/Pages/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx index 85cfcd254e..124dd0fe60 100644 --- a/src/Pages/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx +++ b/src/Pages/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx @@ -88,7 +88,7 @@ const APITokenList = ({ tokenList, renderSearchToken, reload }: APITokenListType
Expires on
-
+
{!tokenList || tokenList.length === 0 ? noMatchingResults() : tokenList.map((list, index) => ( diff --git a/src/Pages/Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx b/src/Pages/Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx index 4064b82c13..f0664c2dc8 100644 --- a/src/Pages/Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx +++ b/src/Pages/Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx @@ -156,7 +156,7 @@ const LinkedCIDetailsModal = ({ handleClose, workflows }: LinkedCIDetailModalPro return (
-
+

{ciPipelineName}

diff --git a/src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx b/src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx index f12c09372d..57e6113942 100644 --- a/src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx +++ b/src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx @@ -312,7 +312,7 @@ export default function EnvCDDetails({ filteredAppIds }: AppGroupDetailDefaultTy
)}
-
+
{renderDetail()}
diff --git a/src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx b/src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx index 1b5a48b923..d72374e532 100644 --- a/src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx +++ b/src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx @@ -293,7 +293,7 @@ export default function EnvCIDetails({ filteredAppIds }: AppGroupDetailDefaultTy
)}
-
+
{!pipelineId ? ( ) : ( -
+
{filteredEnvList?.map((envData) => (
{ ) return ( -
+
diff --git a/src/components/ClusterNodes/ClusterOverview.tsx b/src/components/ClusterNodes/ClusterOverview.tsx index 1dd332d0d0..82b3b055fe 100644 --- a/src/components/ClusterNodes/ClusterOverview.tsx +++ b/src/components/ClusterNodes/ClusterOverview.tsx @@ -327,7 +327,7 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) { {/* Commented to be used in future */} {/* {cardDetailsInBar()} */}
-
+
CPU Usage
@@ -354,7 +354,7 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
-
+
Memory Usage
diff --git a/src/components/charts/list/ChartListPopUp.tsx b/src/components/charts/list/ChartListPopUp.tsx index 765ae30112..5fa4e4d938 100644 --- a/src/components/charts/list/ChartListPopUp.tsx +++ b/src/components/charts/list/ChartListPopUp.tsx @@ -165,7 +165,7 @@ const ChartListPopUp = ({ return renderEmptyState(true) } return ( -
+
{filteredChartList.map((list, index) => { return ( list.id != 1 && ( diff --git a/src/components/ciConfig/CIConfigDiffView.tsx b/src/components/ciConfig/CIConfigDiffView.tsx index f8f6d24419..5bbf6d4a8b 100644 --- a/src/components/ciConfig/CIConfigDiffView.tsx +++ b/src/components/ciConfig/CIConfigDiffView.tsx @@ -317,7 +317,7 @@ export default function CIConfigDiffView({
{renderConfigDiffModalTitle()} -
+
{renderBodyContent()}
{showDeleteDialog && ( diff --git a/src/components/common/FloatingVariablesSuggestions/Suggestions.tsx b/src/components/common/FloatingVariablesSuggestions/Suggestions.tsx index b3440ce6ae..5d59f964c5 100644 --- a/src/components/common/FloatingVariablesSuggestions/Suggestions.tsx +++ b/src/components/common/FloatingVariablesSuggestions/Suggestions.tsx @@ -123,7 +123,7 @@ const Suggestions = ({ handleDeActivation, loading, variables, reloadVariables, const renderSuggestions = (): JSX.Element => ( <> -
+
{suggestions.length ? ( suggestions.map((variable) => ( { if (loading) { return ( -
+
) @@ -164,7 +164,7 @@ const Suggestions = ({ handleDeActivation, loading, variables, reloadVariables, if (variables?.length === 0) { return ( <> -
+
diff --git a/src/components/externalLinks/ExternalLinks.tsx b/src/components/externalLinks/ExternalLinks.tsx index e974178a5e..c9fdf203e8 100644 --- a/src/components/externalLinks/ExternalLinks.tsx +++ b/src/components/externalLinks/ExternalLinks.tsx @@ -461,7 +461,7 @@ const ExternalLinks = ({ isAppConfigView, userRole }: ExternalLinksProps) => { {filteredLinksLen > 0 && ( <> {renderExternalLinksHeader()} -
+
{renderExternalLinks(filteredLinksLen)}
diff --git a/src/components/globalConfigurations/globalConfigurations.scss b/src/components/globalConfigurations/globalConfigurations.scss index 842765eb8e..5b048d8f96 100644 --- a/src/components/globalConfigurations/globalConfigurations.scss +++ b/src/components/globalConfigurations/globalConfigurations.scss @@ -29,7 +29,7 @@ border-right: solid 1px var(--N200); background: var(--bg-primary); height: 100%; - overflow: scroll; + overflow: auto; a { font-size: 13px; @@ -59,7 +59,7 @@ .global-configuration__component-wrapper { padding: 0; - overflow-y: auto; + overflow: auto; position: relative; max-height: 100%; } diff --git a/src/components/notifications/WebhookConfigModal.tsx b/src/components/notifications/WebhookConfigModal.tsx index 99f7dd47cc..c4092803f1 100644 --- a/src/components/notifications/WebhookConfigModal.tsx +++ b/src/components/notifications/WebhookConfigModal.tsx @@ -149,7 +149,7 @@ export const WebhookConfigModal = ({ const renderConfigureLinkInfoColumn = () => (
From 7b6afbb30949827beaa50317900c1c742f5452e6 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 15 Jan 2025 14:03:08 +0530 Subject: [PATCH 04/14] chore: chart & resource browser overflow scroll replaced --- package.json | 2 +- src/components/ClusterNodes/ClusterOverview.tsx | 2 +- src/components/ClusterNodes/ClusterTerminal.tsx | 2 +- .../ResourceBrowser/ResourceList/BaseResourceList.tsx | 2 +- src/components/charts/charts.scss | 2 +- src/components/cluster/ClusterForm.tsx | 4 ++-- src/components/cluster/ClusterInfoStepsModal.tsx | 2 +- .../common/FloatingVariablesSuggestions/SuggestionItem.tsx | 2 +- .../environmentStatus/HelmAppConfigApplyStatusCard.tsx | 2 +- .../sourceInfo/environmentStatus/environmentStatus.scss | 2 +- .../ChartDeploymentHistory.component.tsx | 2 +- .../v2/values/chartValuesDiff/ChartValuesGUIView.tsx | 2 +- .../v2/values/chartValuesDiff/ChartValuesView.component.tsx | 2 +- src/components/v2/values/chartValuesDiff/ChartValuesView.scss | 3 --- src/components/v2/values/chartValuesDiff/ChartValuesView.tsx | 2 +- src/css/base.scss | 4 ++++ 16 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 694f668ffd..7d7b08bd58 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.4.9", + "@devtron-labs/devtron-fe-common-lib": "1.4.9-beta-1", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/src/components/ClusterNodes/ClusterOverview.tsx b/src/components/ClusterNodes/ClusterOverview.tsx index 82b3b055fe..7681e9f8c5 100644 --- a/src/components/ClusterNodes/ClusterOverview.tsx +++ b/src/components/ClusterNodes/ClusterOverview.tsx @@ -527,7 +527,7 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) { const renderClusterSummary = (): JSX.Element => { return (
diff --git a/src/components/ClusterNodes/ClusterTerminal.tsx b/src/components/ClusterNodes/ClusterTerminal.tsx index 9cf170a0a1..239bf7aa80 100644 --- a/src/components/ClusterNodes/ClusterTerminal.tsx +++ b/src/components/ClusterNodes/ClusterTerminal.tsx @@ -700,7 +700,7 @@ node-details-full-screen {connectTerminal && terminalView}
{selectedTabIndex === 1 && ( -
+
)} diff --git a/src/components/ResourceBrowser/ResourceList/BaseResourceList.tsx b/src/components/ResourceBrowser/ResourceList/BaseResourceList.tsx index b983ce429a..d1db538b93 100644 --- a/src/components/ResourceBrowser/ResourceList/BaseResourceList.tsx +++ b/src/components/ResourceBrowser/ResourceList/BaseResourceList.tsx @@ -575,7 +575,7 @@ const BaseResourceListContent = ({ 'scrollable-resource-list', showPaginatedView, showStaleDataWarning, - )} dc__overflow-scroll`} + )} dc__overflow-auto`} >
MESSAGE
-
+
{!saveClusterList || saveClusterList.length === 0 ? ( ) : ( @@ -1238,7 +1238,7 @@ export default function ClusterForm({ className="cluster-form dc__position-rel h-100 bg__primary" > -
+
{ additionalInfo: (
{command} diff --git a/src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx b/src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx index 279d4b58b9..29854ec782 100644 --- a/src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx +++ b/src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx @@ -89,7 +89,7 @@ export default function SuggestionItem({ +
Value
{sanitiseVariableValue(variableValue)} diff --git a/src/components/v2/appDetails/sourceInfo/environmentStatus/HelmAppConfigApplyStatusCard.tsx b/src/components/v2/appDetails/sourceInfo/environmentStatus/HelmAppConfigApplyStatusCard.tsx index d67c201051..228610dab8 100644 --- a/src/components/v2/appDetails/sourceInfo/environmentStatus/HelmAppConfigApplyStatusCard.tsx +++ b/src/components/v2/appDetails/sourceInfo/environmentStatus/HelmAppConfigApplyStatusCard.tsx @@ -49,7 +49,7 @@ const HelmAppConfigApplyStatusCard = ({ releaseStatus, cardLoading }: HelmAppCon

-
+
diff --git a/src/components/v2/appDetails/sourceInfo/environmentStatus/environmentStatus.scss b/src/components/v2/appDetails/sourceInfo/environmentStatus/environmentStatus.scss index b9c58bbe83..887c7c5461 100644 --- a/src/components/v2/appDetails/sourceInfo/environmentStatus/environmentStatus.scss +++ b/src/components/v2/appDetails/sourceInfo/environmentStatus/environmentStatus.scss @@ -24,7 +24,7 @@ margin: auto; margin-right: 0; height: 100%; - overflow: scroll; + overflow: auto; } .config-error-wrap { diff --git a/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx b/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx index 51417d3231..a8490a5331 100644 --- a/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx +++ b/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx @@ -748,7 +748,7 @@ const ChartDeploymentHistory = ({ {renderDeploymentCards()}
-
{renderSelectedDeploymentDetail()}
+
{renderSelectedDeploymentDetail()}
{showRollbackConfirmation && ( +
{ return ( -
+
{renderValuesTabsContainer()}
-
+
{isCreateValueView && (