Merge branch 'main' into deployments/ood.antenna.insectai.org

Author: annavik

ui/src/components/empty-state/empty-state.tsx

@@ -1,26 +1,44 @@
 import { Button } from 'nova-ui-kit'
+import { ReactNode } from 'react'
 import { STRING, translate } from 'utils/language'
 import { useFilters } from 'utils/useFilters'
+import { usePagination } from 'utils/usePagination'
 
 export const EmptyState = () => {
   const { filters, activeFilters, clearFilter } = useFilters()
+  const { pagination, resetPage } = usePagination()
 
-  return (
-    <div className="flex flex-col gap-6 items-center py-24">
-      <span className="body-base text-muted-foreground">
-        {translate(
-          activeFilters.length
-            ? STRING.MESSAGE_NO_RESULTS_FOR_FILTERING
-            : STRING.MESSAGE_NO_RESULTS
-        )}
-      </span>
-      {activeFilters.length ? (
+  if (pagination.page) {
+    return (
+      <Container>
+        <p>{translate(STRING.MESSAGE_NO_RESULTS_FOR_PAGE)}</p>
+        <Button onClick={() => resetPage()}>
+          {translate(STRING.RESET_PAGE)}
+        </Button>
+      </Container>
+    )
+  }
+
+  if (activeFilters.length) {
+    return (
+      <Container>
+        <p>{translate(STRING.MESSAGE_NO_RESULTS_FOR_FILTERING)}</p>
         <Button
           onClick={() => filters.map((filter) => clearFilter(filter.field))}
         >
           {translate(STRING.CLEAR_FILTERS)}
         </Button>
-      ) : null}
-    </div>
+      </Container>
+    )
+  }
+
+  return (
+    <Container>
+      <p>{translate(STRING.MESSAGE_NO_RESULTS)}</p>
+    </Container>
   )
 }
+
+const Container = ({ children }: { children: ReactNode }) => (
+  <div className="flex flex-col gap-6 items-center py-24">{children}</div>
+)

ui/src/design-system/variables/typography.scss

@@ -1,7 +1,7 @@
 @import 'src/design-system/variables/variables.scss';
 
 @mixin heading-6 {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 600;
   font-size: 20px;
@@ -14,7 +14,7 @@
 }
 
 @mixin heading-5 {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 600;
   font-size: 24px;
@@ -28,7 +28,7 @@
 }
 
 @mixin heading-4-italic {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 28px;
@@ -42,39 +42,39 @@
 }
 
 @mixin paragraph-xx-small {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 10px;
   line-height: 16px;
 }
 
 @mixin paragraph-x-small {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 12px;
   line-height: 16px;
 }
 
 @mixin paragraph-small {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 14px;
   line-height: 20px;
 }
 
 @mixin paragraph-medium {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 16px;
   line-height: 22px;
 }
 
 @mixin paragraph-large {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 400;
   font-size: 18px;
@@ -83,7 +83,7 @@
 
 // Not present in Figma
 @mixin label {
-  font-family: 'Mazzard';
+  font-family: 'Mazzard', sans-serif;
   font-style: normal;
   font-weight: 600;
   font-size: 12px;

ui/src/utils/language.ts

@@ -24,6 +24,7 @@ export enum STRING {
   QUEUED,
   REFRESH,
   RESET,
+  RESET_PAGE,
   RETRY,
   RERUN,
   SAVE,
@@ -169,6 +170,7 @@ export enum STRING {
   MESSAGE_NO_IMAGE,
   MESSAGE_NO_RESULTS,
   MESSAGE_NO_RESULTS_FOR_FILTERING,
+  MESSAGE_NO_RESULTS_FOR_PAGE,
   MESSAGE_PASSWORD_FORMAT,
   MESSAGE_PASSWORD_UPDATED,
   MESSAGE_PERMISSIONS_MISSING,
@@ -299,6 +301,7 @@ const ENGLISH_STRINGS: { [key in STRING]: string } = {
   [STRING.QUEUED]: 'Queued',
   [STRING.REFRESH]: 'Refresh',
   [STRING.RESET]: 'Reset',
+  [STRING.RESET_PAGE]: 'Reset page',
   [STRING.RETRY]: 'Retry',
   [STRING.RERUN]: 'Re-run',
   [STRING.SAVE]: 'Save',
@@ -453,7 +456,9 @@ const ENGLISH_STRINGS: { [key in STRING]: string } = {
   [STRING.MESSAGE_NO_IMAGE]: 'No image',
   [STRING.MESSAGE_NO_RESULTS]: 'No results to show.',
   [STRING.MESSAGE_NO_RESULTS_FOR_FILTERING]:
-    'No results to show for the current fitering.',
+    'No results to show for the current filtering.',
+  [STRING.MESSAGE_NO_RESULTS_FOR_PAGE]:
+    'No results to show for the current page.',
   [STRING.MESSAGE_PASSWORD_FORMAT]:
     'The password must contain at least 8 characters and cannot be entirely numeric.',
   [STRING.MESSAGE_PASSWORD_UPDATED]: 'Your password has been updated!',

ui/src/utils/useFilters.ts

@@ -1,6 +1,7 @@
 import { isBefore, isValid } from 'date-fns'
 import { useSearchParams } from 'react-router-dom'
 import { STRING, translate } from './language'
+import { SEARCH_PARAM_KEY_PAGE } from './usePagination'
 
 export const AVAILABLE_FILTERS: {
   label: string
@@ -166,13 +167,25 @@ export const useFilters = (defaultFilters?: { [field: string]: string }) => {
   const addFilter = (field: string, value: string) => {
     if (AVAILABLE_FILTERS.some((filter) => filter.field === field)) {
       searchParams.set(field, value)
+
+      // Reset page param if set, when filters are updated
+      if (searchParams.has(SEARCH_PARAM_KEY_PAGE)) {
+        searchParams.delete(SEARCH_PARAM_KEY_PAGE)
+      }
+
       setSearchParams(searchParams)
     }
   }
 
   const clearFilter = (field: string) => {
     if (AVAILABLE_FILTERS.some((filter) => filter.field === field)) {
       searchParams.delete(field)
+
+      // Reset page param if set, when filters are updated
+      if (searchParams.has(SEARCH_PARAM_KEY_PAGE)) {
+        searchParams.delete(SEARCH_PARAM_KEY_PAGE)
+      }
+
       setSearchParams(searchParams)
     }
   }

ui/src/utils/usePagination.ts

@@ -29,18 +29,22 @@ const useSearchParam = ({
     }
   }
 
-  const clearValue = () => {
+  const resetValue = () => {
     if (searchParams.has(key)) {
       searchParams.delete(key)
       setSearchParams(searchParams)
     }
   }
 
-  return { value, setValue, clearValue }
+  return { value, setValue, resetValue }
 }
 
-export const usePagination = ({ perPage }: { perPage?: number } = {}) => {
-  const { value: page, setValue: setPage } = useSearchParam({
+const usePagination = ({ perPage }: { perPage?: number } = {}) => {
+  const {
+    value: page,
+    setValue: setPage,
+    resetValue: resetPage,
+  } = useSearchParam({
     key: SEARCH_PARAM_KEY_PAGE,
     defaultValue: DEFAULT_PAGINATION.page,
   })
@@ -50,6 +54,9 @@ export const usePagination = ({ perPage }: { perPage?: number } = {}) => {
       page,
       perPage: perPage ?? DEFAULT_PAGINATION.perPage,
     },
+    resetPage,
     setPage,
   }
 }
+
+export { SEARCH_PARAM_KEY_PAGE, usePagination }