Unverified Commit ad56a4bd authored by Tao Feng's avatar Tao Feng Committed by GitHub

fix: change dashboard and group order in search result (#658)

* fix: change dashboard and group order in search result
Signed-off-by: 's avatarfeng-tao <fengtao04@gmail.com>

* fix: update for inline search result as well
Signed-off-by: 's avatarfeng-tao <fengtao04@gmail.com>

* chore: fix js test
Signed-off-by: 's avatarfeng-tao <fengtao04@gmail.com>
parent 506cf6d6
...@@ -58,8 +58,10 @@ class DashboardListItem extends React.Component<DashboardListItemProps, {}> { ...@@ -58,8 +58,10 @@ class DashboardListItem extends React.Component<DashboardListItemProps, {}> {
/> />
<div className="resource-info-text my-auto"> <div className="resource-info-text my-auto">
<div className="resource-name title-2"> <div className="resource-name title-2">
<div className="dashboard-group">{dashboard.group_name}</div> <div className="dashboard-name">{dashboard.name}</div>
<div className="dashboard-name truncated">{dashboard.name}</div> <div className="dashboard-group truncated">
{dashboard.group_name}
</div>
<BookmarkIcon <BookmarkIcon
bookmarkKey={dashboard.uri} bookmarkKey={dashboard.uri}
resourceType={dashboard.type} resourceType={dashboard.type}
......
...@@ -45,9 +45,12 @@ ...@@ -45,9 +45,12 @@
.dashboard-group { .dashboard-group {
color: $text-secondary; color: $text-secondary;
margin-right: $spacer-2;
white-space: nowrap; white-space: nowrap;
} }
.dashboard-name {
margin-right: $spacer-2;
}
} }
ul { ul {
......
...@@ -185,10 +185,10 @@ export class InlineSearchResults extends React.Component< ...@@ -185,10 +185,10 @@ export class InlineSearchResults extends React.Component<
const dashboard = result as DashboardResource; const dashboard = result as DashboardResource;
return ( return (
<div className="dashboard-title"> <div className="dashboard-title">
<div className="title-2 dashboard-group"> <div className="title-2 dashboard-name">{dashboard.name}</div>
<div className="title-2 dashboard-group truncated">
{dashboard.group_name} {dashboard.group_name}
</div> </div>
<div className="title-2 truncated">{dashboard.name}</div>
</div> </div>
); );
case ResourceType.table: case ResourceType.table:
......
...@@ -128,9 +128,12 @@ ...@@ -128,9 +128,12 @@
.dashboard-title { .dashboard-title {
display: flex; display: flex;
.dashboard-name {
margin-right: $spacer-2;
}
.dashboard-group { .dashboard-group {
color: $text-secondary; color: $text-secondary;
margin-right: $spacer-2;
white-space: nowrap; white-space: nowrap;
} }
} }
......
...@@ -385,7 +385,7 @@ describe('InlineSearchResults', () => { ...@@ -385,7 +385,7 @@ describe('InlineSearchResults', () => {
.getSuggestedResultTitle(ResourceType.dashboard, givenDashboard) .getSuggestedResultTitle(ResourceType.dashboard, givenDashboard)
); );
expect(output.text()).toEqual( expect(output.text()).toEqual(
`${givenDashboard.group_name}${givenDashboard.name}` `${givenDashboard.name}${givenDashboard.group_name}`
); );
}); });
it('returns the schema.name for ResourceType.table', () => { it('returns the schema.name for ResourceType.table', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment