diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cde415515a..9247c0dbe5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3c9e0b894e..a43e0f65a7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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' @@ -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' @@ -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' @@ -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 diff --git a/src/themes/icmaa-imp/components/core/blocks/SearchPanel/SearchPanel.vue b/src/themes/icmaa-imp/components/core/blocks/SearchPanel/SearchPanel.vue index 4ddb0dd873..8f4b67652e 100644 --- a/src/themes/icmaa-imp/components/core/blocks/SearchPanel/SearchPanel.vue +++ b/src/themes/icmaa-imp/components/core/blocks/SearchPanel/SearchPanel.vue @@ -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 @@ -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 @@ -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]} })