-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44882 from nextcloud/fix/files-search-clearing
fix(files): Clear search filter when changing directory or view
- Loading branch information
Showing
8 changed files
with
194 additions
and
10 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /** | ||
| * @copyright Copyright (c) 2024 Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @author Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| /** | ||
| * Get the unified search modal (if open) | ||
| */ | ||
| export function getUnifiedSearchModal() { | ||
| return cy.get('#unified-search') | ||
| } | ||
|
|
||
| /** | ||
| * Open the unified search modal | ||
| */ | ||
| export function openUnifiedSearch() { | ||
| cy.get('button[aria-label="Unified search"]').click({ force: true }) | ||
| // wait for it to be open | ||
| getUnifiedSearchModal().should('be.visible') | ||
| } | ||
|
|
||
| /** | ||
| * Close the unified search modal | ||
| */ | ||
| export function closeUnifiedSearch() { | ||
| getUnifiedSearchModal().find('button[aria-label="Close"]').click({ force: true }) | ||
| getUnifiedSearchModal().should('not.be.visible') | ||
| } | ||
|
|
||
| /** | ||
| * Get the input field of the unified search | ||
| */ | ||
| export function getUnifiedSearchInput() { | ||
| return getUnifiedSearchModal().find('[data-cy-unified-search-input]') | ||
| } | ||
|
|
||
| export enum UnifiedSearchFilter { | ||
| FilterCurrentView = 'current-view', | ||
| Places = 'places', | ||
| People = 'people', | ||
| Date = 'date', | ||
| } | ||
|
|
||
| /** | ||
| * Get a filter action from the unified search | ||
| * @param filter The filter to get | ||
| */ | ||
| export function getUnifiedSearchFilter(filter: UnifiedSearchFilter) { | ||
| return getUnifiedSearchModal().find(`[data-cy-unified-search-filters] [data-cy-unified-search-filter="${CSS.escape(filter)}"]`) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /** | ||
| * @copyright Copyright (c) 2024 Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @author Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| import type { User } from '@nextcloud/cypress' | ||
| import { getRowForFile, navigateToFolder } from './FilesUtils' | ||
| import { UnifiedSearchFilter, getUnifiedSearchFilter, getUnifiedSearchInput, getUnifiedSearchModal, openUnifiedSearch } from '../core-utils.ts' | ||
|
|
||
| describe('files: Search and filter in files list', { testIsolation: true }, () => { | ||
| let user: User | ||
|
|
||
| beforeEach(() => cy.createRandomUser().then(($user) => { | ||
| user = $user | ||
|
|
||
| cy.mkdir(user, '/a folder') | ||
| cy.uploadContent(user, new Blob([]), 'text/plain', '/b file') | ||
| cy.uploadContent(user, new Blob([]), 'text/plain', '/a folder/c file') | ||
| cy.login(user) | ||
| cy.visit('/apps/files') | ||
| })) | ||
|
|
||
| it('filters current view', () => { | ||
| // All are visible by default | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('be.visible') | ||
|
|
||
| // Set up a search query | ||
| openUnifiedSearch() | ||
| getUnifiedSearchInput().type('a folder') | ||
| getUnifiedSearchFilter(UnifiedSearchFilter.FilterCurrentView).click({ force: true }) | ||
| // Wait for modal to close | ||
| getUnifiedSearchModal().should('not.be.visible') | ||
|
|
||
| // See that only the folder is visible | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('not.exist') | ||
| }) | ||
|
|
||
| it('resets filter when changeing the directory', () => { | ||
| // All are visible by default | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('be.visible') | ||
|
|
||
| // Set up a search query | ||
| openUnifiedSearch() | ||
| getUnifiedSearchInput().type('a folder') | ||
| getUnifiedSearchFilter(UnifiedSearchFilter.FilterCurrentView).click({ force: true }) | ||
| // Wait for modal to close | ||
| getUnifiedSearchModal().should('not.be.visible') | ||
|
|
||
| // See that only the folder is visible | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('not.exist') | ||
|
|
||
| // go to that folder | ||
| navigateToFolder('a folder') | ||
|
|
||
| // see that the folder is not filtered | ||
| getRowForFile('c file').should('be.visible') | ||
| }) | ||
|
|
||
| it('resets filter when changeing the view', () => { | ||
| // All are visible by default | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('be.visible') | ||
|
|
||
| // Set up a search query | ||
| openUnifiedSearch() | ||
| getUnifiedSearchInput().type('a folder') | ||
| getUnifiedSearchFilter(UnifiedSearchFilter.FilterCurrentView).click({ force: true }) | ||
| // Wait for modal to close | ||
| getUnifiedSearchModal().should('not.be.visible') | ||
|
|
||
| // See that only the folder is visible | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('not.exist') | ||
|
|
||
| // go to other view | ||
| cy.get('[data-cy-files-navigation-item="personal"] a').click({ force: true }) | ||
| // wait for view changed | ||
| cy.url().should('match', /apps\/files\/personal/) | ||
|
|
||
| // see that the folder is not filtered | ||
| getRowForFile('a folder').should('be.visible') | ||
| getRowForFile('b file').should('be.visible') | ||
| }) | ||
| }) |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.