-
Notifications
You must be signed in to change notification settings - Fork 196
fix: catalog entity tabs order #2425
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.
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
openshift-merge-bot
merged 10 commits into
redhat-developer:main
from
its-mitesh-kumar:fix/entity-tabs
Mar 6, 2025
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4bfc660
fix enity tabs order
its-mitesh-kumar fc3c0ff
fixing formatting
its-mitesh-kumar a579319
fixing lint issue
its-mitesh-kumar c21c25e
fix(entity-tabs): moving mergeTabs to new util file
its-mitesh-kumar 69f6201
Merge branch 'main' into fix/entity-tabs
its-mitesh-kumar 99974e8
adding unit tests
its-mitesh-kumar e82f402
updating dev docs
its-mitesh-kumar f4444c0
Merge branch 'main' into fix/entity-tabs
its-mitesh-kumar c1b20ad
fixing with prettier
its-mitesh-kumar e60b2fc
Merge branch 'main' into fix/entity-tabs
its-mitesh-kumar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
44 changes: 44 additions & 0 deletions
44
packages/app/src/components/catalog/EntityPage/utils.test.tsx
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import { defaultTabs } from './defaultTabs'; | ||
import { mergeTabs } from './utils'; | ||
|
||
describe('mergeTabs', () => { | ||
it('should return defaultTabs when no overrides are provided', () => { | ||
const result = mergeTabs({}); | ||
const expected = Object.entries(defaultTabs); | ||
expect(result).toEqual(expected); | ||
}); | ||
|
||
it('should merge entityTabOverrides with defaultTabs', () => { | ||
const overrides = { | ||
'/docs': { | ||
title: 'My Documentation', | ||
mountPoint: 'entity.page.docs', | ||
priority: 2, | ||
}, | ||
}; | ||
const result = mergeTabs(overrides); | ||
expect(result).toContainEqual(['/docs', overrides['/docs']]); | ||
}); | ||
|
||
it('should remove tabs with negative priority', () => { | ||
const overrides = { | ||
'/ci': { ...defaultTabs['/ci'], priority: -1 }, | ||
}; | ||
const result = mergeTabs(overrides); | ||
expect(result.find(([key]) => key === '/ci')).toBeUndefined(); | ||
}); | ||
|
||
it('should sort tabs based on priority', () => { | ||
const overrides = { | ||
'/docs': { ...defaultTabs['/docs'], priority: 5 }, | ||
'/topology': { | ||
title: 'New Topology', | ||
mountPoint: 'entity.page.topology', | ||
priority: 10, | ||
}, | ||
}; | ||
const result = mergeTabs(overrides); | ||
expect(result[0][0]).toBe('/topology'); | ||
expect(result[1][0]).toBe('/docs'); | ||
}); | ||
}); |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { defaultTabs } from './defaultTabs'; | ||
import { DynamicEntityTabProps } from './DynamicEntityTab'; | ||
|
||
export const mergeTabs = ( | ||
entityTabOverrides: Record< | ||
string, | ||
Omit<DynamicEntityTabProps, 'path' | 'if' | 'children'> | ||
>, | ||
) => { | ||
return ( | ||
Object.entries({ ...defaultTabs, ...entityTabOverrides }) | ||
.filter(([, tab]) => !(tab.priority && tab.priority < 0)) | ||
.sort(([, tabA], [, tabB]) => { | ||
const priorityA = tabA.priority ?? 0; | ||
const priorityB = tabB.priority ?? 0; | ||
return priorityB - priorityA; | ||
}) || [] | ||
); | ||
}; | ||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.