From a46c118ed602da934d55c4778624e60c9c94de63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Tue, 16 Apr 2024 09:43:08 +0200
Subject: [PATCH 01/10] chore: version bump

---
 .github/workflows/docker-image.yml | 1 +
 package.json                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c1d49be0..3c5209d5 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -8,6 +8,7 @@ on:
       - develop
       - hotfix/*
       - release/*
+      - feature/v*
 jobs:
   run:
     runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index 9af93291..702d30ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "store-admin",
-  "version": "6.0.4",
+  "version": "6.1.0-dev",
   "private": true,
   "description": "Admin panel for Heseya Store API",
   "author": "Heseya",

From fced7dd136e167495e337f0635806c34dc47ae40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Tue, 16 Apr 2024 10:53:34 +0200
Subject: [PATCH 02/10] feat: added logo for a shipping method

---
 package.json                                  |   2 +-
 .../modules/orders/ShippingMethodForm.vue     |   2 +-
 .../modules/shippingMethods/Form.vue          | 134 +++++++++++-------
 src/views/settings/ShippingMethods.vue        |  48 +++++--
 yarn.lock                                     |   8 +-
 5 files changed, 131 insertions(+), 63 deletions(-)

diff --git a/package.json b/package.json
index 702d30ff..58a65d6a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@heseya/store-core": "6.0.0",
+    "@heseya/store-core": "6.1.0-dev.2",
     "@sentry/tracing": "^7.6.0",
     "@sentry/vue": "^7.6.0",
     "ant-design-vue": "^1.7.8",
diff --git a/src/components/modules/orders/ShippingMethodForm.vue b/src/components/modules/orders/ShippingMethodForm.vue
index 34a3a41a..779e8751 100644
--- a/src/components/modules/orders/ShippingMethodForm.vue
+++ b/src/components/modules/orders/ShippingMethodForm.vue
@@ -20,7 +20,7 @@
         </a-select-option>
       </app-select>
 
-      <address-form v-if="shippingType === ShippingType.Address" v-model="form.shipping_place" />
+      <AddressForm v-if="shippingType === ShippingType.Address" v-model="form.shipping_place" />
 
       <app-select
         v-if="shippingType === ShippingType.Point"
diff --git a/src/components/modules/shippingMethods/Form.vue b/src/components/modules/shippingMethods/Form.vue
index e2eea278..4d682326 100644
--- a/src/components/modules/shippingMethods/Form.vue
+++ b/src/components/modules/shippingMethods/Form.vue
@@ -1,56 +1,71 @@
 <template>
   <div class="shipping-methods-form">
     <modal-form>
-      <div class="center">
-        <app-select
-          v-model="form.shipping_type"
+      <div class="shipping-methods-form__header">
+        <MediaUploadInput
           :disabled="disabled"
-          option-filter-prop="label"
-          :label="$t('form.shippingType').toString()"
-        >
-          <a-select-option
-            v-for="shippingType in Object.values(ShippingType)"
-            :key="shippingType"
-            :label="$t(`shippingTypes.${shippingType}`)"
-          >
-            {{ $t(`shippingTypes.${shippingType}`) }}
-          </a-select-option>
-        </app-select>
-      </div>
-      <validated-input
-        v-model="form.name"
-        :disabled="disabled"
-        rules="required"
-        :label="$t('common.form.name')"
-      />
+          :media="form.logo || undefined"
+          :file-name="$t('form.logo').toString()"
+          @upload="changeMedia"
+        />
 
-      <div class="center">
-        <flex-input>
-          <label class="title">{{ $t('form.paymentBeforeDelivery') }}</label>
-          <a-switch v-model="form.payment_on_delivery" :disabled="disabled" />
-          <label class="title">{{ $t('form.paymentOnDelivery') }}</label>
-        </flex-input>
-      </div>
+        <div>
+          <div class="center">
+            <app-select
+              v-model="form.shipping_type"
+              :disabled="disabled"
+              option-filter-prop="label"
+              :label="$t('form.shippingType').toString()"
+            >
+              <a-select-option
+                v-for="shippingType in Object.values(ShippingType)"
+                :key="shippingType"
+                :label="$t(`shippingTypes.${shippingType}`)"
+              >
+                {{ $t(`shippingTypes.${shippingType}`) }}
+              </a-select-option>
+            </app-select>
+          </div>
+          <validated-input
+            v-model="form.name"
+            :disabled="disabled"
+            rules="required"
+            :label="$t('common.form.name')"
+          />
 
-      <div v-show="!form.payment_on_delivery" class="center">
-        <app-select
-          v-model="form.payment_methods"
-          :disabled="disabled"
-          mode="multiple"
-          option-filter-prop="label"
-          :label="$t('form.paymentMethods')"
-        >
-          <a-select-option v-for="method in paymentMethods" :key="method.id" :label="method.name">
-            {{ method.name }}
-          </a-select-option>
-        </app-select>
-      </div>
+          <div class="center">
+            <flex-input>
+              <label class="title">{{ $t('form.paymentBeforeDelivery') }}</label>
+              <a-switch v-model="form.payment_on_delivery" :disabled="disabled" />
+              <label class="title">{{ $t('form.paymentOnDelivery') }}</label>
+            </flex-input>
+          </div>
 
-      <div class="center">
-        <flex-input>
-          <label class="title">{{ $t('form.public') }}</label>
-          <switch-input v-model="form.public" :disabled="disabled"> </switch-input>
-        </flex-input>
+          <div v-show="!form.payment_on_delivery" class="center">
+            <app-select
+              v-model="form.payment_methods"
+              :disabled="disabled"
+              mode="multiple"
+              option-filter-prop="label"
+              :label="$t('form.paymentMethods')"
+            >
+              <a-select-option
+                v-for="method in paymentMethods"
+                :key="method.id"
+                :label="method.name"
+              >
+                {{ method.name }}
+              </a-select-option>
+            </app-select>
+          </div>
+
+          <div class="center">
+            <flex-input>
+              <label class="title">{{ $t('form.public') }}</label>
+              <switch-input v-model="form.public" :disabled="disabled"> </switch-input>
+            </flex-input>
+          </div>
+        </div>
       </div>
 
       <hr />
@@ -193,6 +208,7 @@
 {
   "pl": {
     "form": {
+      "logo": "logo metody dostawy",
       "shippingType": "Typ dostawy",
       "paymentMethods": "Dostępne metody płatności",
       "public": "Widoczność metody dostawy",
@@ -216,6 +232,7 @@
   },
   "en": {
     "form": {
+      "logo": "shipping method logo",
       "shippingType": "Shipping type",
       "paymentMethods": "Available payment methods",
       "public": "Shipping method visibility",
@@ -249,12 +266,14 @@ import {
   ShippingMethodCreateDto,
   AddressDto,
   ShippingType,
+  CdnMedia,
 } from '@heseya/store-core'
 
 import ModalForm from '@/components/form/ModalForm.vue'
 import SwitchInput from '@/components/form/SwitchInput.vue'
 import FlexInput from '@/components/layout/FlexInput.vue'
 import AutocompleteInput from '@/components/AutocompleteInput.vue'
+import MediaUploadInput from '@/components/modules/media/MediaUploadInput.vue'
 
 import PriceRangesForm from './PriceRangesForm.vue'
 import ShippingPointForm from './ShippingPoint.vue'
@@ -263,6 +282,8 @@ import ShippingPointsGrid from './ShippingPointsGrid.vue'
 import { DEFAULT_ADDRESS_FORM } from '@/consts/addressConsts'
 import CountriesSelect from '@/components/CountriesSelect.vue'
 
+type ShippingMethodForm = ShippingMethodCreateDto & { logo?: CdnMedia | null }
+
 export default defineComponent({
   name: 'ShippingMethodsForm',
   components: {
@@ -275,10 +296,11 @@ export default defineComponent({
     ShippingPointForm,
     ShippingPointsGrid,
     CountriesSelect,
+    MediaUploadInput,
   },
   props: {
     value: {
-      type: Object as PropType<ShippingMethodCreateDto>,
+      type: Object as PropType<ShippingMethodForm>,
       required: true,
     },
     countries: {
@@ -299,10 +321,10 @@ export default defineComponent({
   }),
   computed: {
     form: {
-      get(): ShippingMethodCreateDto {
+      get(): ShippingMethodForm {
         return this.value
       },
-      set(value: ShippingMethodCreateDto) {
+      set(value: ShippingMethodForm) {
         this.$emit('input', value)
       },
     },
@@ -349,12 +371,26 @@ export default defineComponent({
     removePoint(index: number) {
       this.form.shipping_points?.splice(index, 1)
     },
+    changeMedia(media: CdnMedia | null) {
+      this.form.logo = media ?? undefined
+      this.form.logo_id = media?.id || null
+    },
   },
 })
 </script>
 
 <style lang="scss">
 .shipping-methods-form {
+  &__header {
+    display: grid;
+    grid-template-columns: 1fr;
+    gap: 24px;
+
+    @media ($viewport-8) {
+      grid-template-columns: 0.5fr 1fr;
+    }
+  }
+
   .switch-input {
     margin-top: 0;
   }
diff --git a/src/views/settings/ShippingMethods.vue b/src/views/settings/ShippingMethods.vue
index 12c93127..c3ca4027 100644
--- a/src/views/settings/ShippingMethods.vue
+++ b/src/views/settings/ShippingMethods.vue
@@ -16,13 +16,25 @@
       </template>
 
       <template #default="{ item: method }">
-        <cms-table-row
+        <CmsTableRow
           :key="method.id"
           :item="method"
           :headers="tableConfig.headers"
           draggable
           @click="openModal(method.id)"
         >
+          <template #name="{ item }">
+            <div class="shipping-method-name">
+              <img
+                v-if="item.logo"
+                :src="item.logo.url"
+                :alt="item.name"
+                class="shipping-method-name__logo"
+              />
+              <span>{{ item.name }}</span>
+            </div>
+          </template>
+
           <template #countries="{ value }">
             <CmsTableCellList :items="value">
               <template #title>
@@ -38,14 +50,14 @@
               </template>
             </CmsTableCellList>
           </template>
-        </cms-table-row>
+        </CmsTableRow>
       </template>
     </PaginatedList>
 
-    <validation-observer v-slot="{ handleSubmit }">
+    <ValidationObserver v-slot="{ handleSubmit }">
       <a-modal
         v-model="isModalActive"
-        width="660px"
+        width="860px"
         :title="editedItem.id ? $t('editTitle') : $t('newTitle')"
       >
         <ShippingMethodsForm
@@ -77,7 +89,7 @@
             <app-button v-if="canModify" @click="handleSubmit(saveModal)">
               {{ $t('common.save') }}
             </app-button>
-            <pop-confirm
+            <PopConfirm
               v-can="$p.ShippingMethods.Remove"
               :title="$t('deleteText').toString()"
               :ok-text="$t('common.delete').toString()"
@@ -85,11 +97,11 @@
               @confirm="deleteItem"
             >
               <app-button v-if="editedItem.id" type="danger">{{ $t('common.delete') }}</app-button>
-            </pop-confirm>
+            </PopConfirm>
           </div>
         </template>
       </a-modal>
-    </validation-observer>
+    </ValidationObserver>
   </div>
 </template>
 
@@ -159,7 +171,9 @@ import {
   ShippingType,
   ShippingMethodUpdateDto,
   ShippingCountry,
+  CdnMedia,
 } from '@heseya/store-core'
+
 import { sdk } from '../../api'
 
 import PaginatedList from '@/components/PaginatedList.vue'
@@ -196,7 +210,7 @@ export default defineComponent({
   },
   data: () => ({
     isModalActive: false,
-    editedItem: {} as ShippingMethodUpdateDto & { id?: UUID },
+    editedItem: {} as ShippingMethodUpdateDto & { id?: UUID; logo?: CdnMedia | null },
     selectedItem: null as ShippingMethod | null,
     countries: [] as ShippingCountry[],
   }),
@@ -274,6 +288,8 @@ export default defineComponent({
         this.selectedItem = item
         this.editedItem = {
           ...item,
+          logo_id: item.logo?.id || null,
+          logo: item.logo || null,
           payment_methods: item.payment_methods.map(({ id }) => id),
           countries: item.countries.map(({ code }) => code),
           price_ranges: item.price_ranges.map(({ start, value }) => ({
@@ -287,6 +303,8 @@ export default defineComponent({
         this.selectedItem = null
         this.editedItem = {
           name: '',
+          logo: null,
+          logo_id: null,
           shipping_type: ShippingType.Address,
           payment_methods: [],
           is_block_list_countries: false,
@@ -368,4 +386,18 @@ export default defineComponent({
   display: flex;
   justify-content: space-between;
 }
+
+.shipping-method-name {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+
+  &__logo {
+    width: 32px;
+    height: 32px;
+    object-fit: contain;
+    flex-shrink: 0;
+  }
+}
 </style>
diff --git a/yarn.lock b/yarn.lock
index 59658316..a8374ec7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1224,10 +1224,10 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@heseya/store-core@6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-6.0.0.tgz#6845c7cba623f829eef091af28586a87c3739761"
-  integrity sha512-FmXuWoZpHsowV82NFYVTXcsJv9Z25SWdBZSWyTadn15fIzVsx8vAblTGdX6XuDaImdqtu8mvEAvVM+i5VLlnQw==
+"@heseya/store-core@6.1.0-dev.2":
+  version "6.1.0-dev.2"
+  resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-6.1.0-dev.2.tgz#0ea20b59dc3e4ae07548f93e50516138083607c2"
+  integrity sha512-eSOLXB8Kw5r7IZExV84z15SJeEMSwanT1TnZeGWsempGstN1XK6TsrPIutT4Yq041BYQUyj0MuPy6woSd6FtOw==
   dependencies:
     flat "^5.0.2"
     form-data "^4.0.0"

From a6940f5ab953d315793fea7bba5859f72f6929ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Tue, 16 Apr 2024 11:46:17 +0200
Subject: [PATCH 03/10] feat: changed shipping methods list

---
 src/views/settings/ShippingMethods.vue | 44 +++++++++++---------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/views/settings/ShippingMethods.vue b/src/views/settings/ShippingMethods.vue
index c3ca4027..a8f3c053 100644
--- a/src/views/settings/ShippingMethods.vue
+++ b/src/views/settings/ShippingMethods.vue
@@ -23,16 +23,15 @@
           draggable
           @click="openModal(method.id)"
         >
+          <template #logo="{ item }">
+            <Avatar color="#eee">
+              <MediaElement v-if="item.logo" :media="item.logo" :size="44" />
+              <i v-else class="bx bx-image"></i>
+            </Avatar>
+          </template>
+
           <template #name="{ item }">
-            <div class="shipping-method-name">
-              <img
-                v-if="item.logo"
-                :src="item.logo.url"
-                :alt="item.name"
-                class="shipping-method-name__logo"
-              />
-              <span>{{ item.name }}</span>
-            </div>
+            <b>{{ item.name }}</b>
           </template>
 
           <template #countries="{ value }">
@@ -180,11 +179,13 @@ import PaginatedList from '@/components/PaginatedList.vue'
 import PopConfirm from '@/components/layout/PopConfirm.vue'
 import ShippingMethodsForm from '@/components/modules/shippingMethods/Form.vue'
 import MetadataForm, { MetadataRef } from '@/components/modules/metadata/Accordion.vue'
+import CmsTableRow from '@/components/cms/CmsTableRow.vue'
+import CmsTableCellList from '@/components/cms/CmsTableCellList.vue'
+import MediaElement from '@/components/MediaElement.vue'
+import Avatar from '@/components/layout/Avatar.vue'
 
 import { UUID } from '@/interfaces/UUID'
 import { TableConfig } from '@/interfaces/CmsTable'
-import CmsTableRow from '@/components/cms/CmsTableRow.vue'
-import CmsTableCellList from '@/components/cms/CmsTableCellList.vue'
 import { formatPrice } from '@/utils/currency'
 
 export default defineComponent({
@@ -199,6 +200,8 @@ export default defineComponent({
     MetadataForm,
     CmsTableRow,
     CmsTableCellList,
+    MediaElement,
+    Avatar,
   },
   beforeRouteLeave(to, from, next) {
     if (this.isModalActive) {
@@ -223,6 +226,11 @@ export default defineComponent({
     tableConfig(): TableConfig<ShippingMethod> {
       return {
         headers: [
+          {
+            key: 'logo',
+            label: '',
+            width: '60px',
+          },
           {
             key: 'name',
             label: this.$t('common.form.name') as string,
@@ -386,18 +394,4 @@ export default defineComponent({
   display: flex;
   justify-content: space-between;
 }
-
-.shipping-method-name {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-
-  &__logo {
-    width: 32px;
-    height: 32px;
-    object-fit: contain;
-    flex-shrink: 0;
-  }
-}
 </style>

From ba391710a1d678a1bc90ad4cabf38d73556a6aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Wed, 17 Apr 2024 12:39:51 +0200
Subject: [PATCH 04/10] feat: added filters to pages list

---
 src/components/modules/pages/Filters.vue | 79 ++++++++++++++++++++++++
 src/views/pages/Index.vue                | 54 ++++++++++++++--
 2 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 src/components/modules/pages/Filters.vue

diff --git a/src/components/modules/pages/Filters.vue b/src/components/modules/pages/Filters.vue
new file mode 100644
index 00000000..000a8dbe
--- /dev/null
+++ b/src/components/modules/pages/Filters.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <app-input
+      v-model="local.search"
+      class="span-2"
+      type="search"
+      :label="$t('common.search').toString()"
+      allow-clear
+      @input="debouncedSearch"
+    />
+  </div>
+</template>
+
+<i18n lang="json">
+{
+  "pl": {
+    "hasRelationships": "Czy posiada relacje",
+    "mediaType": "Typ mediów"
+  },
+  "en": {
+    "hasRelationships": "Has relationships",
+    "mediaType": "Media type"
+  }
+}
+</i18n>
+
+<script lang="ts">
+/* eslint-disable camelcase */
+import { defineComponent, PropType } from 'vue'
+import debounce from 'lodash/debounce'
+
+export type PagesFiltersType = {
+  search: string
+}
+
+export const EMPTY_MEDIA_FILTERS: PagesFiltersType = {
+  search: '',
+}
+
+export default defineComponent({
+  props: {
+    filters: {
+      type: Object as PropType<PagesFiltersType>,
+      default: () => ({ ...EMPTY_MEDIA_FILTERS }),
+    },
+  },
+
+  data: () => ({
+    local: {
+      ...EMPTY_MEDIA_FILTERS,
+    },
+  }),
+
+  watch: {
+    filters(filters: PagesFiltersType) {
+      this.local = { ...this.local, ...filters }
+    },
+  },
+
+  mounted() {
+    this.local = { ...this.local, ...this.filters }
+  },
+
+  methods: {
+    makeSearch() {
+      this.$emit('search', {
+        ...this.filters,
+        ...this.local,
+      })
+    },
+
+    debouncedSearch: debounce(function (this: any) {
+      this.$nextTick(() => {
+        this.makeSearch()
+      })
+    }, 300),
+  },
+})
+</script>
diff --git a/src/views/pages/Index.vue b/src/views/pages/Index.vue
index f7d30eab..e0573894 100644
--- a/src/views/pages/Index.vue
+++ b/src/views/pages/Index.vue
@@ -1,6 +1,18 @@
 <template>
   <div class="narrower-page">
-    <PaginatedList :title="$t('title').toString()" store-key="pages" draggable :table="tableConfig">
+    <PaginatedList
+      :title="$t('title').toString()"
+      store-key="pages"
+      draggable
+      :table="tableConfig"
+      :filters="filters"
+      @search="makeSearch"
+      @clear-filters="clearFilters"
+    >
+      <template #filters>
+        <PagesFilters :filters="filters" @search="makeSearch" />
+      </template>
+
       <template #nav>
         <icon-button v-can="$p.Pages.Add" to="/pages/create">
           <template #icon>
@@ -11,7 +23,7 @@
       </template>
 
       <template #default="{ item: page }">
-        <cms-table-row
+        <CmsTableRow
           :key="page.id"
           :item="page"
           :headers="tableConfig.headers"
@@ -21,7 +33,7 @@
           <template #slug="{ value }">
             <code>{{ value }}</code>
           </template>
-        </cms-table-row>
+        </CmsTableRow>
       </template>
     </PaginatedList>
   </div>
@@ -42,10 +54,16 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
+import { Page } from '@heseya/store-core'
+
 import PaginatedList from '@/components/PaginatedList.vue'
 import { TableConfig } from '@/interfaces/CmsTable'
-import { Page } from '@heseya/store-core'
 import CmsTableRow from '@/components/cms/CmsTableRow.vue'
+import PagesFilters, {
+  PagesFiltersType,
+  EMPTY_MEDIA_FILTERS,
+} from '@/components/modules/pages/Filters.vue'
+import { formatFilters } from '@/utils/utils'
 
 export default defineComponent({
   metaInfo(this: any) {
@@ -54,7 +72,15 @@ export default defineComponent({
   components: {
     CmsTableRow,
     PaginatedList,
+    PagesFilters,
   },
+
+  data: () => ({
+    filters: {
+      ...EMPTY_MEDIA_FILTERS,
+    } as PagesFiltersType,
+  }),
+
   computed: {
     tableConfig(): TableConfig<Page> {
       return {
@@ -66,5 +92,25 @@ export default defineComponent({
       }
     },
   },
+
+  created() {
+    const { search } = this.$route.query
+    this.filters.search = search.toString() || ''
+  },
+
+  methods: {
+    makeSearch(filters: PagesFiltersType) {
+      this.filters = filters
+      const queryFilters = formatFilters(filters)
+
+      this.$router.push({
+        path: 'pages',
+        query: { ...queryFilters, page: undefined },
+      })
+    },
+    clearFilters(): void {
+      this.makeSearch({ ...EMPTY_MEDIA_FILTERS })
+    },
+  },
 })
 </script>

From 9e9bc15c575402c32643e8aae96d5f6a894669c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Wed, 17 Apr 2024 12:39:58 +0200
Subject: [PATCH 05/10] fix: fixed media filters

---
 src/components/modules/media/MediaFilter.vue |  2 +-
 src/views/products/Index.vue                 |  1 -
 src/views/settings/Media.vue                 | 12 +++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/modules/media/MediaFilter.vue b/src/components/modules/media/MediaFilter.vue
index e71f0231..1b463fca 100644
--- a/src/components/modules/media/MediaFilter.vue
+++ b/src/components/modules/media/MediaFilter.vue
@@ -63,7 +63,7 @@ import { ALL_FILTER_VALUE } from '@/consts/filters'
 export type MediaFiltersType = {
   search: string
   type: CdnMediaType | typeof ALL_FILTER_VALUE
-  has_relationships: boolean | typeof ALL_FILTER_VALUE
+  has_relationships: string | typeof ALL_FILTER_VALUE
 }
 
 export const EMPTY_MEDIA_FILTERS: MediaFiltersType = {
diff --git a/src/views/products/Index.vue b/src/views/products/Index.vue
index d9006737..e9eece53 100644
--- a/src/views/products/Index.vue
+++ b/src/views/products/Index.vue
@@ -245,7 +245,6 @@ export default defineComponent({
   },
   methods: {
     makeSearch(filters: ProductFilers) {
-      console.log('🚀 ~ makeSearch ~ filters:', filters)
       this.filters = filters
 
       const queryFilters = formatFilters(filters)
diff --git a/src/views/settings/Media.vue b/src/views/settings/Media.vue
index 28cccd69..689b8061 100644
--- a/src/views/settings/Media.vue
+++ b/src/views/settings/Media.vue
@@ -8,7 +8,7 @@
       @clear-filters="clearFilters"
     >
       <template #filters>
-        <media-filter :filters="filters" @search="makeSearch" />
+        <MediaFilter :filters="filters" @search="makeSearch" />
       </template>
 
       <template #default="{ item: singleMedia }">
@@ -61,6 +61,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
+import { CdnMediaType } from '@heseya/store-core'
 
 import PaginatedList from '@/components/PaginatedList.vue'
 import MediaEditForm from '@/components/modules/media/MediaEditForm.vue'
@@ -88,6 +89,15 @@ export default defineComponent({
     } as MediaFiltersType,
   }),
 
+  created() {
+    const { search, type, has_relationships: hasRelationships } = this.$route.query
+    this.filters.search = search?.toString() || EMPTY_MEDIA_FILTERS.search
+    this.filters.type = (type as CdnMediaType) || EMPTY_MEDIA_FILTERS.type
+    this.filters.has_relationships = hasRelationships
+      ? hasRelationships.toString()
+      : EMPTY_MEDIA_FILTERS.has_relationships
+  },
+
   methods: {
     makeSearch(filters: MediaFiltersType) {
       this.filters = filters

From 6b54d456395665fdf02e94c18b6a26c17d576ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Wed, 17 Apr 2024 12:45:00 +0200
Subject: [PATCH 06/10] fix: pages search fix

---
 src/views/pages/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/Index.vue b/src/views/pages/Index.vue
index e0573894..af79f724 100644
--- a/src/views/pages/Index.vue
+++ b/src/views/pages/Index.vue
@@ -95,7 +95,7 @@ export default defineComponent({
 
   created() {
     const { search } = this.$route.query
-    this.filters.search = search.toString() || ''
+    this.filters.search = search?.toString() || ''
   },
 
   methods: {

From 6191e6d870645a2752b3bb2e515624dafde8b51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Mon, 22 Apr 2024 15:33:19 +0200
Subject: [PATCH 07/10] feat: added coupon code generate button

---
 .../modules/sales/CouponCodeGenerate.vue      | 52 +++++++++++++++++++
 src/views/coupons/view.vue                    | 35 +++++++++----
 2 files changed, 76 insertions(+), 11 deletions(-)
 create mode 100644 src/components/modules/sales/CouponCodeGenerate.vue

diff --git a/src/components/modules/sales/CouponCodeGenerate.vue b/src/components/modules/sales/CouponCodeGenerate.vue
new file mode 100644
index 00000000..8db94eb2
--- /dev/null
+++ b/src/components/modules/sales/CouponCodeGenerate.vue
@@ -0,0 +1,52 @@
+<template>
+  <icon-button class="coupon-generate-btn" :disabled="disabled" @click="generateCoupon">
+    <template #icon>
+      <i class="bx bx-barcode"></i>
+    </template>
+    {{ $t('generateText') }}
+  </icon-button>
+</template>
+
+<i18n lang="json">
+{
+  "en": {
+    "generateText": "Generate code"
+  },
+  "pl": {
+    "generateText": "Generuj kod"
+  }
+}
+</i18n>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+export default defineComponent({
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  emits: ['generate'],
+
+  methods: {
+    generateCoupon() {
+      const CODE_LENGTH = 10
+
+      const code = Array.from({ length: CODE_LENGTH }, () => Math.random().toString(36)[2])
+        .join('')
+        .toUpperCase()
+      this.$emit('generate', code)
+    },
+  },
+})
+</script>
+
+<style scoped lang="scss">
+.coupon-generate-btn {
+  flex-shrink: 0;
+  align-self: center;
+  width: 140px;
+}
+</style>
diff --git a/src/views/coupons/view.vue b/src/views/coupons/view.vue
index fd254ff1..352268ba 100644
--- a/src/views/coupons/view.vue
+++ b/src/views/coupons/view.vue
@@ -21,12 +21,15 @@
     <div class="coupon-view__form">
       <validation-observer v-slot="{ handleSubmit }">
         <card>
-          <validated-input
-            v-model="form.code"
-            rules="required|coupon-code"
-            :label="$t('formCode')"
-            :disabled="!canModify"
-          />
+          <div class="coupon-view__code">
+            <validated-input
+              v-model="form.code"
+              rules="required|coupon-code"
+              :label="$t('formCode')"
+              :disabled="!canModify"
+            />
+            <CouponCodeGenerate :disabled="!canModify" @generate="(code) => (form.code = code)" />
+          </div>
 
           <hr />
           <SaleForm v-model="form" :disabled="!canModify" />
@@ -94,6 +97,7 @@ import TopNav from '@/components/layout/TopNav.vue'
 import Card from '@/components/layout/Card.vue'
 import SaleForm from '@/components/modules/sales/Form.vue'
 import PopConfirm from '@/components/layout/PopConfirm.vue'
+import CouponCodeGenerate from '@/components/modules/sales/CouponCodeGenerate.vue'
 import MetadataForm, { MetadataRef } from '@/components/modules/metadata/Accordion.vue'
 
 import { UUID } from '@/interfaces/UUID'
@@ -122,7 +126,15 @@ const EMPTY_COUPON_FORM: CouponFormDto = {
 }
 
 export default defineComponent({
-  components: { ValidationObserver, TopNav, Card, PopConfirm, SaleForm, MetadataForm },
+  components: {
+    ValidationObserver,
+    TopNav,
+    Card,
+    PopConfirm,
+    SaleForm,
+    MetadataForm,
+    CouponCodeGenerate,
+  },
   metaInfo(this: any): any {
     return {
       title:
@@ -223,8 +235,9 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-// .coupon-view {
-//   &__form {
-//   }
-// }
+.coupon-view {
+  &__code {
+    display: flex;
+  }
+}
 </style>

From 69eb276b24c23ca76910c3c942d6d3c272c61b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Thu, 16 May 2024 15:15:04 +0200
Subject: [PATCH 08/10] chore: version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b29506d2..ff865ebd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "store-admin",
-  "version": "6.1.0-dev",
+  "version": "6.1.0-rc.1",
   "private": true,
   "description": "Admin panel for Heseya Store API",
   "author": "Heseya",

From df3a6173e0e47475bfb7bd05f13757c064bffb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Thu, 16 May 2024 15:38:04 +0200
Subject: [PATCH 09/10] fix: reverted unnecessary big fetch of products in set

---
 src/views/productSets/Products.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/productSets/Products.vue b/src/views/productSets/Products.vue
index 702bce79..19d54c4c 100644
--- a/src/views/productSets/Products.vue
+++ b/src/views/productSets/Products.vue
@@ -192,8 +192,7 @@ export default defineComponent({
       try {
         const response = await sdk.ProductSets.getAllProducts(this.id, {
           page: this.pagination.currentPage + 1,
-          // TODO: lazy load after scroll
-          limit: 500,
+          limit: 100,
           public: this.showOnlyPublic ? true : undefined,
         })
         this.products = [...this.products, ...response.data]

From 130bdf2b5dd0e5ff368e7cb6143953d5561d23f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20M=C4=99dryga=C5=82?= <artur.medrygal@escolasoft.com>
Date: Fri, 17 May 2024 11:06:14 +0200
Subject: [PATCH 10/10] chore: version bump

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ff865ebd..492b1544 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "store-admin",
-  "version": "6.1.0-rc.1",
+  "version": "6.1.0",
   "private": true,
   "description": "Admin panel for Heseya Store API",
   "author": "Heseya",
@@ -19,7 +19,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@heseya/store-core": "6.1.0-dev.3",
+    "@heseya/store-core": "6.1.0",
     "@sentry/tracing": "^7.6.0",
     "@sentry/vue": "^7.6.0",
     "ant-design-vue": "^1.7.8",
diff --git a/yarn.lock b/yarn.lock
index c0c47918..df63ab67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1224,10 +1224,10 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@heseya/store-core@6.1.0-dev.3":
-  version "6.1.0-dev.3"
-  resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-6.1.0-dev.3.tgz#ed194aca8b365213ee1550f7ffa4ae8dcd93cbdd"
-  integrity sha512-RXYYgGxteeiYK2mvliAEkvP4eN1T4h5EVVnmh/OJ1C3aJrx7fdorQZzPvlp3oPAxx1nFMte7FBnLWE8MB2oy4A==
+"@heseya/store-core@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-6.1.0.tgz#8a87598db94a429702d0ea5b11399e64db087eb2"
+  integrity sha512-IKPoGLkkXIjHcYkKkQTYE/qad+67mi7CSWHUrn39IxMR6ufCNhoWJNFzwWiYJMxtpAhPDulTElZrZNRP3WzhTA==
   dependencies:
     flat "^5.0.2"
     form-data "^4.0.0"