Skip to content

pravki mar 18 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manhir merged 1 commit into from
Mar 19, 2026
Merged

pravki mar 18 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions frontend/src/components/SurveyModal/CheckboxList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,32 @@ export type CheckboxListProps = {
label: string
description?: string
maxValues?: number
hasError?: boolean
}

export function CheckboxList({ field, data, watch, label, description, maxValues = data.length }: CheckboxListProps) {
export function CheckboxList({
field,
data,
watch,
label,
description,
maxValues = data.length,
hasError,
}: CheckboxListProps) {
const selectedOptions: string[] = watch(field.name, []) || []

const getDisabled = (value: string) => !selectedOptions.includes(value) && selectedOptions.length >= maxValues

return (
<Fieldset legend={label} variant="filled">
<Fieldset
legend={label}
variant="filled"
style={{
border: hasError ? "2px solid tomato" : undefined,
borderRadius: "8px",
padding: hasError ? "8px" : undefined,
}}
>
<Text
variant="dimmed"
mb="xs"
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/components/SurveyModal/CheckboxWithOther.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type CheckboxWithOtherProps = {
label: string
description?: string
maxValues?: number
hasError?: boolean
}

export function CheckboxWithOther({
Expand All @@ -22,6 +23,7 @@ export function CheckboxWithOther({
label,
description,
maxValues = data.length,
hasError,
}: CheckboxWithOtherProps) {
const [isShowOtherInput, setIsShowOtherInput] = useState(false)
const [inputValue, setInputValue] = useState("Другое: ")
Expand All @@ -39,7 +41,15 @@ export function CheckboxWithOther({
const getDisabled = (value: string) => !selectedOptions.includes(value) && selectedOptions.length >= maxValues

return (
<Fieldset legend={label} variant="filled">
<Fieldset
legend={label}
variant="filled"
style={{
border: hasError ? "2px solid tomato" : undefined,
borderRadius: "8px",
padding: hasError ? "8px" : undefined,
}}
>
<Text variant="dimmed" mb="xs" size="xs">
{description}
</Text>
Expand Down
161 changes: 100 additions & 61 deletions frontend/src/components/SurveyModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,19 @@ type SchemaToComponentsProps = {
renderFilter?: Record<string, boolean>
}
function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToComponentsProps) {
const { control, setValue, watch, register } = formHook // passed from parent cause it needed for filter
const {
control,
setValue,
watch,
register,
formState: { errors },
} = formHook // passed from parent cause it needed for filter
return schema
.filter((item) => renderFilter?.[item.id] ?? true)
.map((item) => {
switch (item.type) {
case "select": {
const hasError = !!errors[item.id]
return (
<Controller
name={item.id}
Expand All @@ -61,7 +68,11 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
description={item?.description}
styles={{
wrapper: {
"--input-bd-focus": "var(--mantine-color-secondary-0)",
"--input-bd-focus": hasError
? "tomato"
: "var(--mantine-color-secondary-0)",
"--input-invalid": "tomato",
border: hasError ? "2px solid tomato" : undefined,
},
}}
/>
Expand All @@ -70,6 +81,7 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
)
}
case "checkboxOther": {
const hasError = !!errors[item.id]
return (
<Controller
name={item.id}
Expand All @@ -84,12 +96,14 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
description={item?.description}
maxValues={item?.maxValues}
data={item.data ?? []}
hasError={hasError}
/>
)}
/>
)
}
case "textarea": {
const hasError = !!errors[item.id]
return (
<Stack>
{item.id === "a7b52f44-cc92-4df5-bf26-f45a66fe5cb0" && (
Expand Down Expand Up @@ -119,7 +133,9 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
description={item?.description}
styles={{
wrapper: {
"--input-bd-focus": "var(--mantine-color-secondary-0)",
"--input-bd-focus": hasError ? "tomato" : "var(--mantine-color-secondary-0)",
"--input-invalid": "tomato",
border: hasError ? "2px solid tomato" : undefined,
},
}}
/>
Expand All @@ -130,30 +146,38 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
return (
<Fieldset legend={item.text} variant="filled">
<Stack>
{(item.list ?? []).map((listItem: string, index: number) => (
<Controller
key={listItem}
name={`${item.id}-${index}`}
control={control}
rules={{ required: true }}
render={({ field }) => (
<Select
{...field}
value={typeof field.value === "string" ? field.value : null}
label={listItem}
styles={{
label: {
fontWeight: "lighter",
},
wrapper: {
"--input-bd-focus": "var(--mantine-color-secondary-0)",
},
}}
data={item.data ?? []}
/>
)}
/>
))}
{(item.list ?? []).map((listItem: string, index: number) => {
const fieldName = `${item.id}-${index}`
const hasError = !!errors[fieldName]
return (
<Controller
key={listItem}
name={fieldName}
control={control}
rules={{ required: true }}
render={({ field }) => (
<Select
{...field}
value={typeof field.value === "string" ? field.value : null}
label={listItem}
styles={{
label: {
fontWeight: "lighter",
},
wrapper: {
"--input-bd-focus": hasError
? "tomato"
: "var(--mantine-color-secondary-0)",
"--input-invalid": "tomato",
border: hasError ? "2px solid tomato" : undefined,
},
}}
data={item.data ?? []}
/>
)}
/>
)
})}
</Stack>
</Fieldset>
)
Expand All @@ -178,48 +202,62 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
{item?.description}
</Text>
<Stack>
{(item.list ?? []).map((listItem: string, index: number) => (
<Controller
key={listItem}
name={`${item.id}-${index}`}
control={control}
// rules={{ required: true }}
render={({ field }) => (
<Box my="md">
<Text
{(item.list ?? []).map((listItem: string, index: number) => {
const fieldName = `${item.id}-${index}`
const hasError = !!errors[fieldName]
return (
<Controller
key={listItem}
name={fieldName}
control={control}
// rules={{ required: true }}
render={({ field }) => (
<Box
my="md"
style={{
fontSize: "unset",
border: hasError ? "2px solid tomato" : undefined,
borderRadius: "8px",
padding: hasError ? "8px" : undefined,
}}
>
{listItem}
</Text>
<Slider
{...field}
value={typeof field.value === "number" ? field.value : 0}
step={1}
min={0}
max={(item.marks ?? []).length - 1}
defaultValue={0}
marks={(item.marks ?? []).map((x: number) => ({
value: x,
label: String(x),
}))}
label={null}
styles={{
root: {
"--slider-color": "var(--mantine-color-secondary-0)",
},
}}
/>
</Box>
)}
/>
))}
<Text
style={{
fontSize: "unset",
}}
>
{listItem}
</Text>
<Slider
{...field}
value={typeof field.value === "number" ? field.value : 0}
step={1}
min={0}
max={(item.marks ?? []).length - 1}
defaultValue={0}
marks={(item.marks ?? []).map((x: number) => ({
value: x,
label: String(x),
}))}
label={null}
styles={{
root: {
"--slider-color": hasError
? "tomato"
: "var(--mantine-color-secondary-0)",
},
}}
/>
</Box>
)}
/>
)
})}
</Stack>
</Fieldset>
)
}
case "checkboxList": {
const hasError = !!errors[item.id]
return (
<Controller
name={item.id}
Expand All @@ -233,6 +271,7 @@ function SchemaToComponents({ schema, formHook, renderFilter = {} }: SchemaToCom
description={item?.description}
maxValues={item?.maxValues}
data={item.data ?? []}
hasError={hasError}
/>
)}
/>
Expand Down
Loading