Remove lastName field from UserSettings and database
- Removed lastName from UserSettings interface - Updated UserSettingsForm to remove lastName input field - Removed lastName from all database operations - Updated form validation schema to remove lastName validation - Updated ViewLocationCard to use only firstName for recipient name - Removed lastName from user settings form state tracking - Updated Croatian translations to reflect changes 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -15,7 +15,6 @@ import * as IBAN from 'iban';
|
||||
export type State = {
|
||||
errors?: {
|
||||
firstName?: string[];
|
||||
lastName?: string[];
|
||||
street?: string[];
|
||||
town?: string[];
|
||||
iban?: string[];
|
||||
@@ -31,7 +30,6 @@ export type State = {
|
||||
*/
|
||||
const FormSchema = (t: IntlTemplateFn) => z.object({
|
||||
firstName: z.string().optional(),
|
||||
lastName: z.string().optional(),
|
||||
street: z.string().optional(),
|
||||
town: z.string().optional(),
|
||||
iban: z.string()
|
||||
@@ -57,15 +55,6 @@ const FormSchema = (t: IntlTemplateFn) => z.object({
|
||||
message: t("first-name-required"),
|
||||
path: ["firstName"],
|
||||
})
|
||||
.refine((data) => {
|
||||
if (data.show2dCodeInMonthlyStatement) {
|
||||
return !!data.lastName && data.lastName.trim().length > 0;
|
||||
}
|
||||
return true;
|
||||
}, {
|
||||
message: t("last-name-required"),
|
||||
path: ["lastName"],
|
||||
})
|
||||
.refine((data) => {
|
||||
if (data.show2dCodeInMonthlyStatement) {
|
||||
return !!data.street && data.street.trim().length > 0;
|
||||
@@ -148,7 +137,6 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
|
||||
|
||||
const validatedFields = FormSchema(t).safeParse({
|
||||
firstName: formData.get('firstName') || undefined,
|
||||
lastName: formData.get('lastName') || undefined,
|
||||
street: formData.get('street') || undefined,
|
||||
town: formData.get('town') || undefined,
|
||||
iban: formData.get('iban') || undefined,
|
||||
@@ -165,7 +153,7 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
|
||||
};
|
||||
}
|
||||
|
||||
const { firstName, lastName, street, town, iban, currency, show2dCodeInMonthlyStatement } = validatedFields.data;
|
||||
const { firstName, street, town, iban, currency, show2dCodeInMonthlyStatement } = validatedFields.data;
|
||||
|
||||
// Normalize IBAN: remove spaces and convert to uppercase
|
||||
const normalizedIban = iban ? iban.replace(/\s/g, '').toUpperCase() : null;
|
||||
@@ -177,7 +165,6 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
|
||||
const userSettings: UserSettings = {
|
||||
userId,
|
||||
firstName: firstName || null,
|
||||
lastName: lastName || null,
|
||||
street: street || null,
|
||||
town: town || null,
|
||||
iban: normalizedIban,
|
||||
|
||||
@@ -20,8 +20,6 @@ export interface UserSettings {
|
||||
userId: string;
|
||||
/** first name */
|
||||
firstName?: string | null;
|
||||
/** last name */
|
||||
lastName?: string | null;
|
||||
/** street */
|
||||
street?: string | null;
|
||||
/** town */
|
||||
|
||||
@@ -28,7 +28,6 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
|
||||
// Track current form values for real-time validation
|
||||
const [formValues, setFormValues] = useState({
|
||||
firstName: userSettings?.firstName ?? "",
|
||||
lastName: userSettings?.lastName ?? "",
|
||||
street: userSettings?.street ?? "",
|
||||
town: userSettings?.town ?? "",
|
||||
iban: formatIban(userSettings?.iban) ?? "",
|
||||
@@ -41,7 +40,7 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
|
||||
|
||||
// Check if any required field is missing (clean IBAN of spaces for validation)
|
||||
const cleanedIban = formValues.iban.replace(/\s/g, '');
|
||||
const hasMissingData = !formValues.firstName || !formValues.lastName || !formValues.street || !formValues.town || !cleanedIban || !formValues.currency;
|
||||
const hasMissingData = !formValues.firstName || !formValues.street || !formValues.town || !cleanedIban || !formValues.currency;
|
||||
|
||||
// Track whether to generate 2D code for tenant (use persisted value from database)
|
||||
const [show2dCodeInMonthlyStatement, setShow2dCodeInMonthlyStatement] = useState(
|
||||
@@ -94,30 +93,6 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="form-control w-full">
|
||||
<label className="label">
|
||||
<span className="label-text">{t("last-name-label")}</span>
|
||||
</label>
|
||||
<input
|
||||
id="lastName"
|
||||
name="lastName"
|
||||
type="text"
|
||||
placeholder={t("last-name-placeholder")}
|
||||
className="input input-bordered w-full placeholder:text-gray-600"
|
||||
defaultValue={userSettings?.lastName ?? ""}
|
||||
onChange={(e) => handleInputChange("lastName", e.target.value)}
|
||||
disabled={pending}
|
||||
/>
|
||||
<div id="lastName-error" aria-live="polite" aria-atomic="true">
|
||||
{errors?.lastName &&
|
||||
errors.lastName.map((error: string) => (
|
||||
<p className="mt-2 text-sm text-red-500" key={error}>
|
||||
{error}
|
||||
</p>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="form-control w-full">
|
||||
<label className="label">
|
||||
<span className="label-text">{t("street-label")} </span>
|
||||
|
||||
@@ -28,7 +28,7 @@ export const ViewLocationCard:FC<ViewLocationCardProps> = ({location, userSettin
|
||||
ImePlatitelja: tenantName ?? "",
|
||||
AdresaPlatitelja: tenantStreet ?? "",
|
||||
SjedistePlatitelja: tenantTown ?? "",
|
||||
Primatelj: (userSettings?.firstName && userSettings?.lastName) ? `${userSettings.firstName} ${userSettings.lastName}` : "",
|
||||
Primatelj: userSettings?.firstName ?? "",
|
||||
AdresaPrimatelja: userSettings?.street ?? "",
|
||||
SjedistePrimatelja: userSettings?.town ?? "",
|
||||
IBAN: userSettings?.iban ?? "",
|
||||
|
||||
Reference in New Issue
Block a user