Web: added connections and databases selector, changed theme color #302
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
Web: Left nav UI improvements
liuliu-dev
changed the title
tbantle22
approved these changes
Jan 13, 2025
web/renderer/components/ConnectionsAndDatabases/useSelectedConnection.ts
Outdated
Show resolved
Hide resolved
Comment on lines
50
to
72
| <Button.Link | ||
| key={conn.name} | ||
| className={cx(css.connection, { | ||
| [css.selected]: state.connection.name === conn.name, | ||
| })} | ||
| onClick={async () => onSelected(conn)} | ||
| > | ||
| <div className={css.connectionTop}> | ||
| <div className={css.nameAndLabel}> | ||
| <span className={css.connectionName}> | ||
| {excerpt(conn.name, 16)} | ||
| </span> | ||
| <DatabaseTypeLabel conn={conn} /> | ||
| {conn.name === currentConnection.name && ( | ||
| <MdRemoveRedEye className={css.viewing} /> | ||
| )} | ||
| </div> | ||
| <FaChevronRight className={css.arrow} /> | ||
| </div> | ||
| <div className={css.connectionUrl}> | ||
| {excerpt(getHostAndPort(conn.connectionUrl), 42)} | ||
| </div> | ||
| </Button.Link> |
There was a problem hiding this comment.
Would make this easier to read by moving this to a ConnectionItem component
| } | ||
| return ( | ||
| <Button.Link | ||
| className={cx(css.DbItem, css.link)} |
There was a problem hiding this comment.
Suggested change
| className={cx(css.DbItem, css.link)} | |
| className={cx(css.dbItem, css.link)} |
| export function DatabaseTypeLabel({ conn }: Props) { | ||
| const type = getDatabaseType(conn.type ?? undefined, !!conn.isDolt); | ||
| switch (type) { | ||
| case "Dolt": |
There was a problem hiding this comment.
no, it's a string returned from getDatabaseType
Comment on lines
31
to
33
| className={cx(css.titlebar, { | ||
| [css.drag]: !noDrag, | ||
| [css.noDrag]: noDrag, |
There was a problem hiding this comment.
Can you make .drag part of .titlebar since that's the default state?
|
|
||
| return ( | ||
| <div | ||
| className={cx(css.titlebar, { |
There was a problem hiding this comment.
Suggested change
| className={cx(css.titlebar, { | |
| className={cx(css.titleBar, { |
|
|
||
| export function Logo({ imgSrc, className }: LogoProps) { | ||
| return ( | ||
| <Link href="/" className={cx(className)}> |
There was a problem hiding this comment.
Suggested change
| <Link href="/" className={cx(className)}> | |
| <Link href="/" className={className}> |
tbantle22
approved these changes
Jan 15, 2025
| @@ -15,11 +16,13 @@ export default function useDatabaseDetails(): ReturnType { | |||
| const isDolt = res.data?.doltDatabaseDetails.isDolt ?? false; | |||
| const isPostgres = | |||
| res.data?.doltDatabaseDetails.type === DatabaseType.Postgres; | |||
| const isMysql = res.data?.doltDatabaseDetails.type === DatabaseType.Mysql; | |||
There was a problem hiding this comment.
You shouldn't need this. If both isDolt and isPostgres are false then it's a mysql db
Comment on lines
41
to
45
| await res.client.clearStore(); | ||
| if (!addedDb.data) { | ||
| return; | ||
| } | ||
|
|
There was a problem hiding this comment.
Should clearStore only be called if addedDb.data exists?
| if (conn.type === DatabaseType.Postgres) { | ||
| await resetDB({ variables: { newDatabase: databaseName } }); | ||
| } | ||
| const { href, as } = database({ databaseName }); | ||
| const { href, as } = maybeDatabase(databaseName); |
There was a problem hiding this comment.
Why maybeDatabase? Shouldn't databaseName always exist?
|
|
||
| type Props = { | ||
| conn: DatabaseConnectionFragment; | ||
| state: StateType; |
There was a problem hiding this comment.
Do you need to pass the whole state? Seems like you only need connection (which could use a clearer name to distinguish from conn)?
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.
App:
Web:
figma desgin: https://www.figma.com/design/Xzjg91DdTcn9NOlFtp93gO/Dolt-Workbench-v1?node-id=168-291&t=s9Q1reuw8Olc8KkS-0