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

Jump to bottom

feat: search highlights #9294

Merged
merged 4 commits into from
Jun 28, 2023
Merged

feat: search highlights #9294

merged 4 commits into from
Jun 28, 2023

Conversation

AlexAndBear
Copy link
Contributor

@AlexAndBear AlexAndBear commented Jun 26, 2023 •
edited
Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • ...

@update-docs
Copy link

update-docs bot commented Jun 26, 2023

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

AlexAndBear
AlexAndBear commented Jun 26, 2023
View reviewed changes
packages/web-app-files/src/search/sdk/list.ts Outdated
Comment on lines 17 to 18
export interface SearchResource extends Resource {
highlights?: string[]
}
Copy link
Contributor Author

@AlexAndBear AlexAndBear Jun 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDK if this is necessary, I thought it could be used elsewhere

AlexAndBear
AlexAndBear commented Jun 26, 2023
View reviewed changes
packages/web-app-files/src/components/Search/List.vue Outdated
@@ -61,10 +61,21 @@
:is-selectable="true"
:sort-by="sortBy"
:sort-dir="sortDir"
:fields-displayed="['name', 'indicators', 'size', 'tags', 'mdate']"
Copy link
Contributor Author

@AlexAndBear AlexAndBear Jun 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

used to be buggy, as space stuff like quota was shown but shouldn't.
I purged indicators, as they won't be supplied via REPORT

@AlexAndBear AlexAndBear requested a review from JammingBen June 26, 2023 16:03
AlexAndBear
AlexAndBear commented Jun 27, 2023
View reviewed changes
package.json
@@ -83,7 +83,7 @@
"cucumber-html-reporter": "5.5.1",
"depcheck": "1.4.3",
"ejs": "3.1.9",
"eslint": "8.40.0",
"eslint": "8.43.0",
Copy link
Contributor Author

@AlexAndBear AlexAndBear Jun 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bumped eslint as locally calling eslint --fix tried always to alter packages/web-pkg/src/composables/router/types.ts
which resulted in a linter error in the ci, which was annoying.

Works now

JammingBen
JammingBen reviewed Jun 27, 2023
View reviewed changes
Copy link
Contributor

@JammingBen JammingBen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small typo, rest LGTM 👍

changelog/unreleased/enhancement-search-list-add-highligthed-file-content Outdated Show resolved Hide resolved
@AlexAndBear
Copy link
Contributor Author

DO NOT MERGE

@ownclouders
Copy link
Contributor

ownclouders commented Jun 28, 2023 •
edited
Loading

Results for e2e-tests oCIS-1 https://drone.owncloud.com/owncloud/web/36842/12/1

💥 To see the trace, please open the link in the console ...

npx playwright show-trace https://cache.owncloud.com/public/owncloud/web/36842/tracing/search-for-content-of-file-alice-2023-6-28-10-18-48.zip

npx playwright show-trace https://cache.owncloud.com/public/owncloud/web/36842/tracing/search-for-content-of-file-brian-2023-6-28-10-18-56.zip

💥 The e2e-ocis tests pipeline failed. The build has been cancelled.

@AlexAndBear AlexAndBear marked this pull request as ready for review June 28, 2023 10:20
@AlexAndBear AlexAndBear enabled auto-merge (squash) June 28, 2023 10:20
Jan and others added 4 commits June 28, 2023 14:16
Init
f06c410
@JammingBen
Update changelog/unreleased/enhancement-search-list-add-highligthed-f…
85d2828 
…ile-content

Co-authored-by: Jannik Stehle <50302941+JammingBen@users.noreply.github.com>
Fix
edea103
Styling
6ebe689
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug C 1 Bug
Vulnerability A 0 Vulnerabilities
Security Hotspot E 1 Security Hotspot
Code Smell A 3 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@AlexAndBear AlexAndBear merged commit a1979cc into master Jun 28, 2023
@delete-merged-branch delete-merged-branch bot deleted the search-highlights branch June 28, 2023 12:49
ownclouders pushed a commit that referenced this pull request Jun 28, 2023
@JammingBen
feat: search highlights (#9294)
4e7e3c7 
* Init

* Update changelog/unreleased/enhancement-search-list-add-highligthed-file-content

Co-authored-by: Jannik Stehle <50302941+JammingBen@users.noreply.github.com>

* Fix

* Styling

---------

Co-authored-by: Jannik Stehle <50302941+JammingBen@users.noreply.github.com>
@micbar micbar mentioned this pull request Jul 24, 2023
Closed
68 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JammingBen JammingBen JammingBen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[web] Fulltext search: highlight keywords in search result page
3 participants
@AlexAndBear @ownclouders @JammingBen