@molgenis/vip-report-template 6.0.2 → 6.2.0

package/src/views/Variants.tsx

@@ -83,7 +83,7 @@ export const Variants: Component<{
 
   return (
     <div class="columns is-variable is-1">
-      <div class="column is-1-fullhd is-2">
+      <div class="scrolling-div column is-1-fullhd is-2">
         <SearchBox onInput={onSearchChange} />
         <InfoFilters
           fields={flattenFieldMetadata(props.recordsMeta.info)}
@@ -92,7 +92,7 @@ export const Variants: Component<{
           onClear={onFilterClear}
         />
       </div>
-      <div class="column">
+      <div class="scrolling-div column">
         <div class="columns is-gapless">
           <div class="column">
             <p class="title is-3">Reported variants</p>

package/src/views/data/data.tsx

@@ -0,0 +1,7 @@
+import { cache } from "@solidjs/router";
+import { Item, Sample } from "@molgenis/vip-report-api/src/Api";
+import { Record } from "@molgenis/vip-report-vcf/src/Vcf";
+import api from "../../Api";
+
+export const getSample = cache(async (id: number): Promise<Item<Sample>> => api.getSampleById(id), "sample");
+export const getVariant = cache(async (id: number): Promise<Item<Record>> => api.getRecordById(id), "variant");

package/src/components/filter/FilterIntegerDp.tsx

@@ -1,47 +0,0 @@
-import { Component } from "solid-js";
-import { FilterProps } from "./Filter";
-import { Checkbox, CheckboxEvent } from "../Checkbox";
-import { selector, selectorKey } from "../../utils/query";
-import { Item, Sample, Selector } from "@molgenis/vip-report-api/src/Api";
-
-export const FilterIntegerDp: Component<FilterProps> = (props) => {
-  const onFilterChange = (event: CheckboxEvent) => {
-    const fieldSelector: Selector = ["s", (props.sample as Item<Sample>).data.index, ...selector(props.field)];
-    if (event.checked)
-      props.onChange({
-        key: selectorKey(fieldSelector),
-        query: {
-          operator: "or",
-          args: [
-            {
-              selector: fieldSelector,
-              operator: ">=",
-              args: 20,
-            },
-            {
-              selector: fieldSelector,
-              operator: "==",
-              args: null,
-            },
-            {
-              selector: fieldSelector,
-              operator: "==",
-              args: undefined,
-            },
-          ],
-        },
-      });
-    else props.onClear({ key: selectorKey(fieldSelector) });
-  };
-
-  return (
-    <div class="control">
-      <Checkbox
-        desc="Sequencing depth >= 20"
-        label="Depth >= 20"
-        checked={props.query && props.query.args !== undefined}
-        onChange={onFilterChange}
-      />
-    </div>
-  );
-};

package/src/views/data/SampleData.tsx

@@ -1,13 +0,0 @@
-import { createResource, Resource } from "solid-js";
-import { RouteDataFuncArgs } from "@solidjs/router/dist/types";
-import { EMPTY_SAMPLE_ITEM, fetchSampleById } from "../../utils/ApiUtils";
-import { Item, Sample } from "@molgenis/vip-report-api/src/Api";
-
-export type SampleParams = { sampleId: string };
-export type SampleRouteData = { sample: Resource<Item<Sample>> };
-
-export default function SampleData({ params }: RouteDataFuncArgs): SampleRouteData {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-  const [sample] = createResource(() => params.sampleId, fetchSampleById, { initialValue: EMPTY_SAMPLE_ITEM });
-  return { sample };
-}

package/src/views/data/SampleVariantConsequenceData.tsx

@@ -1,13 +0,0 @@
-import { RouteDataFuncArgs } from "@solidjs/router/dist/types";
-import { SampleVariantRouteData } from "./SampleVariantData";
-
-export type SampleVariantConsequenceRouteData = { consequenceId: number } & SampleVariantRouteData;
-
-export default function SampleVariantConsequenceData({
-  params,
-  data,
-}: RouteDataFuncArgs): SampleVariantConsequenceRouteData {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
-  const consequenceId: number = parseInt(params.consequenceId);
-  return { ...(data as SampleVariantRouteData), consequenceId };
-}

package/src/views/data/SampleVariantData.tsx

@@ -1,14 +0,0 @@
-import { createResource, Resource } from "solid-js";
-import { RouteDataFuncArgs } from "@solidjs/router/dist/types";
-import { fetchRecordById } from "../../utils/ApiUtils";
-import { SampleRouteData } from "./SampleData";
-import { Item } from "@molgenis/vip-report-api/src/Api";
-import { Record } from "@molgenis/vip-report-vcf/src/Vcf";
-
-export type SampleVariantRouteData = SampleRouteData & { variant: Resource<Item<Record> | undefined> };
-
-export default function SampleVariantData({ params, data }: RouteDataFuncArgs): SampleVariantRouteData {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-  const [variant] = createResource(() => params.variantId, fetchRecordById);
-  return { ...(data as SampleRouteData), variant };
-}

package/src/views/data/VariantConsequenceData.tsx

@@ -1,10 +0,0 @@
-import { RouteDataFuncArgs } from "@solidjs/router/dist/types";
-import { VariantRouteData } from "./VariantData";
-
-export type VariantConsequenceRouteData = { consequenceId: number } & VariantRouteData;
-
-export default function VariantConsequenceData({ params, data }: RouteDataFuncArgs): VariantConsequenceRouteData {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
-  const consequenceId: number = parseInt(params.consequenceId);
-  return { ...(data as VariantRouteData), consequenceId };
-}

package/src/views/data/VariantData.tsx

@@ -1,13 +0,0 @@
-import { createResource, Resource } from "solid-js";
-import { RouteDataFuncArgs } from "@solidjs/router/dist/types";
-import { EMPTY_RECORD_ITEM, fetchRecordById } from "../../utils/ApiUtils";
-import { Item } from "@molgenis/vip-report-api/src/Api";
-import { Record } from "@molgenis/vip-report-vcf/src/Vcf";
-
-export type VariantRouteData = { variant: Resource<Item<Record>> };
-
-export default function VariantData({ params }: RouteDataFuncArgs): VariantRouteData {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-  const [variant] = createResource(() => params.variantId, fetchRecordById, { initialValue: EMPTY_RECORD_ITEM });
-  return { variant };
-}