Rename 'street' to 'ownerStreet' in UserSettings with 25 character max length

Changes:
- Updated UserSettings interface: street -> ownerStreet
- Updated userSettingsActions.ts:
  - Changed State type to use ownerStreet
  - Added max length validation (25 characters) to FormSchema
  - Updated validation refinement to check ownerStreet
  - Updated form data parsing to read ownerStreet
  - Updated database write operations to use ownerStreet
- Updated UserSettingsForm.tsx:
  - Changed state tracking to use ownerStreet
  - Updated validation check to reference ownerStreet
  - Updated input field: id, name, maxLength={25}
- Updated ViewLocationCard.tsx to use ownerStreet instead of street
- Updated English translations:
  - street-label -> owner-street-label: "Your Street and House Number"
  - street-placeholder -> owner-street-placeholder
  - street-required -> owner-street-required
- Updated Croatian translations with corresponding ownerStreet keys

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Knee Cola
2025-11-22 22:37:04 +01:00
parent db1df76ed6
commit 387b7e0256
6 changed files with 29 additions and 28 deletions

View File

@@ -15,7 +15,7 @@ import * as IBAN from 'iban';
export type State = { export type State = {
errors?: { errors?: {
ownerName?: string[]; ownerName?: string[];
street?: string[]; ownerStreet?: string[];
town?: string[]; town?: string[];
iban?: string[]; iban?: string[];
currency?: string[]; currency?: string[];
@@ -30,7 +30,7 @@ export type State = {
*/ */
const FormSchema = (t: IntlTemplateFn) => z.object({ const FormSchema = (t: IntlTemplateFn) => z.object({
ownerName: z.string().max(25).optional(), ownerName: z.string().max(25).optional(),
street: z.string().optional(), ownerStreet: z.string().max(25).optional(),
town: z.string().optional(), town: z.string().optional(),
iban: z.string() iban: z.string()
.optional() .optional()
@@ -57,12 +57,12 @@ const FormSchema = (t: IntlTemplateFn) => z.object({
}) })
.refine((data) => { .refine((data) => {
if (data.show2dCodeInMonthlyStatement) { if (data.show2dCodeInMonthlyStatement) {
return !!data.street && data.street.trim().length > 0; return !!data.ownerStreet && data.ownerStreet.trim().length > 0;
} }
return true; return true;
}, { }, {
message: t("street-required"), message: t("owner-street-required"),
path: ["street"], path: ["ownerStreet"],
}) })
.refine((data) => { .refine((data) => {
if (data.show2dCodeInMonthlyStatement) { if (data.show2dCodeInMonthlyStatement) {
@@ -137,7 +137,7 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
const validatedFields = FormSchema(t).safeParse({ const validatedFields = FormSchema(t).safeParse({
ownerName: formData.get('ownerName') || undefined, ownerName: formData.get('ownerName') || undefined,
street: formData.get('street') || undefined, ownerStreet: formData.get('ownerStreet') || undefined,
town: formData.get('town') || undefined, town: formData.get('town') || undefined,
iban: formData.get('iban') || undefined, iban: formData.get('iban') || undefined,
currency: formData.get('currency') || undefined, currency: formData.get('currency') || undefined,
@@ -153,7 +153,7 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
}; };
} }
const { ownerName, street, town, iban, currency, show2dCodeInMonthlyStatement } = validatedFields.data; const { ownerName, ownerStreet, town, iban, currency, show2dCodeInMonthlyStatement } = validatedFields.data;
// Normalize IBAN: remove spaces and convert to uppercase // Normalize IBAN: remove spaces and convert to uppercase
const normalizedIban = iban ? iban.replace(/\s/g, '').toUpperCase() : null; const normalizedIban = iban ? iban.replace(/\s/g, '').toUpperCase() : null;
@@ -165,7 +165,7 @@ export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevS
const userSettings: UserSettings = { const userSettings: UserSettings = {
userId, userId,
ownerName: ownerName || null, ownerName: ownerName || null,
street: street || null, ownerStreet: ownerStreet || null,
town: town || null, town: town || null,
iban: normalizedIban, iban: normalizedIban,
currency: currency || null, currency: currency || null,

View File

@@ -20,8 +20,8 @@ export interface UserSettings {
userId: string; userId: string;
/** owner name */ /** owner name */
ownerName?: string | null; ownerName?: string | null;
/** street */ /** owner street */
street?: string | null; ownerStreet?: string | null;
/** town */ /** town */
town?: string | null; town?: string | null;
/** IBAN */ /** IBAN */

View File

@@ -28,7 +28,7 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
// Track current form values for real-time validation // Track current form values for real-time validation
const [formValues, setFormValues] = useState({ const [formValues, setFormValues] = useState({
ownerName: userSettings?.ownerName ?? "", ownerName: userSettings?.ownerName ?? "",
street: userSettings?.street ?? "", ownerStreet: userSettings?.ownerStreet ?? "",
town: userSettings?.town ?? "", town: userSettings?.town ?? "",
iban: formatIban(userSettings?.iban) ?? "", iban: formatIban(userSettings?.iban) ?? "",
currency: userSettings?.currency ?? "EUR", currency: userSettings?.currency ?? "EUR",
@@ -40,7 +40,7 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
// Check if any required field is missing (clean IBAN of spaces for validation) // Check if any required field is missing (clean IBAN of spaces for validation)
const cleanedIban = formValues.iban.replace(/\s/g, ''); const cleanedIban = formValues.iban.replace(/\s/g, '');
const hasMissingData = !formValues.ownerName || !formValues.street || !formValues.town || !cleanedIban || !formValues.currency; const hasMissingData = !formValues.ownerName || !formValues.ownerStreet || !formValues.town || !cleanedIban || !formValues.currency;
// Track whether to generate 2D code for tenant (use persisted value from database) // Track whether to generate 2D code for tenant (use persisted value from database)
const [show2dCodeInMonthlyStatement, setShow2dCodeInMonthlyStatement] = useState( const [show2dCodeInMonthlyStatement, setShow2dCodeInMonthlyStatement] = useState(
@@ -96,21 +96,22 @@ const FormFields: FC<FormFieldsProps> = ({ userSettings, errors, message }) => {
<div className="form-control w-full"> <div className="form-control w-full">
<label className="label"> <label className="label">
<span className="label-text">{t("street-label")} </span> <span className="label-text">{t("owner-street-label")} </span>
</label> </label>
<input <input
id="street" id="ownerStreet"
name="street" name="ownerStreet"
type="text" type="text"
placeholder={t("street-placeholder")} maxLength={25}
placeholder={t("owner-street-placeholder")}
className="input input-bordered w-full placeholder:text-gray-600" className="input input-bordered w-full placeholder:text-gray-600"
defaultValue={userSettings?.street ?? ""} defaultValue={userSettings?.ownerStreet ?? ""}
onChange={(e) => handleInputChange("street", e.target.value)} onChange={(e) => handleInputChange("ownerStreet", e.target.value)}
disabled={pending} disabled={pending}
/> />
<div id="street-error" aria-live="polite" aria-atomic="true"> <div id="ownerStreet-error" aria-live="polite" aria-atomic="true">
{errors?.street && {errors?.ownerStreet &&
errors.street.map((error: string) => ( errors.ownerStreet.map((error: string) => (
<p className="mt-2 text-sm text-red-500" key={error}> <p className="mt-2 text-sm text-red-500" key={error}>
{error} {error}
</p> </p>

View File

@@ -29,7 +29,7 @@ export const ViewLocationCard:FC<ViewLocationCardProps> = ({location, userSettin
AdresaPlatitelja: tenantStreet ?? "", AdresaPlatitelja: tenantStreet ?? "",
SjedistePlatitelja: tenantTown ?? "", SjedistePlatitelja: tenantTown ?? "",
Primatelj: userSettings?.ownerName ?? "", Primatelj: userSettings?.ownerName ?? "",
AdresaPrimatelja: userSettings?.street ?? "", AdresaPrimatelja: userSettings?.ownerStreet ?? "",
SjedistePrimatelja: userSettings?.town ?? "", SjedistePrimatelja: userSettings?.town ?? "",
IBAN: userSettings?.iban ?? "", IBAN: userSettings?.iban ?? "",
ModelPlacanja: "HR00", ModelPlacanja: "HR00",

View File

@@ -191,8 +191,8 @@
"tenant-2d-code-toggle-label": "include 2D code in monthly statements", "tenant-2d-code-toggle-label": "include 2D code in monthly statements",
"owner-name-label": "Your First and Last Name", "owner-name-label": "Your First and Last Name",
"owner-name-placeholder": "enter your first and last name", "owner-name-placeholder": "enter your first and last name",
"street-label": "Street", "owner-street-label": "Your Street and House Number",
"street-placeholder": "enter your street", "owner-street-placeholder": "enter your street and house number",
"town-label": "Town", "town-label": "Town",
"town-placeholder": "enter your town", "town-placeholder": "enter your town",
"iban-label": "IBAN", "iban-label": "IBAN",
@@ -202,7 +202,7 @@
"cancel-button": "Cancel", "cancel-button": "Cancel",
"validation": { "validation": {
"owner-name-required": "Name is mandatory", "owner-name-required": "Name is mandatory",
"street-required": "Street is mandatory", "owner-street-required": "Street is mandatory",
"town-required": "Town is mandatory", "town-required": "Town is mandatory",
"iban-required": "Valid IBAN is mandatory", "iban-required": "Valid IBAN is mandatory",
"iban-invalid": "Invalid IBAN format. Please enter a valid IBAN", "iban-invalid": "Invalid IBAN format. Please enter a valid IBAN",

View File

@@ -190,8 +190,8 @@
"tenant-2d-code-toggle-label": "prikazuj 2D barkod u mjesečnom obračunu", "tenant-2d-code-toggle-label": "prikazuj 2D barkod u mjesečnom obračunu",
"owner-name-label": "Vaše ime i prezime", "owner-name-label": "Vaše ime i prezime",
"owner-name-placeholder": "unesite svoje ime i prezime", "owner-name-placeholder": "unesite svoje ime i prezime",
"street-label": "Ulica i kućni broj", "owner-street-label": "Ulica i kućni broj",
"street-placeholder": "unesite ulicu i kućni broj", "owner-street-placeholder": "unesite ulicu i kućni broj",
"town-label": "Poštanski broj i Grad", "town-label": "Poštanski broj i Grad",
"town-placeholder": "unesite poštanski broj i grad", "town-placeholder": "unesite poštanski broj i grad",
"iban-label": "IBAN", "iban-label": "IBAN",
@@ -201,7 +201,7 @@
"cancel-button": "Odbaci", "cancel-button": "Odbaci",
"validation": { "validation": {
"owner-name-required": "Ime i prezime je obavezno", "owner-name-required": "Ime i prezime je obavezno",
"street-required": "Ulica je obavezna", "owner-street-required": "Ulica je obavezna",
"town-required": "Grad je obavezan", "town-required": "Grad je obavezan",
"iban-required": "Ispravan IBAN je obavezan", "iban-required": "Ispravan IBAN je obavezan",
"iban-invalid": "Neispravan IBAN format. Molimo unesite ispravan IBAN.", "iban-invalid": "Neispravan IBAN format. Molimo unesite ispravan IBAN.",