Merge pull request #14691 from Mylanos/OCPBUGS-48548-The-secret-created-with-Basic-authentication-has-an-incorrect-type

OCPBUGS-48548: The secret created with Basic authentication has an incorrect type

Author: openshift-merge-bot[bot]

frontend/public/components/secrets/create-secret/SecretFormWrapper.tsx

@@ -21,13 +21,13 @@ import {
 import { SecretSubForm } from './SecretSubForm';
 
 export const SecretFormWrapper: React.FC<BaseEditSecretProps_> = (props) => {
-  const { isCreate, modal, onCancel } = props;
+  const { isCreate, modal, onCancel, secretTypeAbstraction } = props;
   const { t } = useTranslation();
   const navigate = useNavigate();
   const params = useParams();
 
   const existingSecret = _.pick(props.obj, ['metadata', 'type']);
-  const defaultSecretType = toDefaultSecretType(props.secretTypeAbstraction);
+  const defaultSecretType = toDefaultSecretType(secretTypeAbstraction);
   const initialSecret = _.defaultsDeep({}, props.fixed, existingSecret, {
     apiVersion: 'v1',
     data: {},
@@ -38,7 +38,6 @@ export const SecretFormWrapper: React.FC<BaseEditSecretProps_> = (props) => {
     type: defaultSecretType,
   });
 
-  const [secretTypeAbstraction] = React.useState(props.secretTypeAbstraction);
   const [secret, setSecret] = React.useState(initialSecret);
   const [inProgress, setInProgress] = React.useState(false);
   const [error, setError] = React.useState();

frontend/public/components/secrets/create-secret/utils.ts

@@ -42,7 +42,7 @@ export const determineSecretType = (stringData): SecretType => {
     return SecretType.dockercfg;
   } else if (_.isEqual(dataKeys, ['.dockerconfigjson'])) {
     return SecretType.dockerconfigjson;
-  } else if (_.isEqual(dataKeys, ['password', 'username'])) {
+  } else if (dataKeys.includes('password')) {
     return SecretType.basicAuth;
   } else if (_.isEqual(dataKeys, ['ssh-privatekey'])) {
     return SecretType.sshAuth;