From c4fc0ea92b4ed1097238ad1a18b64142d667d061 Mon Sep 17 00:00:00 2001
From: ernst86913 <47870436+ernst86913@users.noreply.github.com>
Date: Fri, 14 May 2021 18:02:05 +0200
Subject: [PATCH] Move export to layouts (#5557)

* Export Fix

* Remove unused fields

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/layouts/calendar/calendar.vue         |  3 ++
 app/src/layouts/cards/cards.vue               |  9 ++++-
 app/src/layouts/tabular/tabular.vue           |  9 ++++-
 .../modules/collections/routes/collection.vue |  8 ----
 .../export-sidebar-detail.vue                 | 39 +++++++++----------
 5 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/src/layouts/calendar/calendar.vue b/app/src/layouts/calendar/calendar.vue
index f950e30a83..a5f4451f5b 100644
--- a/app/src/layouts/calendar/calendar.vue
+++ b/app/src/layouts/calendar/calendar.vue
@@ -4,6 +4,7 @@
 
 		<portal to="sidebar">
 			<filter-sidebar-detail v-model="_filters" :collection="collection" :loading="loading" />
+			<export-sidebar-detail :filters="filtersWithCalendarView" :search-query="searchQuery" :collection="collection" />
 		</portal>
 
 		<portal to="actions:prepend">
@@ -56,6 +57,7 @@ import { Item, Filter, Field } from '@/types';
 import useItems from '@/composables/use-items';
 import useSync from '@/composables/use-sync';
 import useCollection from '@/composables/use-collection';
+import ExportSidebarDetail from '@/views/private/components/export-sidebar-detail';
 import { formatISO } from 'date-fns';
 import router from '@/router';
 import { renderPlainStringTemplate } from '@/utils/render-string-template';
@@ -75,6 +77,7 @@ type layoutOptions = {
 };
 
 export default defineComponent({
+	components: { ExportSidebarDetail },
 	props: {
 		collection: {
 			type: String,
diff --git a/app/src/layouts/cards/cards.vue b/app/src/layouts/cards/cards.vue
index 969bcc31da..fd47c0feeb 100644
--- a/app/src/layouts/cards/cards.vue
+++ b/app/src/layouts/cards/cards.vue
@@ -48,6 +48,12 @@
 
 		<portal to="sidebar">
 			<filter-sidebar-detail v-model="_filters" :collection="collection" :loading="loading" />
+			<export-sidebar-detail
+				:layout-query="layoutQuery"
+				:filters="_filters"
+				:search-query="searchQuery"
+				:collection="collection"
+			/>
 		</portal>
 
 		<portal to="actions:prepend">
@@ -140,6 +146,7 @@ import { FieldMeta, Filter } from '@/types';
 import useSync from '@/composables/use-sync/';
 import useCollection from '@/composables/use-collection/';
 import useItems from '@/composables/use-items';
+import ExportSidebarDetail from '@/views/private/components/export-sidebar-detail';
 import Card from './components/card.vue';
 import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
 import { useRelationsStore } from '@/stores/';
@@ -169,7 +176,7 @@ type layoutQuery = {
 };
 
 export default defineComponent({
-	components: { Card, CardsHeader },
+	components: { Card, CardsHeader, ExportSidebarDetail },
 	props: {
 		collection: {
 			type: String,
diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue
index d986f832d5..f414edbdfe 100644
--- a/app/src/layouts/tabular/tabular.vue
+++ b/app/src/layouts/tabular/tabular.vue
@@ -51,6 +51,12 @@
 
 		<portal to="sidebar">
 			<filter-sidebar-detail v-model="_filters" :collection="collection" :loading="loading" />
+			<export-sidebar-detail
+				:layout-query="layoutQuery"
+				:filters="_filters"
+				:search-query="searchQuery"
+				:collection="collection"
+			/>
 		</portal>
 
 		<portal to="actions:prepend">
@@ -151,6 +157,7 @@ import router from '@/router';
 import useSync from '@/composables/use-sync';
 import { debounce, clone } from 'lodash';
 import Draggable from 'vuedraggable';
+import ExportSidebarDetail from '@/views/private/components/export-sidebar-detail';
 import useCollection from '@/composables/use-collection';
 import useItems from '@/composables/use-items';
 import i18n from '@/lang';
@@ -173,7 +180,7 @@ type layoutQuery = {
 };
 
 export default defineComponent({
-	components: { Draggable },
+	components: { Draggable, ExportSidebarDetail },
 	props: {
 		collection: {
 			type: String,
diff --git a/app/src/modules/collections/routes/collection.vue b/app/src/modules/collections/routes/collection.vue
index 303ff32ca7..d04ccde37d 100644
--- a/app/src/modules/collections/routes/collection.vue
+++ b/app/src/modules/collections/routes/collection.vue
@@ -221,12 +221,6 @@
 			</sidebar-detail>
 			<layout-sidebar-detail @input="layout = $event" :value="layout" />
 			<portal-target name="sidebar" />
-			<export-sidebar-detail
-				:filters="filters"
-				:layout-query="layoutQuery"
-				:search-query="searchQuery"
-				:collection="currentCollection"
-			/>
 			<refresh-sidebar-detail @refresh="refresh" v-model="refreshInterval" />
 		</template>
 
@@ -254,7 +248,6 @@ import CollectionsNotFound from './not-found.vue';
 import useCollection from '@/composables/use-collection';
 import usePreset from '@/composables/use-preset';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail';
-import ExportSidebarDetail from '@/views/private/components/export-sidebar-detail';
 import RefreshSidebarDetail from '@/views/private/components/refresh-sidebar-detail';
 import SearchInput from '@/views/private/components/search-input';
 import BookmarkAdd from '@/views/private/components/bookmark-add';
@@ -276,7 +269,6 @@ export default defineComponent({
 		CollectionsNavigationSearch,
 		CollectionsNotFound,
 		LayoutSidebarDetail,
-		ExportSidebarDetail,
 		SearchInput,
 		BookmarkAdd,
 		BookmarkEdit,
diff --git a/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue b/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
index 575418885d..55cf12c75e 100644
--- a/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
+++ b/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
@@ -34,27 +34,32 @@
 
 <script lang="ts">
 import { defineComponent, ref, PropType } from '@vue/composition-api';
-import { Collection, Filter } from '@/types';
+import { Filter } from '@/types';
 import api from '@/api';
 import { getRootPath } from '@/utils/get-root-path';
 import filtersToQuery from '@/utils/filters-to-query';
 
+type LayoutQuery = {
+	fields?: string[];
+	sort?: string;
+};
+
 export default defineComponent({
 	props: {
+		layoutQuery: {
+			type: Object as PropType<LayoutQuery>,
+			default: (): LayoutQuery => ({}),
+		},
 		filters: {
 			type: Array as PropType<Filter[]>,
 			default: () => [],
 		},
-		layoutQuery: {
-			type: Object,
-			default: () => ({}),
-		},
 		searchQuery: {
-			type: String,
+			type: String as PropType<string | null>,
 			default: null,
 		},
 		collection: {
-			type: Object as PropType<Collection>,
+			type: String,
 			required: true,
 		},
 	},
@@ -65,25 +70,17 @@ export default defineComponent({
 		return { format, useFilters, exportData };
 
 		function exportData() {
-			const url = getRootPath() + `items/${props.collection.collection}`;
+			const url = getRootPath() + `items/${props.collection}`;
 
-			let params: Record<string, any> = {
+			let params: Record<string, unknown> = {
 				access_token: api.defaults.headers.Authorization.substring(7),
+				export: format.value || 'json',
 			};
 
-			if (format.value === 'csv') {
-				params.export = 'csv';
-			} else if (format.value === 'xml') {
-				params.export = 'xml';
-			} else {
-				params.export = 'json';
-			}
-
 			if (useFilters.value === true) {
-				params = {
-					...params,
-					...props.layoutQuery,
-				};
+				if (props.layoutQuery && props.layoutQuery.sort) params.sort = props.layoutQuery.sort;
+				if (props.layoutQuery && props.layoutQuery.fields) params.fields = props.layoutQuery.fields;
+				if (props.searchQuery) params.search = props.searchQuery;
 
 				if (props.filters?.length) {
 					params = {