Improved: message to be shown in missing configuration and check for …

…empty settingValue (hotwax#293)
amansinghbais · Aug 7, 2024 · 77f3392 · 77f3392
1 parent be3c61d
commit 77f3392
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -207,7 +207,7 @@
     "Size": "Size",
     "Sizes": "Sizes",
     "sku selected": "sku selected",
-    "Some functionality of this app might not work properly, Since moqui is not setup for this account.": "Some functionality of this app might not work properly, Since moqui is not setup for this account.",
+    "Some of the configuration of the app is missing.": "Some of the configuration of the app is missing.",
     "Some listing data not available": "Some listing data not available",
     "Something went wrong": "Something went wrong",
     "Something went wrong while login. Please contact administrator.": "Something went wrong while login. Please contact administrator.",

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
@@ -231,13 +231,13 @@ const runNow = async (): Promise<any> => {
 
   try {
     resp = await client({
-        url: "checkOmsConnection",
-        method: "GET",
-        baseURL,
-        headers: {
-          "api_key": omsRedirectionInfo.token,
-          "Content-Type": "application/json"
-        }
+      url: "checkOmsConnection",
+      method: "GET",
+      baseURL,
+      headers: {
+        "api_key": omsRedirectionInfo.token,
+        "Content-Type": "application/json"
+      }
     });
 
     if(hasError(resp)) {
@@ -260,7 +260,7 @@ const runNow = async (): Promise<any> => {
       data: payload
     });
 
-    if(!hasError(resp)) {
+    if(!hasError(resp) && resp.data.docs[0].settingValue) {
       routingGroupId = resp.data.docs[0].settingValue
     } else {
       throw resp.data;

diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
@@ -71,10 +71,10 @@ const actions: ActionTree<UserState, RootState> = {
             if(api_key) {
               dispatch("setOmsRedirectionInfo", { url: omsRedirectionUrl, token: api_key })
             } else {
-              showToast(translate("Some functionality of this app might not work properly, Since moqui is not setup for this account."))
+              console.error("Some of the configuration of the app is missing.");
             }
           } else {
-            showToast(translate("Some functionality of this app might not work properly, Since moqui is not setup for this account."))
+            console.error("Some of the configuration of the app is missing.")
           }
 
           // TODO user single mutation