File tree Expand file tree Collapse file tree 5 files changed +9
-11
lines changed
perspective-client/src/rust
perspective-viewer/src/rust
components/column_selector Expand file tree Collapse file tree 5 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ impl Client {
232232 {
233233 tracing:: error!( "{}" , message) ;
234234 } else {
235- tracing:: warn !( "Received unsolicited server message" ) ;
235+ tracing:: debug !( "Received unsolicited server response: {}" , msg ) ;
236236 }
237237
238238 Ok ( false )
Original file line number Diff line number Diff line change @@ -490,7 +490,7 @@ impl Component for FilterColumn {
490490 } ,
491491 } ;
492492
493- let final_col_type = col_type. expect ( "Unknown column" ) ;
493+ let final_col_type = col_type. unwrap_or ( perspective_client :: ColumnType :: Integer ) ;
494494
495495 html ! {
496496 <div
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ impl Component for PivotColumn {
6868 . session
6969 . metadata ( )
7070 . get_column_table_type ( & ctx. props ( ) . column )
71- . expect ( "Unknown column" ) ;
71+ . unwrap_or ( perspective_client :: ColumnType :: Integer ) ;
7272
7373 html ! {
7474 <div
Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ impl Component for SortColumn {
111111 . session
112112 . metadata ( )
113113 . get_column_table_type ( & ctx. props ( ) . sort . 0 . to_owned ( ) )
114- . expect ( "Unknown column" ) ;
114+ . unwrap_or ( perspective_client :: ColumnType :: Integer ) ;
115115
116116 html ! {
117117 <div
Original file line number Diff line number Diff line change @@ -605,7 +605,7 @@ impl Session {
605605 }
606606
607607 async fn validate_view_config ( & self ) -> ApiResult < ( ) > {
608- let config = self . borrow ( ) . config . clone ( ) ;
608+ let mut config = self . borrow ( ) . config . clone ( ) ;
609609 let table_columns = self
610610 . metadata ( )
611611 . get_table_columns ( )
@@ -623,13 +623,11 @@ impl Session {
623623 . ok_or_else ( || apierror ! ( NoTableError ) ) ?
624624 . clone ( ) ;
625625
626- let valid_recs = table. validate_expressions ( config. expressions ) . await ?;
627- let expression_names = self . metadata_mut ( ) . update_expressions ( & valid_recs) ?;
628-
629- // re-fetch config after `await`; `expressions` and `all_columns` are ok,
630- // but `config` may have changed as it is unlocked.
631- let mut config = self . borrow ( ) . config . clone ( ) ;
626+ let valid_recs = table
627+ . validate_expressions ( config. expressions . clone ( ) )
628+ . await ?;
632629
630+ let expression_names = self . metadata_mut ( ) . update_expressions ( & valid_recs) ?;
633631 if config. columns . is_empty ( ) {
634632 config. columns = table_columns. into_iter ( ) . map ( Some ) . collect ( ) ;
635633 }
You can’t perform that action at this time.
0 commit comments