Skip to content

Commit 448ec3a

Browse files
authored
Merge pull request #1610 from devtron-labs/helm-responsiveness
fix: Miscellaneous Bug fixes
2 parents f6cd528 + 0292662 commit 448ec3a

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/components/ciPipeline/SourceMaterials.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export const SourceMaterials: React.FC<SourceMaterialsProps> = function (props)
225225
}
226226
/>
227227
{/* Note: In case Error is not shown added height*/}
228-
{errorObj?.isValid && <div className="h-24"></div>}
228+
{(errorObj?.isValid || islinkedCI) && <div className="h-24"></div>}
229229
</div>
230230
)}
231231

@@ -247,11 +247,12 @@ export const SourceMaterials: React.FC<SourceMaterialsProps> = function (props)
247247
)
248248
}}
249249
error={
250-
errorObj && !errorObj.isValid
251-
&& props.validationRules?.sourceValue(_materials[index].regex).message
250+
errorObj &&
251+
!errorObj.isValid &&
252+
props.validationRules?.sourceValue(_materials[index].regex).message
252253
}
253254
/>
254-
{/* Note: In case Error is not shown */}
255+
{/* Note: In case Error is not shown */}
255256
{errorObj?.isValid && <div className="h-24"></div>}
256257
</div>
257258
)}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ function EnvironmentSelectorComponent({
164164

165165
const deployedAppDetail = isExternalApp && params.appId && params.appId.split('|')
166166

167+
const handleScaleWorkloads = () => {
168+
setWorkloadsModal(true)
169+
}
170+
167171
return (
168172
<div className="flexbox flex-justify pl-20 pr-20 pt-16 pb-16">
169173
<div>
@@ -280,10 +284,10 @@ function EnvironmentSelectorComponent({
280284
Urls
281285
</button>
282286
)}
283-
{!showWorkloadsModal && !isVirtualEnvironment && (
287+
{!isVirtualEnvironment && (
284288
<button
285289
className="scale-workload__btn flex left cta cancel pb-6 pt-6 pl-12 pr-12 en-2 ml-6"
286-
onClick={() => setWorkloadsModal(true)}
290+
onClick={handleScaleWorkloads}
287291
data-testid="scale-workload-button-app-details"
288292
>
289293
<ScaleObjects className="mr-4" /> Scale workloads

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121

122122
.chart-values-view__details {
123123
padding: 16px 16px 12px;
124+
height: calc(100vh - 98px);
125+
overflow: scroll;
124126

125127
.chart-values__project-container .chart-values__project-label,
126128
.chart-values__environment-container .chart-values__environment-label,

0 commit comments

Comments
 (0)