src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -168,9 +167,11 @@ const columns = computed(() => [
             component: 'select',
             name: 'provinceFk',
             attrs: {
-                options: provinceOpts.value,
-                'option-value': 'id',
-                'option-label': 'name',
+                url: 'Provinces',
+                fields: ['id', 'name'],
+                sortBy: ['name ASC'],
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -183,9 +184,11 @@ const columns = computed(() => [
             component: 'select',
             name: 'stateFk',
             attrs: {
-                options: stateOpts.value,
-                'option-value': 'id',
-                'option-label': 'name',
+                sortBy: ['name ASC'],
+                url: 'States',
+                fields: ['id', 'name'],
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -212,9 +215,12 @@ const columns = computed(() => [
             component: 'select',
             name: 'zoneFk',
             attrs: {
-                options: zoneOpts.value,
-                'option-value': 'id',
-                'option-label': 'name',
+                url: 'Zones',
+                fields: ['id', 'name'],
+                sortBy: ['name ASC'],
+
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -225,11 +231,12 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'PayMethods',
             attrs: {
-                options: PayMethodOpts.value,
-                optionValue: 'id',
+                url: 'PayMethods',
+                fields: ['id', 'name'],
+                sortBy: ['id ASC'],
                 optionLabel: 'name',
+                optionValue: 'id',
                 dense: true,
             },
         },
@@ -254,7 +261,9 @@ const columns = computed(() => [
         columnFilter: {
             component: 'select',
             attrs: {
-                options: DepartmentOpts.value,
+                url: 'Departments',
+                fields: ['id', 'name'],
+                sortBy: ['id ASC'],
                 dense: true,
             },
         },
@@ -265,11 +274,12 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'ItemPackingTypes',
             attrs: {
-                options: ItemPackingTypeOpts.value,
-                'option-value': 'code',
-                'option-label': 'code',
+                url: 'ItemPackingTypes',
+                fields: ['code'],
+                sortBy: ['code ASC'],
+                optionValue: 'code',
+                optionCode: 'code',
                 dense: true,
             },
         },
@@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
 const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
-    <FetchData
-        url="Provinces"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (provinceOpts = data)"
-    />
-    <FetchData
-        url="States"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (stateOpts = data)"
-    />
-    <FetchData
-        url="Zones"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (zoneOpts = data)"
-    />
-    <FetchData
-        url="ItemPackingTypes"
-        :filter="{
-            fields: ['code'],
-            order: 'code ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (ItemPackingTypeOpts = data)"
-    />
-    <FetchData
-        url="Departments"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (DepartmentOpts = data)"
-    />
-    <FetchData
-        url="PayMethods"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (PayMethodOpts = data)"
-    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -460,6 +416,7 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
                     :text-color="stateColors[row.classColor] ? 'black' : 'white'"
                     class="q-pa-sm"
                     style="font-size: 14px"
+                    @click="openTab(row.id)"
                 >
                     {{ row.state }}
                 </QBadge>

test/cypress/integration/monitor/monitorTicket.spec.js

@@ -19,7 +19,7 @@ describe('Monitor Tickets Table', () => {
         cy.get(firstRow('provinceFk')).click({ ctrlKey: true });
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
-    it.only('should filter by column headers and update URL params', () => {
+    it('should filter by column headers and update URL params', () => {
         cy.intercept('GET', '**/SalesMonitors/salesFilter*').as('filterRequest');
 
         cy.dataCy('column-filter-id').find('[data-cy="_input"]').type('13');