quasar-ui-danx 0.0.25 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/ActionTable/Filters/CollapsableFiltersSidebar.vue

@@ -7,15 +7,15 @@
       name="admin-ads"
       @update:collapse="$emit('update:show-filters', !$event)"
   >
-    <FilterGroupList
+    <FilterFieldList
         :filter="filter"
-        :filter-groups="filterGroups"
+        :filter-fields="filterFields"
         @update:filter="$emit('update:filter', $event)"
     />
   </CollapsableSidebar>
 </template>
 <script setup>
-import { FilterGroupList } from '.';
+import { FilterFieldList } from '.';
 import { CollapsableSidebar } from '../../Utility';
 
 defineEmits(['update:filter', 'update:show-filters']);
@@ -29,7 +29,7 @@ defineProps({
     type: Object,
     default: null
   },
-  filterGroups: {
+  filterFields: {
     type: Array,
     default: () => []
   }

package/src/components/ActionTable/Filters/{FilterGroupList.vue → FilterFieldList.vue}

@@ -2,7 +2,7 @@
   <q-list>
     <div class="px-4 py-2 max-w-full">
       <template
-          v-for="(group, index) in filterGroups"
+          v-for="(group, index) in filterFields"
           :key="'group-' + group.name"
       >
         <template v-if="group.flat">
@@ -17,7 +17,7 @@
           />
         </template>
 
-        <FilterGroupItem
+        <FilterFieldItem
             v-else
             :name="group.name"
             :count="activeCountByGroup[group.name]"
@@ -31,24 +31,24 @@
               class="mb-4"
               @update:model-value="updateFilter(field, $event)"
           />
-        </FilterGroupItem>
+        </FilterFieldItem>
 
         <q-separator
-            v-if="index < (filterGroups.length - 1)"
+            v-if="index < (filterFields.length - 1)"
             class="my-2"
         />
       </template>
     </div>
-    </q-list>
+  </q-list>
 </template>
 <script setup>
 import { computed } from 'vue';
 import FilterableField from './FilterableField';
-import FilterGroupItem from './FilterGroupItem';
+import FilterFieldItem from './FilterFieldItem';
 
 const emit = defineEmits(['update:filter']);
 const props = defineProps({
-  filterGroups: {
+  filterFields: {
     type: Array,
     required: true
   },
@@ -61,7 +61,7 @@ const props = defineProps({
 
 const activeCountByGroup = computed(() => {
   const activeCountByGroup = {};
-  for (const group of props.filterGroups) {
+  for (const group of props.filterFields) {
     activeCountByGroup[group.name] = group.fields.filter(field => props.filter[field.name] !== undefined).length;
   }
   return activeCountByGroup;

package/src/components/ActionTable/Filters/index.ts

@@ -1,6 +1,6 @@
 export {
     default as CollapsableFiltersSidebar
 } from "./CollapsableFiltersSidebar.vue";
-export { default as FilterGroupList } from "./FilterGroupList.vue";
+export { default as FilterFieldList } from "src/components/ActionTable/Filters/FilterFieldList.vue";
 export { default as FilterListToggle } from "./FilterListToggle.vue";
 export { default as FilterToolbarLayout } from "./FilterToolbarLayout.vue";

package/src/components/ActionTable/listActions.ts

@@ -10,7 +10,6 @@ export function useListActions(name, {
     applyActionRoute = null,
     applyBatchActionRoute = null,
     itemDetailsRoute = null,
-    filterGroups = null,
     refreshFilters = false,
     urlPattern = null,
     filterDefaults = {}
@@ -98,10 +97,10 @@ export function useListActions(name, {
     /**
      * Watches for a filter URL parameter and applies the filter if it is set.
      */
-    function applyFilterFromUrl(url, filterGroups = null) {
+    function applyFilterFromUrl(url, filterFields = null) {
         if (url.match(urlPattern)) {
             // A flat list of valid filterable field names
-            const validFilterKeys = filterGroups?.value?.map(group => group.fields.map(field => field.name)).flat();
+            const validFilterKeys = filterFields?.value?.map(group => group.fields.map(field => field.name)).flat();
 
             const urlFilter = getFilterFromUrl(url, validFilterKeys);
 
@@ -352,7 +351,6 @@ export function useListActions(name, {
         isApplyingBatchAction,
         activeItem,
         formTab,
-        filterGroups,
 
         // Actions
         loadSummary,