Skip to content

Commit d880720

Browse files
committed
Merge branch 'main' into protection-config-dev
2 parents 59656e5 + d684f9c commit d880720

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/components/CIPipelineN/CustomImageTags.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ function CustomImageTags({
270270
</div>
271271
<div className="" style={{ width: '32px', height: '20px' }}>
272272
<Toggle
273-
disabled={window._env_.FORCE_SECURITY_SCANNING && formData.enableCustomTag}
274273
selected={formData.enableCustomTag}
275274
onSelect={handleCustomTagToggle}
276275
dataTestId="create-build-pipeline-custom-tag-enabled-toggle"

src/components/ConfigMapSecret/ConfigMapSecret.components.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,10 @@ export function ProtectedConfigMapSecretDetails({
740740

741741
export const convertToValidValue = (k: any): string => {
742742
if (k !== false && k !== true && k !== '' && !isNaN(Number(k))) {
743-
return Number(k).toString()
743+
//Note: all long integers & floating values in "double quotes" with spaces will be handled in this check
744+
// eg val: "123678765678756764\n" or val: "1234.67856756787676\n" or "1276767634.67856\n" to trim down \n
745+
const replacePattern = /\s/g
746+
return k.toString().replace(replacePattern, '')
744747
}
745748
return k.toString()
746749
}

0 commit comments

Comments
 (0)