-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Add Selected Filters in myHistory #332
Merged
CachedaCodes
merged 23 commits into
main
from
feature/EMP-2293-Add-filters-in-my-history
Nov 3, 2023
Merged
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
292bb01
feat: selected Filters in myHistory
annacv beb1b80
feat: selected Filters in myHistory
annacv b2691a9
feat: add line-clamp tailwind plugin
annacv 31011fb
feat: use line-clamp in my history filters
annacv 4015125
feat: add translations
annacv c43179b
feat: create my-history-filters component
annacv b583f93
feat: wip showing 2 opt
annacv 7a5e686
chore: update branch
annacv a2e2555
feat: apply design with line-clamp
annacv e401ad2
chore: rm unnecessary div
annacv 81c1cd4
feat: st if condition inside custom-my-history
annacv cceca35
feat: rm unneded component, rm unneded class
annacv 0afd27a
chore: add forgotten if
annacv 59a7de0
fix: rm ?? operator from template
annacv ed69591
style(my-history): fix show num of filters, fix underline on hover
annacv d029328
style(my-history): add filters in empathize history queries and fix p…
lauramargar cc1700f
feat(my-history): create new component for history query filters
lauramargar 856c819
feat(my-history): remove line-clamp dependency
lauramargar 9627342
Merge remote-tracking branch 'origin/main' into feature/EMP-2293-Add-…
lauramargar 6dfe40f
Merge remote-tracking branch 'origin/main' into feature/EMP-2293-Add-…
lauramargar b78ef52
feat(my-history): fix pr comments
lauramargar ffc4441
feat(my-history): change history query filters' prop
lauramargar 94aec1e
feat(my-history): underline only the query
lauramargar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 | ||||
---|---|---|---|---|---|---|
|
@@ -22,6 +22,15 @@ | |||||
|
||||||
<div class="x-flex x-flex-col x-gap-2"> | ||||||
<p>{{ suggestion.query }}</p> | ||||||
<p | ||||||
v-if="suggestion.selectedFilters.length > 0" | ||||||
class="x-text1-sm x-text-lead-50 x-line-clamp-1" | ||||||
> | ||||||
<span v-for="filter in suggestion.selectedFilters" :key="filter.id" class="x-pr-8"> | ||||||
{{ filter.label ?? filter.id }} | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
You can accept this commit by pointing to x-components "3.0.1-alpha.1" |
||||||
</span> | ||||||
</p> | ||||||
|
||||||
<p class="x-text1 x-text1-sm x-text-neutral-75"> | ||||||
{{ formatTime(suggestion.timestamp) }} | ||||||
<template v-if="suggestion.totalResults !== undefined"> | ||||||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
filter.id
should not be needed as soon as this empathyco/x#1325 is implemented