From 58c78d37480a1e5d8364921ff9c75ccc99e5e37b Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Tue, 24 Jan 2023 11:12:35 +0100
Subject: [PATCH] catalog: accept null as field value

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 plugins/catalog-backend/src/catalog/types.ts                  | 4 ++--
 plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/catalog-backend/src/catalog/types.ts b/plugins/catalog-backend/src/catalog/types.ts
index 30472782a8..dc85e44e7a 100644
--- a/plugins/catalog-backend/src/catalog/types.ts
+++ b/plugins/catalog-backend/src/catalog/types.ts
@@ -295,7 +295,7 @@ export type Cursor = {
   /**
    * The values of the fields of a specific item used for paginating the data.
    */
-  sortFieldValues: string[];
+  sortFieldValues: Array<string | null>;
   /**
    * A filter to be applied to the full list of entities.
    */
@@ -313,7 +313,7 @@ export type Cursor = {
    * The catalog uses this field internally to understand if the beginning
    * of the list has been reached when performing cursor based pagination.
    */
-  firstSortFieldValues?: string[];
+  firstSortFieldValues?: Array<string | null>;
   /**
    * The number of items that match the provided filters
    */
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index 25d232958b..bf5c7f8242 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -338,7 +338,7 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     const limit = request?.limit ?? 20;
 
     const cursor: Omit<Cursor, 'sortFieldValues'> & {
-      sortFieldValues?: string[];
+      sortFieldValues?: (string | null)[];
     } = {
       sortFields: [defaultSortField],
       isPrevious: false,
@@ -689,5 +689,5 @@ function invertOrder(order: EntitySortField['order']) {
 }
 
 function sortFieldsFromRow(row: DbSearchRow) {
-  return [row.value!, row.entity_id];
+  return [row.value, row.entity_id];
 }