Skip to content

Fe/bugfix/ri 4776 4778 icon and loading #2383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Fe/bugfix/ri 4776 4778 icon and loading #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b791f99
#RI-4778 - fix loading functions and libraries list
AmirAllayarovSofteq Jul 24, 2023
d38258b
#RI-4778 - fix loading and image
AmirAllayarovSofteq Jul 24, 2023
355796d
update bundle version
vlad-dargel Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion electron-builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "distribution",
"hardenedRuntime": true,
"darkModeSupport": true,
"bundleVersion": "60",
"bundleVersion": "70",
"icon": "resources/icon.icns",
"artifactName": "${productName}-${os}-${arch}.${ext}",
"entitlements": "resources/entitlements.mac.plist",
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion redisinsight/ui/src/assets/img/triggers_and_functions_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,14 @@ describe('FunctionsPage', () => {
expect(pushMock)
.toBeCalledWith(Pages.triggeredFunctionsLibraries('instanceId'))
})

it('should not render functions list', () => {
(triggeredFunctionsFunctionsSelector as jest.Mock).mockReturnValueOnce({
data: null,
loading: false
})
const { queryByTestId } = render(<FunctionsPage />)

expect(queryByTestId('total-functions')).not.toBeInTheDocument()
})
})
28 changes: 17 additions & 11 deletions redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiResiza
import { useDispatch, useSelector } from 'react-redux'
import { useHistory } from 'react-router-dom'
import cx from 'classnames'
import { find, pick } from 'lodash'
import { find, isNull, pick } from 'lodash'
import {
fetchTriggeredFunctionsFunctionsList,
setSelectedFunctionToShow,
Expand Down Expand Up @@ -114,6 +114,10 @@ const FunctionsPage = () => {
? NoFunctionsMessage
: (<NoLibrariesScreen isModuleLoaded={isModuleLoaded} onAddLibrary={onAddLibrary} />)

if (!instanceId) {
return null
}

return (
<EuiFlexGroup
className={cx('triggeredFunctions__page', styles.main)}
Expand Down Expand Up @@ -164,16 +168,18 @@ const FunctionsPage = () => {
<EuiLoadingSpinner size="xl" />
</div>
)}
<FunctionsList
items={items}
loading={loading}
onRefresh={updateList}
lastRefresh={lastRefresh}
selectedRow={selectedRow}
onSelectRow={handleSelectRow}
message={message}
isRefreshDisabled={!isModuleLoaded}
/>
{(!isModuleLoaded || !isNull(functions)) && (
<FunctionsList
items={items}
loading={loading}
onRefresh={updateList}
lastRefresh={lastRefresh}
selectedRow={selectedRow}
onSelectRow={handleSelectRow}
message={message}
isRefreshDisabled={!isModuleLoaded}
/>
)}
</div>
</EuiResizablePanel>
<EuiResizableButton
Expand Down
10 changes: 10 additions & 0 deletions redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,14 @@ describe('LibrariesPage', () => {

expect(screen.queryByTestId('lib-details-lib1')).not.toBeInTheDocument()
})

it('should not render libraries list', () => {
(triggeredFunctionsLibrariesSelector as jest.Mock).mockReturnValueOnce({
data: null,
loading: false
})
const { queryByTestId } = render(<LibrariesPage />)

expect(queryByTestId('total-libraries')).not.toBeInTheDocument()
})
})
24 changes: 13 additions & 11 deletions redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,19 @@ const LibrariesPage = () => {
<EuiLoadingSpinner size="xl" />
</div>
)}
<LibrariesList
items={items}
loading={loading}
onRefresh={updateList}
lastRefresh={lastRefresh}
selectedRow={selectedRow}
onSelectRow={handleSelectRow}
onDeleteRow={handleDelete}
message={message}
isRefreshDisabled={!isModuleLoaded}
/>
{(!isModuleLoaded || !isNull(libraries)) && (
<LibrariesList
items={items}
loading={loading}
onRefresh={updateList}
lastRefresh={lastRefresh}
selectedRow={selectedRow}
onSelectRow={handleSelectRow}
onDeleteRow={handleDelete}
message={message}
isRefreshDisabled={!isModuleLoaded}
/>
)}
</div>
</EuiResizablePanel>
<EuiResizableButton
Expand Down