Remove ts utils and use function to check boolean

saleor · Oct 24, 2023 · 5ed7c7b · 5ed7c7b
1 parent b8c602a
commit 5ed7c7b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/products/views/ProductUpdate/handlers/data/attributes.ts b/src/products/views/ProductUpdate/handlers/data/attributes.ts
@@ -10,7 +10,8 @@ import {
   getColumnAttribute,
   isCurrentRow,
 } from "@dashboard/products/utils/datagrid";
-import { nonNullable } from "@dashboard/utils/ts";
+
+import { byAttributeName } from "../utils";
 
 export function getAttributeData(
   data: DatagridChange[],
@@ -134,7 +135,9 @@ export function getAttributeInput(
 
   if (inputType === AttributeInputTypeEnum.REFERENCE) {
     return {
-      references: values.map(({ reference }) => reference).filter(nonNullable),
+      references: values
+        .map(({ reference }) => reference)
+        .filter(byAttributeName),
     };
   }
 
@@ -151,7 +154,7 @@ export function getAttributeInput(
   }
 
   return {
-    values: values.map(({ name }) => name).filter(nonNullable),
+    values: values.map(({ name }) => name).filter(byAttributeName),
   };
 }
 

diff --git a/src/products/views/ProductUpdate/handlers/utils.ts b/src/products/views/ProductUpdate/handlers/utils.ts
@@ -246,3 +246,7 @@ export function inferProductChannelsAfterUpdate(
     ...updatedChannelsIds,
   ]);
 }
+
+export function byAttributeName(x: string | null | undefined): x is string {
+  return typeof x === "string" && x.length > 0;
+}
diff --git a/src/utils/ts.ts b/src/utils/ts.ts
@@ -6,13 +6,3 @@ src/orders/components/OrderGrantRefundPage/reducer.ts
 export function exhaustiveCheck(x: never) {
   return x;
 }
-
-export function nonNullable<T>(value: T): value is NonNullable<T> {
-  return value !== null && value !== undefined;
-}
-
-type Truthy<T> = T extends false | "" | 0 | null | undefined ? never : T; // from lodash
-
-export function truthy<T>(value: T): value is Truthy<T> {
-  return !!value;
-}