Skip to content

Only show each database once in :dbs output #1006

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
huboneo merged 1 commit into from
Dec 4, 2019
Merged

Only show each database once in :dbs output #1006

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/browser/modules/Stream/Auth/DbsFrame.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ import { useDbCommand } from 'shared/modules/commands/commandsDuck'
import TextCommand from 'browser/modules/DecoratedText/TextCommand'
import ClickToCode from 'browser/modules/ClickToCode/index'
import { StyledCodeBlockFrame } from 'browser/modules/Main/styled'
import { uniqBy } from 'lodash-es'

export const DbsFrame = props => {
const { frame } = props
const { dbs = [] } = frame
const dbsToShow = uniqBy(dbs, 'name')

return (
<React.Fragment>
Expand All @@ -51,10 +53,10 @@ export const DbsFrame = props => {
</StyledConnectionAside>
<StyledConnectionBodyContainer>
<StyledConnectionBody>
<Render if={Array.isArray(dbs) && dbs.length}>
<Render if={Array.isArray(dbsToShow) && dbsToShow.length}>
Click on one to start using it:
<UnstyledList data-testid='dbs-command-list'>
{dbs.map(db => {
{dbsToShow.map(db => {
return (
<StyledDbsRow key={toKeyString(db.name)}>
<TextCommand command={`${useDbCommand} ${db.name}`} />
Expand All @@ -63,7 +65,7 @@ export const DbsFrame = props => {
})}
</UnstyledList>
</Render>
<Render if={!Array.isArray(dbs) || !dbs.length}>
<Render if={!Array.isArray(dbsToShow) || !dbsToShow.length}>
<div>
Either you don't have permission to list available databases or
the dbms you're connected to don't support multiple databases.
Expand Down