Skip to content

Commit 50b689e

Browse files
committed
Display different UI messages in case the API key has expired
1 parent 9b9efa9 commit 50b689e

File tree

1 file changed

+36
-16
lines changed

1 file changed

+36
-16
lines changed

ui/src/components/Settings/ApiKeySettings.tsx

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ export default function ApiKeySettings() {
107107
const expiresAt =
108108
role.api_key_expires_at &&
109109
convertUTCDateToLocalDate(new Date(role.api_key_expires_at));
110+
const now = new Date();
111+
const hasExpired = expiresAt <= now;
110112

111113
return (
112114
<>
@@ -118,25 +120,43 @@ export default function ApiKeySettings() {
118120
/>
119121
</h4>
120122

121-
<p>
122-
{expiresAt && (
123-
<FormattedMessage
124-
id="settings.api_key.text_expiration"
125-
defaultMessage="Your API key will expire on {date}, {time}."
126-
values={{
127-
date: <FormattedDate value={expiresAt} />,
128-
time: <FormattedTime value={expiresAt} />,
129-
}}
130-
/>
131-
)}
132-
</p>
123+
{role.has_api_key && expiresAt && (
124+
<p>
125+
{hasExpired ? (
126+
<FormattedMessage
127+
id="settings.api_key.text_expired"
128+
defaultMessage="Your API key expired on {date}, {time}."
129+
values={{
130+
date: <FormattedDate value={expiresAt} />,
131+
time: <FormattedTime value={expiresAt} />,
132+
}}
133+
/>
134+
) : (
135+
<FormattedMessage
136+
id="settings.api_key.text_expiration"
137+
defaultMessage="Your API key will expire on {date}, {time}."
138+
values={{
139+
date: <FormattedDate value={expiresAt} />,
140+
time: <FormattedTime value={expiresAt} />,
141+
}}
142+
/>
143+
)}
144+
</p>
145+
)}
133146

134147
<p>
135148
{role.has_api_key ? (
136-
<FormattedMessage
137-
id="settings.api_key.text_regenerate"
138-
defaultMessage="When you regenerate your API key, your old key will stop working."
139-
/>
149+
hasExpired ? (
150+
<FormattedMessage
151+
id="settings.api_key.text_regenerate_expired"
152+
defaultMessage="Regenerate your API key in order to access the Aleph API."
153+
/>
154+
) : (
155+
<FormattedMessage
156+
id="settings.api_key.text_regenerate"
157+
defaultMessage="When you regenerate your API key, your old key will stop working."
158+
/>
159+
)
140160
) : (
141161
<FormattedMessage
142162
id="settings.api_key.text_generate"

0 commit comments

Comments
 (0)