Adapt modal size to viewer upstream changes

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.github/workflows/integration.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable24']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

.github/workflows/phpunit.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable24']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

.github/workflows/static-analysis.yml

@@ -12,7 +12,7 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              ocp-version: [ 'dev-master' ]
+              ocp-version: [ 'dev-stable24' ]
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout

l10n/cs.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Vytváření nové karty…",
     "\"{card}\" was added to \"{board}\"" : "„{card}“ bylo přidáno do „{board}“",
     "(circle)" : "(okruh)",
-    "This week" : "Tento týden"
+    "This week" : "Tento týden",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Opravdu chcete předat vlastnictví tabule {title} uživateli {user}?"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

l10n/cs.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Vytváření nové karty…",
     "\"{card}\" was added to \"{board}\"" : "„{card}“ bylo přidáno do „{board}“",
     "(circle)" : "(okruh)",
-    "This week" : "Tento týden"
+    "This week" : "Tento týden",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Opravdu chcete předat vlastnictví tabule {title} uživateli {user}?"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

l10n/de.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Neue Karte wird erstellt …",
     "\"{card}\" was added to \"{board}\"" : "Karte \"{card}\" wurde zu Board \"{board}\" hinzugefügt",
     "(circle)" : "(Kreis)",
-    "This week" : "Diese Woche"
+    "This week" : "Diese Woche",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Möchtest Du wirklich das Board {title} an {user} übertragen?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/de.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Neue Karte wird erstellt …",
     "\"{card}\" was added to \"{board}\"" : "Karte \"{card}\" wurde zu Board \"{board}\" hinzugefügt",
     "(circle)" : "(Kreis)",
-    "This week" : "Diese Woche"
+    "This week" : "Diese Woche",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Möchtest Du wirklich das Board {title} an {user} übertragen?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/de_DE.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Neue Karte wird erstellt …",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" wurde \"{board}\" hinzugefügt",
     "(circle)" : "(Kreis)",
-    "This week" : "Diese Woche"
+    "This week" : "Diese Woche",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Möchten Sie wirklich Das Board {title} an {user} übertragen?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/de_DE.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Neue Karte wird erstellt …",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" wurde \"{board}\" hinzugefügt",
     "(circle)" : "(Kreis)",
-    "This week" : "Diese Woche"
+    "This week" : "Diese Woche",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Möchten Sie wirklich Das Board {title} an {user} übertragen?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/hu.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Új kártya létrehozása…",
     "\"{card}\" was added to \"{board}\"" : "A(z) „{card}” hozzáadva a(z) „{board}” táblához",
     "(circle)" : "(kör)",
-    "This week" : "Ez a hét"
+    "This week" : "Ez a hét",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Biztos, hogy átadja a(z) {board} tábla tulajdonjogát {user} számára?"
 },
 "nplurals=2; plural=(n != 1);");

l10n/hu.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Új kártya létrehozása…",
     "\"{card}\" was added to \"{board}\"" : "A(z) „{card}” hozzáadva a(z) „{board}” táblához",
     "(circle)" : "(kör)",
-    "This week" : "Ez a hét"
+    "This week" : "Ez a hét",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Biztos, hogy átadja a(z) {board} tábla tulajdonjogát {user} számára?"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/pl.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Tworzę nową kartę…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" została dodana do \"{board}\"",
     "(circle)" : "(krąg)",
-    "This week" : "W tym tygodniu"
+    "This week" : "W tym tygodniu",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Czy na pewno chcesz przenieść tablicę {title} dla {user}?"
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");

l10n/pl.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Tworzę nową kartę…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" została dodana do \"{board}\"",
     "(circle)" : "(krąg)",
-    "This week" : "W tym tygodniu"
+    "This week" : "W tym tygodniu",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Czy na pewno chcesz przenieść tablicę {title} dla {user}?"
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }

l10n/pt_BR.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Criando o novo cartão…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" foi adicionado a \"{board}\"",
     "(circle)" : "(círculo)",
-    "This week" : "Esta semana"
+    "This week" : "Esta semana",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?"
 },
 "nplurals=2; plural=(n > 1);");

l10n/pt_BR.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Criando o novo cartão…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" foi adicionado a \"{board}\"",
     "(circle)" : "(círculo)",
-    "This week" : "Esta semana"
+    "This week" : "Esta semana",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "Tem certeza de que deseja transferir o quadro {title} para {user}?"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

l10n/tr.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "Yeni kart ekleniyor…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" kartı \"{board}\" panosuna eklendi",
     "(circle)" : "(çevre)",
-    "This week" : "Bu hafta"
+    "This week" : "Bu hafta",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "{title} panosunu {user} kullanıcısına aktarmak istediğinize emin misiniz?"
 },
 "nplurals=2; plural=(n > 1);");

l10n/tr.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "Yeni kart ekleniyor…",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" kartı \"{board}\" panosuna eklendi",
     "(circle)" : "(çevre)",
-    "This week" : "Bu hafta"
+    "This week" : "Bu hafta",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "{title} panosunu {user} kullanıcısına aktarmak istediğinize emin misiniz?"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

l10n/zh_HK.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "正在建立新卡片...",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" 已添加到 \"{board}\"",
     "(circle)" : "（社交圈子）",
-    "This week" : "本星期"
+    "This week" : "本星期",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "您想要轉移 {user} 的面板 {title} 嗎？"
 },
 "nplurals=1; plural=0;");

l10n/zh_HK.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "正在建立新卡片...",
     "\"{card}\" was added to \"{board}\"" : "\"{card}\" 已添加到 \"{board}\"",
     "(circle)" : "（社交圈子）",
-    "This week" : "本星期"
+    "This week" : "本星期",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "您想要轉移 {user} 的面板 {title} 嗎？"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

l10n/zh_TW.js

@@ -296,6 +296,7 @@ OC.L10N.register(
     "Creating the new card…" : "正在建立新卡片……",
     "\"{card}\" was added to \"{board}\"" : "「{card}」已新增至「{board}」",
     "(circle)" : "(circle)",
-    "This week" : "本週"
+    "This week" : "本週",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "您想要轉移 {user} 的看板 {title} 嗎？"
 },
 "nplurals=1; plural=0;");

l10n/zh_TW.json

@@ -294,6 +294,7 @@
     "Creating the new card…" : "正在建立新卡片……",
     "\"{card}\" was added to \"{board}\"" : "「{card}」已新增至「{board}」",
     "(circle)" : "(circle)",
-    "This week" : "本週"
+    "This week" : "本週",
+    "Are you sure you want to transfer the board {title} for {user} ?" : "您想要轉移 {user} 的看板 {title} 嗎？"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

lib/Migration/Version10800Date20220422061816.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Your name <your@email.com>
+ *
+ * @author Your name <your@email.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Deck\Migration;
+
+use Closure;
+use Doctrine\DBAL\Schema\SchemaException;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version10800Date20220422061816 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 * @throws SchemaException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_boards',
+			'idx_owner_modified',
+			[ 'owner', 'last_modified' ]
+		);
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_board_acl',
+			'idx_participant_type',
+			[ 'participant', 'type']
+		) || $indexAdded;
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_cards',
+			'idx_due_notified_archived_deleted', [
+				'duedate', 'notified', 'archived', 'deleted_at'
+			],
+		) || $indexAdded;
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_cards',
+			'idx_last_editor', [
+				'last_editor', 'description_prev'
+			], [],
+			// Adding a partial index on the description_prev as it is only used for a NULL check
+			['lengths' => [null, 1]]
+		) || $indexAdded;
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_attachment',
+			'idx_cardid_deletedat',
+			[ 'card_id', 'deleted_at']
+		) || $indexAdded;
+
+		$indexAdded = $this->addIndex($schema,
+			'deck_assigned_users',
+			'idx_card_participant',
+			[ 'card_id', 'participant']
+		) || $indexAdded;
+
+		return $indexAdded ? $schema : null;
+	}
+
+	private function addIndex(ISchemaWrapper $schema, string $table, string $indexName, array $columns, array $flags = [], array $options = []): bool {
+		$table = $schema->getTable($table);
+		if (!$table->hasIndex($indexName)) {
+			$table->addIndex($columns, $indexName, $flags, $options);
+			return true;
+		}
+
+		return false;
+	}
+}

lib/Service/StackService.php

@@ -181,6 +181,7 @@ class StackService {
 				if (array_key_exists($card->id, $labels)) {
 					$cards[$cardIndex]->setLabels($labels[$card->id]);
 				}
+				$cards[$cardIndex]->setAttachmentCount($this->attachmentService->count($card->getId()));
 			}
 			$stacks[$stackIndex]->setCards($cards);
 		}

src/App.vue

@@ -31,6 +31,7 @@
 			v-if="cardDetailsInModal && $route.params.cardId"
 			:clear-view-delay="0"
 			:title="t('deck', 'Card details')"
+			size="large"
 			@close="hideModal()">
 			<div class="modal__content modal__card">
 				<router-view name="sidebar" />
@@ -154,14 +155,6 @@ export default {
 			}
 		}
 	}
-
-	.modal__card {
-		min-width: 320px;
-		width: 50vw;
-		max-width: 800px;
-		min-height: 200px;
-		height: 80vh;
-	}
 </style>
 
 <style lang="scss">

src/components/card/CardSidebar.vue

@@ -225,6 +225,8 @@ export default {
 		max-width: calc(100% - #{$modal-padding*2});
 		padding: 0 14px;
 		max-height: 100%;
+		overflow: initial;
+
 		&::v-deep {
 			.app-sidebar-header {
 				position: sticky;
@@ -240,6 +242,10 @@ export default {
 				background-color: var(--color-main-background);
 			}
 
+			.app-sidebar__tab {
+				overflow: initial;
+			}
+
 			#emptycontent, .emptycontent {
 				margin-top: 88px;
 			}

src/components/cards/CardMenu.vue

@@ -135,6 +135,10 @@ export default {
 		},
 		activeBoards() {
 			return this.$store.getters.boards.filter((item) => item.deletedAt === 0 && item.archived === false)
+		},
+
+		boardId() {
+			return this.card?.boardId ? this.card.boardId : this.$route.params.id
 		}
 	},
 	methods: {
@@ -167,10 +171,13 @@ export default {
 				},
 			})
 		},
-		moveCard() {
+		async moveCard() {
 			this.copiedCard = Object.assign({}, this.card)
 			this.copiedCard.stackId = this.selectedStack.id
 			this.$store.dispatch('moveCard', this.copiedCard)
+			if (parseInt(this.boardId) === parseInt(this.selectedStack.boardId)) {
+				await this.$store.commit('addNewCard', { ...this.copiedCard })
+			}
 			this.modalShow = false
 		},
 		async loadStacksFromBoard(board) {

src/init-talk.js

@@ -44,14 +44,33 @@ window.addEventListener('DOMContentLoaded', () => {
 	window.OCA.Talk.registerMessageAction({
 		label: t('deck', 'Create a card'),
 		icon: 'icon-deck',
-		async callback({ message: { message, actorDisplayName }, metadata: { name: conversationName, token: conversationToken } }) {
-			const shortenedMessageCandidate = message.replace(/^(.{255}[^\s]*).*/, '$1')
-			const shortenedMessage = shortenedMessageCandidate === '' ? message.slice(0, 255) : shortenedMessageCandidate
+		async callback({ message: { message, messageParameters, actorDisplayName }, metadata: { name: conversationName, token: conversationToken } }) {
+			const parsedMessage = message.replace(/{[a-z0-9-_]+}/gi, function(parameter) {
+				const parameterName = parameter.substr(1, parameter.length - 2)
+
+				if (messageParameters[parameterName]) {
+					if (messageParameters[parameterName].type === 'file' && messageParameters[parameterName].path) {
+						return messageParameters[parameterName].path
+					}
+					if (messageParameters[parameterName].type === 'user' || messageParameters[parameterName].type === 'call') {
+						return '@' + messageParameters[parameterName].name
+					}
+					if (messageParameters[parameterName].name) {
+						return messageParameters[parameterName].name
+					}
+				}
+
+				// Do not replace so insert with curly braces again
+				return parameter
+			})
+
+			const shortenedMessageCandidate = parsedMessage.replace(/^(.{255}[^\s]*).*/, '$1')
+			const shortenedMessage = shortenedMessageCandidate === '' ? parsedMessage.substr(0, 255) : shortenedMessageCandidate
 			try {
 				await buildSelector(CardCreateDialog, {
 					props: {
 						title: shortenedMessage,
-						description: message + '\n\n' + '['
+						description: parsedMessage + '\n\n' + '['
 							+ t('deck', 'Message from {author} in {conversationName}', {
 								author: actorDisplayName,
 								conversationName,

src/store/card.js

@@ -264,6 +264,9 @@ export default {
 				Vue.set(state.cards[existingIndex], 'attachmentCount', state.cards[existingIndex].attachmentCount - 1)
 			}
 		},
+		addNewCard(state, card) {
+			state.cards.push(card)
+		},
 	},
 	actions: {
 		async addCard({ commit }, card) {

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="lib/Activity/ActivityManager.php">
     <TypeDoesNotContainType occurrences="1">
       <code>$message !== null</code>
@@ -10,17 +10,6 @@
       <code>(int)$subjectParams['comment']</code>
     </InvalidScalarArgument>
   </file>
-  <file src="lib/AppInfo/Application.php">
-    <InvalidArgument occurrences="7">
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-      <code>registerEventListener</code>
-    </InvalidArgument>
-  </file>
   <file src="lib/Command/UserExport.php">
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>void</code>
@@ -49,11 +38,6 @@
       <code>$this-&gt;userId</code>
     </UndefinedThisPropertyFetch>
   </file>
-  <file src="lib/Controller/BoardController.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\OCP\Deck\DB\Board</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/Controller/CommentsApiController.php">
     <InvalidScalarArgument occurrences="6">
       <code>$cardId</code>
@@ -107,11 +91,6 @@
       <code>$cardId</code>
     </ParamNameMismatch>
   </file>
-  <file src="lib/Db/AttachmentMapper.php">
-    <UndefinedVariable occurrences="1">
-      <code>$query</code>
-    </UndefinedVariable>
-  </file>
   <file src="lib/Db/BoardMapper.php">
     <ParamNameMismatch occurrences="1">
       <code>$boardId</code>
@@ -184,6 +163,11 @@
       <code>$stackId</code>
     </ParamNameMismatch>
   </file>
+  <file src="lib/Migration/Version10800Date20220422061816.php">
+    <MoreSpecificImplementedParamType occurrences="1">
+      <code>$schemaClosure</code>
+    </MoreSpecificImplementedParamType>
+  </file>
   <file src="lib/Notification/Notifier.php">
     <RedundantCast occurrences="4">
       <code>(string) $l-&gt;t('%s has mentioned you in a comment on "%s".', [$dn, $params[0]])</code>