fix: round custom filters to ensure correct file size comparison, use…

… base 10 (SI) file sizes
sanity-io · Jan 3, 2021 · b3c2cfc · b3c2cfc
1 parent 63403e3
commit b3c2cfc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/components/AssetMetadata/index.tsx b/src/components/AssetMetadata/index.tsx
@@ -26,7 +26,7 @@ const AssetMetadata: FC<Props> = (props: Props) => {
         <Flex justify="space-between">
           <Text size={1}>Size</Text>
           <Text muted size={1}>
-            {filesize(asset?.size, {round: 0})}
+            {filesize(asset?.size, {base: 10, round: 0})}
           </Text>
         </Flex>
         {/* MIME type */}

diff --git a/src/components/TableRow/index.tsx b/src/components/TableRow/index.tsx
@@ -253,7 +253,7 @@ const TableRow = (props: Props) => {
         }}
       >
         <TextEllipsis muted size={1}>
-          {filesize(asset.size, {round: 0})}
+          {filesize(asset.size, {base: 10, round: 0})}
         </TextEllipsis>
       </LegacyBox>
 

diff --git a/src/constants.ts b/src/constants.ts
@@ -58,12 +58,12 @@ export const FACETS: (SearchFacetProps | null)[] = [
         {
           name: 'kb',
           title: 'KB',
-          fn: val => val * 1000
+          fieldModifier: fieldName => `round(${fieldName} / 1000)`
         },
         {
           name: 'mb',
           title: 'MB',
-          fn: val => val * 1000000
+          fieldModifier: fieldName => `round(${fieldName} / 1000000)`
         }
       ]
     },

diff --git a/src/modules/assets/index.ts b/src/modules/assets/index.ts
@@ -798,10 +798,12 @@ const constructFilter = (searchFacets: SearchFacetProps[], searchQuery?: string)
       // Get current modifier
       const currentModifier = options?.modifiers.find(m => m.name === modifier)
 
-      // Apply modifier fn (if present)
-      const modifiedValue = currentModifier ? currentModifier?.fn(value) : value
+      // Apply field modifier fn (if present)
+      const fieldValue = currentModifier?.fieldModifier
+        ? currentModifier.fieldModifier(field)
+        : field
 
-      return `${field} ${COMPARISON_OPERATOR_MAPPING[operators.comparison].value} ${modifiedValue}`
+      return `${fieldValue} ${COMPARISON_OPERATOR_MAPPING[operators.comparison].value} ${value}`
     }
 
     if (facet.type === 'select') {

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -88,8 +88,7 @@ export type Order = {
 }
 
 export type SearchFacetNumberModifier = {
-  // TODO: use correct type
-  fn: (val: any) => any
+  fieldModifier?: (fieldName: string) => string
   name: string
   title: string
 }