added import results dialog, renamed files

Signed-off-by: Elizabeth Danzberger <lizzy7128@tutanota.de>

src/file-actions-script.js → src/file-actions.js

@@ -1,6 +1,6 @@
 import { FileAction, registerFileAction } from '@nextcloud/files'
 import { showError, spawnDialog } from '@nextcloud/dialogs'
-import ImportIntoTables from './modules/modals/ImportIntoTables.vue'
+import FileActionImport from './modules/modals/FileActionImport.vue'
 
 const icon = `<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="24" height="24" viewBox="0 0 24 24">
     <path d="M4,3H20A2,2 0 0,1 22,5V20A2,2 0 0,1 20,22H4A2,2 0 0,1 2,20V5A2,2 0 0,1 4,3M4,7V10H8V7H4M10,7V10H14V7H10M20,10V7H16V10H20M4,12V15H8V12H4M4,20H8V17H4V20M10,12V15H14V12H10M10,20H14V17H10V20M20,20V17H16V20H20M20,12H16V15H20V12Z"/>
@@ -21,7 +21,7 @@ const fileAction = new FileAction({
 			return null
 		}
 
-		spawnDialog(ImportIntoTables, { t, file })
+		spawnDialog(FileActionImport, { t, file, })
 
 		return null
 	},

src/modules/modals/ImportIntoTables.vue → src/modules/modals/FileActionImport.vue

@@ -86,12 +86,13 @@
 import { NcModal, NcButton, NcSelect, NcCheckboxRadioSwitch, NcEmojiPicker, NcLoadingIcon } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import { Node } from '@nextcloud/files'
-import { showError, showSuccess } from '@nextcloud/dialogs'
+import { showError, showSuccess, spawnDialog } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import RowFormWrapper from '../../shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue'
+import ImportResults from './ImportResults.vue'
 
 export default {
-	name: 'ImportIntoTables',
+	name: 'FileActionImport',
 
 	components: {
 		NcModal,
@@ -125,6 +126,7 @@ export default {
 				emoji: '🔧',
 				title: this.file.basename,
 			},
+			importResults: null,
 			existingTables: [],
 			selectedTable: null,
 		}
@@ -170,9 +172,9 @@ export default {
 			this.importingFile = true
 
 			if (this.importAsNew) {
-				const tableCreated = await importToNewTable(this.newTable.title, this.newTable.emoji, this.file, this.createMissingColumns)
+				this.importResults = await importToNewTable(this.newTable.title, this.newTable.emoji, this.file)
 
-				if (!tableCreated) {
+				if (!this.importResults) {
 					showError(t('tables', 'Could not create table'))
 				} else {
 					showSuccess(t('tables', 'Created table "{emoji} {table}"', { emoji: this.newTable.emoji, table: this.newTable.title }))
@@ -183,9 +185,9 @@ export default {
 					return
 				}
 
-				const imported = await importToExistingTable(this.selectedTable.value, this.file.path, this.createMissingColumns)
+				this.importResults = await importToExistingTable(this.selectedTable.value, this.file, this.createMissingColumns)
 
-				if (!imported) {
+				if (!this.importResults) {
 					showError(t('tables', 'Could not import data to table'))
 				} else {
 					showSuccess(t('tables', 'Imported to table "{table}"', { table: this.selectedTable.label }))
@@ -194,6 +196,8 @@ export default {
 
 			this.importingFile = false
 			this.modal = false
+
+			spawnDialog(ImportResults, { t, results: this.importResults, })
 		},
 	},
 }

src/modules/modals/ImportResults.vue

@@ -0,0 +1,92 @@
+<template>
+  <NcDialog :name="t('tables', 'Result')" :open.sync="show" size="small">
+    <template #actions>
+      <NcButton :aria-label="t('tables', 'Close')" @click="hideDialog">
+        {{ t('tables', 'Close') }}
+      </NcButton>
+    </template>
+
+    <table class="import_modal__results">
+      <tbody>
+        <tr>
+          <td>{{ t('tables', 'Found columns') }}</td>
+          <td>{{ results.found_columns_count }}</td>
+        </tr>
+
+        <tr>
+          <td>{{ t('tables', 'Matching columns') }}</td>
+          <td>{{ results.matching_columns_count }}</td>
+        </tr>
+
+        <tr>
+          <td>{{ t('tables', 'Created columns') }}</td>
+          <td>{{ results.created_columns_count }}</td>
+        </tr>
+
+
+        <tr>
+          <td>{{ t('tables', 'Inserted rows') }}</td>
+          <td>{{ results.inserted_rows_count }}</td>
+        </tr>
+
+
+        <tr>
+          <td>{{ t('tables', 'Value parsing errors') }}</td>
+          <td>{{ results.errors_parsing_count }}</td>
+        </tr>
+
+        <tr>
+          <td>{{ t('tables', 'Row creation errors') }}</td>
+          <td>{{ results.errors_count }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </NcDialog>
+</template>
+
+<script>
+import { NcDialog, NcButton } from '@nextcloud/vue'
+
+export default {
+  name: 'ImportResults',
+
+  components: {
+    NcDialog,
+    NcButton,
+  },
+
+  props: {
+    t: {
+      type: Function,
+      default: null,
+    },
+    results: {
+      found_columns_count: 0,
+      matching_columns_count: 0,
+      created_columns_count: 0,
+      inserted_rows_count: 0,
+      errors_parsing_count: 0,
+      errors_count: 0,
+    },
+  },
+
+  data() {
+    return {
+      show: true,
+    }
+  },
+
+  methods: {
+    hideDialog() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style scoped>
+.import_modal__results {
+  width: 100%;
+  margin-bottom: 10px;
+}
+</style>

webpack.js

@@ -3,7 +3,7 @@ const webpackConfig = require('@nextcloud/webpack-vue-config')
 
 webpackConfig.entry = {
 	main: path.join(__dirname, 'src', 'main.js'),
-	files: path.join(__dirname, 'src', 'file-actions-script.js'),
+	files: path.join(__dirname, 'src', 'file-actions.js'),
 	reference: path.join(__dirname, 'src', 'reference.js'),
 }