Changeset 244350 in webkit

Timestamp:

Apr 16, 2019 12:02:23 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Storage: values truncated in Local/Session table
​https://bugs.webkit.org/show_bug.cgi?id=178318
<rdar://problem/34998581>

Reviewed by Joseph Pecoraro.

• UserInterface/Views/DataGrid.js:

(WI.DataGrid):
(WI.DataGrid.prototype._copyTextForDataGridNode):

• UserInterface/Views/TimelineDataGrid.js:

(WI.TimelineDataGrid):
Refactor WI.DataGrid constructor to allow for more optional arguments.
Introduce a new optional argument copyCallback that can be used to override the text that
would be copied for any WI.DataGridNode in any column.

• UserInterface/Views/DOMStorageContentView.js:

(WI.DOMStorageContentView):
(WI.DOMStorageContentView.prototype.itemAdded):
(WI.DOMStorageContentView.prototype.itemUpdated):
(WI.DOMStorageContentView.prototype._populate):
(WI.DOMStorageContentView.prototype._dataGridCopy): Added.
Save the full non-truncated value as part of the WI.DataGridNode's data. When copying,
use the full non-truncated value instead of what was shown in the DOM.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DOMStorageContentView.js (modified) (7 diffs)
• UserInterface/Views/DataGrid.js (modified) (4 diffs)
• UserInterface/Views/TimelineDataGrid.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-16  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Storage: values truncated in Local/Session table
+        https://bugs.webkit.org/show_bug.cgi?id=178318
+        <rdar://problem/34998581>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/DataGrid.js:
+        (WI.DataGrid):
+        (WI.DataGrid.prototype._copyTextForDataGridNode):
+        * UserInterface/Views/TimelineDataGrid.js:
+        (WI.TimelineDataGrid):
+        Refactor `WI.DataGrid` constructor to allow for more optional arguments.
+        Introduce a new optional argument `copyCallback` that can be used to override the text that
+        would be copied for any `WI.DataGridNode` in any column.
+
+        * UserInterface/Views/DOMStorageContentView.js:
+        (WI.DOMStorageContentView):
+        (WI.DOMStorageContentView.prototype.itemAdded):
+        (WI.DOMStorageContentView.prototype.itemUpdated):
+        (WI.DOMStorageContentView.prototype._populate):
+        (WI.DOMStorageContentView.prototype._dataGridCopy): Added.
+        Save the full non-truncated value as part of the `WI.DataGridNode`'s `data`. When copying,
+        use the full non-truncated value instead of what was shown in the DOM.
+
 2019-04-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js

@@ -42 +42 @@
         columns.value = {title: WI.UIString("Value"), sortable: true};
 
-        this._dataGrid = new WI.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
+        this._dataGrid = new WI.DataGrid(columns, {
+            editingCallback: this._editingCallback.bind(this),
+            copyCallback: this._dataGridCopy.bind(this),
+            deleteCallback: this._deleteCallback.bind(this),
+        });
         this._dataGrid.sortOrder = WI.DataGrid.SortOrder.Ascending;
         this._dataGrid.sortColumnIdentifier = "key";
@@ -86 +90 @@
     {
         let {key, value} = event.data;
+        let originalValue = value;
         value = this._truncateValue(value);
 
@@ -94 +99 @@
         }
 
-        this._dataGrid.appendChild(new WI.DataGridNode({key, value}, false));
+        this._dataGrid.appendChild(new WI.DataGridNode({key, value, originalValue}, false));
         this._sortDataGrid();
     }
@@ -101 +106 @@
     {
         let {key, value} = event.data;
+        let originalValue = value;
         value = this._truncateValue(value);
 
@@ -114 +120 @@
                 keyFound = true;
                 childNode.data.value = value;
+                childNode.data.originalValue = originalValue;
                 childNode.refresh();
             }
@@ -137 +144 @@
                     continue;
 
+                let originalValue = value;
                 value = this._truncateValue(value);
-                let node = new WI.DataGridNode({key, value}, false);
+                let node = new WI.DataGridNode({key, value, originalValue}, false);
                 this._dataGrid.appendChild(node);
             }
@@ -254 +262 @@
         domStorage.setItem(key, value);
     }
+
+    _dataGridCopy(node, columnIdentifier, text)
+    {
+        if (columnIdentifier === "value" && node.data.originalValue)
+            return node.data.originalValue;
+        return text;
+    }
 };
 

trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js

@@ -26 +26 @@
 WI.DataGrid = class DataGrid extends WI.View
 {
-    constructor(columnsData, editCallback, deleteCallback, preferredColumnOrder)
+    constructor(columnsData, {editCallback, copyCallback, deleteCallback, preferredColumnOrder} = {})
     {
         super();
@@ -110 +110 @@
         }
 
+        if (copyCallback)
+            this._copyCallback = copyCallback;
+
         if (deleteCallback)
             this._deleteCallback = deleteCallback;
@@ -169 +172 @@
         }
 
-        var dataGrid = new WI.DataGrid(columnsData, undefined, undefined, columnNames);
+        let dataGrid = new WI.DataGrid(columnsData, {preferredColumnOrder: columnNames});
         for (var i = 0; i < values.length / numColumns; ++i) {
             var data = {};
@@ -1698 +1701 @@
     _copyTextForDataGridNode(node)
     {
-        let fields = node.dataGrid.orderedColumns.map((identifier) => this.textForDataGridNodeColumn(node, identifier));
+        let fields = node.dataGrid.orderedColumns.map((identifier) => {
+            let text = this.textForDataGridNodeColumn(node, identifier);
+            if (this._copyCallback)
+                text = this._copyCallback(node, identifier, text);
+            return text;
+        });
         return fields.join(this._copyTextDelimiter);
     }

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js

@@ -26 +26 @@
 WI.TimelineDataGrid = class TimelineDataGrid extends WI.DataGrid
 {
-    constructor(columns, editCallback, deleteCallback)
-    {
-        super(columns, editCallback, deleteCallback);
+    constructor(columns)
+    {
+        super(columns);
 
         this.element.classList.add("timeline");