Fixed Data Grid components labels being rewriten to false

Author: Alena-Levina

src/components/base/Base.js

@@ -1090,7 +1090,7 @@ export default class BaseComponent {
   }
 
   labelIsHidden() {
-    return !this.component.label || this.component.hideLabel || this.options.inputsOnly;
+    return !this.component.label || this.component.hideLabel || this.options.inputsOnly || (this.component.inDataGrid && !this.component.dataGridLabel);
   }
 
   /**

src/components/button/Button.js

@@ -15,7 +15,8 @@ export default class ButtonComponent extends BaseComponent {
       action: 'submit',
       persistent: false,
       disableOnInvalid: false,
-      theme: 'default'
+      theme: 'default',
+      dataGridLabel: true
     }, ...extend);
   }
 
@@ -120,7 +121,7 @@ export default class ButtonComponent extends BaseComponent {
       this.buttonElement.appendChild(this.text(' '));
     }
 
-    if (this.component.label) {
+    if (!this.labelIsHidden()) {
       this.labelElement = this.text(this.addShortcutToLabel());
       this.buttonElement.appendChild(this.labelElement);
       this.createTooltip(this.buttonElement, null, this.iconClass('question-sign'));

src/components/checkbox/Checkbox.js

@@ -8,7 +8,7 @@ export default class CheckBoxComponent extends BaseComponent {
       inputType: 'checkbox',
       label: 'Checkbox',
       key: 'checkbox',
-      datagridLabel: true,
+      dataGridLabel: true,
       labelPosition: 'right',
       value: '',
       name: ''
@@ -75,7 +75,7 @@ export default class CheckBoxComponent extends BaseComponent {
 
   createElement() {
     let className = `form-check ${this.className}`;
-    if (this.component.label) {
+    if (!this.labelIsHidden()) {
       className += ' checkbox';
     }
     this.element = this.ce('div', {
@@ -135,7 +135,7 @@ export default class CheckBoxComponent extends BaseComponent {
   }
 
   createLabel(container, input) {
-    if (!this.component.label) {
+    if (this.labelIsHidden()) {
       return null;
     }
 

src/components/checkbox/editForm/Checkbox.edit.display.js

@@ -75,7 +75,7 @@ export default [
     input: true,
     weight: 440,
     label: 'Datagrid Label',
-    key: 'datagridLabel',
+    key: 'dataGridLabel',
     tooltip: 'Show the label when in a datagrid.'
   }
 ];

src/components/checkbox/fixtures/comp1.js

@@ -15,7 +15,7 @@ export default {
   'protected': false,
   'defaultValue': false,
   'key': 'checkme',
-  'datagridLabel': true,
+  'dataGridLabel': true,
   'label': 'Check me',
   'hideLabel': false,
   'tableView': true,

src/components/datagrid/DataGrid.js

@@ -229,7 +229,6 @@ export default class DataGridComponent extends NestedComponent {
     options.name += `[${rowIndex}]`;
     options.row = `${rowIndex}-${colIndex}`;
     const comp = this.createComponent(_.assign({}, column, {
-      label: column.dataGridLabel ? column.label : false,
       row: options.row
     }), options, row);
     comp.rowIndex = rowIndex;