From 56a8d2bc796c31deb813de1dfe31f30b84e26dec Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Thu, 16 Oct 2025 08:27:33 +0100
Subject: [PATCH 1/5] feat(VCST-3991): no results search page

---
 .../shared/catalog/components/category.vue    | 198 ++++++++++--------
 .../shared/catalog/composables/useProducts.ts |   2 +-
 locales/de.json                               |   7 +-
 locales/en.json                               |   1 +
 locales/es.json                               |   7 +-
 locales/fi.json                               |   1 +
 locales/fr.json                               |   7 +-
 locales/it.json                               |   7 +-
 locales/ja.json                               |   7 +-
 locales/no.json                               |   1 +
 locales/pl.json                               |   7 +-
 locales/pt.json                               |   7 +-
 locales/ru.json                               |   7 +-
 locales/sv.json                               |   1 +
 locales/zh.json                               |   7 +-
 15 files changed, 150 insertions(+), 117 deletions(-)

diff --git a/client-app/shared/catalog/components/category.vue b/client-app/shared/catalog/components/category.vue
index ac3594d21a..93176ff6b1 100644
--- a/client-app/shared/catalog/components/category.vue
+++ b/client-app/shared/catalog/components/category.vue
@@ -20,7 +20,7 @@
       />
 
       <VcLayout sticky-sidebar>
-        <template v-if="!hideSidebar && !isMobile && !isHorizontalFilters" #sidebar>
+        <template v-if="!hideSidebar && !isMobile && !isHorizontalFilters && !emptyViewSearchOnly" #sidebar>
           <CategorySelector
             v-if="categoryId || isRoot"
             :category="currentCategory"
@@ -39,7 +39,11 @@
         </template>
 
         <VcTypography tag="h1" class="category__title">
-          <i18n-t v-if="!categoryId && !isRoot && searchParams.keyword" keypath="pages.search.header" tag="span">
+          <i18n-t
+            v-if="!categoryId && !isRoot && searchParams.keyword"
+            :keypath="emptyViewSearchOnly ? 'pages.search.header_empty' : 'pages.search.header'"
+            tag="span"
+          >
             <template #keyword>
               <strong>{{ searchParams.keyword }}</strong>
             </template>
@@ -60,7 +64,10 @@
             {{ currentCategory?.name }}
           </span>
 
-          <sup v-if="!fetchingProducts && !hideTotal && !fixedProductsCount" class="category__products-count">
+          <sup
+            v-if="!fetchingProducts && !hideTotal && !fixedProductsCount && !emptyViewSearchOnly"
+            class="category__products-count"
+          >
             <b class="me-1">{{ $n(totalProductsCount, "decimal") }}</b>
 
             <template v-if="currentCategory && searchQueryParam">
@@ -75,99 +82,102 @@
 
         <div ref="stickyMobileHeaderAnchor" class="category__header-anchor"></div>
 
-        <div
-          :class="[
-            'category__filters',
-            {
-              'category__filters--sticky': stickyMobileHeaderIsVisible,
-            },
-          ]"
-        >
-          <!-- Popup sidebar filters toggler -->
-          <VcButton
-            v-if="!hideSidebar"
-            class="category__facets-button"
-            icon="filter"
-            size="sm"
-            :aria-label="$t('common.accessibility.open_filters')"
-            @click="showFiltersSidebar"
-          />
-
-          <!-- Sorting -->
-          <div v-if="!hideSorting && !isHorizontalFilters" class="category__sort">
-            <VcLabel class="category__sort-label">
-              {{ $t("pages.catalog.sort_by_label") }}
-            </VcLabel>
-
-            <VcSelect
-              v-model="sortQueryParam"
-              text-field="name"
-              value-field="id"
-              :disabled="fetchingProducts"
-              :items="translatedProductSortingList"
-              class="category__sort-dropdown"
+        <template v-if="!hideAllControls">
+          <div
+            :class="[
+              'category__filters',
+              {
+                'category__filters--sticky': stickyMobileHeaderIsVisible,
+              },
+            ]"
+          >
+            <!-- Popup sidebar filters toggler -->
+            <VcButton
+              v-if="!hideSidebar"
+              class="category__facets-button"
+              icon="filter"
               size="sm"
-              @change="resetCurrentPage"
+              :aria-label="$t('common.accessibility.open_filters')"
+              @click="showFiltersSidebar"
+            />
+
+            <!-- Sorting -->
+            <div v-if="!hideSorting && !isHorizontalFilters" class="category__sort">
+              <VcLabel class="category__sort-label">
+                {{ $t("pages.catalog.sort_by_label") }}
+              </VcLabel>
+
+              <VcSelect
+                v-model="sortQueryParam"
+                text-field="name"
+                value-field="id"
+                :disabled="fetchingProducts"
+                :items="translatedProductSortingList"
+                class="category__sort-dropdown"
+                size="sm"
+                @change="resetCurrentPage"
+              />
+            </div>
+
+            <!-- View options - horizontal view -->
+            <ViewMode
+              v-if="!hideViewModeSelector"
+              v-model:mode="savedViewMode"
+              class="category__view-mode"
+              data-test-id="category-page.view-switcher"
+            />
+
+            <!-- In stock and branches -->
+            <CategoryControls
+              v-if="!hideControls && !isMobile && !isHorizontalFilters"
+              v-model="localStorageInStock"
+              v-model:purchased-before="localStoragePurchasedBefore"
+              :loading="fetchingProducts"
+              :saved-branches="localStorageBranches"
+              class="category__controls"
+              @open-branches-modal="openBranchesModal"
+              @apply-in-stock="resetCurrentPage"
+              @apply-purchased-before="resetCurrentPage"
             />
           </div>
 
-          <!-- View options - horizontal view -->
-          <ViewMode
-            v-if="!hideViewModeSelector"
-            v-model:mode="savedViewMode"
-            class="category__view-mode"
-            data-test-id="category-page.view-switcher"
+          <!-- Horizontal filters -->
+          <CategoryHorizontalFilters
+            v-if="isHorizontalFilters && !isMobile"
+            :facets-loading="fetchingFacets"
+            :keyword-query-param="keywordQueryParam"
+            :sort-query-param="sortQueryParam"
+            :loading="fetchingProducts || fetchingFacets"
+            :filters="filtersToShow"
+            :hide-sorting="hideSorting"
+            :hide-all-filters="hideSidebar"
+            @reset-facet-filters="resetFacetFilters"
+            @change:filters="applyFiltersOnly($event)"
+            @show-popup-sidebar="showFiltersSidebar"
+            @apply-sort="resetCurrentPage"
           />
 
-          <!-- In stock and branches -->
-          <CategoryControls
-            v-if="!hideControls && !isMobile && !isHorizontalFilters"
-            v-model="localStorageInStock"
-            v-model:purchased-before="localStoragePurchasedBefore"
-            :loading="fetchingProducts"
-            :saved-branches="localStorageBranches"
-            class="category__controls"
-            @open-branches-modal="openBranchesModal"
-            @apply-in-stock="resetCurrentPage"
-            @apply-purchased-before="resetCurrentPage"
-          />
-        </div>
+          <ActiveFilterChips
+            v-if="hasSelectedFacets || isResetPageButtonShown"
+            :filters="productsFilters.filters"
+            :facets-to-hide="normalizedFacetsToHide"
+            @apply-filters="applyFiltersOnly"
+          >
+            <template #actions>
+              <VcChip v-if="hasSelectedFacets" color="secondary" variant="outline" clickable @click="resetFacetFilters">
+                <span>{{ $t("common.buttons.reset_filters") }}</span>
 
-        <!-- Horizontal filters -->
-        <CategoryHorizontalFilters
-          v-if="isHorizontalFilters && !isMobile"
-          :facets-loading="fetchingFacets"
-          :keyword-query-param="keywordQueryParam"
-          :sort-query-param="sortQueryParam"
-          :loading="fetchingProducts || fetchingFacets"
-          :filters="filtersToShow"
-          :hide-sorting="hideSorting"
-          :hide-all-filters="hideSidebar"
-          @reset-facet-filters="resetFacetFilters"
-          @change:filters="applyFiltersOnly($event)"
-          @show-popup-sidebar="showFiltersSidebar"
-          @apply-sort="resetCurrentPage"
-        />
-        <ActiveFilterChips
-          v-if="hasSelectedFacets || isResetPageButtonShown"
-          :filters="productsFilters.filters"
-          :facets-to-hide="normalizedFacetsToHide"
-          @apply-filters="applyFiltersOnly"
-        >
-          <template #actions>
-            <VcChip v-if="hasSelectedFacets" color="secondary" variant="outline" clickable @click="resetFacetFilters">
-              <span>{{ $t("common.buttons.reset_filters") }}</span>
-
-              <VcIcon name="reset" />
-            </VcChip>
-
-            <VcChip v-if="isResetPageButtonShown" color="secondary" variant="outline" clickable @click="resetPage">
-              <span>{{ $t("common.buttons.reset_page") }}</span>
-
-              <VcIcon name="reset" />
-            </VcChip>
-          </template>
-        </ActiveFilterChips>
+                <VcIcon name="reset" />
+              </VcChip>
+
+              <VcChip v-if="isResetPageButtonShown" color="secondary" variant="outline" clickable @click="resetPage">
+                <span>{{ $t("common.buttons.reset_page") }}</span>
+
+                <VcIcon name="reset" />
+              </VcChip>
+            </template>
+          </ActiveFilterChips>
+        </template>
 
         <div ref="categoryProductsAnchor" class="category__products-anchor"></div>
 
@@ -395,6 +405,16 @@ const categoryListProperties = computed(() => ({
   related_type: "category",
 }));
 
+const filteredOnlyBySearch = computed(() => {
+  return !hasSelectedFacets.value && searchQueryParam.value;
+});
+const emptyViewSearchOnly = computed(() => {
+  return filteredOnlyBySearch.value && products.value.length === 0 && !fetchingProducts.value;
+});
+const hideAllControls = computed(() => {
+  return emptyViewSearchOnly.value;
+});
+
 const categoryComponentAnchor = shallowRef<HTMLElement | null>(null);
 const categoryComponentAnchorIsVisible = useElementVisibility(categoryComponentAnchor);
 
diff --git a/client-app/shared/catalog/composables/useProducts.ts b/client-app/shared/catalog/composables/useProducts.ts
index 972e2771c6..4276a9c377 100644
--- a/client-app/shared/catalog/composables/useProducts.ts
+++ b/client-app/shared/catalog/composables/useProducts.ts
@@ -315,7 +315,7 @@ export function useProducts(
     const filteredFilters = productsFilters.value.filters.filter(
       (filter) => !normalizedFacetsToHide.value?.includes(filter.name.toLowerCase()),
     );
-    return !!filteredFacets.length && !!filteredFilters.length;
+    return !!filteredFacets.length || !!filteredFilters.length;
   }
 
   function setFacets({ termFacets = [], rangeFacets = [] }: { termFacets?: TermFacet[]; rangeFacets?: RangeFacet[] }) {
diff --git a/locales/de.json b/locales/de.json
index 04d6aa1df7..55b25bc75d 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Listen Einstellungen",
         "list_name_label": "Listenname",
         "list_name_placeholder": "Bitte Namen eingeben",
+        "sharing_scope_label": "Teilen-Optionen",
+        "sharing_scope_placeholder": "Bitte wähle eine Option",
+        "sharing_link_label": "Link",
         "create_button": "Liste erstellen",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Private Liste",
         "make_shared": "Teilen",
-        "sharing_scope_label": "Teilen-Optionen",
-        "sharing_scope_placeholder": "Bitte wähle eine Option",
-        "sharing_link_label": "Link",
         "sharing_scope": {
           "Private": "Privat",
           "Organization": "Organisation",
@@ -1412,6 +1412,7 @@
       },
       "title": "Suche",
       "header": "Ihre Suche nach {keyword} ergab Folgendes",
+      "header_empty": "Ihre Suche nach „{keyword}“ ergab leider keine Ergebnisse",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Ihre <strong>{0}</strong>-Abfrage ergab keine Ergebnisse",
diff --git a/locales/en.json b/locales/en.json
index 5f75fecf20..e0fe220526 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1412,6 +1412,7 @@
       },
       "title": "Search",
       "header": "Your search for {keyword} returned the following",
+      "header_empty": "Sorry, your search for \"{keyword}\" didn't return any results",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Your <strong>{0}</strong> query did not return any results",
diff --git a/locales/es.json b/locales/es.json
index f6a910428d..8f40db2531 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Configuraciones de la lista",
         "list_name_label": "Nombre de la lista",
         "list_name_placeholder": "Por favor, introduce el nombre",
+        "sharing_scope_label": "Opciones para compartir",
+        "sharing_scope_placeholder": "Por favor, seleccione una opción",
+        "sharing_link_label": "Enlace",
         "create_button": "Crear lista",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Lista privada",
         "make_shared": "Hacer compartida",
-        "sharing_scope_label": "Opciones para compartir",
-        "sharing_scope_placeholder": "Por favor, seleccione una opción",
-        "sharing_link_label": "Enlace",
         "sharing_scope": {
           "Private": "Privado",
           "Organization": "Organización",
@@ -1412,6 +1412,7 @@
       },
       "title": "Buscar",
       "header": "Tu búsqueda de {keyword} devolvió lo siguiente",
+      "header_empty": "Lo sentimos, su búsqueda de \"{keyword}\" no produjo ningún resultado",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Tu consulta <strong>{0}</strong> no devolvió ningún resultado",
diff --git a/locales/fi.json b/locales/fi.json
index 09ead8e562..1b8f6435b3 100644
--- a/locales/fi.json
+++ b/locales/fi.json
@@ -1412,6 +1412,7 @@
       },
       "title": "Haku",
       "header": "Hakusi {keyword} tuotti seuraavat tulokset",
+      "header_empty": "Hakusanasi, hakusi \"{keyword}\" -haulla ei löytynyt yhtään tulosta",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Hakusi <strong>{0}</strong> ei tuottanut tuloksia",
diff --git a/locales/fr.json b/locales/fr.json
index dba2816b30..7d8ceab072 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Paramètres de la liste",
         "list_name_label": "Nom de la liste",
         "list_name_placeholder": "Veuillez entrer le nom",
+        "sharing_scope_label": "Options de partage",
+        "sharing_scope_placeholder": "Veuillez choisir une option",
+        "sharing_link_label": "Lien",
         "create_button": "Créer une liste",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Liste privée",
         "make_shared": "Rendre partagé",
-        "sharing_scope_label": "Options de partage",
-        "sharing_scope_placeholder": "Veuillez choisir une option",
-        "sharing_link_label": "Lien",
         "sharing_scope": {
           "Private": "Privé(e)",
           "Organization": "Organisation",
@@ -1412,6 +1412,7 @@
       },
       "title": "Rechercher",
       "header": "Votre recherche pour {keyword} a donné les résultats suivants",
+      "header_empty": "Désolé, votre recherche pour « {keyword} » n’a renvoyé aucun résultat",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Votre requête <strong>{0}</strong> n'a donné aucun résultat",
diff --git a/locales/it.json b/locales/it.json
index 1942c6cd42..e0a2e4b7f9 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Impostazioni lista",
         "list_name_label": "Nome lista",
         "list_name_placeholder": "Inserisci il nome",
+        "sharing_scope_label": "Opzioni di condivisione",
+        "sharing_scope_placeholder": "Seleziona un'opzione",
+        "sharing_link_label": "Link",
         "create_button": "Crea lista",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Lista privata",
         "make_shared": "Rendi condivisa",
-        "sharing_scope_label": "Opzioni di condivisione",
-        "sharing_scope_placeholder": "Seleziona un'opzione",
-        "sharing_link_label": "Link",
         "sharing_scope": {
           "Private": "Privato",
           "Organization": "Organizzazione",
@@ -1412,6 +1412,7 @@
       },
       "title": "Cerca",
       "header": "La tua ricerca per {keyword} ha restituito i seguenti risultati",
+      "header_empty": "Siamo spiacenti, la ricerca di \"{keyword}\" non ha prodotto risultati",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "La tua ricerca <strong>{0}</strong> non ha prodotto risultati",
diff --git a/locales/ja.json b/locales/ja.json
index 65f71961db..969049cb67 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "List Settings",
         "list_name_label": "List name",
         "list_name_placeholder": "Please enter name",
+        "sharing_scope_label": "共有オプション",
+        "sharing_scope_placeholder": "いずれか 1 つを選択してください",
+        "sharing_link_label": "リンク",
         "create_button": "Create list",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Private list",
         "make_shared": "Make shared",
-        "sharing_scope_label": "共有オプション",
-        "sharing_scope_placeholder": "いずれか 1 つを選択してください",
-        "sharing_link_label": "リンク",
         "sharing_scope": {
           "Private": "プライベート",
           "Organization": "組織",
@@ -1412,6 +1412,7 @@
       },
       "title": "検索",
       "header": "「{keyword}」の検索結果",
+      "header_empty": "申し訳ありません。「{keyword}」の検索では、何も結果がありませんでした",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "「<strong>{0}</strong>」に一致する結果が見つかりませんでした",
diff --git a/locales/no.json b/locales/no.json
index 9f0387ec73..920b42591a 100644
--- a/locales/no.json
+++ b/locales/no.json
@@ -1412,6 +1412,7 @@
       },
       "title": "Søk",
       "header": "Søket ditt etter {keyword} ga følgende resultater",
+      "header_empty": "Beklager, søket ditt etter «{keyword}» ga ingen resultater",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Søket ditt etter <strong>{0}</strong> ga ingen resultater",
diff --git a/locales/pl.json b/locales/pl.json
index 56f468b012..1023a9defa 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Ustawienia listy",
         "list_name_label": "Nazwa listy",
         "list_name_placeholder": "Proszę wpisać nazwę",
+        "sharing_scope_label": "Opcje udostępniania",
+        "sharing_scope_placeholder": "Wybierz jedną opcję",
+        "sharing_link_label": "Link",
         "create_button": "Utwórz listę",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Lista prywatna",
         "make_shared": "Uczyń współdzieloną",
-        "sharing_scope_label": "Opcje udostępniania",
-        "sharing_scope_placeholder": "Wybierz jedną opcję",
-        "sharing_link_label": "Link",
         "sharing_scope": {
           "Private": "Prywatne",
           "Organization": "Organizacja",
@@ -1412,6 +1412,7 @@
       },
       "title": "Szukaj",
       "header": "Twoje wyszukiwanie {keyword} zwróciło następujące wyniki",
+      "header_empty": "Przepraszamy, wyszukiwanie frazy „{keyword}” nie przyniosło żadnych wyników",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Twoje zapytanie <strong>{0}</strong> nie zwróciło żadnych wyników",
diff --git a/locales/pt.json b/locales/pt.json
index d57ebded11..66dbe432d6 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Configurações da Lista",
         "list_name_label": "Nome da lista",
         "list_name_placeholder": "Por favor, insira o nome",
+        "sharing_scope_label": "Opções de compartilhamento",
+        "sharing_scope_placeholder": "Por favor, selecione uma opção",
+        "sharing_link_label": "Link",
         "create_button": "Criar lista",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Lista privada",
         "make_shared": "Tornar compartilhada",
-        "sharing_scope_label": "Opções de compartilhamento",
-        "sharing_scope_placeholder": "Por favor, selecione uma opção",
-        "sharing_link_label": "Link",
         "sharing_scope": {
           "Private": "Privado",
           "Organization": "Organização",
@@ -1412,6 +1412,7 @@
       },
       "title": "Pesquisar",
       "header": "Sua pesquisa por {keyword} retornou o seguinte",
+      "header_empty": "Desculpe, sua busca por \"{keyword}\" não retornou nenhum resultado",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Sua consulta <strong>{0}</strong> não retornou nenhum resultado",
diff --git a/locales/ru.json b/locales/ru.json
index 18dbeb008d..aa82e36041 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "Настройки списка",
         "list_name_label": "Название списка",
         "list_name_placeholder": "Пожалуйста, введите название",
+        "sharing_scope_label": "Поделиться",
+        "sharing_scope_placeholder": "Пожалуйста, выберите один вариант",
+        "sharing_link_label": "Ссылка",
         "create_button": "Создать список",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "Приватный список",
         "make_shared": "Сделать общим",
-        "sharing_scope_label": "Поделиться",
-        "sharing_scope_placeholder": "Пожалуйста, выберите один вариант",
-        "sharing_link_label": "Ссылка",
         "sharing_scope": {
           "Private": "Приватный",
           "Organization": "Организация",
@@ -1412,6 +1412,7 @@
       },
       "title": "Поиск",
       "header": "Ваш поиск {keyword} вернул следующее",
+      "header_empty": "К сожалению, поиск по запросу «{keyword}» не дал результатов",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Ваш запрос <strong>{0}</strong> не дал результатов",
diff --git a/locales/sv.json b/locales/sv.json
index c1c028496c..465deb3cb6 100644
--- a/locales/sv.json
+++ b/locales/sv.json
@@ -1412,6 +1412,7 @@
       },
       "title": "Sök",
       "header": "Din sökning efter {keyword} gav följande resultat",
+      "header_empty": "Tyvärr, din sökning efter \"{keyword}\" gav inga resultat",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "Din sökning efter <strong>{0}</strong> gav inga resultat",
diff --git a/locales/zh.json b/locales/zh.json
index 92c6aaa32a..c4aa1c431c 100644
--- a/locales/zh.json
+++ b/locales/zh.json
@@ -898,14 +898,14 @@
         "edit_mode_title": "清单设置",
         "list_name_label": "清单名称",
         "list_name_placeholder": "请输入名称",
+        "sharing_scope_label": "分享选项",
+        "sharing_scope_placeholder": "请选择一个选项",
+        "sharing_link_label": "链接",
         "create_button": "创建清单",
         "save_button": "@:common.buttons.save",
         "cancel_button": "@:common.buttons.cancel",
         "private_list": "私人清单",
         "make_shared": "设为共享",
-        "sharing_scope_label": "分享选项",
-        "sharing_scope_placeholder": "请选择一个选项",
-        "sharing_link_label": "链接",
         "sharing_scope": {
           "Private": "私密",
           "Organization": "组织",
@@ -1412,6 +1412,7 @@
       },
       "title": "搜索",
       "header": "您搜索的 {keyword} 返回了以下结果",
+      "header_empty": "抱歉，您搜索“{keyword}”未找到任何结果",
       "sort_by_label": "@:common.labels.sort_by",
       "choose_button": "@:common.buttons.choose",
       "no_results_message": "您的 <strong>{0}</strong> 查询未返回任何结果",

From 78a7e1703f39ed024a9326b40ddea52c215d64a9 Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Thu, 16 Oct 2025 10:21:21 +0100
Subject: [PATCH 2/5] feat: minor refactor

---
 client-app/shared/catalog/components/category.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/client-app/shared/catalog/components/category.vue b/client-app/shared/catalog/components/category.vue
index 93176ff6b1..81113a58e2 100644
--- a/client-app/shared/catalog/components/category.vue
+++ b/client-app/shared/catalog/components/category.vue
@@ -20,7 +20,7 @@
       />
 
       <VcLayout sticky-sidebar>
-        <template v-if="!hideSidebar && !isMobile && !isHorizontalFilters && !emptyViewSearchOnly" #sidebar>
+        <template v-if="isSidebarVisible" #sidebar>
           <CategorySelector
             v-if="categoryId || isRoot"
             :category="currentCategory"
@@ -64,10 +64,7 @@
             {{ currentCategory?.name }}
           </span>
 
-          <sup
-            v-if="!fetchingProducts && !hideTotal && !fixedProductsCount && !emptyViewSearchOnly"
-            class="category__products-count"
-          >
+          <sup v-if="showProductsCount" class="category__products-count">
             <b class="me-1">{{ $n(totalProductsCount, "decimal") }}</b>
 
             <template v-if="currentCategory && searchQueryParam">
@@ -415,6 +412,13 @@ const hideAllControls = computed(() => {
   return emptyViewSearchOnly.value;
 });
 
+const isSidebarVisible = computed(() => {
+  return !props.hideSidebar && !isMobile.value && !isHorizontalFilters.value && !emptyViewSearchOnly.value;
+});
+const showProductsCount = computed(() => {
+  return !fetchingProducts.value && !props.hideTotal && !props.fixedProductsCount && !emptyViewSearchOnly.value;
+});
+
 const categoryComponentAnchor = shallowRef<HTMLElement | null>(null);
 const categoryComponentAnchorIsVisible = useElementVisibility(categoryComponentAnchor);
 

From e27f4444fae12b2bf52c370139af71774d80f1cd Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Thu, 16 Oct 2025 13:13:33 +0100
Subject: [PATCH 3/5] fix: condition

---
 .../shared/catalog/components/category.vue      | 17 ++++++++++++-----
 .../shared/catalog/composables/useProducts.ts   |  7 ++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/client-app/shared/catalog/components/category.vue b/client-app/shared/catalog/components/category.vue
index 81113a58e2..d23b1b34d5 100644
--- a/client-app/shared/catalog/components/category.vue
+++ b/client-app/shared/catalog/components/category.vue
@@ -155,13 +155,19 @@
           />
 
           <ActiveFilterChips
-            v-if="hasSelectedFacets || isResetPageButtonShown"
+            v-if="hasSelectedFilters || isResetPageButtonShown"
             :filters="productsFilters.filters"
             :facets-to-hide="normalizedFacetsToHide"
             @apply-filters="applyFiltersOnly"
           >
             <template #actions>
-              <VcChip v-if="hasSelectedFacets" color="secondary" variant="outline" clickable @click="resetFacetFilters">
+              <VcChip
+                v-if="hasSelectedFilters"
+                color="secondary"
+                variant="outline"
+                clickable
+                @click="resetFacetFilters"
+              >
                 <span>{{ $t("common.buttons.reset_filters") }}</span>
 
                 <VcIcon name="reset" />
@@ -186,9 +192,9 @@
           :fetching-products="fetchingProducts"
           :fixed-products-count="fixedProductsCount"
           :has-active-filters="
-            hasSelectedFacets || localStorageInStock || localStoragePurchasedBefore || !!localStorageBranches.length
+            hasSelectedFilters || localStorageInStock || localStoragePurchasedBefore || !!localStorageBranches.length
           "
-          :has-selected-facets="hasSelectedFacets"
+          :has-selected-facets="hasSelectedFilters"
           :items-per-page="itemsPerPage"
           :pages-count="pagesCount"
           :page-number="currentPage"
@@ -341,6 +347,7 @@ const {
   fetchingProducts,
   fetchingFacets,
   hasSelectedFacets,
+  hasSelectedFilters,
   isFiltersSidebarVisible,
   keywordQueryParam,
   localStorageBranches,
@@ -403,7 +410,7 @@ const categoryListProperties = computed(() => ({
 }));
 
 const filteredOnlyBySearch = computed(() => {
-  return !hasSelectedFacets.value && searchQueryParam.value;
+  return !hasSelectedFilters.value && !!searchQueryParam.value;
 });
 const emptyViewSearchOnly = computed(() => {
   return filteredOnlyBySearch.value && products.value.length === 0 && !fetchingProducts.value;
diff --git a/client-app/shared/catalog/composables/useProducts.ts b/client-app/shared/catalog/composables/useProducts.ts
index 4276a9c377..0e72958b2c 100644
--- a/client-app/shared/catalog/composables/useProducts.ts
+++ b/client-app/shared/catalog/composables/useProducts.ts
@@ -315,7 +315,11 @@ export function useProducts(
     const filteredFilters = productsFilters.value.filters.filter(
       (filter) => !normalizedFacetsToHide.value?.includes(filter.name.toLowerCase()),
     );
-    return !!filteredFacets.length || !!filteredFilters.length;
+    return !!filteredFacets.length && !!filteredFilters.length;
+  }
+
+  function hasSelectedFilters(): boolean {
+    return !!productsFilters.value.filters.length;
   }
 
   function setFacets({ termFacets = [], rangeFacets = [] }: { termFacets?: TermFacet[]; rangeFacets?: RangeFacet[] }) {
@@ -506,6 +510,7 @@ export function useProducts(
     fetchingMoreProducts: readonly(fetchingMoreProducts),
     fetchingProducts: readonly(fetchingProducts),
     hasSelectedFacets: computed(() => hasSelectedFacets()),
+    hasSelectedFilters: computed(() => hasSelectedFilters()),
     isFiltersDirty: computed(() => !isEqual(prevProductsFilters.value, productsFilters.value)),
     isFiltersSidebarVisible: readonly(isFiltersSidebarVisible),
     /** @deprecated use `searchQueryParam` instead */

From 50d370bb3c2d55066d4fa2c0d7f866d9fd53fed8 Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Fri, 24 Oct 2025 17:37:15 +0100
Subject: [PATCH 4/5] fix: correct route on reset search button click

---
 .../shared/catalog/components/category.vue    | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/client-app/shared/catalog/components/category.vue b/client-app/shared/catalog/components/category.vue
index d23b1b34d5..9e87f01fe6 100644
--- a/client-app/shared/catalog/components/category.vue
+++ b/client-app/shared/catalog/components/category.vue
@@ -231,7 +231,7 @@ import {
 import omit from "lodash/omit";
 import { computed, defineAsyncComponent, onBeforeUnmount, onMounted, ref, shallowRef, toRef, toRefs, watch } from "vue";
 import { useI18n } from "vue-i18n";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useAnalytics, useThemeContext } from "@/core/composables";
 import { useLanguages } from "@/core/composables/useLanguages";
 import { useModuleSettings } from "@/core/composables/useModuleSettings";
@@ -257,6 +257,7 @@ import ProductsFilters from "./products-filters.vue";
 import ViewMode from "./view-mode.vue";
 import type { Product } from "@/core/api/graphql/types";
 import type { FiltersDisplayOrderType, ProductsFiltersType, ProductsSearchParamsType } from "@/shared/catalog";
+import type { RouteLocationRaw } from "vue-router";
 import ActiveFilterChips from "@/shared/catalog/components/active-filter-chips.vue";
 import CategoryControls from "@/shared/catalog/components/category/category-controls.vue";
 import CategoryHorizontalFilters from "@/shared/catalog/components/category/category-horizontal-filters.vue";
@@ -306,6 +307,7 @@ const isMobile = breakpoints.smaller("md");
 const isCategoryNotFound = ref(false);
 
 const route = useRoute();
+const router = useRouter();
 
 const normalizedFacetsToHide = computed(() => {
   return facetsToHide.value?.map((facet) => facet.toLowerCase());
@@ -537,8 +539,33 @@ function resetPage() {
 }
 
 function handleResetFilterKeyword() {
+  const back = router.options.history.state?.back;
+
+  if (!back) {
+    resetSearchKeyword();
+    return;
+  }
+
+  if (isRouteLocationRaw(back)) {
+    const previousResolvedRoute = router.resolve(back);
+    if (previousResolvedRoute.matched.length > 0) {
+      void router.push(previousResolvedRoute);
+      return;
+    }
+  }
+
   resetSearchKeyword();
-  resetFacetFilters();
+}
+
+function isRouteLocationRaw(value: unknown): value is RouteLocationRaw {
+  if (typeof value === "string") {
+    return true;
+  }
+  if (typeof value === "object" && value !== null) {
+    const record = value as Record<string, unknown>;
+    return "path" in record || "name" in record;
+  }
+  return false;
 }
 
 whenever(() => !isMobile.value, hideFiltersSidebar);

From d0eca08c2823bc26011fc00a088be9bbff4eee96 Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Tue, 28 Oct 2025 14:15:02 +0000
Subject: [PATCH 5/5] fix: reset search redirect

---
 .../shared/catalog/components/category.vue    | 30 ++++++++++++-------
 .../components/search-bar/search-bar.vue      |  8 ++++-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/client-app/shared/catalog/components/category.vue b/client-app/shared/catalog/components/category.vue
index 9e87f01fe6..af8c793704 100644
--- a/client-app/shared/catalog/components/category.vue
+++ b/client-app/shared/catalog/components/category.vue
@@ -237,6 +237,7 @@ import { useLanguages } from "@/core/composables/useLanguages";
 import { useModuleSettings } from "@/core/composables/useModuleSettings";
 import { BREAKPOINTS, DEFAULT_PAGE_SIZE, PRODUCT_SORTING_LIST } from "@/core/constants";
 import { MODULE_XAPI_KEYS } from "@/core/constants/modules";
+import { QueryParamName } from "@/core/enums";
 import { globals } from "@/core/globals";
 import {
   getFilterExpression,
@@ -246,6 +247,7 @@ import {
   getFilterExpressionForPurchasedBefore,
   getFilterExpressionForZeroPrice,
 } from "@/core/utilities";
+import { ROUTES } from "@/router/routes/constants";
 import { useCategorySeo } from "@/shared/catalog/composables/useCategorySeo";
 import { CATALOG_PAGINATION_MODES } from "@/shared/catalog/constants/catalog";
 import { useSearchBar } from "@/shared/layout/composables/useSearchBar.ts";
@@ -309,6 +311,8 @@ const isCategoryNotFound = ref(false);
 const route = useRoute();
 const router = useRouter();
 
+const { isCategoryScope } = useSearchScore();
+
 const normalizedFacetsToHide = computed(() => {
   return facetsToHide.value?.map((facet) => facet.toLowerCase());
 });
@@ -538,23 +542,29 @@ function resetPage() {
   void fetchProducts();
 }
 
-function handleResetFilterKeyword() {
+async function handleResetFilterKeyword() {
   const back = router.options.history.state?.back;
 
-  if (!back) {
-    resetSearchKeyword();
+  resetSearchKeyword();
+
+  if (!back || !isRouteLocationRaw(back)) {
     return;
   }
 
-  if (isRouteLocationRaw(back)) {
-    const previousResolvedRoute = router.resolve(back);
-    if (previousResolvedRoute.matched.length > 0) {
-      void router.push(previousResolvedRoute);
-      return;
-    }
+  const previousResolvedRoute = router.resolve(back);
+
+  if (previousResolvedRoute.matched.length <= 0) {
+    return;
   }
 
-  resetSearchKeyword();
+  if (isCategoryScope.value) {
+    void router.push(previousResolvedRoute);
+  } else {
+    const catalogQuery = router.currentRoute.value.name === ROUTES.SEARCH.NAME ? router.currentRoute.value.query : {};
+    const catalogQueryWithoutSearch = omit(catalogQuery, [QueryParamName.SearchPhrase]);
+
+    void router.push({ name: ROUTES.CATALOG.NAME, query: catalogQueryWithoutSearch });
+  }
 }
 
 function isRouteLocationRaw(value: unknown): value is RouteLocationRaw {
diff --git a/client-app/shared/layout/components/search-bar/search-bar.vue b/client-app/shared/layout/components/search-bar/search-bar.vue
index 412882e2da..6301cfb575 100644
--- a/client-app/shared/layout/components/search-bar/search-bar.vue
+++ b/client-app/shared/layout/components/search-bar/search-bar.vue
@@ -447,7 +447,13 @@ function handleSearchHistoryClick(query: string) {
 
 function goToSearchResultsPage() {
   hideSearchDropdown();
-  void router.push(getSearchRoute(trimmedSearchPhrase.value));
+  const ifAlreadySearch = !!router.currentRoute.value.query[QueryParamName.SearchPhrase];
+
+  if (ifAlreadySearch) {
+    void router.replace(getSearchRoute(trimmedSearchPhrase.value));
+  } else {
+    void router.push(getSearchRoute(trimmedSearchPhrase.value));
+  }
 
   if (trimmedSearchPhrase.value) {
     analytics("search", trimmedSearchPhrase.value, products.value, total.value);