archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-14 17:18:33 +00:00
Code Issues Projects Releases Wiki Activity

--amend

Browse source
This commit is contained in:
Jeremie Pardou 2025-04-03 11:26:18 +02:00
parent 77e4388212
commit 242cb0c6cf
4 changed files with 24 additions and 11 deletions
backend/src/baserow/contrib/integrations/local_baserow
utils.py
enterprise/web-frontend/modules/baserow_enterprise/builder
elementTypes.js
web-frontend/modules/core/assets/scss/components/builder/elements/ab_components
ab_avatar.scssab_file_input.scss

12
backend/src/baserow/contrib/integrations/local_baserow/utils.py
View file

@ -1,6 +1,6 @@
from typing import Any, Callable, Dict, Optional, Union from typing import Any, Callable, Dict, Optional, Union
from urllib.parse import urlparse
from baserow.core.services.exceptions import ServiceImproperlyConfigured
from drf_spectacular.types import OPENAPI_TYPE_MAPPING from drf_spectacular.types import OPENAPI_TYPE_MAPPING
from rest_framework.fields import ( from rest_framework.fields import (
BooleanField, BooleanField,
@ -18,11 +18,6 @@ from rest_framework.fields import (
) )
from rest_framework.serializers import ListSerializer, Serializer from rest_framework.serializers import ListSerializer, Serializer
from baserow.core.user_files.exceptions import (
FileSizeTooLargeError,
FileURLCouldNotBeReached,
)
from urllib.parse import urlparse
from baserow.contrib.database.api.fields.serializers import DurationFieldSerializer from baserow.contrib.database.api.fields.serializers import DurationFieldSerializer
from baserow.contrib.integrations.local_baserow.models import LocalBaserowUpsertRow from baserow.contrib.integrations.local_baserow.models import LocalBaserowUpsertRow
from baserow.core.formula.validator import ( from baserow.core.formula.validator import (
@ -33,6 +28,11 @@ from baserow.core.formula.validator import (
ensure_integer, ensure_integer,
ensure_string, ensure_string,
) )
from baserow.core.services.exceptions import ServiceImproperlyConfigured
from baserow.core.user_files.exceptions import (
FileSizeTooLargeError,
FileURLCouldNotBeReached,
)
from baserow.core.user_files.handler import UserFileHandler from baserow.core.user_files.handler import UserFileHandler

2
enterprise/web-frontend/modules/baserow_enterprise/builder/elementTypes.js
View file

@ -152,7 +152,7 @@ export class FileInputElementType extends FormElementType {
if (!name) { if (!name) {
try { try {
const parsedUrl = new URL(url) const parsedUrl = new URL(url)
const segments = parsedUrl.pathname.split('/').filter(Boolean) // Remove empty segments $u const segments = parsedUrl.pathname.split('/').filter(Boolean) // Remove empty segments
return segments.at(-1) return segments.at(-1)
} catch { } catch {
return name return name

18
web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_avatar.scss
View file

@ -64,9 +64,21 @@
.ab-avatar--neutral { .ab-avatar--neutral {
border: 1px solid border: 1px solid
color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 80%); color-mix(
background: color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 95%); in srgb,
color: color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 50%); var(--body-text-color, $black),
var(--page-background-color, $color-neutral-500) 80%
);
background: color-mix(
in srgb,
var(--body-text-color, $black),
var(--page-background-color, $color-neutral-500) 95%
);
color: color-mix(
in srgb,
var(--body-text-color, $black),
var(--page-background-color, $color-neutral-500) 50%
);
} }
.ab-avatar--transparent { .ab-avatar--transparent {

3
web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_file_input.scss
View file

@ -4,7 +4,8 @@
color: var(--input-text-color, $color-neutral-900); color: var(--input-text-color, $color-neutral-900);
font-family: var(--input-font-family, Inter); font-family: var(--input-font-family, Inter);
background-color: var(--input-background-color, $white); background-color: var(--input-background-color, $white);
padding: var(--input-vertical-padding, 8px) var(--input-horizontal-padding, 12px); padding: var(--input-vertical-padding, 8px)
var(--input-horizontal-padding, 12px);
border: var(--input-border-size, 1px) solid var(--input-border-color, black); border: var(--input-border-size, 1px) solid var(--input-border-color, black);
border-radius: var(--input-border-radius, 0); border-radius: var(--input-border-radius, 0);