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

Merge branch 'develop' into test/fix-cypress-failure

Browse source
This commit is contained in:
Mekhla Asopa 2023-03-31 21:01:16 +05:30
commit 0675cf38d2
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Editor/AppVersionsManager/CreateVersionModal.jsx
View file

@ -99,7 +99,7 @@ export const CreateVersion = ({
options={options}
defaultValue={options[options.length - 1]}
onChange={(version) => {
setAppDefinitionFromVersion(version);
setAppDefinitionFromVersion(version, false);
}}
useMenuPortal={false}
width="100%"

35
frontend/src/Editor/Editor.jsx
View file

@ -480,21 +480,26 @@ class EditorComponent extends React.Component {
);
};
setAppDefinitionFromVersion = (version) => {
this.appDefinitionChanged(defaults(version.definition, this.defaultDefinition), {
skipAutoSave: true,
skipYmapUpdate: true,
versionChanged: true,
});
this.setState({
editingVersion: version,
isSaving: false,
});
this.saveEditingVersion();
this.fetchDataSources();
this.fetchDataQueries();
this.initComponentVersioning();
setAppDefinitionFromVersion = (version, shouldWeEditVersion = true) => {
if (version?.id !== this.state.editingVersion?.id) {
this.appDefinitionChanged(defaults(version.definition, this.defaultDefinition), {
skipAutoSave: true,
skipYmapUpdate: true,
versionChanged: true,
});
this.setState(
{
editingVersion: version,
isSaving: false,
},
() => {
shouldWeEditVersion && this.saveEditingVersion();
this.fetchDataSources();
this.fetchDataQueries();
this.initComponentVersioning();
}
);
}
};
/**