Skip to content

Commit

Permalink
Merge pull request #533 from hotwax/fix-build-error
Browse files Browse the repository at this point in the history
Fixed: build error TS2532: Object is possibly 'undefined'.
  • Loading branch information
adityasharma7 authored Jun 20, 2023
2 parents 3940cd3 + 724e1f0 commit 118ce61
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/services/UserService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ const getShopifyConfig = async (productStoreId: any, token?: any): Promise <any>
payload.baseURL = store.getters['user/getBaseUrl'];
const resp = await client(payload);
if (hasError(resp)) {
return Promise.reject(resp.data);
return Promise.reject(resp?.data);
} else {
return Promise.resolve(resp.data.docs);
return Promise.resolve(resp?.data.docs);
}
} catch(error: any) {
return Promise.reject(error)
Expand Down Expand Up @@ -89,9 +89,9 @@ const getEComStores = async (token: any): Promise<any> => {
}
});
if (hasError(resp)) {
return Promise.reject(resp.data);
return Promise.reject(resp?.data);
} else {
return Promise.resolve(resp.data.docs);
return Promise.resolve(resp?.data.docs);
}
} catch(error: any) {
return Promise.reject(error)
Expand All @@ -116,11 +116,11 @@ const getEcommerceCatalog = async (productStoreId: any): Promise<any> => {
params,
cache: true
});
if (hasError(resp) || resp.data.docs?.length == 0) {
if (hasError(resp) || resp?.data.docs?.length == 0) {
// if has error or not catalog found
return Promise.reject(resp.data);
return Promise.reject(resp?.data);
} else {
return Promise.resolve(resp.data.docs[0]);
return Promise.resolve(resp?.data.docs[0]);
}
} catch(error: any) {
return Promise.reject(error)
Expand Down Expand Up @@ -148,10 +148,10 @@ const getPreOrderBackorderCategory = async (prodCatalogId: any): Promise<any> =>
params,
cache: true
});
if (hasError(resp) || resp.data.docs?.length == 0) {
return Promise.reject(resp.data);
if (hasError(resp) || resp?.data.docs?.length == 0) {
return Promise.reject(resp?.data);
} else {
return Promise.resolve(resp.data.docs);
return Promise.resolve(resp?.data.docs);
}
} catch(error: any) {
return Promise.reject(error)
Expand Down Expand Up @@ -215,9 +215,9 @@ const getPreferredStore = async (token: any): Promise<any> => {
},
});
if (hasError(resp)) {
return Promise.reject(resp.data);
return Promise.reject(resp?.data);
} else {
return Promise.resolve(resp.data.userPrefValue);
return Promise.resolve(resp?.data.userPrefValue);
}
} catch(error: any) {
return Promise.reject(error)
Expand Down Expand Up @@ -255,9 +255,9 @@ const getUserPermissions = async (payload: any, token: any): Promise<any> => {
'Content-Type': 'application/json'
}
})
if(resp.status === 200 && resp.data.docs?.length && !hasError(resp)) {
serverPermissions = resp.data.docs.map((permission: any) => permission.permissionId);
const total = resp.data.count;
if(resp.status === 200 && resp?.data.docs?.length && !hasError(resp)) {
serverPermissions = resp?.data.docs.map((permission: any) => permission.permissionId);
const total = resp?.data.count;
const remainingPermissions = total - serverPermissions.length;
if (remainingPermissions > 0) {
// We need to get all the remaining permissions
Expand Down Expand Up @@ -325,8 +325,8 @@ const getUserProfile = async (token: any): Promise<any> => {
'Content-Type': 'application/json'
}
});
if(hasError(resp)) return Promise.reject("Error getting user profile: " + JSON.stringify(resp.data));
return Promise.resolve(resp.data)
if(hasError(resp)) return Promise.reject("Error getting user profile: " + JSON.stringify(resp?.data));
return Promise.resolve(resp?.data)
} catch(error: any) {
return Promise.reject(error)
}
Expand Down

0 comments on commit 118ce61

Please sign in to comment.