Refactore empty object type

denisprotassoff · Sep 30, 2022 · 29ced01 · 29ced01
1 parent 867035f
commit 29ced01
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/packages/scandipwa/src/component/MyAccountInformation/MyAccountInformation.type.ts b/packages/scandipwa/src/component/MyAccountInformation/MyAccountInformation.type.ts
@@ -46,7 +46,7 @@ export interface MyAccountInformationContainerFunctions {
 
 export type MyAccountInformationContainerProps = MyAccountInformationContainerMapStateProps
 & MyAccountInformationContainerMapDispatchProps
-& RouteComponentProps<Record<string, never>, Record<string, never>, { editPassword?: boolean }>;
+& RouteComponentProps<EmptyObject, EmptyObject, { editPassword?: boolean }>;
 
 export interface MyAccountInformationContainerState {
     showEmailChangeField: boolean;

diff --git a/packages/scandipwa/src/component/MyAccountOrder/MyAccountOrder.type.ts b/packages/scandipwa/src/component/MyAccountOrder/MyAccountOrder.type.ts
@@ -59,7 +59,7 @@ export interface MyAccountOrderContainerState {
 }
 
 export interface MyAccountOrderComponentProps {
-    order: OrderItem | Record<string, never>;
+    order: OrderItem | EmptyObject;
     isLoading: boolean;
     handleReorder: () => void;
     is_allowed_reorder: boolean;

diff --git a/packages/scandipwa/src/component/MyAccountOrderInformation/MyAccountOrderInformation.type.ts b/packages/scandipwa/src/component/MyAccountOrderInformation/MyAccountOrderInformation.type.ts
@@ -12,5 +12,5 @@
 import { OrderItem } from 'Query/Order.type';
 
 export interface MyAccountOrderInformationComponentProps {
-    order: OrderItem | Record<string, never>;
+    order: OrderItem | EmptyObject;
 }
diff --git a/packages/scandipwa/src/component/Router/Router.type.ts b/packages/scandipwa/src/component/Router/Router.type.ts
@@ -63,7 +63,7 @@ export interface RouterComponentState {
     errorDetails: {
         err: Error;
         info: ErrorInfo;
-    } | Record<string, never>;
+    } | EmptyObject;
     hasError: boolean;
 }
 

diff --git a/packages/scandipwa/src/route/LoginAccount/LoginAccount.type.ts b/packages/scandipwa/src/route/LoginAccount/LoginAccount.type.ts
@@ -27,7 +27,7 @@ export interface LoginAccountContainerMapDispatchProps extends MyAccountOverlayC
 
 export type LoginAccountContainerProps = LoginAccountContainerMapDispatchProps
 & MyAccountOverlayContainerProps
-& RouteComponentProps<Record<string, never>, Record<string, never>, HistoryState>;
+& RouteComponentProps<EmptyObject, EmptyObject, HistoryState>;
 
 export interface LoginAccountContainerFunctions extends MyAccountOverlayContainerFunctions {
     onCreateAccountClick: () => void;

diff --git a/packages/scandipwa/src/route/SomethingWentWrong/SomethingWentWrong.type.ts b/packages/scandipwa/src/route/SomethingWentWrong/SomethingWentWrong.type.ts
@@ -25,7 +25,7 @@ export interface SomethingWentWrongContainerBaseProps {
     errorDetails: {
         err: Error;
         info: ErrorInfo;
-    } | Record<string, never>;
+    } | EmptyObject;
 
 }
 
@@ -37,7 +37,7 @@ export interface SomethingWentWrongComponentProps {
     errorDetails: {
         err: Error;
         info: ErrorInfo;
-    } | Record<string, never>;
+    } | EmptyObject;
 
 }
 

diff --git a/packages/scandipwa/src/route/UrlRewrites/UrlRewrites.type.ts b/packages/scandipwa/src/route/UrlRewrites/UrlRewrites.type.ts
@@ -31,7 +31,7 @@ export type UrlRewritesContainerProps = UrlRewritesContainerMapStateProps
 
 export interface UrlRewritesComponentProps {
     type: string;
-    props: UrlRewriteProps | Record<string, never>;
+    props: UrlRewriteProps | EmptyObject;
 }
 
 export type UrlRewritesContainerPropsKeys = 'type'

diff --git a/packages/scandipwa/src/route/WishlistSharedPage/WishlistSharedPage.type.ts b/packages/scandipwa/src/route/WishlistSharedPage/WishlistSharedPage.type.ts
@@ -40,7 +40,7 @@ WishlistSharedPageContainerMapDispatchProps
 
 export interface WishlistSharedPageContainerState extends MyAccountMyWishlistContainerState {
     creatorsName: string;
-    wishlistItems: Record<string, never>;
+    wishlistItems: EmptyObject;
     isWishlistLoading: boolean;
 }
 

diff --git a/packages/scandipwa/src/type/Global.type.ts b/packages/scandipwa/src/type/Global.type.ts
@@ -13,8 +13,6 @@ import { StoreEnhancer } from 'redux';
 
 import { Mix } from './Common.type';
 
-// import { ValidationData } from 'Util/Validator';
-
 declare global {
     interface Window {
         // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -125,7 +123,5 @@ declare global {
         };
     }
 
-    // interface HTMLElementEventMap {
-    //     validate: ValidationData
-    // }
+    type EmptyObject = Record<string, never>;
 }