Merge branch 'main' into feature/1424-add-table-user-migration

Author: samin-z

.github/workflows/app-upgrade-mysql.yml

@@ -51,7 +51,7 @@ jobs:
 
     services:
       mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mysql-8.0:latest
+        image: ghcr.io/nextcloud/continuous-integration-mysql-8.0:latest # zizmor: ignore[unpinned-images]
         ports:
           - 4444:3306/tcp
         env:
@@ -65,8 +65,9 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
@@ -77,15 +78,17 @@ jobs:
           echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
 
       - name: Checkout text app
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           repository: nextcloud/text
           path: apps/text
           ref: ${{ env.text_app_ref }}
 
       - name: Checkout viewer app
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           repository: nextcloud/viewer
           path: apps/viewer
           ref: ${{ matrix.server-versions }}
@@ -117,8 +120,9 @@ jobs:
           ./occ app:enable --force ${{ env.APP_NAME }}
 
       - name: Checkout app
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up dependencies
@@ -131,7 +135,7 @@ jobs:
           ./occ app:list
 
       - name: Upload nextcloud logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: always()
         with:
           name: nextcloud.log

.github/workflows/cypress-component.yml

@@ -29,10 +29,12 @@ jobs:
 
     steps:
       - name: Checkout app
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Set up Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -48,15 +50,15 @@ jobs:
         run: npm run tests:component
 
       - name: Upload test failure screenshots
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: failure()
         with:
           name: cypress-component-screenshots-node${{ matrix.node-version }}
           path: cypress/screenshots/
           retention-days: 5
 
       - name: Upload test videos
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: failure()
         with:
           name: cypress-component-videos-node${{ matrix.node-version }}

.github/workflows/cypress-custom.yml

@@ -31,13 +31,13 @@ jobs:
       fail-fast: false
       matrix:
         databases: [ 'mysql' ]
-        server-versions: [ 'stable31', 'stable32', 'master' ]
+        server-versions: [ 'stable31', 'stable32', 'stable33', 'master' ]
         include:
           - php-versions: 8.2
 
     services:
       mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest # zizmor: ignore[unpinned-images]
         ports:
           - 4444:3306/tcp
         env:
@@ -47,21 +47,17 @@ jobs:
     steps:
 
       - name: Checkout server
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
+          submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
       - name: Checkout viewer
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           repository: nextcloud/viewer
           ref: ${{ matrix.server-versions }}
           path: apps/viewer
@@ -87,12 +83,13 @@ jobs:
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up node from version file
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           cache: 'npm'
           cache-dependency-path: apps/${{ env.APP_NAME}}/package-lock.json
@@ -107,12 +104,12 @@ jobs:
 
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, zip, zlib, sqlite, pdo_sqlite, apcu, pgsql, pdo_pgsql,mysql, pdo_mysql
@@ -144,7 +141,7 @@ jobs:
           cat data/nextcloud.log
 
       - name: Cypress run
-        uses: cypress-io/github-action@v4
+        uses: cypress-io/github-action@8a35f965fbd13e3b18d9fb3bdc5f50ae2f4a5e76 # v7.1.0
         with:
           wait-on: '${{ env.CYPRESS_baseUrl }}'
           working-directory: 'apps/${{ env.APP_NAME }}'
@@ -164,15 +161,15 @@ jobs:
           cat data/nextcloud.log
 
       - name: Upload test failure screenshots ${{ matrix.node-version }}-${{ matrix.php-versions }}-${{ matrix.server-versions }}-${{ matrix.databases }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: failure()
         with:
           name: Upload screenshots ${{ matrix.node-version }}-${{ matrix.php-versions }}-${{ matrix.server-versions }}-${{ matrix.databases }}
           path: apps/${{ env.APP_NAME }}/cypress/screenshots/
           retention-days: 5
 
       - name: Upload nextcloud logs ${{ matrix.node-version }}-${{ matrix.php-versions }}-${{ matrix.server-versions }}-${{ matrix.databases }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: failure()
         with:
           name: Upload nextcloud log ${{ matrix.node-version }}-${{ matrix.php-versions }}-${{ matrix.server-versions }}-${{ matrix.databases }}

.github/workflows/integration.yml

@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        server-versions: ['stable31', 'stable32', 'master']
+        server-versions: ['stable31', 'stable32', 'stable33', 'master']
         php-versions: ['8.2']
         databases: ['mysql']
         include:
@@ -74,7 +74,7 @@ jobs:
 
     services:
       postgres:
-        image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
+        image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images]
         ports:
           - 4445:5432/tcp
         env:
@@ -83,7 +83,7 @@ jobs:
           POSTGRES_DB: nextcloud
         options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
       mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest # zizmor: ignore[unpinned-images]
         ports:
           - 4444:3306/tcp
         env:
@@ -92,25 +92,21 @@ jobs:
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
+          submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
       - name: Checkout app
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.34.1
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, zip, zlib, sqlite, pdo_sqlite, apcu, pgsql, pdo_pgsql,mysql, pdo_mysql

appinfo/info.xml

@@ -48,7 +48,7 @@ Have a good time and manage whatever you want.
 		<database>pgsql</database>
 		<database>mysql</database>
 		<database>sqlite</database>
-		<nextcloud min-version="31" max-version="33"/>
+		<nextcloud min-version="31" max-version="34"/>
 	</dependencies>
 	<repair-steps>
 		<pre-migration>

composer.lock

@@ -94,8 +94,8 @@ describe('Public link sharing', () => {
 			cy.visit(`apps/tables/s/${shareToken}`)
 
 			// Password Gate
-			cy.get('input[type="password"]#password').should('be.visible').type(password)
-			cy.get('input#password-submit').click()
+			cy.get('input[type="password"]').should('be.visible').type(password)
+			cy.get('button[type="submit"], input[type="submit"]').filter(':visible').first().click()
 			cy.get('[data-cy="publicTableElement"]').should('be.visible')
 
 			// Login again to delete share

cypress/e2e/tables-sharing-link.cy.js

@@ -21,5 +21,20 @@ import './commands.js'
 
 Cypress.on('uncaught:exception', (err) => {
 	return !err.message.includes('ResizeObserver loop limit exceeded') &&
-		!err.message.includes('ResizeObserver loop completed with undelivered notifications')
+		!err.message.includes('ResizeObserver loop completed with undelivered notifications') &&
+		!err.message.includes("Cannot read properties of undefined (reading 'from')") &&
+		!err.message.includes("Cannot read properties of undefined (reading 'createEditor')")
+})
+
+// Handle unsupported browser dialog that appears on page load
+Cypress.Commands.overwrite('visit', (originalVisit, url, options) => {
+	return originalVisit(url, options).then(() => {
+		// Wait a moment for the dialog to appear if needed
+		cy.get('body', { timeout: 1000 }).then(($body) => {
+			const button = $body.find('button:contains("Continue with this unsupported browser")')
+			if (button.length > 0) {
+				cy.contains('button', 'Continue with this unsupported browser').click()
+			}
+		})
+	})
 })

cypress/support/e2e.js

@@ -415,14 +415,19 @@ OC.L10N.register(
     "No shares" : "Žádná sdílení",
     "After the promotion of the share recipient to table manager, any applications created by share recipients that utilise this table will continue to access its data, even if you later demote them." : "Po povýšení příjemce sdílení na správce tabulky, jakékoli aplikace, vytvořené příjemci sdílení, které tuto tabulku využívají, budou pokračovat v přístupu k jejím datům, i když jejich povýšení později zrušíte.",
     "Confirm table manager promotion" : "Potvrdit povýšení na správce tabulky",
+    "Error creating link share" : "Chyba při vytváření sdílení odkazem",
+    "Error deleting link share" : "Chyba při mazání sdílení odkazem",
     "Link copied to clipboard" : "Odkaz zkopírován do schánky",
+    "Error copying link" : "Chyba při kopírování odkazu",
     "Password copied" : "Heslo zkopírováno",
+    "Error copying password" : "Chyba při kopírování hesla",
     "Create public link" : "Vytvořit veřejný odkaz",
     "Create a new share link" : "Vytvořit nový odkaz pro sdílení",
     "Set password" : "Nastavit heslo",
     "Password" : "Heslo",
     "Share link" : "Nasdílet odkaz",
     "View only" : "Pouze prohlížet",
+    "Copy public share link" : "Zkopírovat odkaz na veřejné sdílení",
     "Delete link" : "Smazat odkaz",
     "Public links" : "Veřejné odkazy",
     "No view in context" : "Žádný pohled v kontextu",
@@ -559,6 +564,7 @@ OC.L10N.register(
     "Search for tables and views..." : "Hledání tabulek a pohledů …",
     "Import into Tables" : "Naimportovat do Tabulek",
     "Could not create share." : "Nepodařilo se vytvořit sdílení.",
+    "Could not create public link." : "Nebylo možné vytvořit veřejný odkaz.",
     "Could not remove share." : "Nepodařilo se odebrat sdílení.",
     "Could not update share." : "Nepodařilo se zaktualizovat sdílení.",
     "Could not update cell" : "Nebylo možné zaktualizovat buňku",

l10n/cs.js

@@ -413,14 +413,19 @@
     "No shares" : "Žádná sdílení",
     "After the promotion of the share recipient to table manager, any applications created by share recipients that utilise this table will continue to access its data, even if you later demote them." : "Po povýšení příjemce sdílení na správce tabulky, jakékoli aplikace, vytvořené příjemci sdílení, které tuto tabulku využívají, budou pokračovat v přístupu k jejím datům, i když jejich povýšení později zrušíte.",
     "Confirm table manager promotion" : "Potvrdit povýšení na správce tabulky",
+    "Error creating link share" : "Chyba při vytváření sdílení odkazem",
+    "Error deleting link share" : "Chyba při mazání sdílení odkazem",
     "Link copied to clipboard" : "Odkaz zkopírován do schánky",
+    "Error copying link" : "Chyba při kopírování odkazu",
     "Password copied" : "Heslo zkopírováno",
+    "Error copying password" : "Chyba při kopírování hesla",
     "Create public link" : "Vytvořit veřejný odkaz",
     "Create a new share link" : "Vytvořit nový odkaz pro sdílení",
     "Set password" : "Nastavit heslo",
     "Password" : "Heslo",
     "Share link" : "Nasdílet odkaz",
     "View only" : "Pouze prohlížet",
+    "Copy public share link" : "Zkopírovat odkaz na veřejné sdílení",
     "Delete link" : "Smazat odkaz",
     "Public links" : "Veřejné odkazy",
     "No view in context" : "Žádný pohled v kontextu",
@@ -557,6 +562,7 @@
     "Search for tables and views..." : "Hledání tabulek a pohledů …",
     "Import into Tables" : "Naimportovat do Tabulek",
     "Could not create share." : "Nepodařilo se vytvořit sdílení.",
+    "Could not create public link." : "Nebylo možné vytvořit veřejný odkaz.",
     "Could not remove share." : "Nepodařilo se odebrat sdílení.",
     "Could not update share." : "Nepodařilo se zaktualizovat sdílení.",
     "Could not update cell" : "Nebylo možné zaktualizovat buňku",