Fix filter on Cancer Type Detailed

Author: fuzhaoyuan

src/shared/components/fusionTable/FusionTable.tsx

@@ -373,21 +373,35 @@ export default class FusionTable<
         this.mergeOncoKbIcons = !!props.mergeOncoKbIcons;
     }
 
-    private defaultFilter(
-        data: StructuralVariant[],
-        dataField: string,
+    private filterColumnFn(
+        label: FusionTableColumnProps,
+        d: StructuralVariant[],
         filterStringUpper: string
     ): boolean {
-        const matchingData = data.find(next => {
-            const val = (next as any)[dataField];
+        if (label.columnType === FusionTableColumnType.CANCER_TYPE_DETAILED) {
+            let data: string | null = null;
+            if (this.props.uniqueSampleKeyToTumorType) {
+                data =
+                    this.props.uniqueSampleKeyToTumorType[
+                        d[0].uniqueSampleKey
+                    ] || null;
+            }
             return (
-                val &&
-                String(val)
-                    .toUpperCase()
-                    .includes(filterStringUpper)
+                data !== null &&
+                data.toUpperCase().indexOf(filterStringUpper) > -1
             );
-        });
-        return Boolean(matchingData);
+        } else {
+            const matchingData = d.find(next => {
+                const val = (next as any)[label.attribute];
+                return (
+                    val &&
+                    String(val)
+                        .toUpperCase()
+                        .includes(filterStringUpper)
+                );
+            });
+            return Boolean(matchingData);
+        }
     }
 
     private renderColumnFn(
@@ -616,7 +630,7 @@ export default class FusionTable<
                     d: StructuralVariantExt[],
                     filterString: string,
                     filterStringUpper: string
-                ) => this.defaultFilter(d, label.attribute, filterStringUpper),
+                ) => this.filterColumnFn(label, d, filterStringUpper),
                 visible: visibleColumns.indexOf(label.columnType) > -1,
             };
         });
@@ -706,7 +720,7 @@ export default class FusionTable<
                 columns={this.columns}
                 dataStore={this.props.dataStore}
                 downloadDataFetcher={this.props.downloadDataFetcher}
-                initialItemsPerPage={50}
+                initialItemsPerPage={this.props.initialItemsPerPage}
                 initialSortColumn={this.props.initialSortColumn}
                 initialSortDirection={this.props.initialSortDirection}
                 itemsLabel={this.props.itemsLabel}