Merge pull request #58 from CloudBoltSoftware/bugfix/ENG-23850-uncaught-cancelled-error

Bugfix/eng 23850 uncaught cancelled error

Author: ehussm

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbolt/cb-api-helper",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "scripts": {
     "co:login": "aws sso login && aws codeartifact login --tool npm --repository cloudbolt-npm --domain cloudbolt --domain-owner 499620025628",
     "husky:install": "husky install",

package.json

@@ -1,5 +1,4 @@
-import { baseApi } from '../../../baseApi'
-import ResponseParser from '../../../helpers/ResponseParser'
+import crud from '../../../crudOperations'
 
 const statusURL = 'v3/cmp/system/status'
 const settingsURL = 'v3/cmp/system/settings'
@@ -9,27 +8,11 @@ export default {
    * Retrieve System Status to display on the System Status Widget
    * @returns {Promise} API Response object of System Status objects
    */
-  status: async () => {
-    try {
-      const response = await baseApi.get(statusURL)
-      return response
-    } catch (error) {
-      const errMsg = ResponseParser.getErrorMessage(error)
-      throw new Error(errMsg)
-    }
-  },
+  status: (options) => crud.getItemByEndpoint(statusURL, options),
 
   /**
    * Retrieve System Settings to display on the System Settings Widget
    * @returns {Promise} API Response object of System Settings objects
    */
-  settings: async () => {
-    try {
-      const response = await baseApi.get(settingsURL)
-      return response
-    } catch (error) {
-      const errMsg = ResponseParser.getErrorMessage(error)
-      throw new Error(errMsg)
-    }
-  }
+  settings: (options) => crud.getItemByEndpoint(settingsURL, options)
 }

src/api/services/v3/cmp/SystemService.js

@@ -4,11 +4,11 @@ import SystemService from './SystemService'
 test('status calls the correct endpoint', async () => {
   const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({})
   await SystemService.status()
-  expect(mockFn).toHaveBeenCalledWith('v3/cmp/system/status')
+  expect(mockFn).toHaveBeenCalledWith('/v3/cmp/system/status/')
 })
 
 test('settings calls the correct endpoint', async () => {
   const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({})
   await SystemService.settings()
-  expect(mockFn).toHaveBeenCalledWith('v3/cmp/system/settings')
+  expect(mockFn).toHaveBeenCalledWith('/v3/cmp/system/settings/')
 })