Some TS runtime error fixes

denisprotassoff · Sep 8, 2022 · 5c5dd16 · 5c5dd16
1 parent aea6e5c
commit 5c5dd16
Show file tree

Hide file tree

Showing 29 changed files with 1,475 additions and 1,368 deletions.
diff --git a/packages/scandipwa/i18n/da_DK.json b/packages/scandipwa/i18n/da_DK.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/de_DE.json b/packages/scandipwa/i18n/de_DE.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/es_ES.json b/packages/scandipwa/i18n/es_ES.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/fa_IR.json b/packages/scandipwa/i18n/fa_IR.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/fi_FI.json b/packages/scandipwa/i18n/fi_FI.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/fr_FR.json b/packages/scandipwa/i18n/fr_FR.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/it_IT.json b/packages/scandipwa/i18n/it_IT.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/lv_LV.json b/packages/scandipwa/i18n/lv_LV.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/nb_NO.json b/packages/scandipwa/i18n/nb_NO.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/nl_NL.json b/packages/scandipwa/i18n/nl_NL.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/pl_PL.json b/packages/scandipwa/i18n/pl_PL.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/pt_BR.json b/packages/scandipwa/i18n/pt_BR.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/ru_RU.json b/packages/scandipwa/i18n/ru_RU.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/sl_SI.json b/packages/scandipwa/i18n/sl_SI.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/sv_SE.json b/packages/scandipwa/i18n/sv_SE.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/tr_TR.json b/packages/scandipwa/i18n/tr_TR.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/i18n/zh_TW.json b/packages/scandipwa/i18n/zh_TW.json
@@ -608,5 +608,6 @@
     "The requested qty is not available!": null,
     "County": null,
     "State/Province": null,
-    "Region": null
-}
+    "Region": null,
+    "You %s the address": null
+}
diff --git a/packages/scandipwa/src/component/Header/Header.container.tsx b/packages/scandipwa/src/component/Header/Header.container.tsx
@@ -218,7 +218,7 @@ export class HeaderContainer extends NavigationAbstractContainer<HeaderContainer
     getNavigationState(): NavigationState {
         const { navigationState } = this.props;
 
-        const { location: { pathname, state } } = history || {};
+        const { location: { pathname, state = {} } } = history || {};
 
         // TODO: something here breaks /<STORE CODE> from being opened, and / when, the url-based stores are enabled.
 
@@ -241,7 +241,7 @@ export class HeaderContainer extends NavigationAbstractContainer<HeaderContainer
     }
 
     getUserName(): string | undefined {
-        const { firstname } = BrowserDatabase.getItem(CUSTOMER) || {};
+        const { firstname }: { firstname?: string } = BrowserDatabase.getItem(CUSTOMER) || {};
 
         return firstname;
     }

diff --git a/packages/scandipwa/src/component/MyAccountCreateAccount/MyAccountCreateAccount.container.tsx b/packages/scandipwa/src/component/MyAccountCreateAccount/MyAccountCreateAccount.container.tsx
@@ -125,7 +125,7 @@ export class MyAccountCreateAccountContainer extends PureComponent<MyAccountCrea
             lastname,
             is_subscribed,
             taxvat
-        } = transformToNameValuePair(fields);
+        } = transformToNameValuePair<Record<string, string | number | boolean>>(fields);
 
         const customerData = {
             customer: {
@@ -139,7 +139,7 @@ export class MyAccountCreateAccountContainer extends PureComponent<MyAccountCrea
         } as CreateAccountOptions;
 
         if (is_subscribed) {
-            customerData.customer.is_subscribed = is_subscribed;
+            customerData.customer.is_subscribed = !!is_subscribed;
         }
 
         if (isLoading) {

diff --git a/packages/scandipwa/src/component/ProductReviewForm/ProductReviewForm.container.tsx b/packages/scandipwa/src/component/ProductReviewForm/ProductReviewForm.container.tsx
@@ -126,7 +126,7 @@ ProductReviewFormContainerState
             nickname,
             title,
             detail
-        } = transformToNameValuePair(fields as Record<string, FieldData>);
+        } = transformToNameValuePair<Record<string, string>>(fields as Record<string, FieldData>);
 
         const { sku: product_sku = '' } = product;
 

diff --git a/packages/scandipwa/src/query/ProductList.query.ts b/packages/scandipwa/src/query/ProductList.query.ts
@@ -211,11 +211,11 @@ export class ProductListQuery {
                 type: 'ProductAttributeFilterInput!',
                 handler: (initialOptions = {}) => {
                     // add customer group by default to all requests
-                    const { group_id } = BrowserDatabase.getItem(CUSTOMER) || {};
+                    const { group_id }: { group_id?: number } = BrowserDatabase.getItem(CUSTOMER) || {};
 
                     const options: ProductAttributeFilterOptions = {
                         ...initialOptions,
-                        customerGroupId: group_id || '0'
+                        customerGroupId: group_id || 0
                     };
 
                     const {

diff --git a/packages/scandipwa/src/route/PasswordChangePage/PasswordChangePage.container.tsx b/packages/scandipwa/src/route/PasswordChangePage/PasswordChangePage.container.tsx
@@ -162,7 +162,7 @@ PasswordChangePageContainerState
         this.setState({ isLoading: true }, () => {
             const { resetPassword } = this.props;
             const { location } = history;
-            const { password, password_confirmation } = transformToNameValuePair(fields);
+            const { password, password_confirmation } = transformToNameValuePair<Record<string, string>>(fields);
             const token = getQueryParam('token', location);
             const customer_id = getQueryParam('id', location);
 

diff --git a/packages/scandipwa/src/route/SendConfirmationPage/SendConfirmationPage.container.tsx b/packages/scandipwa/src/route/SendConfirmationPage/SendConfirmationPage.container.tsx
@@ -113,7 +113,7 @@ SendConfirmationPageContainerState
 
         this.setState({ isLoading: true });
 
-        const { email } = transformToNameValuePair(fields);
+        const { email } = transformToNameValuePair<Record<string, string>>(fields);
 
         try {
             const data = await resendConfirmation({ email });

diff --git a/packages/scandipwa/src/store/Config/Config.reducer.ts b/packages/scandipwa/src/store/Config/Config.reducer.ts
@@ -40,6 +40,7 @@ export const filterStoreConfig = (config: StoreConfig): Partial<StoreConfig> =>
 );
 
 export const {
+// @ts-ignore
     countries, reviewRatings, storeConfig, currencyData, currency, cartDisplayConfig
 } = BrowserDatabase.getItem('config') || {
     countries: [],

diff --git a/packages/scandipwa/src/store/Config/Config.type.ts b/packages/scandipwa/src/store/Config/Config.type.ts
@@ -61,6 +61,7 @@ export type ConfigStore = StoreConfig & {
     category_url_suffix: string;
     device: Device;
     currency: Currencies;
+    storeConfig: StoreConfig;
 };
 
 declare module 'Util/Store/Store.type' {

diff --git a/packages/scandipwa/src/store/Navigation/Navigation.reducer.ts b/packages/scandipwa/src/store/Navigation/Navigation.reducer.ts
@@ -41,6 +41,10 @@ export const NavigationReducer: Reducer<NavigationStore, NavigationAction> = (
 ) => {
     const { navigationType, navigationState } = action;
 
+    if (!navigationType) {
+        return state;
+    }
+
     const {
         [navigationType]: {
             navigationStateHistory,

diff --git a/packages/scandipwa/src/util/Query/PrepareDocument.ts b/packages/scandipwa/src/util/Query/PrepareDocument.ts
@@ -80,11 +80,11 @@ export const prepareRequest = <T>(fields: AbstractField<string, T, boolean>[], t
     // go through argument accumulator collected in "prepareFieldString", join values
     // into the format "$var:Type" and append variable value to variables field
     const resolvedArgs = Object.entries(accArgs).reduce((acc, [name, dataArray]): string[] => {
-        (dataArray as Array<Omit<FieldArgument, 'name'>>).forEach((item, i: number) => {
+        (dataArray as Array<string[]>).forEach(([type, value], i: number) => {
             const variable = `${name}_${i + 1}`;
 
             acc.push(`$${variable}:${type}`);
-            variables[variable] = String(item.value);
+            variables[variable] = value;
         });
 
         return acc;
@@ -105,6 +105,8 @@ export const prepareRequest = <T>(fields: AbstractField<string, T, boolean>[], t
         );
     }
 
+    console.log(`${type}${formattedArgs}`, '***');
+
     return {
         // format like "query($var_1:String){test(arg: $var_1){id}}"
         query: `${type}${formattedArgs}{${fieldStrings}}`,

diff --git a/packages/scandipwa/src/util/Request/Request.ts b/packages/scandipwa/src/util/Request/Request.ts
@@ -231,29 +231,29 @@ export const executeGet = async <T>(
         refreshUid();
     }
 
-    // circumvention of the eslint rule that prohibits usage of let
-    const res: Response[] = [];
-
     try {
-        res[0] = await getFetch(uri, name, signal);
-    } catch (err) {
-        if (res[0].status === HTTP_410_GONE) {
+        const result = await getFetch(uri, name, signal);
+
+        if (result.status === HTTP_410_GONE) {
             const putResponse = await putPersistedQuery(getGraphqlEndpoint(), query, cacheTTL);
 
             if (putResponse.status === HTTP_201_CREATED) {
-                res[0] = await getFetch(uri, name, signal);
+                return await parseResponse(await getFetch(uri, name, signal));
             }
-        } else if (res[0].status === HTTP_503_SERVICE_UNAVAILABLE) {
-            handleConnectionError(err, 'Service unavailable!...');
+        }
 
-            throw new Error(err as string);
+        if (result.status === HTTP_503_SERVICE_UNAVAILABLE) {
+            handleConnectionError(result.status, result.statusText);
+            throw new Error(result.statusText);
         }
 
-        handleConnectionError(err, 'executeGet failed');
-        throw new Error(err as string);
+        // Successful and all other http responses go here:
+        return await parseResponse(result);
+    } catch (error) {
+    // Network error
+        handleConnectionError(error, 'executeGet failed');
+        throw new Error(error as string);
     }
-
-    return parseResponse(res[0]);
 };
 /**
  * Make POST request to endpoint