Skip to content

Commit 74d4999

Browse files
committed
feat: hide user name password for anonymous
1 parent 71c1c36 commit 74d4999

File tree

1 file changed

+36
-34
lines changed

1 file changed

+36
-34
lines changed

src/components/dockerRegistry/Docker.tsx

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,45 +1636,47 @@ const DockerForm = ({
16361636
handleChangeOtherRegistryAuthType={handleChangeOtherRegistryAuthType}
16371637
/>
16381638
)}
1639-
<div className={`${isGCROrGCP ? '' : 'form__row--two-third'}`}>
1640-
<div className="form__row">
1641-
<CustomInput
1642-
name="username"
1643-
required={isUserNamePasswordRequired}
1644-
value={customState.username.value || selectedDockerRegistryType.id.defaultValue}
1645-
error={customState.username.error}
1646-
onChange={customHandleChange}
1647-
label={selectedDockerRegistryType.id.label}
1648-
disabled={!!selectedDockerRegistryType.id.defaultValue}
1649-
placeholder={
1650-
selectedDockerRegistryType.id.placeholder
1651-
? selectedDockerRegistryType.id.placeholder
1652-
: 'Enter username'
1653-
}
1654-
/>
1655-
</div>
1656-
<div className="form__row">
1657-
{(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
1658-
selectedDockerRegistryType.value === RegistryType.ACR ||
1659-
selectedDockerRegistryType.value === RegistryType.QUAY ||
1660-
selectedDockerRegistryType.value === RegistryType.OTHER) && (
1661-
<PasswordField
1662-
shouldShowDefaultPlaceholderOnBlur={!!id}
1663-
name="password"
1664-
required={isUserNamePasswordRequired}
1665-
value={customState.password.value}
1666-
error={customState.password.error}
1639+
{isUserNamePasswordRequired && (
1640+
<div className={`${isGCROrGCP ? '' : 'form__row--two-third'}`}>
1641+
<div className="form__row">
1642+
<CustomInput
1643+
name="username"
1644+
required
1645+
value={customState.username.value || selectedDockerRegistryType.id.defaultValue}
1646+
error={customState.username.error}
16671647
onChange={customHandleChange}
1668-
label={selectedDockerRegistryType.password.label}
1648+
label={selectedDockerRegistryType.id.label}
1649+
disabled={!!selectedDockerRegistryType.id.defaultValue}
16691650
placeholder={
1670-
selectedDockerRegistryType.password.placeholder
1671-
? selectedDockerRegistryType.password.placeholder
1672-
: 'Enter password/token'
1651+
selectedDockerRegistryType.id.placeholder
1652+
? selectedDockerRegistryType.id.placeholder
1653+
: 'Enter username'
16731654
}
16741655
/>
1675-
)}
1656+
</div>
1657+
<div className="form__row">
1658+
{(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
1659+
selectedDockerRegistryType.value === RegistryType.ACR ||
1660+
selectedDockerRegistryType.value === RegistryType.QUAY ||
1661+
selectedDockerRegistryType.value === RegistryType.OTHER) && (
1662+
<PasswordField
1663+
shouldShowDefaultPlaceholderOnBlur={!!id}
1664+
name="password"
1665+
required
1666+
value={customState.password.value}
1667+
error={customState.password.error}
1668+
onChange={customHandleChange}
1669+
label={selectedDockerRegistryType.password.label}
1670+
placeholder={
1671+
selectedDockerRegistryType.password.placeholder
1672+
? selectedDockerRegistryType.password.placeholder
1673+
: 'Enter password/token'
1674+
}
1675+
/>
1676+
)}
1677+
</div>
16761678
</div>
1677-
</div>
1679+
)}
16781680
{isGCROrGCP && (
16791681
<Textarea
16801682
label={selectedDockerRegistryType.password.label}

0 commit comments

Comments
 (0)