Merge pull request #35772 from nextcloud/feat/files2vue-navigation

Port Files navigation to vue
nextcloud · Jan 4, 2023 · e235c64 · e235c64
2 parents 36b6a7c + 6249732
commit e235c64
Show file tree

Hide file tree

Showing 155 changed files with 5,199 additions and 1,438 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         # run multiple copies of the current job in parallel
-        containers: [1, 2]
+        containers: ['component', 1, 2]
 
     name: runner ${{ matrix.containers }}
 
@@ -66,14 +66,18 @@ jobs:
           key: cypress-context-${{ github.run_id }}
           path: /home/runner/work/server
 
-      - name: Run E2E cypress tests
-        uses: cypress-io/github-action@v4
+      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
+
+        uses: cypress-io/github-action@v5
         with:
           record: true
           parallel: true
+          # cypress run type
+          component: ${{ matrix.containers == 'component' }}
+          group: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }}
           # cypress env
           ci-build-id: ${{ github.sha }}-${{ github.run_number }}
-          tag: ${{ github.event_name }}
+          tag: ${{ github.event_name }}t
         env:
           # Needs to be prefixed with CYPRESS_
           CYPRESS_BRANCH: ${{ env.BRANCH }}

diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
@@ -39,19 +39,47 @@
 
 use OCA\Files\Controller\OpenLocalEditorController;
 
+// Legacy routes above
+/** @var $this \OC\Route\Router */
+$this->create('files_ajax_download', 'apps/files/ajax/download.php')
+	->actionInclude('files/ajax/download.php');
+$this->create('files_ajax_list', 'apps/files/ajax/list.php')
+	->actionInclude('files/ajax/list.php');
+
 /** @var Application $application */
 $application = \OC::$server->query(Application::class);
 $application->registerRoutes(
 	$this,
 	[
 		'routes' => [
+			[
+				'name' => 'view#index',
+				'url' => '/',
+				'verb' => 'GET',
+			],
+			[
+				'name' => 'view#index',
+				'url' => '/{view}',
+				'verb' => 'GET',
+				'postfix' => 'view',
+			],
+			[
+				'name' => 'view#index',
+				'url' => '/{view}/{fileid}',
+				'verb' => 'GET',
+				'postfix' => 'fileid',
+			],
 			[
 				'name' => 'View#showFile',
 				'url' => '/f/{fileid}',
 				'verb' => 'GET',
 				'root' => '',
 			],
-
+			[
+				'name' => 'ajax#getStorageStats',
+				'url' => '/ajax/getstoragestats',
+				'verb' => 'GET',
+			],
 			[
 				'name' => 'API#getThumbnail',
 				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
@@ -69,6 +97,16 @@
 				'url' => '/api/v1/recent/',
 				'verb' => 'GET'
 			],
+			[
+				'name' => 'API#setConfig',
+				'url' => '/api/v1/config/{key}',
+				'verb' => 'POST'
+			],
+			[
+				'name' => 'API#getConfigs',
+				'url' => '/api/v1/configs',
+				'verb' => 'GET'
+			],
 			[
 				'name' => 'API#updateFileSorting',
 				'url' => '/api/v1/sorting',
@@ -94,16 +132,6 @@
 				'url' => '/api/v1/showgridview',
 				'verb' => 'GET'
 			],
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'ajax#getStorageStats',
-				'url' => '/ajax/getstoragestats',
-				'verb' => 'GET',
-			],
 			[
 				'name' => 'API#toggleShowFolder',
 				'url' => '/api/v1/toggleShowFolder/{key}',
@@ -186,10 +214,3 @@
 		],
 	]
 );
-
-/** @var $this \OC\Route\Router */
-
-$this->create('files_ajax_download', 'apps/files/ajax/download.php')
-	->actionInclude('files/ajax/download.php');
-$this->create('files_ajax_list', 'apps/files/ajax/list.php')
-	->actionInclude('files/ajax/list.php');
diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php
@@ -58,5 +58,6 @@
     'OCA\\Files\\Service\\DirectEditingService' => $baseDir . '/../lib/Service/DirectEditingService.php',
     'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir . '/../lib/Service/OwnershipTransferService.php',
     'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
+    'OCA\\Files\\Service\\UserConfig' => $baseDir . '/../lib/Service/UserConfig.php',
     'OCA\\Files\\Settings\\PersonalSettings' => $baseDir . '/../lib/Settings/PersonalSettings.php',
 );
diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php
@@ -73,6 +73,7 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Service\\DirectEditingService' => __DIR__ . '/..' . '/../lib/Service/DirectEditingService.php',
         'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__ . '/..' . '/../lib/Service/OwnershipTransferService.php',
         'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
+        'OCA\\Files\\Service\\UserConfig' => __DIR__ . '/..' . '/../lib/Service/UserConfig.php',
         'OCA\\Files\\Settings\\PersonalSettings' => __DIR__ . '/..' . '/../lib/Settings/PersonalSettings.php',
     );
 

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
diff --git a/apps/files/css/files.css.map b/apps/files/css/files.css.map
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
@@ -380,7 +380,9 @@ table td.filename .thumbnail {
 	display: inline-block;
 	width: 32px;
 	height: 32px;
-	background-size: 32px;
+	background-size: contain;
+	background-position: center;
+	background-repeat: no-repeat;
 	margin-left: 9px;
 	margin-top: 9px;
 	border-radius: var(--border-radius);

diff --git a/apps/files/css/merged.css b/apps/files/css/merged.css