Set right sorting of Chart and remove wrong items from Table

minvws · Jul 29, 2022 · b5529aa · b5529aa
1 parent b3e780a
commit b5529aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/app/src/domain/variants/static-props/get-variant-chart-data.ts b/packages/app/src/domain/variants/static-props/get-variant-chart-data.ts
@@ -2,7 +2,7 @@ import { NlVariants } from '@corona-dashboard/common';
 import { isDefined } from 'ts-is-present';
 import { SiteText } from '~/locale';
 
-export type VariantCodesAll = SiteText['common']['variant_codes']
+export type VariantCodesAll = SiteText['common']['variant_codes'];
 
 export type VariantCode = keyof VariantCodesAll;
 
@@ -34,7 +34,7 @@ export function getVariantChartData(variants: NlVariants | undefined) {
         variant.last_value.is_variant_of_concern ||
         variant.last_value.has_historical_significance
     )
-    .sort((a, b) => a.last_value.order - b.last_value.order);
+    .sort((a, b) => b.last_value.order - a.last_value.order);
 
 
 

diff --git a/packages/app/src/domain/variants/static-props/get-variant-table-data.ts b/packages/app/src/domain/variants/static-props/get-variant-table-data.ts
@@ -31,7 +31,7 @@ export function getVariantTableData(
       date_start_unix: 0,
       date_end_unix: 0,
     },
-  } as const
+  } as const;
 
   if (!isDefined(variants) || !isDefined(variants.values)) {
     return emptyValues;
@@ -65,7 +65,7 @@ export function getVariantTableData(
   const variantTable = variants.values
     .filter(
       (variant) =>
-        variant.variant_code !== 'other_graph' || (!variant.last_value.has_historical_significance && variant.last_value.is_variant_of_concern)
+        variant.variant_code !== 'other_graph' && !variant.last_value.has_historical_significance
     )
     .sort((a, b) => a.last_value.order - b.last_value.order)
     .map<VariantRow>((variant) => {