Skip to content

Commit b791f99

Browse files
#RI-4778 - fix loading functions and libraries list
1 parent ca73ba3 commit b791f99

File tree

4 files changed

+46
-22
lines changed

4 files changed

+46
-22
lines changed

redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,14 @@ describe('FunctionsPage', () => {
161161
expect(pushMock)
162162
.toBeCalledWith(Pages.triggeredFunctionsLibraries('instanceId'))
163163
})
164+
165+
it('should not render functions list', () => {
166+
(triggeredFunctionsFunctionsSelector as jest.Mock).mockReturnValueOnce({
167+
data: null,
168+
loading: false
169+
})
170+
const { queryByTestId } = render(<FunctionsPage />)
171+
172+
expect(queryByTestId('total-functions')).not.toBeInTheDocument()
173+
})
164174
})

redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiResiza
33
import { useDispatch, useSelector } from 'react-redux'
44
import { useHistory } from 'react-router-dom'
55
import cx from 'classnames'
6-
import { find, pick } from 'lodash'
6+
import { find, isNull, pick } from 'lodash'
77
import {
88
fetchTriggeredFunctionsFunctionsList,
99
setSelectedFunctionToShow,
@@ -164,16 +164,18 @@ const FunctionsPage = () => {
164164
<EuiLoadingSpinner size="xl" />
165165
</div>
166166
)}
167-
<FunctionsList
168-
items={items}
169-
loading={loading}
170-
onRefresh={updateList}
171-
lastRefresh={lastRefresh}
172-
selectedRow={selectedRow}
173-
onSelectRow={handleSelectRow}
174-
message={message}
175-
isRefreshDisabled={!isModuleLoaded}
176-
/>
167+
{!isNull(functions) && (
168+
<FunctionsList
169+
items={items}
170+
loading={loading}
171+
onRefresh={updateList}
172+
lastRefresh={lastRefresh}
173+
selectedRow={selectedRow}
174+
onSelectRow={handleSelectRow}
175+
message={message}
176+
isRefreshDisabled={!isModuleLoaded}
177+
/>
178+
)}
177179
</div>
178180
</EuiResizablePanel>
179181
<EuiResizableButton

redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,14 @@ describe('LibrariesPage', () => {
229229

230230
expect(screen.queryByTestId('lib-details-lib1')).not.toBeInTheDocument()
231231
})
232+
233+
it('should not render libraries list', () => {
234+
(triggeredFunctionsLibrariesSelector as jest.Mock).mockReturnValueOnce({
235+
data: null,
236+
loading: false
237+
})
238+
const { queryByTestId } = render(<LibrariesPage />)
239+
240+
expect(queryByTestId('total-libraries')).not.toBeInTheDocument()
241+
})
232242
})

redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,19 @@ const LibrariesPage = () => {
240240
<EuiLoadingSpinner size="xl" />
241241
</div>
242242
)}
243-
<LibrariesList
244-
items={items}
245-
loading={loading}
246-
onRefresh={updateList}
247-
lastRefresh={lastRefresh}
248-
selectedRow={selectedRow}
249-
onSelectRow={handleSelectRow}
250-
onDeleteRow={handleDelete}
251-
message={message}
252-
isRefreshDisabled={!isModuleLoaded}
253-
/>
243+
{!isNull(libraries) && (
244+
<LibrariesList
245+
items={items}
246+
loading={loading}
247+
onRefresh={updateList}
248+
lastRefresh={lastRefresh}
249+
selectedRow={selectedRow}
250+
onSelectRow={handleSelectRow}
251+
onDeleteRow={handleDelete}
252+
message={message}
253+
isRefreshDisabled={!isModuleLoaded}
254+
/>
255+
)}
254256
</div>
255257
</EuiResizablePanel>
256258
<EuiResizableButton

0 commit comments

Comments
 (0)