Skip to content
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

fix(compass-sidebar): do not filter out low level items when a top level item matches the filter COMPASS-8026 #6027

Merged
merged 4 commits into from
Jul 16, 2024
Merged

fix(compass-sidebar): do not filter out low level items when a top level item matches the filter COMPASS-8026 #6027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a81311
fix: do not filter children of matching parents COMPASS-8026
paula-stacho Jul 16, 2024
f3a95a1
fix single connection
paula-stacho Jul 16, 2024
8344343
update tests
paula-stacho Jul 16, 2024
a8152f6
..
paula-stacho Jul 16, 2024
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
3 changes: 2 additions & 1 deletion packages/compass-sidebar/src/components/legacy/sidebar-databases-navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ const filterDatabases = (
results.push({
...db,
isMatch,
collections: childMatches.length ? childMatches : db.collections,
collections:
!isMatch && childMatches.length ? childMatches : db.collections,
});
}
}
Expand Down
78 changes: 71 additions & 7 deletions packages/compass-sidebar/src/components/use-filtered-connections.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ const sidebarConnections: SidebarConnection[] = [
sourceName: '',
pipeline: [],
},
{
_id: 'coll_ready_2_2',
name: 'coll_ready_2_2',
type: 'collection',
sourceName: '',
pipeline: [],
},
],
collectionsLength: 1,
collectionsStatus: 'ready',
Expand Down Expand Up @@ -499,6 +506,40 @@ describe('useFilteredConnections', function () {
});
});

it('should not filter the database items if the parent is also a match', async function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: [
{
...mockSidebarConnections[0],
name: 'Matching connection',
databases: [
{
...(mockSidebarConnections[0] as SidebarConnectedConnection)
.databases[0],
name: 'Matching database',
},
{
...(mockSidebarConnections[0] as SidebarConnectedConnection)
.databases[1],
name: 'Another database',
},
],
} as SidebarConnectedConnection,
],
filterRegex: new RegExp('Matching', 'i'), // this matches connection as well as database
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
});

await waitFor(() => {
expect(
(result.current.filtered?.[0] as SidebarConnectedConnection).databases
).to.have.length(2); // both databases are included
});
});

it('should match the collection items', async function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
Expand All @@ -516,17 +557,40 @@ describe('useFilteredConnections', function () {
{
...matchedItem,
// will only match the second database's collection
databases: [matchedItem.databases[0]],
databases: [
{
...matchedItem.databases[0],
collections: [matchedItem.databases[0].collections[0]],
},
],
},
]);
});
});

it('should not filter the collection items if the parent is also a match', async function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('ready_2_1', 'i'), // this matches 1 database and 1 collection
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
});

await waitFor(() => {
expect(
(result.current.filtered?.[0] as SidebarConnectedConnection)
.databases[0].collections
).to.have.length(2); // the result has 2 collections
});
});

it('as expanded, it should return an object containing an expanded object for the matching items', async function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
Expand Down Expand Up @@ -568,7 +632,7 @@ describe('useFilteredConnections', function () {

rerender({
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
});
Expand All @@ -591,7 +655,7 @@ describe('useFilteredConnections', function () {
{
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
Expand Down Expand Up @@ -630,7 +694,7 @@ describe('useFilteredConnections', function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
Expand Down Expand Up @@ -662,7 +726,7 @@ describe('useFilteredConnections', function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
Expand Down Expand Up @@ -700,7 +764,7 @@ describe('useFilteredConnections', function () {
const { result } = renderHookWithContext(useFilteredConnections, {
initialProps: {
connections: mockSidebarConnections,
filterRegex: new RegExp('_1_1', 'i'),
filterRegex: new RegExp('coll_ready_1_1', 'i'),
fetchAllCollections: fetchAllCollectionsStub,
onDatabaseExpand: onDatabaseExpandStub,
},
Expand Down
10 changes: 6 additions & 4 deletions packages/compass-sidebar/src/components/use-filtered-connections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ const filterConnections = (
isMatch,
...(connection.connectionStatus === ConnectionStatus.Connected
? {
databases: childMatches.length
? childMatches
: connection.databases,
databases:
!isMatch && childMatches.length
? childMatches
: connection.databases,
}
: {}),
});
Expand All @@ -83,7 +84,8 @@ const filterDatabases = (
results.push({
...db,
isMatch,
collections: childMatches.length ? childMatches : db.collections,
collections:
!isMatch && childMatches.length ? childMatches : db.collections,
});
}
}
Expand Down
Loading