Merge pull request #71 from mskilab-org/fix/minor-bugs

Fix/minor bugs

Author: xanthopoulakis

src/components/filteredEventsListPanel/columnBuilders.js

@@ -162,7 +162,7 @@ function computeRangeBounds(records, dataIndex) {
  * @param {Object} rendererProps - Additional props to pass to the renderer, plus t() function
  * @returns {Object} Complete Ant Design column config
  */
-export function buildColumnConfig(columnDef, records, rendererProps = {}) {
+export function buildColumnConfig(columnDef, records, rendererProps = {}, filteredValue = null) {
   const {
     id,
     title,
@@ -237,6 +237,10 @@ export function buildColumnConfig(columnDef, records, rendererProps = {}) {
         columnConfig.filterSearch = true;
       }
     }
+    // Apply controlled filteredValue if provided (enables programmatic filter reset)
+    if (filteredValue !== null) {
+      columnConfig.filteredValue = filteredValue;
+    }
   }
 
   // Add sorter if enabled
@@ -262,7 +266,8 @@ export function buildColumnsFromSettings(
   settingsColumns = [],
   datasetColumns = [],
   records = [],
-  rendererProps = {}
+  rendererProps = {},
+  filterValues = {}
 ) {
   // Merge settings and dataset columns, dataset takes precedence
   const allColumns = [...settingsColumns];
@@ -281,6 +286,6 @@ export function buildColumnsFromSettings(
 
   // Build column configs
   return allColumns.map((columnDef) =>
-    buildColumnConfig(columnDef, records, rendererProps)
+    buildColumnConfig(columnDef, records, rendererProps, filterValues[columnDef.id] ?? null)
   );
 }

src/components/filteredEventsListPanel/index.js

@@ -318,6 +318,16 @@ class FilteredEventsListPanel extends Component {
     let records =
       (eventType === "all" ? filteredEvents : recordsHash.get(eventType)) || [];
 
+    // Build filter values object for controlled filter state
+    const filterValues = {
+      gene: this.state.geneFilters,
+      tier: this.state.tierFilters,
+      type: this.state.typeFilters,
+      role: this.state.roleFilters,
+      effect: this.state.effectFilters,
+      variant: this.state.variantFilters,
+    };
+
     // Build columns from settings.json and dataset configuration
     const columns = buildColumnsFromSettings(
       data?.filteredEventsColumns || [],
@@ -327,7 +337,8 @@ class FilteredEventsListPanel extends Component {
         t,
         selectFilteredEvent,
         getTierTooltipContent: this.getTierTooltipContent,
-      }
+      },
+      filterValues
     );
 
     return (

src/components/reportButtonsPanel/index.js

@@ -199,6 +199,8 @@ const mapDispatchToProps = (dispatch) => ({
 const mapStateToProps = (state) => ({
   loading: state.PopulationStatistics.loading,
   id: state.CaseReport.id,
+  CaseReport: state.CaseReport,
+  Interpretations: state.Interpretations,
   mergedEvents: require("../../redux/interpretations/selectors").selectMergedEvents(state),
 });