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

#197501 Improve SearchPanel component #284

Merged
merged 10 commits into from
Apr 15, 2020
Merged

#197501 Improve SearchPanel component #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
97bf78f
#197501 Improve `SearchPanel` component
cewald Apr 15, 2020
0d99836
Trigger tests
cewald Apr 15, 2020
0efcfb8
Debug action
cewald Apr 15, 2020
dc80d3f
Debug actions
cewald Apr 15, 2020
eb1fa1c
Debug action
cewald Apr 15, 2020
63edfba
Revert changes and update `bahmutov/npm-install`
cewald Apr 15, 2020
df05b89
Debug action
cewald Apr 15, 2020
bb8db09
Add version to yarn
cewald Apr 15, 2020
7668ee4
Update `actions/setup-node` action
cewald Apr 15, 2020
a81e76e
Merge branch 'develop-2020-04-11' into feature/197501-improve-search-…
cewald Apr 15, 2020
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v1.4.1
with:
node-version: '13.x'

- name: Install
uses: bahmutov/npm-install@v1
uses: bahmutov/npm-install@v1.1.0

- name: Get repository name, and branch name
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v1.4.1
with:
node-version: '13.x'

Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v1.4.1
with:
node-version: '13.x'

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v1.4.1
with:
node-version: '13.x'

Expand All @@ -82,7 +82,7 @@ jobs:
run: rsync -r ./vue-storefront-workspace/template/vue-storefront/ ./

- name: Install
uses: bahmutov/npm-install@v1
uses: bahmutov/npm-install@v1.1.0

- name: Build
run: yarn build
Expand Down
12 changes: 6 additions & 6 deletions src/themes/icmaa-imp/components/core/blocks/SearchPanel/SearchPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,8 @@ export default {
},
search: debounce(async function () {
if (!this.$v.searchString.$invalid) {
let query = this.prepareQuickSearchQuery(
this.searchAlias = await this.getAlias(this.searchString)
)
this.searchAlias = await this.getAlias(this.searchString)
let query = this.prepareQuickSearchQuery(this.searchAlias)

this.start = 0
this.moreProducts = true
Expand All @@ -175,7 +174,7 @@ export default {
}, 350),
async loadMoreProducts () {
if (!this.$v.searchString.$invalid) {
let query = this.prepareQuickSearchQuery(await this.getAlias(this.searchString))
let query = this.prepareQuickSearchQuery(await this.getAlias(this.searchString), true)
this.loadingProducts = true
this.$store.dispatch('product/list', { query, start: this.start, size: this.size, updateState: false }).then((resp) => {
const { items, aggregations, total, start } = resp
Expand All @@ -197,11 +196,12 @@ export default {
this.emptyResults = true
}
},
prepareQuickSearchQuery (value) {
prepareQuickSearchQuery (value, plain = false) {
let searchQuery = new SearchQuery()

const searchFilterKey = plain ? 'search-text-plain' : 'search-text'
searchQuery = searchQuery
.applyFilter({ key: 'search-text', value })
.applyFilter({ key: searchFilterKey, value })
.applyFilter({ key: 'stock', value: '' })
.applyFilter({ key: 'visibility', value: {'in': [3, 4]} })
.applyFilter({ key: 'status', value: {'in': [0, 1]} })
Expand Down