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

Merge pull request #6571 from ToolJet/merge-back/2.6.2

Browse source 
Merge back/2.6.2
This commit is contained in:
Sherfin Shamsudeen 2023-05-26 18:16:12 +05:30 committed by GitHub
commit b9fea38b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontend/src/Editor/QueryManager/QueryManager.jsx
View file

@ -177,15 +177,6 @@ class QueryManagerComponent extends React.Component {
}
);
};
componentDidUpdate(prevState) {
if (this.state?.selectedQuery?.id == prevState?.selectedQuery?.id) {
if (prevState?.selectedQuery?.name !== this.state?.selectedQuery?.name) {
this.setState({
queryName: this.state.selectedQuery?.name,
});
}
}
}
UNSAFE_componentWillReceiveProps(nextProps) {
if (useDataSourcesStore.getState().loadingDataSources) return;
@ -234,6 +225,10 @@ class QueryManagerComponent extends React.Component {
return;
}
if (Object.keys(diffProps).length === 1 && nextProps.mode === 'create' && diffProps?.selectedQuery?.name) {
return this.setState({ queryName: nextProps.selectedQuery?.name });
}
this.setStateFromProps(nextProps);
}
@ -409,7 +404,7 @@ class QueryManagerComponent extends React.Component {
// Clear the focus field value from options
cleanFocusedFields = (newOptions) => {
const diffFields = diff(newOptions, this.defaultOptions.current);
const diffFields = diff(newOptions, this.defaultOptions.current ?? {});
const updatedOptions = { ...newOptions };
Object.keys(diffFields).forEach((key) => {
if (newOptions[key] === '' && this.defaultOptions.current[key] === undefined) {

1
frontend/src/Editor/QueryPanel/QueryCard.jsx
View file

@ -66,6 +66,7 @@ export const QueryCard = ({
if (id === 'draftQuery') {
toast.success('Query Name Updated');
setDraftQuery((query) => ({ ...query, name: newName }));
setSelectedQuery('draftQuery', { ...dataQuery, name: newName });
} else {
renameQuery(dataQuery?.id, newName, fetchDataQueries);
}