Skip to content

Commit 39aa767

Browse files
agatha197agatha197
committed
Apply suggestions from code review
1 parent babfc2f commit 39aa767

File tree

24 files changed

+89
-129
lines changed

24 files changed

+89
-129
lines changed

‎packages/backend.ai-ui/src/components/Table/BAITable.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ const BAITable = <RecordType extends object = any>({
365365
{tableProps.pagination !== false && (
366366
<BAIFlex justify="end" gap={'xs'}>
367367
<Pagination
368-
size={tableProps.size === 'small' ? 'small' : 'default'}
368+
size={tableProps.pagination?.size || 'small'}
369369
align="end"
370370
pageSizeOptions={['10', '20', '50']}
371371
showSizeChanger={true}

‎packages/backend.ai-ui/src/components/fragments/BAIHuggingFaceRegistrySettingModal.tsx‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { BAIHuggingFaceRegistrySettingModalFragment$key } from '../../__generated__/BAIHuggingFaceRegistrySettingModalFragment.graphql';
2+
import { UpdateHuggingFaceRegistryInput } from '../../__generated__/BAIHuggingFaceRegistrySettingModalMutation.graphql';
23
import { toLocalId } from '../../helper';
4+
import { useErrorMessageResolver } from '../../hooks';
35
import BAIFlex from '../BAIFlex';
46
import BAIModal, { BAIModalProps } from '../BAIModal';
57
import BAIUnmountAfterClose from '../BAIUnmountAfterClose';
@@ -14,17 +16,17 @@ export type BAIHuggingFaceRegistrySettingModalFragmentKey =
1416

1517
export interface BAIHuggingFaceRegistrySettingModalProps extends BAIModalProps {
1618
huggingFaceRegistryFragment?: BAIHuggingFaceRegistrySettingModalFragmentKey;
17-
onRequestClose?: (success?: boolean) => void;
1819
}
1920

2021
const BAIHuggingFaceRegistrySettingModal = ({
2122
huggingFaceRegistryFragment,
22-
onRequestClose,
2323
...baiModalProps
2424
}: BAIHuggingFaceRegistrySettingModalProps) => {
2525
'use memo';
2626
const { t } = useTranslation();
2727
const { message, modal } = App.useApp();
28+
const { getErrorMessage } = useErrorMessageResolver();
29+
2830
const formRef = useRef<FormInstance>(null);
2931

3032
const huggingFaceRegistry = useFragment(
@@ -56,34 +58,26 @@ const BAIHuggingFaceRegistrySettingModal = ({
5658

5759
const hasToken = initialToken && initialToken.length > 0;
5860

59-
const executeUpdate = (values: any) => {
61+
const executeUpdate = (values: UpdateHuggingFaceRegistryInput) => {
6062
updateHuggingFaceRegistry({
6163
variables: {
6264
input: {
6365
id: toLocalId(huggingFaceRegistry!.id),
64-
token: values.token,
66+
token: values.token ?? '',
6567
},
6668
},
6769
onCompleted: (_res, errors) => {
6870
if (errors && errors.length > 0) {
69-
errors.forEach((err) =>
70-
message.error(
71-
err.message ??
72-
t('comp:HuggingFaceRegistrySettingModal.FailedToUpdateToken'),
73-
),
74-
);
71+
errors.forEach((err) => message.error(getErrorMessage(err)));
7572
return;
7673
}
7774
message.success(
7875
t('comp:HuggingFaceRegistrySettingModal.TokenUpdatedSuccessfully'),
7976
);
80-
onRequestClose?.(true);
77+
baiModalProps.onOk?.({} as React.MouseEvent<HTMLButtonElement>);
8178
},
8279
onError: (err) => {
83-
message.error(
84-
err.message ??
85-
t('comp:HuggingFaceRegistrySettingModal.FailedToUpdateToken'),
86-
);
80+
message.error(getErrorMessage(err));
8781
},
8882
});
8983
};
@@ -96,11 +90,19 @@ const BAIHuggingFaceRegistrySettingModal = ({
9690
return;
9791
}
9892

93+
if (hasToken && !isEditing) {
94+
// If not editing, no need to update
95+
message.success(
96+
t('comp:HuggingFaceRegistrySettingModal.NoChangesToSave'),
97+
);
98+
baiModalProps.onOk?.({} as React.MouseEvent<HTMLButtonElement>);
99+
return;
100+
}
101+
99102
formRef.current
100103
?.validateFields()
101104
.then((values) => {
102105
// Check if current token exists and is empty string, but new token is not empty
103-
104106
if (hasToken && !values.token) {
105107
modal.confirm({
106108
title: t('comp:HuggingFaceRegistrySettingModal.ResetTokenConfirm'),
@@ -114,7 +116,7 @@ const BAIHuggingFaceRegistrySettingModal = ({
114116
// Don't proceed with update
115117
},
116118
okButtonProps: { danger: true },
117-
okText: t('button.Reset'),
119+
okText: t('general.button.Reset'),
118120
});
119121
} else {
120122
executeUpdate(values);
@@ -128,15 +130,14 @@ const BAIHuggingFaceRegistrySettingModal = ({
128130
<BAIModal
129131
destroyOnHidden
130132
afterClose={() => setIsEditing(false)}
133+
{...baiModalProps}
131134
title={t('comp:HuggingFaceRegistrySettingModal.HuggingFaceSettings')}
132135
centered
133-
okText={t('button.Save')}
136+
okText={t('general.button.Save')}
134137
onOk={handleOk}
135-
onCancel={() => onRequestClose?.(false)}
136138
okButtonProps={{
137139
loading: isInflightUpdateHuggingFaceRegistry,
138140
}}
139-
{...baiModalProps}
140141
>
141142
<Form ref={formRef} layout="vertical">
142143
<Form.Item

‎packages/backend.ai-ui/src/locale/de.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Zurücksetzen",
5-
"Save": "Speichern"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Aktivieren",
95
"ActivateArtifacts": "Artefakte aktivieren",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "Das Token konnte nicht aktualisiert werden.",
144139
"HuggingFaceRegistryNotFound": "Hugging Face-Registrierung nicht gefunden.",
145140
"HuggingFaceSettings": "Einstellungen für Hugging Face.",
141+
"NoChangesToSave": "Keine Änderungen zum Speichern",
146142
"ResetTokenConfirm": "Token zurücksetzen",
147143
"ResetTokenConfirmMessage": "Der Token scheint leer zu sein. \nMöchten Sie es mit einem neuen Wert initialisieren?",
148144
"Token": "Token",
@@ -169,6 +165,8 @@
169165
"Delete": "Löschen",
170166
"Expand": "Expandieren",
171167
"Remove": "Entfernen",
168+
"Reset": "Zurücksetzen",
169+
"Save": "Speichern",
172170
"Upload": "Hochladen"
173171
},
174172
"modal": {

‎packages/backend.ai-ui/src/locale/el.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Επαναφορά",
5-
"Save": "Εκτός"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Δραστηριοποιώ",
95
"ActivateArtifacts": "Ενεργοποιήστε αντικείμενα",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "Η ενημέρωση του διακριτικού απέτυχε.",
144139
"HuggingFaceRegistryNotFound": "Το μητρώο Hugging Face δεν βρέθηκε.",
145140
"HuggingFaceSettings": "Ρυθμίσεις Hugging Face",
141+
"NoChangesToSave": "Δεν υπάρχουν αλλαγές για αποθήκευση",
146142
"ResetTokenConfirm": "Επαναφορά διακριτικού",
147143
"ResetTokenConfirmMessage": "Το διακριτικό φαίνεται να είναι κενό. \nΘέλετε να το αρχικοποιήσετε με μια νέα τιμή;",
148144
"Token": "Ενδειξη",
@@ -169,6 +165,8 @@
169165
"Delete": "Διαγράφω",
170166
"Expand": "Διαστέλλω",
171167
"Remove": "Αφαιρώ",
168+
"Reset": "Επαναφορά",
169+
"Save": "Αποθήκευση",
172170
"Upload": "Μεταφορτώσω"
173171
},
174172
"modal": {

‎packages/backend.ai-ui/src/locale/en.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Reset",
5-
"Save": "Save"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Activate",
95
"ActivateArtifacts": "Activate Artifacts",
@@ -144,9 +140,9 @@
144140
},
145141
"comp:HuggingFaceRegistrySettingModal": {
146142
"EnterToken": "Enter your HuggingFace token",
147-
"FailedToUpdateToken": "Failed to update token.",
148143
"HuggingFaceRegistryNotFound": "Hugging Face Registry not found.",
149144
"HuggingFaceSettings": "Hugging Face Settings",
145+
"NoChangesToSave": "No changes to save",
150146
"ResetTokenConfirm": "Reset Token",
151147
"ResetTokenConfirmMessage": "The token appears to be empty. Would you like to initialize it with a new value?",
152148
"Token": "Token",
@@ -173,6 +169,8 @@
173169
"Delete": "Delete",
174170
"Expand": "Expand",
175171
"Remove": "Remove",
172+
"Reset": "Reset",
173+
"Save": "Save",
176174
"Upload": "Upload"
177175
},
178176
"modal": {

‎packages/backend.ai-ui/src/locale/es.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Reiniciar",
5-
"Save": "Ahorrar"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Activar",
95
"ActivateArtifacts": "Activar artefactos",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "No se pudo actualizar el token.",
144139
"HuggingFaceRegistryNotFound": "Hugging Face Registro no encontrado.",
145140
"HuggingFaceSettings": "Configuración de Hugging Face",
141+
"NoChangesToSave": "No hay cambios que guardar",
146142
"ResetTokenConfirm": "Restablecer token",
147143
"ResetTokenConfirmMessage": "El token parece estar vacío. \n¿Le gustaría inicializarlo con un nuevo valor?",
148144
"Token": "Simbólico",
@@ -169,6 +165,8 @@
169165
"Delete": "Borrar",
170166
"Expand": "Expandir",
171167
"Remove": "Eliminar",
168+
"Reset": "Reiniciar",
169+
"Save": "Ahorrar",
172170
"Upload": "Subir"
173171
},
174172
"modal": {

‎packages/backend.ai-ui/src/locale/fi.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Nollaa",
5-
"Save": "Tallentaa"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Aktivoida",
95
"ActivateArtifacts": "Aktivoida esineitä",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "Tunnusteen päivittäminen epäonnistui.",
144139
"HuggingFaceRegistryNotFound": "Hugging Face-rekisteriä ei löydy.",
145140
"HuggingFaceSettings": "Halaavat kasvot -asetukset",
141+
"NoChangesToSave": "Ei tallennettavia muutoksia",
146142
"ResetTokenConfirm": "Reset Token",
147143
"ResetTokenConfirmMessage": "Tunnus näyttää olevan tyhjä. \nHaluatko alustaa sen uudella arvolla?",
148144
"Token": "Token",
@@ -169,6 +165,8 @@
169165
"Delete": "Poistaa",
170166
"Expand": "Laajentaa",
171167
"Remove": "Poistaa",
168+
"Reset": "Nollaa",
169+
"Save": "Tallentaa",
172170
"Upload": "Ladata"
173171
},
174172
"modal": {

‎packages/backend.ai-ui/src/locale/fr.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Réinitialiser",
5-
"Save": "Sauvegarder"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Activer",
95
"ActivateArtifacts": "Activer les artefacts",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "Échec de la mise à jour du jeton.",
144139
"HuggingFaceRegistryNotFound": "Registre Hugging Face introuvable.",
145140
"HuggingFaceSettings": "Paramètres Hugging Face",
141+
"NoChangesToSave": "Aucune modification à enregistrer",
146142
"ResetTokenConfirm": "Réinitialiser le jeton",
147143
"ResetTokenConfirmMessage": "Le jeton semble vide. \nSouhaitez-vous l'initialiser avec une nouvelle valeur ?",
148144
"Token": "Jeton",
@@ -169,6 +165,8 @@
169165
"Delete": "Supprimer",
170166
"Expand": "Développer",
171167
"Remove": "Retirer",
168+
"Reset": "Réinitialiser",
169+
"Save": "Sauvegarder",
172170
"Upload": "Télécharger"
173171
},
174172
"modal": {

‎packages/backend.ai-ui/src/locale/id.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Mengatur ulang"
5-
},
63
"comp:BAIActivateArtifactsModal": {
74
"Activate": "Mengaktifkan",
85
"ActivateArtifacts": "Aktifkan artefak",
@@ -139,8 +136,8 @@
139136
}
140137
},
141138
"comp:HuggingFaceRegistrySettingModal": {
142-
"FailedToUpdateToken": "Gagal memperbarui token.",
143139
"HuggingFaceRegistryNotFound": "Registri Wajah Memeluk tidak ditemukan.",
140+
"NoChangesToSave": "Tidak ada perubahan untuk disimpan",
144141
"ResetTokenConfirm": "Setel Ulang Token",
145142
"ResetTokenConfirmMessage": "Tokennya tampaknya kosong. \nApakah Anda ingin menginisialisasinya dengan nilai baru?",
146143
"TokenUpdatedSuccessfully": "Token berhasil diperbarui."
@@ -166,6 +163,8 @@
166163
"Delete": "Menghapus",
167164
"Expand": "Memperluas",
168165
"Remove": "Menghapus",
166+
"Reset": "Mengatur ulang",
167+
"Save": "Simpan",
169168
"Upload": "Mengunggah"
170169
},
171170
"modal": {

‎packages/backend.ai-ui/src/locale/it.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "../../i18n.schema.json",
3-
"button": {
4-
"Reset": "Reset",
5-
"Save": "Salva"
6-
},
73
"comp:BAIActivateArtifactsModal": {
84
"Activate": "Attivare",
95
"ActivateArtifacts": "Attivare artefatti",
@@ -140,9 +136,9 @@
140136
}
141137
},
142138
"comp:HuggingFaceRegistrySettingModal": {
143-
"FailedToUpdateToken": "Impossibile aggiornare il token.",
144139
"HuggingFaceRegistryNotFound": "Registro Hugging Face non trovato.",
145140
"HuggingFaceSettings": "Impostazioni Hugging Face.",
141+
"NoChangesToSave": "Nessuna modifica da salvare",
146142
"ResetTokenConfirm": "Reimposta gettone",
147143
"ResetTokenConfirmMessage": "Il token sembra essere vuoto. \nDesideri inizializzarlo con un nuovo valore?",
148144
"Token": "Gettone",
@@ -169,6 +165,8 @@
169165
"Delete": "Eliminare",
170166
"Expand": "Espandere",
171167
"Remove": "Rimuovere",
168+
"Reset": "Reset",
169+
"Save": "Salva",
172170
"Upload": "Caricamento"
173171
},
174172
"modal": {

0 commit comments

Comments
 (0)