Skip to content

Commit 960ae50

Browse files
Merge pull request #64 from CloudBoltSoftware/feature/ENG-24556-add-catalog-settings
ENG-24556 updated test for catalog settings
2 parents 80c3b2e + 6901c78 commit 960ae50

File tree

6 files changed

+38
-3
lines changed

6 files changed

+38
-3
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudbolt/cb-api-helper",
3-
"version": "0.5.8",
3+
"version": "0.5.9",
44
"scripts": {
55
"co:login": "aws sso login && aws codeartifact login --tool npm --repository cloudbolt-npm --domain cloudbolt --domain-owner 499620025628",
66
"husky:install": "husky install",
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import crud from '../../../crudOperations'
2+
3+
const URL = 'v3/cmp/settings'
4+
5+
export default {
6+
/**
7+
* Retrieve Settings for mainly the Catalog
8+
* @param options Optionally select specific fields that can be returned alone.
9+
* example: '/?fields=catalogViewingMode' only returns the catalogViewingMode value
10+
* Full list: runQuickSetup,catalogViewingMode,catalogShowCategoriesFilter,
11+
* catalogShowOsBuildsFilter,catalogShowResourceTypesFilter,catalogShowGroupsFilter
12+
* @returns {Promise} API Response of the Settings object, or the specific fields requested
13+
*/
14+
list: (options) => crud.getItems(URL, options)
15+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { baseApi } from '../../../baseApi'
2+
import SettingsService from './SettingsService'
3+
4+
test('settings calls the correct endpoint', async () => {
5+
const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({})
6+
await SettingsService.list()
7+
expect(mockFn).toHaveBeenCalledWith('/v3/cmp/settings/')
8+
})
9+
10+
test('settings list passes options correctly', async () => {
11+
const testOptions = '?fields=runQuickSetup'
12+
const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({
13+
data: { runQuickSetup: 'true' }
14+
})
15+
await SettingsService.list(testOptions)
16+
expect(mockFn).toHaveBeenCalledWith('/v3/cmp/settings/?fields=runQuickSetup')
17+
})

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import RolesService from './RolesService'
3434
import ServerActionsService from './ServerActionsService'
3535
import ServerService from './ServerService'
3636
import ServerSummaryService from './ServerSummaryService'
37+
import SettingsService from './SettingsService'
3738
import SystemService from './SystemService'
3839
import UiExtensionComponentsService from './UiExtensionComponentsService'
3940
import UserService from './UserService'
@@ -76,6 +77,7 @@ export default {
7677
serverActions: ServerActionsService,
7778
serverSummary: ServerSummaryService,
7879
servers: ServerService,
80+
settings: SettingsService,
7981
uiExtensionComponents: UiExtensionComponentsService,
8082
users: UserService
8183
}

src/api/services/v3/cmp/index.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const services = [
4444
'serverActions',
4545
'serverSummary',
4646
'servers',
47+
'settings',
4748
'uiExtensionComponents',
4849
'users'
4950
]

0 commit comments

Comments
 (0)