feat: implement direct file upload

Signed-off-by: Luka Trovic <luka@nextcloud.com>
nextcloud · Feb 23, 2024 · 207c0a8 · 207c0a8
1 parent c86aeb4
commit 207c0a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/cypress/e2e/tables-import.cy.js b/cypress/e2e/tables-import.cy.js
@@ -13,7 +13,7 @@ describe('Import csv', () => {
 		cy.visit('apps/tables')
 	})
 
-	it('Import csv', () => {
+	it('Import csv from Files', () => {
 		cy.uploadFile('test-import.csv', 'text/csv')
 		cy.loadTable('Tutorial')
 		cy.clickOnTableThreeDotMenu('Import')
@@ -25,11 +25,11 @@ describe('Import csv', () => {
 		cy.get('[data-cy="importResultColumnsMatch"]').should('contain.text', '4')
 		cy.get('[data-cy="importResultColumnsCreated"]').should('contain.text', '0')
 		cy.get('[data-cy="importResultRowsInserted"]').should('contain.text', '3')
-		cy.get('[data-cy="importResultParsingErrors"]').should('contain.text', '0')
-		cy.get('[data-cy="importResultRowErrors"]').should('contain.text', '0')
+		cy.get('[data-cy="importResultParsingErrors"]').should('not.exist')
+		cy.get('[data-cy="importResultRowErrors"]').should('not.exist')
 	})
 
-	it('Import csv with upload file button', () => {
+	it('Import csv from device', () => {
 		cy.loadTable('Tutorial')
 		cy.clickOnTableThreeDotMenu('Import')
 		cy.get('.modal__content button').contains('Upload from device').click()
@@ -39,8 +39,8 @@ describe('Import csv', () => {
 		cy.get('[data-cy="importResultColumnsMatch"]').should('contain.text', '4')
 		cy.get('[data-cy="importResultColumnsCreated"]').should('contain.text', '0')
 		cy.get('[data-cy="importResultRowsInserted"]').should('contain.text', '3')
-		cy.get('[data-cy="importResultParsingErrors"]').should('contain.text', '0')
-		cy.get('[data-cy="importResultRowErrors"]').should('contain.text', '0')
+		cy.get('[data-cy="importResultParsingErrors"]').should('not.exist')
+		cy.get('[data-cy="importResultRowErrors"]').should('not.exist')
 	})
 
 })
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
@@ -111,8 +111,7 @@ public function import(?int $tableId, ?int $viewId, string $path, bool $createMi
 				} else {
 					$error = true;
 				}
-			}
-			elseif (\file_exists($path)) {
+			} elseif (\file_exists($path)) {
 				$spreadsheet = IOFactory::load($path);
 				$this->loop($spreadsheet->getActiveSheet());
 			} else {

diff --git a/src/modules/modals/Import.vue b/src/modules/modals/Import.vue
@@ -40,7 +40,7 @@
 						<p class="span">
 							{{ t('tables', 'Supported formats: xlsx, xls, csv, html, xml') }}
 							<br>
-							{{ t('tables', 'The first row if the file must contain column headings.') }}
+							{{ t('tables', 'First row of the file must contain column headings.') }}
 						</p>
 					</div>
 				</RowFormWrapper>
@@ -224,7 +224,14 @@ export default {
 			return this.canCreateMissingColumns && this.createMissingColumns
 		},
 		importFileName() {
-			return this.selectedUploadFile ? this.selectedUploadFile.name : this.path
+			const fileName = this.selectedUploadFile ? this.selectedUploadFile.name : this.path
+
+			if (fileName.length > 30) {
+				const extension = fileName.split('.').pop()
+				return fileName.substring(0, 30 - extension.length - 3) + '...' + extension
+			}
+
+			return fileName
 		},
 	},
 	watch: {