Merge pull request #139 from rstudio/fix-rsc-preview

Fix rsc preview

Author: machow

pins/boards.py

@@ -943,13 +943,21 @@ def prepare_pin_version(self, pin_dir_path, x, name: "str | None", *args, **kwar
 
         if isinstance(x, pd.DataFrame):
             # TODO(compat) is 100 hard-coded?
+            # Note that we go df -> json -> dict, to take advantage of pandas type conversions
             data = json.loads(x.head(100).to_json(orient="records"))
             columns = [
                 {"name": [col], "label": [col], "align": ["left"], "type": [""]}
                 for col in x
             ]
 
-            context["data_preview"] = json.dumps({"data": data, "columns": columns})
+            # this reproduces R pins behavior, by omitting entries that would be null
+            data_no_nulls = [
+                {k: v for k, v in row.items() if v is not None} for row in data
+            ]
+
+            context["data_preview"] = json.dumps(
+                {"data": data_no_nulls, "columns": columns}
+            )
         else:
             # TODO(compat): set display none in index.html
             context["data_preview"] = json.dumps({})

pins/tests/_snapshots/test_board_pin_write_rsc_index_html/data.txt

@@ -2,8 +2,8 @@ api_version: 1
 created: 20200113T235859Z
 description: some description
 file: test_rsc_pin.csv
-file_size: 16
-pin_hash: d6820e2d11300a70
+file_size: 19
+pin_hash: a6cf5331bf3de6c6
 title: some pin
 type: csv
 user: {}

pins/tests/_snapshots/test_board_pin_write_rsc_index_html/index.html

@@ -45,8 +45,8 @@ <h3>derek/test_rsc_pin</h3>
 created: 20200113T235859Z
 description: some description
 file: test_rsc_pin.csv
-file_size: 16
-pin_hash: d6820e2d11300a70
+file_size: 19
+pin_hash: a6cf5331bf3de6c6
 title: some pin
 type: csv
 user: {}
@@ -76,7 +76,7 @@ <h3>Code</h3>
       <h3>Preview <small>(up to 100 rows)</small></h3>
       <div data-pagedtable style="height: 25em;">
         <script data-pagedtable-source type="application/json">
-          {"data": [{"x": 1, "y": "a"}, {"x": 2, "y": "b"}, {"x": 3, "y": "c"}], "columns": [{"name": ["x"], "label": ["x"], "align": ["left"], "type": [""]}, {"name": ["y"], "label": ["y"], "align": ["left"], "type": [""]}]}
+          {"data": [{"x": 1.0, "y": "a"}, {"x": 2.0, "y": "b"}, {"y": "c"}], "columns": [{"name": ["x"], "label": ["x"], "align": ["left"], "type": [""]}, {"name": ["y"], "label": ["y"], "align": ["left"], "type": [""]}]}
         </script>
       </div>
     </section>

pins/tests/_snapshots/test_board_pin_write_rsc_index_html/test_rsc_pin.csv

@@ -1,4 +1,4 @@
 x,y
-1,a
-2,b
-3,c
+1.0,a
+2.0,b
+,c

pins/tests/test_boards.py

@@ -100,7 +100,7 @@ def test_board_pin_write_rsc_index_html(board, tmp_dir2, snapshot):
     if board.fs.protocol != "rsc":
         pytest.skip()
 
-    df = pd.DataFrame({"x": [1, 2, 3], "y": ["a", "b", "c"]})
+    df = pd.DataFrame({"x": [1, 2, None], "y": ["a", "b", "c"]})
 
     pin_name = "test_rsc_pin"