From 3f73664a647ca5cb28a59743627d37efd8a37d90 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Thu, 15 Oct 2020 12:44:38 +0200
Subject: [PATCH] update files and remove console logs

---
 app/src/interfaces/files/files.vue            | 69 ++++++++++---------
 .../interfaces/many-to-many/use-actions.ts    |  2 -
 .../interfaces/many-to-many/use-preview.ts    |  7 --
 3 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/app/src/interfaces/files/files.vue b/app/src/interfaces/files/files.vue
index afaf64dab9..816816208f 100644
--- a/app/src/interfaces/files/files.vue
+++ b/app/src/interfaces/files/files.vue
@@ -5,30 +5,25 @@
 	<div v-else class="files">
 		<v-table
 			inline
-			:items="displayItems"
+			:items="items"
 			:loading="loading"
 			:headers.sync="tableHeaders"
-			:item-key="relationFields.junctionPkField"
+			:item-key="relationInfo.junctionPkField"
 			:disabled="disabled"
 			@click:row="editItem"
 		>
 			<template #item.$thumbnail="{ item }">
 				<render-display
-					:value="item"
+					:value="get(item, relationInfo.junctionField)"
 					display="file"
-					:collection="relationFields.junctionCollection"
-					:field="relationFields.relationPkField"
+					:collection="relationInfo.junctionCollection"
+					:field="relationInfo.relationPkField"
 					type="file"
 				/>
 			</template>
 
 			<template #item-append="{ item }" v-if="!disabled">
-				<v-icon
-					name="close"
-					v-tooltip="$t('deselect')"
-					class="deselect"
-					@click.stop="deleteItem(item, items)"
-				/>
+				<v-icon name="close" v-tooltip="$t('deselect')" class="deselect" @click.stop="deleteItem(item)" />
 			</template>
 		</v-table>
 
@@ -41,12 +36,12 @@
 
 		<modal-item
 			v-if="!disabled"
-			:active="currentlyEditing !== null"
-			:collection="relationFields.junctionCollection"
+			:active="editModalActive"
+			:collection="relationInfo.junctionCollection"
 			:primary-key="currentlyEditing || '+'"
 			:edits="editsAtStart"
-			:related-primary-key="relationFields.relationPkField || '+'"
-			:junction-field="relationFields.junctionRelation"
+			:related-primary-key="relatedPrimaryKey || '+'"
+			:junction-field="relationInfo.junctionField"
 			@input="stageEdits"
 			@update:active="cancelEdit"
 		/>
@@ -54,7 +49,7 @@
 		<modal-collection
 			v-if="!disabled"
 			:active.sync="selectModalActive"
-			:collection="relation.one_collection"
+			:collection="relationInfo.relationCollection"
 			:selection="[]"
 			:filters="selectionFilters"
 			@input="stageSelection"
@@ -114,7 +109,7 @@ export default defineComponent({
 	setup(props, { emit }) {
 		const { collection, field, value, primaryKey } = toRefs(props);
 
-		const { junction, junctionCollection, relation, relationCollection, relationFields } = useRelation(
+		const { junction, junctionCollection, relation, relationCollection, relationInfo } = useRelation(
 			collection,
 			field
 		);
@@ -131,9 +126,12 @@ export default defineComponent({
 			getNewSelectedItems,
 			getJunctionItem,
 			getJunctionFromRelatedId,
-		} = useActions(value, relationFields, emitter);
+		} = useActions(value, relationInfo, emitter);
 
-		const fields = ref(['id', 'type', 'title']);
+		const fields = computed(() => {
+			const { junctionField } = relationInfo.value;
+			return ['id', 'type', 'title'].map((key) => `${junctionField}.${key}`);
+		});
 
 		const tableHeaders = ref<TableHeader[]>([
 			{
@@ -146,33 +144,37 @@ export default defineComponent({
 			{
 				text: i18n.t('title'),
 				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				value: 'title',
+				value: relationInfo.value.junctionField + '.' + 'title',
 				align: 'left',
 				sortable: true,
 				width: 250,
 			},
 		]);
 
-		const { loading, displayItems, error, items } = usePreview(
+		const { loading, error, items } = usePreview(
 			value,
 			fields,
-			relationFields,
+			relationInfo,
 			getNewSelectedItems,
 			getUpdatedItems,
 			getNewItems,
 			getPrimaryKeys
 		);
 
-		const { cancelEdit, stageEdits, editsAtStart, editItem, currentlyEditing } = useEdit(
-			value,
-			relationFields,
-			emitter
-		);
+		const {
+			cancelEdit,
+			stageEdits,
+			editsAtStart,
+			editItem,
+			currentlyEditing,
+			editModalActive,
+			relatedPrimaryKey,
+		} = useEdit(value, relationInfo, emitter);
 
 		const { stageSelection, selectModalActive, selectionFilters } = useSelection(
 			value,
-			displayItems,
-			relationFields,
+			items,
+			relationInfo,
 			emitter
 		);
 
@@ -184,7 +186,6 @@ export default defineComponent({
 			tableHeaders,
 			junctionCollection,
 			loading,
-			displayItems,
 			error,
 			currentlyEditing,
 			cancelEdit,
@@ -198,8 +199,10 @@ export default defineComponent({
 			items,
 			get,
 			onUpload,
-			relationFields,
+			relationInfo,
 			editItem,
+			editModalActive,
+			relatedPrimaryKey,
 		};
 
 		function useUpload() {
@@ -212,11 +215,11 @@ export default defineComponent({
 
 				if (files.length === 0) return;
 
-				const { junctionRelation } = relationFields.value;
+				const { junctionField } = relationInfo.value;
 				const file = files[0];
 
 				const fileAsJunctionRow = {
-					[junctionRelation]: {
+					[junctionField]: {
 						id: file.id,
 						title: file.title,
 						type: file.type,
diff --git a/app/src/interfaces/many-to-many/use-actions.ts b/app/src/interfaces/many-to-many/use-actions.ts
index c64d2644a9..69dc2285ab 100644
--- a/app/src/interfaces/many-to-many/use-actions.ts
+++ b/app/src/interfaces/many-to-many/use-actions.ts
@@ -89,8 +89,6 @@ export default function useActions(
 		const junctionId = get(deletingItem, junctionPkField) as number | string | undefined;
 		const relatedId = get(deletingItem, [junctionField, relationPkField]) as number | string | undefined;
 
-		console.log(junctionId, relatedId);
-
 		const newValue = value.value.filter((item) => {
 			if (junctionId !== undefined) {
 				if (typeof item === 'object') {
diff --git a/app/src/interfaces/many-to-many/use-preview.ts b/app/src/interfaces/many-to-many/use-preview.ts
index 140a26046d..7691672fd4 100644
--- a/app/src/interfaces/many-to-many/use-preview.ts
+++ b/app/src/interfaces/many-to-many/use-preview.ts
@@ -75,7 +75,6 @@ export default function usePreview(
 					);
 				}
 
-				console.log('responseData1', responseData);
 				// Insert the related items into the junction items
 				responseData = responseData.map((data) => {
 					const id = get(data, relationPkField);
@@ -91,10 +90,6 @@ export default function usePreview(
 				const updatedItems = getUpdatedItems();
 				const newItems = getNewItems();
 
-				console.log('updatedItems', updatedItems);
-				console.log('newItems', newItems);
-				console.log('responseData2', responseData);
-
 				// Replace existing items with it's updated counterparts
 				responseData = responseData
 					.map((item) => {
@@ -106,7 +101,6 @@ export default function usePreview(
 					})
 					.concat(...newItems);
 
-				console.log('responseData3', responseData);
 				items.value = responseData;
 			} catch (err) {
 				error.value = err;
@@ -123,7 +117,6 @@ export default function usePreview(
 		try {
 			let data: Record<string, any>[] = [];
 			const primaryKeys = getPrimaryKeys();
-			console.log('PKS', primaryKeys);
 
 			if (primaryKeys.length > 0) {
 				const filteredFields = getJunctionFields();