@dative-gpi/foundation-shared-components 1.0.65 → 1.0.67-map-edit

package/components/lists/FSDataTableUI.vue

@@ -1,66 +1,90 @@
 <template>
   <FSCol
     gap="16px"
+    style="position: relative;"
   >
     <FSRow
-      align="bottom-left"
-      :wrap="isExtraSmall ? false : true"
+      v-if="$props.showSearch || (!isMobileSized && ($slots['prepend-toolbar'] || $slots['toolbar'] || $slots['append-toolbar'])) || (!$props.disableTable && !$props.disableIterator)"
+      align="top-left"
+      :wrap="isMobileSized ? false : true"
       width="fill"
     >
       <slot
-        v-if="!isExtraSmall"
+        v-if="!isMobileSized"
         name="prepend-toolbar"
       />
-      <template
-        v-if="$props.showSearch"
+      <FSRow
+        align="top-left"
       >
-        <FSSearchField
-          prependInnerIcon="mdi-magnify"
-          :hideHeader="true"
-          v-model="innerSearch"
-        />
-        <FSButton
-          v-if="filterableHeaders.length > 0"
-          prependIcon="mdi-filter-variant"
-          :variant="showFilters ? 'full' : 'standard'"
-          @click="showFilters = !showFilters"
+        <FSRow
+          v-if="$props.showSearch || $slots['toolbar']"
+          align="bottom-left"
+        >
+          <template
+            v-if="$props.showSearch"
+          >
+            <FSSearchField
+              v-if="$props.showSearch"
+              :hideHeader="true"
+              v-model="innerSearch"
+            />
+            <FSButton
+              v-if="filterableHeaders.length > 0"
+              prependIcon="mdi-filter-variant"
+              :variant="innerShowFilters ? 'full' : 'standard'"
+              @click="innerShowFilters = !innerShowFilters"
+            />
+          </template>
+          <slot
+            v-if="!isMobileSized"
+            name="toolbar"
+          />
+        </FSRow>
+        <slot
+          v-if="!isMobileSized"
+          name="append-toolbar"
         />
-      </template>
-      <slot
-        v-if="!isExtraSmall"
-        name="toolbar"
-      />
+      </FSRow>
       <template
-        v-if="!$props.disableTable && !$props.disableIterator"
+        v-if="(!$props.disableTable && !$props.disableIterator)"
       >
-        <v-spacer />
         <FSRow
-          align="center-right"
+          align="top-right"
+          width="hug"
+          :wrap="false"
         >
           <FSOptionGroup
+            v-if="!$props.disableTable && !$props.disableIterator"
             :values="modeOptions"
             :singleColor="true"
             :required="true"
+            variant="slide"
             v-model="innerMode"
           />
         </FSRow>
       </template>
     </FSRow>
     <FSRow
-      v-if="isExtraSmall && hasToolbar"
+      v-if="isMobileSized && ($slots['prepend-toolbar'] || $slots['toolbar'] || $slots['append-toolbar'])"
     >
-      <FSWrapGroup>
+      <FSSlideGroup>
+        <slot
+          name="prepend-toolbar"
+        />
         <slot
           name="toolbar"
         />
-      </FSWrapGroup>
+        <slot
+          name="append-toolbar"
+        />
+      </FSSlideGroup>
     </FSRow>
     <FSRow
       v-if="showFiltersRow"
       gap="16px"
     >
       <FSCol
-        v-if="showFilters && hasVisibleFilters"
+        v-if="innerShowFilters && hasVisibleFilters"
         width="hug"
       >
         <FSRow
@@ -94,12 +118,12 @@
           gap="8px"
         >
           <FSChip
-            v-if="showFilters && resetable"
+            v-if="innerShowFilters && resetable"
             variant="standard"
-            :label="$tr('ui.data-table.reset-filters', 'Reset')"
+            :label="$tr('data-table.reset-filters', 'Reset')"
             :height="['30px', '24px']"
             :color="ColorEnum.Error"
-            :editable="true"
+            :clickable="true"
             @click="resetFilter"
           />
           <FSHiddenButton
@@ -122,7 +146,7 @@
         :headers="extraHeaders.concat(innerHeaders)"
         :sortBy="innerSortBy ? [innerSortBy] : []"
         :itemsPerPage="innerRowsPerPage"
-        :showSelect="$props.showSelect"
+        :selectable="$props.selectable"
         :hover="!$props.sortDraggable"
         :itemValue="$props.itemValue"
         :loading="$props.loading"
@@ -148,7 +172,7 @@
           <FSText
             font="text-overline"
           >
-            {{ $tr("ui.data-table.empty", "No data") }}
+            {{ $tr("ui.common.no-data", "No data") }}
           </FSText>
         </template>
         <template
@@ -245,7 +269,7 @@
                     width="hug"
                   >
                     <FSCheckbox
-                      v-if="$props.showSelect"
+                      v-if="$props.selectable"
                       :modelValue="props.item.items.every((item) => $props.modelValue.includes(item.key))"
                       :indeterminate="$props.modelValue.some((id) => props.item.items.some((item) => item.key === id)) && !props.item.items.every((item) => $props.modelValue.includes(item.key))"
                       @update:modelValue="toggleSelectGroup(props.item)"
@@ -290,25 +314,29 @@
               <slot
                 :name="`${header.slotName}-append`"
               />
-              <v-spacer />
-              <slot
-                :name="`${header.slotName}-configuration`"
+              <FSRow
+                align="center-right"
+                :wrap="false"
               >
-                <FSHeaderButton
-                  :first="index === 0"
-                  :last="index === headersSlots.length - 1"
-                  @update:hide="updateHeader(header, 'hidden', !header.hidden)"
-                  @update:left="updateHeader(header, 'index', -1)"
-                  @update:right="updateHeader(header, 'index', 1)"
-                />
-                <FSButton
-                  v-if="header.sortable"
-                  variant="icon"
-                  :color="sortColor(header, props)"
-                  :icon="sortIcon(header, props)"
-                  @click="toggleSort(header)"
-                />
-              </slot>
+                <slot
+                  :name="`${header.slotName}-configuration`"
+                >
+                  <FSHeaderButton
+                    :first="index === 0"
+                    :last="index === headersSlots.length - 1"
+                    @update:hide="updateHeader(header, 'hidden', !header.hidden)"
+                    @update:left="updateHeader(header, 'index', -1)"
+                    @update:right="updateHeader(header, 'index', 1)"
+                  />
+                  <FSButton
+                    v-if="header.sortable"
+                    variant="icon"
+                    :color="sortColor(header, props)"
+                    :icon="sortIcon(header, props)"
+                    @click="toggleSort(header)"
+                  />
+                </slot>
+              </FSRow>
             </FSRow>
           </slot>
         </template>
@@ -356,22 +384,23 @@
                   <FSText
                     font="text-button"
                   >
-                    {{ $tr("ui.data-table.all-selected-bold", "Warning:") }}
+                    {{ $tr("data-table.all-selected-bold", "Warning:") }}
                   </FSText>
                   <FSText>
-                    {{ $tr("ui.data-table.all-selected-regular", "All elements selected") }}
+                    {{ $tr("data-table.all-selected-regular", "All elements selected") }}
                   </FSText>
                 </FSRow>
               </template>
               <template
                 v-else
               >
-                <FSText>
-                  {{ $tr("ui.data-table.some-selected", "{0} element(s) selected", $props.modelValue.length.toString()) }}
-                </FSText>
+                <FSRow>
+                  <FSText>
+                    {{ $tr("data-table.some-selected", "{0} element(s) selected", $props.modelValue.length.toString()) }}
+                  </FSText>
+                </FSRow>
               </template>
             </template>
-            <v-spacer />
             <FSRow
               align="center-right"
               width="hug"
@@ -380,7 +409,7 @@
               <FSText
                 font="text-overline"
               >
-                {{ $tr("ui.data-table.rows-per-page", "Rows per page") }}
+                {{ $tr("data-table.rows-per-page", "Rows per page") }}
               </FSText>
               <FSSelectField
                 class="fs-data-table-rows-per-page fs-small-input"
@@ -432,7 +461,7 @@
           <FSText
             font="text-overline"
           >
-            {{ $tr("ui.data-table.empty", "No data") }}
+            {{ $tr("ui.common.no-data", "No data") }}
           </FSText>
         </template>
         <template
@@ -446,7 +475,7 @@
               v-for="(item, index) in items"
               elementSelector=".fs-draggable-item"
               :disabled="draggableDisabled"
-              :item="item"
+              :item="{ ...item, index }"
               :key="index"
               @update:dragend="(event, dragged) => onDragEnd(event, dragged, '.fs-data-iterator-container')"
               @dragover="(event) => onDragOver(event, '.fs-draggable-item', '.fs-data-iterator-container')"
@@ -460,18 +489,20 @@
               >
                 <FSDataIteratorItem
                   v-if="item.type === 'item'"
-                  :itemColor="$props.rowColor ? $props.rowColor(item.raw) : ColorEnum.Background"
+                  :leftColor="$props.rowColor ? $props.rowColor(item.raw) : null"
                   :headers="innerHeaders.filter(h => !$props.sneakyHeaders.includes(h.value))"
-                  :clickable="onClickLibrary.clickable"
-                  :showSelect="$props.showSelect"
-                  :itemTo="$props.itemTo"
-                  :color="$props.color"
+                  :selectable="$props.selectable"
+                  :singleSelect="$props.singleSelect"
+                  :to="$props.itemTo"
+                  :bottomColor="$props.color"
                   :item="item.raw"
                   :key="index"
-                  :modelValue="$props.modelValue.includes(item.raw[$props.itemValue])"
-                  @update:modelValue="toggleSelect"
-                  @auxclick="() => onClickLibrary.mobile($event, item)"
-                  @click="() => onClickLibrary.mobile($event, item)"
+                  :modelValue="$props.modelValue?.includes(item.raw[$props.itemValue])"
+                  @update:modelValue="toggleSelect(item.raw)"
+                  v-bind="onClickLibrary.clickable ? {
+                    onClick: (event) => onClickLibrary.mobile(event, item),
+                    onAuxclick: (event) => onClickLibrary.mobile(event, item)
+                  } : {}"
                 >
                   <template
                     #item.top="props"
@@ -530,22 +561,23 @@
                   <FSText
                     font="text-button"
                   >
-                    {{ $tr("ui.data-table.all-selected-bold", "Warning:") }}
+                    {{ $tr("data-table.all-selected-bold", "Warning:") }}
                   </FSText>
                   <FSText>
-                    {{ $tr("ui.data-table.all-selected-regular", "All elements selected") }}
+                    {{ $tr("data-table.all-selected-regular", "All elements selected") }}
                   </FSText>
                 </FSRow>
               </template>
               <template
                 v-else
               >
-                <FSText>
-                  {{ $tr("ui.data-table.some-selected", "{0} element(s) selected", $props.modelValue.length.toString()) }}
-                </FSText>
+                <FSRow>
+                  <FSText>
+                    {{ $tr("data-table.some-selected", "{0} element(s) selected", $props.modelValue.length.toString()) }}
+                  </FSText>
+                </FSRow>
               </template>
             </template>
-            <v-spacer />
             <FSRow
               align="center-right"
               :wrap="false"
@@ -553,7 +585,7 @@
               <FSText
                 font="text-overline"
               >
-                {{ $tr("ui.data-table.rows-per-page", "Rows per page") }}
+                {{ $tr("data-table.rows-per-page", "Rows per page") }}
               </FSText>
               <FSRow
                 width="120px"
@@ -602,7 +634,7 @@
           <FSText
             font="text-overline"
           >
-            {{ $tr("ui.data-table.empty", "No data") }}
+            {{ $tr("ui.common.no-data", "No data") }}
           </FSText>
         </template>
         <template
@@ -617,7 +649,7 @@
               v-for="(item, index) in items.filter((item) => item.type === 'item')"
               elementSelector=".fs-draggable-item"
               :disabled="draggableDisabled"
-              :item="item"
+              :item="{ ...item, index }"
               :key="index"
               @update:dragend="(event, dragged) => onDragEnd(event, dragged, '.fs-data-iterator-container')"
               @dragover="(event) => onDragOver(event, '.fs-draggable-item', '.fs-data-iterator-container')"
@@ -630,18 +662,20 @@
                 v-bind="{ index, item: item.raw, toggleSelect }"
               >
                 <FSDataIteratorItem
-                  :itemColor="$props.rowColor ? $props.rowColor(item.raw) : ColorEnum.Background"
+                  :leftColor="$props.rowColor ? $props.rowColor(item.raw) : null"
                   :headers="innerHeaders.filter(h => !$props.sneakyHeaders.includes(h.value))"
-                  :clickable="onClickLibrary.clickable"
-                  :showSelect="$props.showSelect"
-                  :itemTo="$props.itemTo"
-                  :color="$props.color"
+                  :selectable="$props.selectable"
+                  :singleSelect="$props.singleSelect"
+                  :to="$props.itemTo"
+                  :bottomColor="$props.color"
                   :item="item.raw"
                   :key="index"
-                  :modelValue="$props.modelValue.includes(item.raw[$props.itemValue])"
-                  @update:modelValue="toggleSelect"
-                  @auxclick="() => onClickLibrary.mobile($event, item)"
-                  @click="() => onClickLibrary.mobile($event, item)"
+                  :modelValue="$props.modelValue?.includes(item.raw[$props.itemValue])"
+                  @update:modelValue="toggleSelect(item.raw)"
+                  v-bind="onClickLibrary.clickable ? {
+                    onClick: (event) => onClickLibrary.mobile(event, item),
+                    onAuxclick: (event) => onClickLibrary.mobile(event, item)
+                  } : {}"
                 >
                   <template
                     #item.top="props"
@@ -684,7 +718,7 @@
     <div
       class="fs-data-table-intersection"
       :id="elementId"
-    />
+    /> 
   </FSCol>
 </template>
 
@@ -695,6 +729,7 @@ import { useRouter } from "vue-router";
 import { ColorEnum, type FSDataTableColumn, type FSDataTableFilter, type FSDataTableOrder, type FSToggle } from "@dative-gpi/foundation-shared-components/models";
 import { useBreakpoints, useColors, useSlots } from "@dative-gpi/foundation-shared-components/composables";
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
+import { useRouting } from "@dative-gpi/foundation-shared-services/composables";
 import { uuidv4 } from "@dative-gpi/bones-ui/tools/uuid"
 
 import { alphanumericSort, containsSearchTerm, sizeToVar } from "../../utils";
@@ -745,6 +780,11 @@ export default defineComponent({
       type: Array as PropType<FSDataTableColumn[]>,
       required: true
     },
+    showFilters: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     filters: {
       type: Object as PropType<{ [key: string]: FSDataTableFilter[] }>,
       required: false,
@@ -804,7 +844,7 @@ export default defineComponent({
       required: false,
       default: ColorEnum.Primary
     },
-    showSelect: {
+    selectable: {
       type: Boolean,
       required: false,
       default: true
@@ -814,6 +854,11 @@ export default defineComponent({
       required: false,
       default: true
     },
+    noSearch: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     singleSelect: {
       type: Boolean,
       required: false,
@@ -832,7 +877,7 @@ export default defineComponent({
     mode: {
       type: String as PropType<"table" | "iterator">,
       required: false,
-      default: "iterator"
+      default: "table"
     },
     disableTable: {
       type: Boolean,
@@ -880,9 +925,10 @@ export default defineComponent({
       default: "12px"
     },
   },
-  emits: ["update:modelValue", "update:headers", "update:filters", "update:mode", "update:sortBy", "update:rowsPerPage", "update:page", "update:include", "update:items", "click:row"],
+  emits: ["update:modelValue", "update:headers", "update:search", "update:showFilters", "update:filters", "update:mode", "update:sortBy", "update:rowsPerPage", "update:page", "update:include", "update:items", "click:row"],
   setup(props, { emit }) {
-    const { isExtraSmall } = useBreakpoints();
+    const { isExtraSmall, isMobileSized } = useBreakpoints();
+    const { handleRoutingEvent } = useRouting();
     const { $tr } = useTranslationsProvider();
     const { getColors } = useColors();
     const router = useRouter();
@@ -894,9 +940,9 @@ export default defineComponent({
     const innerSearch: Ref<string | null> = ref(null);
     const innerRowsPerPage = ref(props.rowsPerPage);
     const innerSortBy = ref(props.sortBy);
-    const innerMode = ref(props.mode);
+    const innerMode = ref(props.disableTable ? "iterator" : props.disableIterator ? "table" : props.mode);
     const innerPage = ref(props.page);
-    const showFilters = ref(false);
+    const innerShowFilters = ref(props.showFilters);
     const resetable = ref(false);
 
     const intersectionObserver = ref<IntersectionObserver | null>(null);
@@ -913,11 +959,18 @@ export default defineComponent({
       { id: 5, label: "5" },
       { id: 10, label: "10" },
       { id: 30, label: "30" },
-      { id: -1, label: $tr("ui.data-table.all-rows", "All") }
+      { id: -1, label: $tr("ui.common.all", "All") }
     ];
 
     const showFiltersRow = computed((): boolean => {
-      return (props.showSearch && showFilters.value && filterableHeaders.value.length > 0) || hiddenHeaders.value.length > 0;
+      switch (innerMode.value) {
+        case "iterator": {
+          return (props.showSearch && innerShowFilters.value && filterableHeaders.value.length > 0);
+        }
+        case "table": {
+          return (props.showSearch && innerShowFilters.value && filterableHeaders.value.length > 0) || hiddenHeaders.value.length > 0;
+        }
+      }
     });
 
     const hasVisibleFilters = computed((): boolean => {
@@ -925,11 +978,15 @@ export default defineComponent({
     });
 
     const showFiltersDivider = computed((): boolean => {
-      return resetable.value || (hiddenHeaders.value.length > 0 && hasVisibleFilters.value);
-    });
-
-    const hasToolbar = computed((): boolean => {
-      return !!useSlots().slots["toolbar"];
+      switch (innerMode.value) {
+        case "iterator": {
+          return resetable.value;
+        }
+        case "table": {
+          return resetable.value || (hiddenHeaders.value.length > 0 && hasVisibleFilters.value);
+        }
+      }
+      
     });
 
     const innerSlots = computed((): { [label: string]: Slot<any> } => {
@@ -989,7 +1046,7 @@ export default defineComponent({
           width: "0%"
         });
       }
-      if (props.showSelect) {
+      if (props.selectable) {
         extra.push({
           key: "data-table-select",
           width: "0%"
@@ -1020,20 +1077,27 @@ export default defineComponent({
     });
 
     const innerItems = computed((): any[] => {
-      const activeFilters: { key: string, filter: FSDataTableFilter }[] = Object.keys(filters.value).reduce((acc, key) => {
-        return acc.concat(filters.value[key].filter((filter) => filter.hidden).map((filter) => ({ key, filter })));
-      }, [] as { key: string, filter: FSDataTableFilter }[]);
+      // Select only the filters where a value is hidden, for others, accept all values
+      const activeFilters: { [key: string]: FSDataTableFilter[] } = Object.keys(filters.value).reduce((acc, key) => {
+        if (filters.value[key].some((filter) => filter.hidden)) {
+          acc[key] = filters.value[key].filter((filter) => !filter.hidden);
+        }
+        return acc;
+      }, {} as { [key: string]: FSDataTableFilter[] });
+
       if (props.items && props.items.length) {
         const innerSearchFormatted = innerSearch.value ? innerSearch.value.toLowerCase() : null;
         return props.items.filter((item) => {
           if (props.selectedOnly && !props.modelValue.includes(item[props.itemValue])) {
             return false;
           }
-          if (innerSearchFormatted) {
-            return containsSearchTerm(item, innerSearchFormatted);
+          for (const property in activeFilters) {
+            if (!activeFilters[property].some((filter) => filter.filter && filter.filter(filter.value, item[property], item))) {
+              return false;
+            }
           }
-          if (activeFilters.some(af => af.filter.filter && af.filter.filter(af.filter.value, item[af.key], item))) {
-            return false;
+          if (!props.noSearch && innerSearchFormatted) {
+            return containsSearchTerm(item, innerSearchFormatted);
           }
           return true;
         });
@@ -1077,17 +1141,13 @@ export default defineComponent({
     });
 
     const onClickLibrary = computed((): { [key: string]: Function | boolean } => {
+      console.log(props["onClick:row"]);
       if (props["onClick:row"] || props.itemTo) {
         return {
           clickable: true,
           row: (event: PointerEvent, row: any) => {
             if (props.itemTo && router) {
-              if (event.metaKey || event.ctrlKey || event.button === 1) {
-                window.open(router.resolve(props.itemTo(row.item)).href, "_blank");
-              }
-              else {
-                router.push(props.itemTo(row.item));
-              }
+              handleRoutingEvent(event, props.itemTo(row.item), true);
             }
             else {
               emit("click:row", row.item);
@@ -1220,13 +1280,13 @@ export default defineComponent({
           value = header.fixedFilters.map((ff): FSDataTableFilter => ({
             hidden: currentFilters?.find((cf) => cf.value == (ff.value || null))?.hidden ?? false,
             text: ff.text?.toString() ?? "—",
-            value: ff.value || null,
+            value: ff.value ?? null,
             filter: header.methodFilter ?? ((_, property, item) => {
               if (header.methodFilterRaw) {
                 return header.methodFilterRaw(ff.value, item);
               }
               const flat = property = [property].flat();
-              return Array.isArray(flat) ? flat.includes(ff.value) || (!ff.value && flat.length == 0) : (!ff.value && !flat) || ff.value == flat;
+              return (!ff.value && flat.length == 0) || flat.some(f => f == ff.value);
             })
           }));
           filterDictionary[key] = value;
@@ -1249,7 +1309,7 @@ export default defineComponent({
                     return header.methodFilterRaw(dv, item);
                   }
                   const flat = [property].flat().map(mapToInnerValue);
-                  return Array.isArray(flat) ? flat.includes(dv) || (!dv && flat.length == 0) : (!dv && !flat) || dv == flat;
+                  return (!dv && flat.length == 0) || flat.some(f => f == dv);
                 })
               }
             });
@@ -1324,6 +1384,7 @@ export default defineComponent({
             }, { threshold: [0.9] });
           }
           if (document.querySelector(`#${elementId}`)) {
+            intersectionObserver.value.unobserve(document.querySelector(`#${elementId}`)!);
             intersectionObserver.value.observe(document.querySelector(`#${elementId}`)!);
           }
           return;
@@ -1360,10 +1421,10 @@ export default defineComponent({
     };
 
     const resetRowIndex = (initialIndex: number, currentIndex: number, draggedElement: HTMLElement, tbodyElement: HTMLElement) => {
-      if (initialIndex > currentIndex) {
+      if (initialIndex > currentIndex && tbodyElement.children[initialIndex]) {
         tbodyElement.children[initialIndex].insertAdjacentElement("afterend", draggedElement);
       }
-      else {
+      else if(tbodyElement.children[initialIndex]) {
         tbodyElement.children[initialIndex].insertAdjacentElement("beforebegin", draggedElement);
       }
     };
@@ -1479,8 +1540,17 @@ export default defineComponent({
       }
     });
 
+    watch(() => props.showFilters, () => {
+      innerShowFilters.value = props.showFilters;
+    });
+
     watch(innerSearch, () => {
       innerPage.value = 1;
+      emit("update:search", innerSearch.value);
+    });
+
+    watch(innerShowFilters, () => {
+      emit("update:showFilters", innerShowFilters.value);
     });
 
     watch(filters, () => {
@@ -1488,6 +1558,10 @@ export default defineComponent({
         .some((key) => filters.value[key].some((filter) => filter.hidden));
     }, { deep: true });
 
+    watch(size, () => {
+      observeIntersection();
+    });
+
     watch(innerMode, () => {
       emit("update:mode", innerMode.value);
       size.value = props.sizeIterator;
@@ -1512,13 +1586,14 @@ export default defineComponent({
 
     watch(() => props.items, async () => {
       computeFilters();
+      observeIntersection();
       if (innerPage.value !== 1) {
         const formerPage = innerPage.value;
         innerPage.value = 1;
         await nextTick();
         innerPage.value = formerPage;
       }
-    });
+    }, { deep: true });
 
     return {
       ColorEnum,
@@ -1529,9 +1604,8 @@ export default defineComponent({
       innerMode,
       modeOptions,
       innerPage,
-      hasToolbar,
       pageOptions,
-      showFilters,
+      innerShowFilters,
       showFiltersRow,
       showFiltersDivider,
       hasVisibleFilters,
@@ -1548,6 +1622,7 @@ export default defineComponent({
       classes,
       style,
       size,
+      isMobileSized,
       isExtraSmall,
       draggableDisabled,
       elementId,