Skip to content
This repository was archived by the owner on May 13, 2024. It is now read-only.

Commit 6293299

Browse files
Hubert KosterHubert Koster
authored andcommitted
chore: fixing some bugs
1 parent 645764d commit 6293299

File tree

1 file changed

+25
-13
lines changed
  • src/features/dashboard/components/ApiTokenForm/CreateTokenField

1 file changed

+25
-13
lines changed

src/features/dashboard/components/ApiTokenForm/CreateTokenField/index.tsx

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,30 @@ const CreateTokenField = ({
4848
const tokens_limit_reached = tokens.length === 30 && Object.keys(errors).length === 0;
4949
const token_name_exists =
5050
getTokenNames.includes(input_value.toLowerCase()) && Object.keys(errors).length === 0;
51-
const has_no_errors = Object.values(errors).length === 0;
52-
const disable_button = token_name_exists || Object.keys(errors).length > 0 || input_value === '';
53-
const error_border_active = token_name_exists || errors.name;
51+
const has_custom_errors = token_name_exists || (tokens_limit_reached && input_value !== '');
52+
const has_no_errors = Object.values(errors).length === 0 && !has_custom_errors;
53+
const disable_button =
54+
token_name_exists || Object.keys(errors).length > 0 || input_value === '' || has_custom_errors;
55+
const error_border_active = token_name_exists || errors.name || has_custom_errors;
56+
57+
const CustomErrors = () => {
58+
if (token_name_exists) {
59+
return (
60+
<div className='error-message'>
61+
<p>That name is taken. Choose another.</p>
62+
</div>
63+
);
64+
}
65+
if (tokens_limit_reached && input_value !== '') {
66+
return (
67+
<div className='error-message'>
68+
<p>You&apos;ve reached 30 tokens creation limit.</p>
69+
</div>
70+
);
71+
}
72+
73+
return <></>;
74+
};
5475

5576
return (
5677
<React.Fragment>
@@ -84,16 +105,7 @@ const CreateTokenField = ({
84105
{errors.name.message}
85106
</Text>
86107
)}
87-
{token_name_exists && (
88-
<div className='error-message'>
89-
<p>That name is taken. Choose another.</p>
90-
</div>
91-
)}
92-
{tokens_limit_reached && input_value !== '' && (
93-
<div className='error-message'>
94-
<p>You&apos;ve reached 30 tokens creation limit.</p>
95-
</div>
96-
)}
108+
<CustomErrors />
97109
{has_no_errors && (
98110
<div className={styles.helperText}>
99111
<ul>

0 commit comments

Comments
 (0)