Compare commits

...

3 Commits

Author SHA1 Message Date
Charles Bochet 276dee1f50 Bump version 2025-03-27 19:31:01 +01:00
Charles Bochet 5f9caf11ad Fix inline cell height issue and allow field settings update (#11248)
In this PR:
- allow to update settings on fields metadata (regression introduced by
a recent refactoring of fields-metadata update)
- revert changes introduced by
https://github.com/twentyhq/twenty/pull/11221
2025-03-27 19:30:30 +01:00
Marie Stoppa 609bb528ec Bump version 2025-03-27 17:35:56 +01:00
10 changed files with 32 additions and 24 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-e2e-testing",
"version": "0.50.0-canary",
"version": "0.50.1",
"description": "",
"author": "",
"private": true,
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-emails",
"version": "0.50.0-canary",
"version": "0.50.1",
"description": "",
"author": "",
"private": true,
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-front",
"version": "0.50.0-canary",
"version": "0.50.1",
"private": true,
"type": "module",
"scripts": {
@@ -38,6 +38,7 @@ const StyledLabelAndIconContainer = styled.div`
display: flex;
gap: ${({ theme }) => theme.spacing(1)};
height: 18px;
padding-top: 3px;
`;
const StyledValueContainer = styled.div`
@@ -53,16 +54,11 @@ const StyledLabelContainer = styled.div<{ width?: number }>`
width: ${({ width }) => width}px;
`;
const StyledInlineCellBaseContainer = styled.div<{
isDisplayModeFixHeight?: boolean;
}>`
const StyledInlineCellBaseContainer = styled.div`
box-sizing: border-box;
width: 100%;
display: flex;
line-height: ${({ isDisplayModeFixHeight }) =>
isDisplayModeFixHeight ? `24px` : `18px`};
height: ${({ isDisplayModeFixHeight }) =>
isDisplayModeFixHeight ? `24px` : `18px`};
height: fit-content;
gap: ${({ theme }) => theme.spacing(1)};
user-select: none;
align-items: center;
@@ -74,14 +70,8 @@ export const StyledSkeletonDiv = styled.div`
`;
export const RecordInlineCellContainer = () => {
const {
readonly,
IconLabel,
label,
labelWidth,
showLabel,
isDisplayModeFixHeight,
} = useRecordInlineCellContext();
const { readonly, IconLabel, label, labelWidth, showLabel } =
useRecordInlineCellContext();
const { recordId, fieldDefinition } = useContext(FieldContext);
@@ -111,7 +101,6 @@ export const RecordInlineCellContainer = () => {
return (
<StyledInlineCellBaseContainer
isDisplayModeFixHeight={isDisplayModeFixHeight}
onMouseEnter={handleContainerMouseEnter}
onMouseLeave={handleContainerMouseLeave}
>
@@ -44,6 +44,8 @@ const StyledRecordInlineCellNormalModeInnerContainer = styled.div`
align-items: center;
color: ${({ theme }) => theme.font.color.primary};
height: fit-content;
padding-top: 3px;
padding-bottom: 3px;
overflow: hidden;
text-overflow: ellipsis;
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-server",
"version": "0.50.0-canary",
"version": "0.50.1",
"description": "",
"author": "",
"private": true,
@@ -75,7 +75,12 @@ export class BeforeUpdateOneField<T extends UpdateFieldInput>
locale?: keyof typeof APP_LOCALES,
): UpdateOneInputType<T> {
const update: StandardFieldUpdate = {};
const updatableFields = ['isActive', 'isLabelSyncedWithName', 'options'];
const updatableFields = [
'isActive',
'isLabelSyncedWithName',
'options',
'settings',
];
const overridableFields = ['label', 'icon', 'description'];
const nonUpdatableFields = Object.keys(instance.update).filter(
@@ -110,6 +115,7 @@ export class BeforeUpdateOneField<T extends UpdateFieldInput>
this.handleLabelSyncedWithNameField(instance, update);
this.handleStandardOverrides(instance, fieldMetadata, update, locale);
this.handleOptionsField(instance, update);
this.handleSettingsField(instance, update);
return {
id: instance.id,
@@ -128,6 +134,17 @@ export class BeforeUpdateOneField<T extends UpdateFieldInput>
update.options = instance.update.options;
}
private handleSettingsField(
instance: UpdateOneInputType<T>,
update: StandardFieldUpdate,
): void {
if (!isDefined(instance.update.settings)) {
return;
}
update.settings = instance.update.settings;
}
private handleActiveField(
instance: UpdateOneInputType<T>,
update: StandardFieldUpdate,
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-shared",
"version": "0.50.0-canary",
"version": "0.50.1",
"main": "dist/twenty-shared.cjs.js",
"module": "dist/twenty-shared.esm.js",
"license": "AGPL-3.0",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-ui",
"version": "0.50.0-canary",
"version": "0.50.1",
"type": "module",
"main": "./src/index.ts",
"exports": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "twenty-website",
"version": "0.50.0-canary",
"version": "0.50.1",
"private": true,
"scripts": {
"nx": "NX_DEFAULT_PROJECT=twenty-website node ../../node_modules/nx/bin/nx.js",