From 1540f08695cfbd0733a19a922c0b3afd0a490535 Mon Sep 17 00:00:00 2001
From: Chantsova Ekaterina <chantsova.ekaterina@gmail.com>
Date: Wed, 19 Feb 2020 16:10:54 +0200
Subject: [PATCH 1/2] Add ability to use custom translations and labels
 containing apostrophe in table default sort order (#2397)

---
 ui/src/app/widget/lib/entities-table-widget.js       | 4 ++--
 ui/src/app/widget/lib/entities-table-widget.tpl.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/widget/lib/entities-table-widget.js b/ui/src/app/widget/lib/entities-table-widget.js
index 19b25ae724..e8cedd640e 100644
--- a/ui/src/app/widget/lib/entities-table-widget.js
+++ b/ui/src/app/widget/lib/entities-table-widget.js
@@ -196,9 +196,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
         if (vm.settings.defaultSortOrder && vm.settings.defaultSortOrder.length) {
             vm.defaultSortOrder = vm.settings.defaultSortOrder;
             if (vm.settings.defaultSortOrder.charAt(0) === "-") {
-                vm.defaultSortOrder = "-'" + vm.settings.defaultSortOrder.substring(1) + "'";
+                vm.defaultSortOrder = '-"' + utils.customTranslation(vm.settings.defaultSortOrder.substring(1), vm.settings.defaultSortOrder.substring(1)) + '"';
             } else {
-                vm.defaultSortOrder = "'" + vm.settings.defaultSortOrder + "'";
+                vm.defaultSortOrder = '"' + utils.customTranslation(vm.settings.defaultSortOrder, vm.settings.defaultSortOrder) + '"';
             }
         }
 
diff --git a/ui/src/app/widget/lib/entities-table-widget.tpl.html b/ui/src/app/widget/lib/entities-table-widget.tpl.html
index ec91de1531..b6ba05531d 100644
--- a/ui/src/app/widget/lib/entities-table-widget.tpl.html
+++ b/ui/src/app/widget/lib/entities-table-widget.tpl.html
@@ -41,7 +41,7 @@
             <table md-table>
                 <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder">
                 <tr md-row>
-                    <th ng-if="column.display" md-column md-order-by="'{{ column.label }}'" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th>
+                    <th ng-if="column.display" md-column md-order-by='"{{column.label}}"' ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th>
                     <th md-column class="tb-action-cell" layout="row" layout-align="end center"></th>
                 </tr>
                 </thead>

From d5c3a9cc5dab65b88c46a4db6af00a054ddc223f Mon Sep 17 00:00:00 2001
From: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
Date: Wed, 19 Feb 2020 16:14:18 +0200
Subject: [PATCH 2/2] fixed: focus on fullscreen for react schema grouped forms
 (#2400)

---
 .../components/react/json-form-ace-editor.jsx |  6 ++---
 .../react/json-form-schema-form.jsx           | 25 +++++++++++--------
 ui/src/app/components/react/json-form.scss    |  3 +++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ui/src/app/components/react/json-form-ace-editor.jsx b/ui/src/app/components/react/json-form-ace-editor.jsx
index 2329bbddf7..966419b3fe 100644
--- a/ui/src/app/components/react/json-form-ace-editor.jsx
+++ b/ui/src/app/components/react/json-form-ace-editor.jsx
@@ -83,9 +83,9 @@ class ThingsboardAceEditor extends React.Component {
         fixAceEditor(editor);
     }
 
-    onToggleFull() {
+    onToggleFull(groupId) {
         this.setState({ isFull: !this.state.isFull });
-        this.props.onToggleFullscreen();
+        this.props.onToggleFullscreen(groupId);
         this.updateAceEditorSize = true;
     }
 
@@ -140,7 +140,7 @@ class ThingsboardAceEditor extends React.Component {
                     <div className="title-panel">
                         <label>{this.props.mode}</label>
                         <FlatButton style={ styles.tidyButtonStyle } className="tidy-button" label={'Tidy'} onTouchTap={this.onTidy}/>
-                        <FlatButton style={ styles.tidyButtonStyle } className="tidy-button" label={this.state.isFull ? 'Exit fullscreen' : 'Fullscreen'} onTouchTap={this.onToggleFull}/>
+                        <FlatButton style={ styles.tidyButtonStyle } className="tidy-button" label={this.state.isFull ? 'Exit fullscreen' : 'Fullscreen'} onTouchTap={() => this.onToggleFull(this.props.groupId)}/>
                     </div>
                     <AceEditor mode={this.props.mode}
                                height={this.state.isFull ? "100%" : "150px"}
diff --git a/ui/src/app/components/react/json-form-schema-form.jsx b/ui/src/app/components/react/json-form-schema-form.jsx
index df4c1cc02f..2172ac3640 100644
--- a/ui/src/app/components/react/json-form-schema-form.jsx
+++ b/ui/src/app/components/react/json-form-schema-form.jsx
@@ -40,6 +40,9 @@ class ThingsboardSchemaForm extends React.Component {
 
     constructor(props) {
         super(props);
+        this.state = {
+            groupId: null,
+        };
 
         this.mapper = {
             'number': ThingsboardNumber,
@@ -71,7 +74,6 @@ class ThingsboardSchemaForm extends React.Component {
     }
 
     onChange(key, val) {
-        //console.log('SchemaForm.onChange', key, val);
         this.props.onModelChange(key, val);
         if (this.hasConditions) {
             this.forceUpdate();
@@ -86,12 +88,15 @@ class ThingsboardSchemaForm extends React.Component {
         this.props.onIconClick(event);
     }
 
-    onToggleFullscreen() {
+    onToggleFullscreen(groupId) {
+        this.setState({
+            groupId: groupId
+        });
         this.props.onToggleFullscreen();
     }
 
-    
-    builder(form, model, index, onChange, onColorClick, onIconClick, onToggleFullscreen, mapper) {
+
+    builder(form, groupId, model, index, onChange, onColorClick, onIconClick, onToggleFullscreen, mapper) {
         var type = form.type;
         let Field = this.mapper[type];
         if(!Field) {
@@ -104,21 +109,21 @@ class ThingsboardSchemaForm extends React.Component {
                 return null;
             }
         }
-        return <Field model={model} form={form} key={index} onChange={onChange} onColorClick={onColorClick} onIconClick={onIconClick} onToggleFullscreen={onToggleFullscreen} mapper={mapper} builder={this.builder}/>
+        return <Field model={model} groupId={groupId} form={form} key={index} onChange={onChange} onColorClick={onColorClick} onIconClick={onIconClick} onToggleFullscreen={onToggleFullscreen} mapper={mapper} builder={this.builder}/>
     }
 
-    createSchema(theForm) {
+    createSchema(theForm, groupId) {
         let merged = utils.merge(this.props.schema, theForm, this.props.ignore, this.props.option);
         let mapper = this.mapper;
         if(this.props.mapper) {
             mapper = _.merge(this.mapper, this.props.mapper);
         }
         let forms = merged.map(function(form, index) {
-            return this.builder(form, this.props.model, index, this.onChange, this.onColorClick, this.onIconClick, this.onToggleFullscreen, mapper);
+            return this.builder(form, groupId, this.props.model, index, this.onChange, this.onColorClick, this.onIconClick, this.onToggleFullscreen, mapper);
         }.bind(this));
 
         let formClass = 'SchemaForm';
-        if (this.props.isFullscreen) {
+        if (this.props.isFullscreen && groupId === this.state.groupId) {
             formClass += ' SchemaFormFullscreen';
         }
 
@@ -131,7 +136,7 @@ class ThingsboardSchemaForm extends React.Component {
         if(this.props.groupInfoes&&this.props.groupInfoes.length>0){
             let content=[];
             for(let info of this.props.groupInfoes){
-                let forms = this.createSchema(this.props.form[info.formIndex]);
+                let forms = this.createSchema(this.props.form[info.formIndex], info.formIndex);
                 let item = <ThingsboardSchemaGroup key={content.length} forms={forms} info={info}></ThingsboardSchemaGroup>;
                 content.push(item);
             }
@@ -165,4 +170,4 @@ class ThingsboardSchemaGroup extends React.Component{
                     <div style={{padding: '20px'}} className={this.state.showGroup?"":"invisible"}>{this.props.forms}</div>
                 </section>);
     }
-} 
+}
diff --git a/ui/src/app/components/react/json-form.scss b/ui/src/app/components/react/json-form.scss
index 85825abf42..91c14d51ff 100644
--- a/ui/src/app/components/react/json-form.scss
+++ b/ui/src/app/components/react/json-form.scss
@@ -24,12 +24,15 @@ $input-label-float-scale: .75 !default;
 .tb-fullscreen {
   [name="ReactSchemaForm"] {
     .SchemaForm {
+      display: none;
+
       &.SchemaFormFullscreen {
         position: absolute;
         top: 0;
         right: 0;
         bottom: 0;
         left: 0;
+        display: block;
 
         > div:not(.fullscreen-form-field) {
           display: none !important;