Merge pull request #47190 from nextcloud/release/30.0.0_rc1

Signed-off-by: Joas Schilling <coding@schilljs.com>

.github/workflows/integration-sqlite.yml

@@ -70,7 +70,7 @@ jobs:
           - 'videoverification_features'
 
         php-versions: ['8.2']
-        spreed-versions: ['main']
+        spreed-versions: ['stable30']
 
     services:
       redis:

.github/workflows/performance.yml

@@ -64,7 +64,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: before.json
-          profiler-branch: master
+          profiler-branch: stable30
 
       - name: Apply PR
         run: |
@@ -86,7 +86,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: after.json
-          profiler-branch: master
+          profiler-branch: stable30
           compare-with: before.json
 
       - name: Upload profiles

README.md

@@ -5,8 +5,8 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
-[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable30)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable30)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable30/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
 

build/update-apps.sh

@@ -3,16 +3,16 @@
 # SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-# Update Nextcloud apps from latest git master
+# Update Nextcloud apps from latest git stable30
 # For local development environment
 # Use from Nextcloud server folder with `./build/update-apps.sh`
 #
 # It automatically:
 # - goes through all apps which are not shipped via server
 # - shows the app name in bold and uses whitespace for separation
-# - changes to master and pulls quietly
+# - changes to stable30 and pulls quietly
 # - shows the 3 most recent commits for context
-# - removes branches merged into master
+# - removes branches merged into stable30
 # - … could even do the build steps if they are consistent for the apps (like `make`)
 
-find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs git branch -d && cd ..' \;
+find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout stable30 && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged stable30 | grep -v "stable30$" | xargs git branch -d && cd ..' \;

build/update.sh

@@ -3,17 +3,17 @@
 # SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-# Update Nextcloud server and apps from latest git master
+# Update Nextcloud server and apps from latest git stable30
 # For local development environment
 # Use from Nextcloud server folder with `./build/update.sh`
 
 # Update server
 printf "\n\033[1m${PWD##*/}\033[0m\n"
-git checkout master
+git checkout stable30
 git pull --quiet -p
 git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
 printf "\n"
-git branch --merged master | grep -v "master$" | xargs git branch -d
+git branch --merged stable30 | grep -v "stable30$" | xargs git branch -d
 git submodule update --init
 
 # Update apps

codecov.yml

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
 codecov:
-  branch: master
+  branch: stable30
   ci:
   - drone.nextcloud.com
   - '!scrutinizer-ci.com'

core/src/components/AppMenu.vue

@@ -123,16 +123,6 @@ export default defineComponent({
 		display: flex;
 		flex-wrap: nowrap;
 		margin-inline: calc(var(--app-menu-entry-growth) / 2);
-		transition: margin-inline var(--animation-quick) ease-in-out;
-
-		// Remove padding if the first child is focussed
-		&:has(.app-menu-entry:hover:first-child, .app-menu-entry:focus-within:first-child) {
-			margin-inline: 0 calc(var(--app-menu-entry-growth) / 2);
-		}
-		// Remove padding if the last child is focussed
-		&:has(.app-menu-entry:hover:last-child, .app-menu-entry:focus-within:last-child) {
-			margin-inline: calc(var(--app-menu-entry-growth) / 2) 0;
-		}
 	}
 
 	&__overflow {

core/src/components/AppMenuEntry.vue

@@ -4,9 +4,11 @@
  -->
 
 <template>
-	<li class="app-menu-entry"
+	<li ref="containerElement"
+		class="app-menu-entry"
 		:class="{
 			'app-menu-entry--active': app.active,
+			'app-menu-entry--truncated': needsSpace,
 		}">
 		<a class="app-menu-entry__link"
 			:href="app.href"
@@ -15,7 +17,7 @@
 			:target="app.target ? '_blank' : undefined"
 			:rel="app.target ? 'noopener noreferrer' : undefined">
 			<AppMenuIcon class="app-menu-entry__icon" :app="app" />
-			<span class="app-menu-entry__label">
+			<span ref="labelElement" class="app-menu-entry__label">
 				{{ app.name }}
 			</span>
 		</a>
@@ -24,11 +26,26 @@
 
 <script setup lang="ts">
 import type { INavigationEntry } from '../types/navigation'
+import { onMounted, ref, watch } from 'vue'
 import AppMenuIcon from './AppMenuIcon.vue'
 
-defineProps<{
+const props = defineProps<{
 	app: INavigationEntry
 }>()
+
+const containerElement = ref<HTMLLIElement>()
+const labelElement = ref<HTMLSpanElement>()
+const needsSpace = ref(false)
+
+/** Update the space requirements of the app label */
+function calculateSize() {
+	const maxWidth = containerElement.value!.clientWidth
+	// Also keep the 0.5px letter spacing in mind
+	needsSpace.value = (maxWidth - props.app.name.length * 0.5) < (labelElement.value!.scrollWidth)
+}
+// Update size on mounted and when the app name changes
+onMounted(calculateSize)
+watch(() => props.app.name, calculateSize)
 </script>
 
 <style scoped lang="scss">
@@ -37,8 +54,6 @@ defineProps<{
 	width: var(--header-height);
 	height: var(--header-height);
 	position: relative;
-	// Needed to prevent jumping when hover an entry (keep in sync with :hover styles)
-	transition: width var(--animation-quick) ease-in-out;
 
 	&__link {
 		position: relative;
@@ -65,9 +80,8 @@ defineProps<{
 		left: 50%;
 		top: 50%;
 		display: block;
-		min-width: 100%;
 		transform: translateX(-50%);
-		width: 100%;
+		max-width: 100%;
 		text-overflow: ellipsis;
 		overflow: hidden;
 		letter-spacing: -0.5px;
@@ -115,25 +129,27 @@ defineProps<{
 
 	// Adjust the width when an entry is focussed
 	// The focussed / hovered entry should grow, while both neighbors need to shrink
-	&:hover,
-	&:focus-within {
-		width: calc(var(--header-height) + var(--app-menu-entry-growth));
+	&--truncated:hover,
+	&--truncated:focus-within {
+		.app-menu-entry__label {
+			max-width: calc(var(--header-height) + var(--app-menu-entry-growth));
+		}
 
 		// The next entry needs to shrink half the growth
 		+ .app-menu-entry {
-			width: calc(var(--header-height) - (var(--app-menu-entry-growth) / 2));
-			.app-menu-entry__icon {
-				margin-inline-end: calc(var(--app-menu-entry-growth) / 2);
+			.app-menu-entry__label {
+				font-weight: normal;
+				max-width: calc(var(--header-height) - var(--app-menu-entry-growth));
 			}
 		}
 	}
 
 	// The previous entry needs to shrink half the growth
-	&:has(+ .app-menu-entry:hover),
-	&:has(+ .app-menu-entry:focus-within) {
-		width: calc(var(--header-height) - (var(--app-menu-entry-growth) / 2));
-		.app-menu-entry__icon {
-			margin-inline-start: calc(var(--app-menu-entry-growth) / 2);
+	&:has(+ .app-menu-entry--truncated:hover),
+	&:has(+ .app-menu-entry--truncated:focus-within) {
+		.app-menu-entry__label {
+			font-weight: normal;
+			max-width: calc(var(--header-height) - var(--app-menu-entry-growth));
 		}
 	}
 }

package-lock.json

@@ -139,7 +139,7 @@
         "jsdoc": "^4.0.2",
         "karma": "^6.4.3",
         "karma-chrome-launcher": "^3.1.1",
-        "karma-coverage": "2.2.0",
+        "karma-coverage": "2.2.1",
         "karma-jasmine": "^1.1.2",
         "karma-jasmine-sinon": "^1.0.4",
         "karma-spec-reporter": "^0.0.36",
@@ -19627,11 +19627,10 @@
       }
     },
     "node_modules/karma-coverage": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz",
-      "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
+      "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^5.1.0",

package.json

@@ -167,7 +167,7 @@
     "jsdoc": "^4.0.2",
     "karma": "^6.4.3",
     "karma-chrome-launcher": "^3.1.1",
-    "karma-coverage": "2.2.0",
+    "karma-coverage": "2.2.1",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-sinon": "^1.0.4",
     "karma-spec-reporter": "^0.0.36",

version.php

@@ -9,10 +9,10 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
 // when updating major/minor version number.
 
-$OC_Version = [30, 0, 0, 7];
+$OC_Version = [30, 0, 0, 8];
 
 // The human-readable string
-$OC_VersionString = '30.0.0 beta 5';
+$OC_VersionString = '30.0.0 RC1';
 
 $OC_VersionCanBeUpgradedFrom = [
 	'nextcloud' => [