From d97ad3e360559d4df26dd9228918855682a17fa8 Mon Sep 17 00:00:00 2001
From: Gandharv <gandharvkumargarg@gmail.com>
Date: Thu, 9 Dec 2021 17:33:13 +0530
Subject: [PATCH 1/2] add definition default values (#1549)

---
 frontend/src/Editor/Editor.jsx           | 25 +++++++++++++-----------
 frontend/src/Editor/LeftSidebar/index.js |  1 -
 frontend/src/Editor/SaveAndPreview.jsx   |  7 +++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index be5197b7a1..111c550dc3 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -2,6 +2,7 @@ import React, { createRef } from 'react';
 import { datasourceService, dataqueryService, appService, authenticationService } from '@/_services';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
+import { defaults } from 'lodash';
 import { Container } from './Container';
 import { CustomDragLayer } from './CustomDragLayer';
 import { LeftSidebar } from './LeftSidebar';
@@ -52,6 +53,15 @@ class Editor extends React.Component {
       };
     }
 
+    this.defaultDefinition = {
+      components: {},
+      globalSettings: {
+        hideHeader: false,
+        canvasMaxWidth: 1292,
+        canvasBackgroundColor: props.darkMode ? '#2f3c4c' : '#edeff5',
+      },
+    };
+
     this.state = {
       currentUser: authenticationService.currentUserValue,
       app: {},
@@ -69,14 +79,7 @@ class Editor extends React.Component {
       zoomLevel: 1.0,
       currentLayout: 'desktop',
       deviceWindowWidth: 450,
-      appDefinition: {
-        components: {},
-        globalSettings: {
-          hideHeader: false,
-          canvasMaxWidth: 1292,
-          canvasBackgroundColor: props.darkMode ? '#2f3c4c' : '#edeff5',
-        },
-      },
+      appDefinition: this.defaultDefinition,
       currentState: {
         queries: {},
         components: {},
@@ -245,13 +248,13 @@ class Editor extends React.Component {
     const appId = this.props.match.params.id;
 
     appService.getApp(appId).then((data) => {
-      const dataDefinition = data.definition || {};
+      const dataDefinition = defaults(data.definition, this.defaultDefinition);
       this.setState(
         {
           app: data,
           isLoading: false,
           editingVersion: data.editing_version,
-          appDefinition: { ...this.state.appDefinition, ...dataDefinition },
+          appDefinition: dataDefinition,
           slug: data.slug,
         },
         () => {
@@ -265,7 +268,7 @@ class Editor extends React.Component {
   };
 
   setAppDefinitionFromVersion = (version) => {
-    this.appDefinitionChanged(version.definition || {});
+    this.appDefinitionChanged(defaults(version.definition, this.defaultDefinition));
     this.setState({
       editingVersion: version,
     });
diff --git a/frontend/src/Editor/LeftSidebar/index.js b/frontend/src/Editor/LeftSidebar/index.js
index c1d997b2df..3738d73593 100644
--- a/frontend/src/Editor/LeftSidebar/index.js
+++ b/frontend/src/Editor/LeftSidebar/index.js
@@ -28,7 +28,6 @@ export const LeftSidebar = ({
   globalSettingsChanged,
   globalSettings,
 }) => {
-  console.log('11', globalSettings);
   const router = useRouter();
   const [showLeaveDialog, setShowLeaveDialog] = useState(false);
   return (
diff --git a/frontend/src/Editor/SaveAndPreview.jsx b/frontend/src/Editor/SaveAndPreview.jsx
index e4d16f42cc..a969c29171 100644
--- a/frontend/src/Editor/SaveAndPreview.jsx
+++ b/frontend/src/Editor/SaveAndPreview.jsx
@@ -74,7 +74,6 @@ class SaveAndPreview extends React.Component {
 
   editVersion = (version) => () => {
     this.props.setAppDefinitionFromVersion(version);
-    this.props.fetchApp();
   };
 
   saveVersion = (versionId) => {
@@ -190,7 +189,7 @@ class SaveAndPreview extends React.Component {
                             </div>
                             <div className="col-auto">
                               <button
-                                className="btn btn-sm text-muted font-500 color-primary"
+                                className="btn btn-sm color-primary font-500 color-primary"
                                 onClick={() => this.saveVersion(version.id)}
                                 disabled={
                                   savingVersionId === version.id ||
@@ -200,14 +199,14 @@ class SaveAndPreview extends React.Component {
                                 {savingVersionId === version.id ? 'saving...' : 'save'}
                               </button>
                               <button
-                                className="btn btn btn-sm mx-2 text-muted"
+                                className="btn btn btn-sm mx-2 color-primary"
                                 onClick={this.editVersion(version)}
                                 disabled={this.props.editingVersionId === version.id}
                               >
                                 edit
                               </button>
                               <a
-                                className="btn btn btn-sm mx text-muted"
+                                className="btn btn btn-sm mx color-primary"
                                 href={`/applications/${appId}/versions/${version.id}`}
                                 target="_blank"
                                 rel="noreferrer"

From eec622e91c9d830267af7bc2d657595769c629f8 Mon Sep 17 00:00:00 2001
From: Sherfin Shamsudeen <sherfin@tooljet.io>
Date: Fri, 10 Dec 2021 12:52:41 +0530
Subject: [PATCH 2/2] Hotfix/iframe new api (#1557)

* [improvement] Widget components #1475 - iframe widget (#1493)

* Bump ToolJet version to v0.11.1

Co-authored-by: Arpit <arpitnath42@gmail.com>
---
 .version                                  |  2 +-
 frontend/src/Editor/Components/IFrame.jsx | 28 ++++-------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/.version b/.version
index 142464bf22..027934ea1a 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.11.0
\ No newline at end of file
+0.11.1
\ No newline at end of file
diff --git a/frontend/src/Editor/Components/IFrame.jsx b/frontend/src/Editor/Components/IFrame.jsx
index f231d82be9..966637fd91 100644
--- a/frontend/src/Editor/Components/IFrame.jsx
+++ b/frontend/src/Editor/Components/IFrame.jsx
@@ -1,31 +1,11 @@
 import React from 'react';
-import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils';
 
-export const IFrame = function IFrame({ id, width, height, component, onComponentClick, currentState }) {
-  const source = component.definition.properties.source.value;
-  const widgetVisibility = component.definition.styles?.visibility?.value ?? true;
-  const disabledState = component.definition.styles?.disabledState?.value ?? false;
-
-  const parsedDisabledState =
-    typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState;
-
-  let parsedWidgetVisibility = widgetVisibility;
-
-  try {
-    parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []);
-  } catch (err) {
-    console.log(err);
-  }
+export const IFrame = function IFrame({ width, height, properties, styles }) {
+  const source = properties.source;
+  const { visibility, disabledState } = styles;
 
   return (
-    <div
-      data-disabled={parsedDisabledState}
-      style={{ display: parsedWidgetVisibility ? '' : 'none' }}
-      onClick={(event) => {
-        event.stopPropagation();
-        onComponentClick(id, component, event);
-      }}
-    >
+    <div data-disabled={disabledState} style={{ display: visibility ? '' : 'none' }}>
       <iframe
         width={width - 4}
         height={height}