chore: group dependabot PRs for minor and patch updates

Signed-off-by: Anna Larch <anna@nextcloud.com>

Author: miaulalala

.github/dependabot.yml

@@ -1,17 +1,30 @@
 version: 2
 updates:
-- package-ecosystem: composer
+- package-ecosystem: "composer"
   directory: "/"
   schedule:
     interval: weekly
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 6
   open-pull-requests-limit: 10
   labels:
-  - 3. to review
-  - dependencies
-- package-ecosystem: composer
+    - 3. to review
+    - dependencies
+  groups:
+    prod:
+      dependency-type: "production"
+      update-types:
+        - "minor"
+        - "patch"
+    dev:
+      dependency-type: "development"
+      update-types:
+        - "minor"
+        - "patch"
+- package-ecosystem: "composer"
   directories:
     - "/vendor-bin/cs-fixer"
     - "/vendor-bin/phpunit"
@@ -21,23 +34,42 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 6
   open-pull-requests-limit: 10
   labels:
     - 3. to review
     - dependencies
-- package-ecosystem: npm
+- package-ecosystem: "npm"
   directory: "/"
   schedule:
     interval: weekly
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  cooldown:
+    default-days: 6
   open-pull-requests-limit: 10
   # Disable automatic rebasing because without a build CI will likely fail anyway
   rebase-strategy: "disabled"
   labels:
-  - 3. to review
-  - dependencies
+    - 3. to review
+    - dependencies
+  groups:
+    vue:
+      patterns:
+        - "*vue*"
+        - "*vite*"
+    prod:
+      dependency-type: "production"
+      update-types:
+        - "minor"
+        - "patch"
+    dev:
+      dependency-type: "development"
+      update-types:
+        - "minor"
+        - "patch"
   # GitHub Actions
 - package-ecosystem: "github-actions"
   directory: ".github/workflows"
@@ -49,3 +81,12 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Berlin
+  cooldown:
+    default-days: 6
+  labels:
+    - 3. to review
+    - github_actions
+  groups:
+    github-actions:
+      patterns:
+        - "*"

cypress/e2e/sidebar.cy.ts

@@ -4,7 +4,7 @@
  */
 
 import { createFolder, getFileListRow, moveFile, navigateToFolder, renameFile } from './filesUtils.ts'
-import { addComment, addTag, createPublicShare, randHash, showActivityTab, toggleFavorite } from './sidebarUtils.ts'
+import { addComment, addTag, closeToasts, createPublicShare, randHash, showActivityTab, toggleFavorite } from './sidebarUtils.ts'
 
 describe('Check activity listing in the sidebar', { testIsolation: true }, () => {
 	beforeEach(function() {
@@ -56,8 +56,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 	it('Has move activity', () => {
 		createFolder('Test folder')
 		moveFile('welcome.txt', 'Test folder')
+		closeToasts()
 		navigateToFolder('Test folder')
-
 		showActivityTab('welcome.txt')
 		cy.get('.activity-entry').first().should('contains.text', 'You moved')
 	})

cypress/e2e/sidebarUtils.ts

@@ -24,6 +24,10 @@ export function closeSidebar() {
 		.should('not.contain', 'opendetails')
 }
 
+export function closeToasts() {
+	cy.get('button.toast-close').click({ multiple: true })
+}
+
 export function showActivityTab(fileName: string) {
 	cy.intercept('GET', '/ocs/v2.php/apps/activity/api/v2/activity/filter**').as('getActivities')
 

lib/Settings/Admin.php

@@ -105,7 +105,7 @@ public function getForm(): TemplateResponse {
 			IExtension::METHOD_NOTIFICATION => $this->l10n->t('Push'),
 		]);
 
-		return new TemplateResponse('activity', 'settings/admin', [], 'blank');
+		return new TemplateResponse('activity', 'settings/admin', [], TemplateResponse::RENDER_AS_BLANK);
 	}
 
 	#[\Override]

lib/Settings/Personal.php

@@ -139,7 +139,7 @@ public function getForm(): TemplateResponse {
 			'methods' => $methods,
 
 			'activity_digest_enabled' => $this->userSettings->getUserSetting($this->userId, 'setting', 'activity_digest')
-		], 'blank');
+		], TemplateResponse::RENDER_AS_BLANK);
 	}
 
 	/**