Skip to content

Commit 31f2fc0

Browse files
bold null in join only for mismatched columns
1 parent 080bb27 commit 31f2fc0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/StardustDocs/resources/api/join/notebook_test_join_18.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
/*<!--*/
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"name: String\" style=\"color:#f44336;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">name</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Alice"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Charlie"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Bob"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Alice"}] },
461461
{ name: "<span title=\"age: Int?\">age</span>", children: [], rightAlign: true, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
462-
{ name: "<span title=\"city: String?\" style=\"color:#2196f3;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">city</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "London"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Moscow"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
462+
{ name: "<span title=\"city: String?\" style=\"color:#2196f3;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">city</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "London"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Moscow"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
463463
{ name: "<span title=\"isBusy: Boolean\">isBusy</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "false"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"}] },
464464
], id: 0, rootId: 0, totalRows: 4 } ) });
465465
/*-->*/

docs/StardustDocs/resources/api/join/notebook_test_join_19.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
/*<!--*/
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"name: String\" style=\"color:#f44336;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">name</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Alice"},{ style: "background-color:#f5e2bf;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Bob"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Charlie"},{ style: "background-color:#bfdfe8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Charlie"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Bob"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Alice"}] },
461461
{ name: "<span title=\"age: Int?\">age</span>", children: [], rightAlign: true, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">15</span></span>"},{ style: "background-color:#f5e2bf;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">20</span></span>"},{ style: "background-color:#bfdfe8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"numbers\">40</span></span>"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
462-
{ name: "<span title=\"city: String?\" style=\"color:#2196f3;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">city</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "London"},{ style: "background-color:#f5e2bf;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Dubai"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Moscow"},{ style: "background-color:#bfdfe8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
462+
{ name: "<span title=\"city: String?\" style=\"color:#2196f3;font-family:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace\">city</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "London"},{ style: "background-color:#f5e2bf;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Dubai"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Moscow"},{ style: "background-color:#bfdfe8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "Tokyo"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"}] },
463463
{ name: "<span title=\"isBusy: Boolean?\">isBusy</span>", children: [], rightAlign: false, values: [{ style: "background-color:#f2d2bd;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"},{ style: "background-color:#f5e2bf;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"},{ style: "background-color:#d2e5c7;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"},{ style: "background-color:#bfdfe8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important;font-weight:bold", value: "<span class=\"formatted\" title=\"\"><span class=\"null\">null</span></span>"},{ style: "background-color:#c8c8e8;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "false"},{ style: "background-color:#e9c7dc;color:#000000;--text-color:#000000 !important;--text-color-dark:#000000 !important;--text-color-pale:#000000 !important;--text-color-medium:#000000 !important", value: "true"}] },
464464
], id: 0, rootId: 0, totalRows: 6 } ) });
465465
/*-->*/

samples/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/multiple/JoinSamples.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class JoinSamples : DataFrameSampleHelper("join", "api") {
265265
dfLeft.leftJoin(dfRight) { name and city }
266266
// SampleEnd
267267
.colorized()
268-
.format().with { if (it == null) bold else null }
268+
.format { all() except (name and city) }.with { if (it == null) bold else null }
269269
.defaultHeaderFormatting { name and city }
270270
.saveDfHtmlSample()
271271
}
@@ -281,7 +281,7 @@ class JoinSamples : DataFrameSampleHelper("join", "api") {
281281
dfLeft.rightJoin(dfRight) { name and city }
282282
// SampleEnd
283283
.colorized()
284-
.format().with { if (it == null) bold else null }
284+
.format { all() except (name and city) }.with { if (it == null) bold else null }
285285
.defaultHeaderFormatting { name and city }
286286
.saveDfHtmlSample()
287287
}
@@ -295,7 +295,7 @@ class JoinSamples : DataFrameSampleHelper("join", "api") {
295295
dfLeft.fullJoin(dfRight) { name and city }
296296
// SampleEnd
297297
.colorized()
298-
.format().with { if (it == null) bold else null }
298+
.format { all() except (name and city) }.with { if (it == null) bold else null }
299299
.defaultHeaderFormatting { name and city }
300300
.saveDfHtmlSample()
301301
}

0 commit comments

Comments
 (0)