@micha.bigler/ui-core-micha 3.8.0 → 3.9.1

package/src/components/ProfileComponent.jsx

@@ -18,6 +18,7 @@ import { useTranslation } from 'react-i18next';
 // WICHTIG: Importiere den Context, um die bereits geladenen Daten zu nutzen
 import { AuthContext } from '../auth/AuthContext'; 
 import { fetchCookieStatement, fetchPrivacyStatement } from '../auth/authApi';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export function ProfileComponent({
   onSubmit,
@@ -29,7 +30,7 @@ export function ProfileComponent({
   privacyStatementText = null,
   cookieStatementText = null,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   
   // WICHTIG: Wir holen den User direkt aus dem globalen State
   // Das verhindert den doppelten Request und den ReferenceError
@@ -140,7 +141,7 @@ export function ProfileComponent({
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error("Profile update error:", err);
-      setErrorKey(err.code || 'Auth.PROFILE_UPDATE_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Auth.PROFILE_UPDATE_FAILED'));
     } finally {
       setSaving(false);
     }
@@ -175,7 +176,7 @@ export function ProfileComponent({
     >
       {errorKey && (
         <Alert severity="error">
-          {t(errorKey)}
+          {errorKey}
         </Alert>
       )}
       {successKey && (

package/src/components/QrSignupManager.jsx

@@ -10,6 +10,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import { QRCodeSVG } from 'qrcode.react';
 import { createSignupQr } from '../auth/authApi';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export const QR_SIGNUP_MANAGER_ALERT_SX = { mb: 2 };
 
@@ -47,7 +48,7 @@ export function QrSignupManager({
   registrationContext = null,
   defaultMaxRedemptions = DEFAULT_MAX_REDEMPTIONS,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const qrWrapperRef = useRef(null);
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState('');
@@ -112,7 +113,7 @@ export function QrSignupManager({
       hasGeneratedRef.current = true;
       setSuccess(t('Auth.SIGNUP_QR_CREATE_SUCCESS', 'New QR signup link created.'));
     } catch (err) {
-      setError(t(err?.code || 'Auth.SIGNUP_QR_CREATE_FAILED', 'Could not create signup QR.'));
+      setError(resolveErrorText(i18n, err, 'Auth.SIGNUP_QR_CREATE_FAILED'));
     } finally {
       setBusy(false);
     }
@@ -158,7 +159,7 @@ export function QrSignupManager({
         setSuccess(t('Auth.SIGNUP_QR_CREATE_SUCCESS', 'New QR signup link created.'));
       } catch (err) {
         if (!active) return;
-        setError(t(err?.code || 'Auth.SIGNUP_QR_CREATE_FAILED', 'Could not create signup QR.'));
+        setError(resolveErrorText(i18n, err, 'Auth.SIGNUP_QR_CREATE_FAILED'));
       } finally {
         if (active) {
           setBusy(false);

package/src/components/QrSignupValidityManager.jsx

@@ -9,6 +9,7 @@ import {
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { updateAuthPolicy } from '../auth/authApi';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export const QR_SIGNUP_VALIDITY_ALERT_SX = { mb: 2 };
 export const QR_SIGNUP_VALIDITY_FIELD_SX = { flex: 1 };
@@ -30,7 +31,7 @@ export function QrSignupValidityManager({
   onPolicyChange,
   canEdit = true,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const [currentExpiryDays, setCurrentExpiryDays] = useState(String(expiryDays || DEFAULT_EXPIRY_DAYS));
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState('');
@@ -53,7 +54,7 @@ export function QrSignupValidityManager({
       setSuccess(t('Auth.AUTH_POLICY_SAVE_SUCCESS', 'Authentication settings saved.'));
       if (onPolicyChange) onPolicyChange(next);
     } catch (err) {
-      setError(t(err?.code || 'Auth.AUTH_POLICY_UPDATE_FAILED', 'Could not save authentication settings.'));
+      setError(resolveErrorText(i18n, err, 'Auth.AUTH_POLICY_UPDATE_FAILED'));
     } finally {
       setBusy(false);
     }

package/src/components/RegistrationMethodsManager.jsx

@@ -10,6 +10,7 @@ import {
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { updateAuthPolicy } from '../auth/authApi';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export const REGISTRATION_METHODS_ALERT_SX = { mb: 2 };
 export const REGISTRATION_METHODS_INFO_SX = { mt: 2 };
@@ -31,7 +32,7 @@ export function RegistrationMethodsManager({
   onPolicyChange,
   canEdit = true,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const [policyState, setPolicyState] = useState(EMPTY_POLICY);
   const [busyField, setBusyField] = useState('');
   const [saveError, setSaveError] = useState('');
@@ -57,7 +58,7 @@ export function RegistrationMethodsManager({
       if (onPolicyChange) onPolicyChange(next);
     } catch (err) {
       setPolicyState((prev) => ({ ...prev, [field]: previous }));
-      setSaveError(t(err?.code || 'Auth.AUTH_POLICY_UPDATE_FAILED', 'Could not save authentication settings.'));
+      setSaveError(resolveErrorText(i18n, err, 'Auth.AUTH_POLICY_UPDATE_FAILED'));
     } finally {
       setBusyField('');
     }

package/src/components/SecurityComponent.jsx

@@ -14,6 +14,7 @@ import { MFAComponent } from './MFAComponent';
 import { changePassword } from '../auth/authApi';
 import { startSocialLogin } from '../utils/authService';
 import { AuthContext } from '../auth/AuthContext';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export const SECURITY_ALERT_SX = { mb: 2 };
 export const SECURITY_DIVIDER_SX = { my: 3 };
@@ -22,7 +23,7 @@ export function SecurityComponent({
   fromRecovery = false,
   fromWeakLogin = false,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const { authMethods } = useContext(AuthContext);
 
   const [messageKey, setMessageKey] = useState(null);
@@ -60,7 +61,7 @@ export function SecurityComponent({
         callbackUrl: `${window.location.origin}/account?tab=security`,
       });
     } catch (err) {
-      setErrorKey(err.code || 'Auth.SOCIAL_LOGIN_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Auth.SOCIAL_LOGIN_FAILED'));
     }
   };
 
@@ -71,7 +72,7 @@ export function SecurityComponent({
       await changePassword(currentPassword, newPassword);
       setMessageKey('Auth.RESET_PASSWORD_SUCCESS');
     } catch (err) {
-      setErrorKey(err.code || 'Auth.PASSWORD_CHANGE_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Auth.PASSWORD_CHANGE_FAILED'));
     }
   };
 
@@ -96,7 +97,7 @@ export function SecurityComponent({
       )}
       {errorKey && (
         <Alert severity="error" sx={SECURITY_ALERT_SX}>
-          {t(errorKey)}
+          {errorKey}
         </Alert>
       )}
 

package/src/components/SupportRecoveryRequestsTab.jsx

@@ -24,6 +24,7 @@ import {
 } from '@mui/material';
 import CloseIcon from '@mui/icons-material/Close';
 import { useTranslation } from 'react-i18next';
+import { resolveErrorText } from '../utils/resolveErrorText';
 import { AuthContext } from '../auth/AuthContext';
 import {
   approveRecoveryRequest,
@@ -63,7 +64,7 @@ export function SupportRecoveryRequestsTab() {
       const data = await fetchRecoveryRequests(statusFilter);
       setRequests(Array.isArray(data) ? data : []);
     } catch (err) {
-      setErrorKey(err.code || 'Support.RECOVERY_REQUESTS_LOAD_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Support.RECOVERY_REQUESTS_LOAD_FAILED'));
     } finally {
       setLoading(false);
     }
@@ -88,7 +89,7 @@ export function SupportRecoveryRequestsTab() {
       });
       setAllUsers(list);
     } catch (err) {
-      setAgentErrorKey(err.code || 'Auth.USER_LIST_FAILED');
+    setAgentErrorKey(resolveErrorText(i18n, err, 'Auth.USER_LIST_FAILED'));
     } finally {
       setAgentLoading(false);
     }
@@ -124,7 +125,7 @@ export function SupportRecoveryRequestsTab() {
       await loadRequests();
       closeDialog();
     } catch (err) {
-      setErrorKey(err.code || 'Support.RECOVERY_REQUEST_APPROVE_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Support.RECOVERY_REQUEST_APPROVE_FAILED'));
     }
   };
 
@@ -136,7 +137,7 @@ export function SupportRecoveryRequestsTab() {
       await loadRequests();
       closeDialog();
     } catch (err) {
-      setErrorKey(err.code || 'Support.RECOVERY_REQUEST_REJECT_FAILED');
+      setErrorKey(resolveErrorText(i18n, err, 'Support.RECOVERY_REQUEST_REJECT_FAILED'));
     }
   };
 
@@ -167,7 +168,7 @@ export function SupportRecoveryRequestsTab() {
       setSelectedAgentCandidate(null);
       await loadUsers();
     } catch (err) {
-      setAgentErrorKey(err.code || 'Auth.USER_SUPPORT_UPDATE_FAILED');
+      setAgentErrorKey(resolveErrorText(i18n, err, 'Auth.USER_SUPPORT_UPDATE_FAILED'));
     } finally {
       setAgentActionUserId(null);
     }
@@ -185,7 +186,7 @@ export function SupportRecoveryRequestsTab() {
       }
       await loadUsers();
     } catch (err) {
-      setAgentErrorKey(err.code || 'Auth.USER_SUPPORT_UPDATE_FAILED');
+      setAgentErrorKey(resolveErrorText(i18n, err, 'Auth.USER_SUPPORT_UPDATE_FAILED'));
     } finally {
       setAgentActionUserId(null);
     }
@@ -216,7 +217,7 @@ export function SupportRecoveryRequestsTab() {
 
           {agentErrorKey && (
             <Alert severity="error" sx={SUPPORT_RECOVERY_ALERT_SX}>
-              {t(agentErrorKey)}
+              {agentErrorKey}
             </Alert>
           )}
 
@@ -310,7 +311,7 @@ export function SupportRecoveryRequestsTab() {
 
       {errorKey && (
         <Alert severity="error" sx={SUPPORT_RECOVERY_ALERT_SX}>
-          {t(errorKey)}
+          {errorKey}
         </Alert>
       )}
 

package/src/components/UserInviteComponent.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Box, TextField, Button, Typography, Alert, CircularProgress } from '@mui/material';
 import { sendAdminInvite } from '../auth/authApi';
 import { useTranslation } from 'react-i18next';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 export const USER_INVITE_ACTION_SX = {
   minWidth: 120,
@@ -11,7 +12,7 @@ export const USER_INVITE_ACTION_SX = {
 export const USER_INVITE_ALERT_SX = { mb: 2 };
 
 export function UserInviteComponent() { // FIX: Removed apiUrl prop
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const [inviteEmail, setInviteEmail] = useState('');
   const [message, setMessage] = useState('');
   const [error, setError] = useState('');
@@ -31,7 +32,7 @@ export function UserInviteComponent() { // FIX: Removed apiUrl prop
       // err.message contains normalized text or code from authApi
       // eslint-disable-next-line no-console
       console.error('Error inviting user:', err);
-      setError(t(err.code) || err.message || t('Auth.INVITE_FAILED'));
+      setError(resolveErrorText(i18n, err, 'Auth.INVITE_FAILED'));
     } finally {
         setLoading(false);
     }

package/src/components/UserListComponent.jsx

@@ -24,6 +24,7 @@ import CancelIcon from '@mui/icons-material/Cancel';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { useTranslation } from 'react-i18next';
 import { fetchUsersList, deleteUser, updateUserRole } from '../auth/authApi';
+import { resolveErrorText } from '../utils/resolveErrorText';
 
 const DEFAULT_ROLES = ['none', 'student', 'teacher', 'admin'];
 
@@ -49,7 +50,7 @@ export function UserListComponent({
     canDeleteUser = null,
     onDeleteUser = null,
 }) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const [users, setUsers] = useState([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
@@ -75,7 +76,7 @@ export function UserListComponent({
       });
       setUsers(list);
     } catch (err) {
-      setError(err.code || 'Auth.USER_LIST_FAILED');
+      setError(resolveErrorText(i18n, err, 'Auth.USER_LIST_FAILED'));
     } finally {
       setLoading(false);
     }
@@ -99,7 +100,7 @@ export function UserListComponent({
       }
       setUsers(prev => prev.filter(u => u.id !== userId));
     } catch (err) {
-      alert(t(err.code || 'Auth.USER_DELETE_FAILED'));
+      alert(resolveErrorText(i18n, err, 'Auth.USER_DELETE_FAILED'));
     }
   };
 
@@ -120,7 +121,7 @@ export function UserListComponent({
       await loadUsers();
       alert(t('UserList.ROLE_UPDATE_SUCCESS', 'Role updated.'));
     } catch (err) {
-      alert(t(err.code || 'Auth.USER_ROLE_UPDATE_FAILED'));
+      alert(resolveErrorText(i18n, err, 'Auth.USER_ROLE_UPDATE_FAILED'));
     }
   };
 
@@ -154,6 +155,11 @@ export function UserListComponent({
     return canEdit(targetUser);
   };
 
+  const isOwnRow = (targetUser) => {
+    if (currentUser?.id == null || targetUser?.id == null) return false;
+    return String(targetUser.id) === String(currentUser.id);
+  };
+
   const listContext = useMemo(() => ({
     currentUser,
     extraContext,
@@ -276,7 +282,7 @@ export function UserListComponent({
       });
     } catch (err) {
       // eslint-disable-next-line no-alert
-      alert(err?.message || t('Common.OPERATION_FAILED', 'Operation failed.'));
+      alert(resolveErrorText(i18n, err, 'Common.OPERATION_FAILED'));
     } finally {
       setRowActionLoading((prev) => ({ ...prev, [actionId]: false }));
     }
@@ -434,7 +440,7 @@ export function UserListComponent({
             );
           })}
 
-          {showDeleteAction && (
+          {showDeleteAction && !isOwnRow(row) && (
             <Tooltip title={t('Common.DELETE', 'Delete')}>
               <span>
                 <Button
@@ -472,6 +478,7 @@ export function UserListComponent({
     loadUsers,
     canEdit,
     canDelete,
+    isOwnRow,
   ]);
 
   const sortedUsers = useMemo(() => {
@@ -514,7 +521,7 @@ export function UserListComponent({
         />
       </Box>
 
-      {error && <Alert severity="error" sx={USER_LIST_ALERT_SX}>{t(error)}</Alert>}
+      {error && <Alert severity="error" sx={USER_LIST_ALERT_SX}>{error}</Alert>}
 
       {loading && (
         <Box sx={{ display: 'flex', justifyContent: 'center', p: 3 }}>