MEN-7551 - fix: added path for all devices on device page #60
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mzedel
requested changes
Sep 30, 2024
| @@ -28,7 +28,7 @@ import DocsLink from './common/docslink'; | |||
|
|
|||
| const listItems = [ | |||
| { route: '/', text: 'Dashboard', canAccess }, | |||
| { route: '/devices', text: 'Devices', canAccess: ({ userCapabilities: { canReadDevices } }) => canReadDevices }, | |||
| { route: '/devices/accepted', text: 'Devices', canAccess: ({ userCapabilities: { canReadDevices } }) => canReadDevices }, | |||
There was a problem hiding this comment.
this should remain /devices as it is expected to be set by the previously selected state, if that wasn't selected before the devices should always default to accepted
| @@ -147,7 +147,7 @@ export const DeviceGroups = () => { | |||
| } | |||
| // preset selectedIssues and selectedId with empty values, in case if remain properties are missing them | |||
| let listState = { ...remainder }; | |||
| if (statusParam && Object.values(DEVICE_STATES).some(state => state === statusParam)) { | |||
| if (statusParam && Object.values(DEVICE_STATES).some(state => state === statusParam || statusParam === 'any')) { | |||
There was a problem hiding this comment.
Suggested change
| if (statusParam && Object.values(DEVICE_STATES).some(state => state === statusParam || statusParam === 'any')) { | |
| if (statusParam && (Object.values(DEVICE_STATES).some(state => state === statusParam) || statusParam === routes.allDevices.key)) { |
to not have the check in every iteration there
| @@ -219,7 +219,7 @@ export const formatDeviceSearch = ({ pageState, filters, selectedGroup }) => { | |||
| export const generateDevicePath = ({ pageState }) => { | |||
| const { state: selectedState } = pageState; | |||
| const path = ['/devices']; | |||
| if (![routes.allDevices.key, ''].includes(selectedState)) { | |||
| if (![''].includes(selectedState)) { | |||
There was a problem hiding this comment.
Suggested change
| if (![''].includes(selectedState)) { | |
| if (selectedState !== '') { |
I think
mineralsfree
force-pushed
the
MEN-7551
branch
from
994f3a8
to
e97a7bf
Compare
Ticket: MEN-7551 Changelog: None Signed-off-by: Mikita Pilinka <[email protected]>
mzedel
approved these changes
Oct 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket: MEN-7551
Changelog: None