Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 01:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fixes/app-builder-perf' of https://github.com/ToolJet/ToolJet into fixes/app-builder-perf

Browse source
This commit is contained in:
Johnson Cherian 2024-05-29 15:30:38 +05:30
commit ae50ea6632
8 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Editor/CodeEditor/MultiLineCodeEditor.jsx
View file

@ -41,6 +41,7 @@ const MultiLineCodeEditor = (props) => {
portalProps,
showPreview,
paramLabel = '',
delayOnChange = true, // Added this prop to immediately update the onBlurUpdate callback
} = props;
const [currentValue, setCurrentValue] = React.useState(() => initialValue);
@ -63,6 +64,7 @@ const MultiLineCodeEditor = (props) => {
}, []);
const handleOnBlur = () => {
if (!delayOnChange) return onChange(currentValue);
setTimeout(() => {
onChange(currentValue);
}, 100);

36
frontend/src/Editor/Inspector/Components/Table/Table.jsx
View file

@ -425,21 +425,31 @@ class TableComponent extends React.Component {
...draggableStyle,
});
removeColumn = (index, ref) => {
const columns = this.props.component.component.definition.properties.columns;
const newValue = columns.value;
const removedColumns = newValue.splice(index, 1);
this.props.paramUpdated({ name: 'columns' }, 'value', newValue, 'properties', true);
removeColumn = async (index, ref) => {
try {
const columns = this.props.component.component.definition.properties.columns;
const newValue = columns.value;
const removedColumns = newValue.splice(index, 1);
await this.props.paramUpdated({ name: 'columns' }, 'value', newValue, 'properties', true);
const existingcolumnDeletionHistory =
this.props.component.component.definition.properties.columnDeletionHistory?.value ?? [];
const newcolumnDeletionHistory = [
...existingcolumnDeletionHistory,
...removedColumns.map((column) => column.key || column.name),
];
this.props.paramUpdated({ name: 'columnDeletionHistory' }, 'value', newcolumnDeletionHistory, 'properties', true);
const existingColumnDeletionHistory =
this.props.component.component.definition.properties.columnDeletionHistory?.value ?? [];
const newColumnDeletionHistory = [
...existingColumnDeletionHistory,
...removedColumns.map((column) => column.key || column.name),
];
await this.props.paramUpdated(
{ name: 'columnDeletionHistory' },
'value',
newColumnDeletionHistory,
'properties',
true
);
this.deleteEvents(ref, 'table_column');
await this.deleteEvents(ref, 'table_column');
} catch (error) {
console.error('Error updating column:', error);
}
};
reorderColumns = (startIndex, endIndex) => {

1
frontend/src/Editor/QueryManager/Components/Transformation.jsx
View file

@ -218,6 +218,7 @@ return data.filter(row => row.amount > 1000);
cyLabel={'transformation-input'}
callgpt={noop}
isCopilotEnabled={false}
delayOnChange={false}
/>
</div>
)}

1
frontend/src/Editor/QueryManager/QueryEditors/Runjs/Runjs.jsx
View file

@ -36,6 +36,7 @@ const Runjs = (props) => {
}}
componentName="Runjs"
cyLabel={`runjs`}
delayOnChange={false}
/>
</Card>
);

1
frontend/src/Editor/QueryManager/QueryEditors/Runpy.jsx
View file

@ -26,6 +26,7 @@ export class Runpy extends React.Component {
onChange={(value) => changeOption(this, 'code', value)}
componentName="Runpy"
cyLabel={`runpy`}
delayOnChange={false}
/>
</div>
);

2
frontend/src/Editor/SubContainer.jsx
View file

@ -80,7 +80,7 @@ export const SubContainer = ({
setContainerCanvasWidth(canvasWidth);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [parentRef, getContainerCanvasWidth(), listmode]);
}, [parentRef, getContainerCanvasWidth(), listmode, parentComponent?.definition?.properties?.size?.value]); // Listen for changes to the modal size and update the subcontainer state with the new grid width.
zoomLevel = zoomLevel || 1;

1
frontend/src/_components/DynamicForm.jsx
View file

@ -339,6 +339,7 @@ const DynamicForm = ({
width,
componentName: queryName ? `${queryName}::${key ?? ''}` : null,
cyLabel: key ? `${String(key).toLocaleLowerCase().replace(/\s+/g, '-')}` : '',
delayOnChange: false,
};
case 'react-component-openapi-validator':
return {

4
frontend/src/_stores/utils.js
View file

@ -264,7 +264,7 @@ const computeComponentDiff = (appDiff, currentPageId, opts, currentLayout) => {
if (doesActionsExist || doesColumnsExist) {
const actions = _.toArray(metaDiff.definition[attribute]?.actions?.value) || [];
const columns = _.toArray(metaDiff.definition[attribute]?.columns?.value) || [];
// const columns = _.toArray(metaDiff.definition[attribute]?.columns?.value) || [];
metaDiff.definition = {
...metaDiff.definition,
@ -274,7 +274,7 @@ const computeComponentDiff = (appDiff, currentPageId, opts, currentLayout) => {
value: actions,
},
columns: {
value: columns,
value: component.component?.definition?.properties?.columns?.value,
},
},
};