Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const AppNavigation = ({ actions, onChange }: AppNavigationProps) => {
borderLess
grow={false}
justify="center"
style={{ paddingTop: '20px' }}
style={{ paddingTop: '16px' }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is bugging me, but I guess it should be fixed in dedicated ticket

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix to make the action buttons and the navigation in line.
image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the inline style is bugging me, not the value :)

>
<Tabs.Compose
value={activeTab?.pageName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ const mockedProps: Props = {
describe('Actions', () => {
it('should render', () => {
expect(render(<Actions {...mockedProps} />)).toBeTruthy()

// Verify the buttons are present
const bulkActionsButton = screen.getByTestId('btn-bulk-actions')
const addKeyButton = screen.getByTestId('btn-add-key')

expect(bulkActionsButton).toBeInTheDocument()
expect(addKeyButton).toBeInTheDocument()
})

it('should show feature dependent items when feature flag is off', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import {
TelemetryEvent,
} from 'uiSrc/telemetry'
import {
EmptyButton,
SecondaryButton,
} from 'uiSrc/components/base/forms/buttons'
import styles from 'uiSrc/pages/browser/components/browser-search-panel/styles.module.scss'
import { setBulkActionType } from 'uiSrc/slices/browser/bulkActions'
import { BulkActionsType, FeatureFlags } from 'uiSrc/constants'
import { SubscriptionsIcon } from 'uiSrc/components/base/icons'
Expand Down Expand Up @@ -46,28 +46,29 @@ const Actions = ({ handleAddKeyPanel, handleBulkActionsPanel }: Props) => {
onClick={openAddKeyPanel}
data-testid="btn-add-key"
>
+ <span className={styles.addKeyText}>Key</span>
Add key
</SecondaryButton>
)
const openBulkActions = () => {
dispatch(setBulkActionType(BulkActionsType.Delete))
handleBulkActionsPanel(true)
}
const BulkActionsBtn = (
<SecondaryButton
<EmptyButton
color="secondary"
icon={SubscriptionsIcon}
onClick={openBulkActions}
data-testid="btn-bulk-actions"
aria-label="bulk actions"
>
Bulk Actions
</SecondaryButton>
Bulk actions
</EmptyButton>
)
return (
<Row
grow={false}
gap="m"
align="center"
style={{
flexShrink: 0,
marginLeft: 12,
Expand Down
Loading