From 244ddf7e644a5122a1dc6ea98ad342dfce76b5d5 Mon Sep 17 00:00:00 2001
From: Iku-turso <mikko.aspiala@gmail.com>
Date: Wed, 26 Oct 2022 11:49:55 +0300
Subject: [PATCH] Consolidate some "maybe-types" and arguments using them

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
---
 .../utils/composable-responsibilities/orderable/orderable.ts  | 4 +++-
 .../utils/composable-responsibilities/showable/showable.ts    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/utils/composable-responsibilities/orderable/orderable.ts b/src/common/utils/composable-responsibilities/orderable/orderable.ts
index 819d9087d6..e0425cc0a7 100644
--- a/src/common/utils/composable-responsibilities/orderable/orderable.ts
+++ b/src/common/utils/composable-responsibilities/orderable/orderable.ts
@@ -9,7 +9,9 @@ export interface Orderable {
   readonly orderNumber: number;
 }
 
-export const orderByOrderNumber = <T extends Orderable | object>(maybeOrderables: T[]) =>
+export type MaybeOrderable = Orderable | object;
+
+export const orderByOrderNumber = <T extends MaybeOrderable>(maybeOrderables: T[]) =>
   sortBy(
     (orderable) =>
       "orderNumber" in orderable
diff --git a/src/common/utils/composable-responsibilities/showable/showable.ts b/src/common/utils/composable-responsibilities/showable/showable.ts
index 61c779a693..ad8e2ed25b 100644
--- a/src/common/utils/composable-responsibilities/showable/showable.ts
+++ b/src/common/utils/composable-responsibilities/showable/showable.ts
@@ -10,9 +10,9 @@ export interface Showable {
   readonly isShown: IComputedValue<boolean> | boolean;
 }
 
-export type MaybeShowable = Partial<Showable>;
+export type MaybeShowable = Showable | object;
 
-export const isShown = (showable: Showable | object) => {
+export const isShown = (showable: MaybeShowable) => {
   if (!("isShown" in showable)) {
     return true;
   }