Merge pull request #4157 from nextcloud/release/1.8.1

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

.github/workflows/cypress.yml

@@ -23,7 +23,7 @@ jobs:
         # containers: [1, 2, 3]
         php-versions: [ '7.4' ]
         databases: [ 'sqlite' ]
-        server-versions: [ 'master' ]
+        server-versions: [ 'stable25' ]
 
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
@@ -77,7 +77,7 @@ jobs:
           php occ app:enable deck
           php occ app:list
           cd apps/deck
-          composer install
+          composer install --no-dev
           npm ci
           npm run build
           cd ../../

.github/workflows/integration.yml

@@ -27,13 +27,13 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       postgres:
-        image: postgres
+        image: postgres:14
         ports:
           - 4445:5432/tcp
         env:

.github/workflows/phpunit.yml

@@ -28,13 +28,13 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       postgres:
-        image: postgres
+        image: postgres:14
         ports:
           - 4445:5432/tcp
         env:

.github/workflows/psalm.yml

@@ -0,0 +1,35 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Static analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+
+    name: Nextcloud
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none
+
+      - name: Install dependencies
+        run: composer i
+
+      - name: Run coding standards check
+        run: composer run psalm

.github/workflows/static-analysis.yml

@@ -1,31 +0,0 @@
-name: Static analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  static-psalm-analysis:
-      runs-on: ubuntu-latest
-      strategy:
-          matrix:
-              ocp-version: [ 'dev-master' ]
-      name: Nextcloud ${{ matrix.ocp-version }}
-      steps:
-          - name: Checkout
-            uses: actions/checkout@v3
-          - name: Set up php
-            uses: shivammathur/setup-php@2.21.2
-            with:
-                php-version: 7.4
-                tools: composer:v1
-                coverage: none
-          - name: Install dependencies
-            run: composer i
-          - name: Install dependencies
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-          - name: Run coding standards check
-            run: composer run psalm

.github/workflows/update-nextcloud-ocp.yml

@@ -0,0 +1,65 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Update nextcloud/ocp
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "5 2 * * 0"
+
+jobs:
+  update-nextcloud-ocp:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        branches: ["master", "stable25", "stable24", "stable23"]
+
+    name: update-nextcloud-ocp-${{ matrix.branches }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.branches }}
+          submodules: true
+
+      - name: Set up php7.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+
+      - name: Composer install
+        run: composer install
+
+      - name: Composer update nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
+        continue-on-error: true
+
+      - name: Reset checkout dirs
+        run: |
+          git clean -f 3rdparty
+          git clean -f vendor
+          git checkout 3rdparty vendor
+        continue-on-error: true
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.COMMAND_BOT_PAT }}
+          commit-message: Update psalm baseline
+          committer: GitHub <noreply@github.com>
+          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
+          signoff: true
+          branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp
+          title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency"
+          body: |
+            Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
+          labels: |
+            dependencies
+            3. to review

CHANGELOG.md

@@ -1,8 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.8.0-beta.1
-### Enhancements
+## 1.8.1
+
+### Fixed
+
+ - Fix Duedate activity @nickvergessen [#4155](https://github.com/nextcloud/deck/pull/4155)
+
+## 1.8.0
+
+### Added
 
 - Nextcloud 25 compatibility
 - Performance improvements
@@ -14,10 +21,26 @@ All notable changes to this project will be documented in this file.
   - Improve filter popover accessibility @juliushaertl [#3820](https://github.com/nextcloud/deck/pull/3820)
   - Set ids to skip to content/navigation @juliushaertl [#3924](https://github.com/nextcloud/deck/pull/3924)
   - Invert icons properly in dark mode @juliushaertl [#3939](https://github.com/nextcloud/deck/pull/3939)
-- Bump dependencies
+- Implement card reference widget @eneiluj [#4031](https://github.com/nextcloud/deck/pull/4031)
+- Implement new dashboard widget interfaces @eneiluj [#4033](https://github.com/nextcloud/deck/pull/4033)
+- Add related resources panel to board sharing tab sidebar @Pytal [#4000](https://github.com/nextcloud/deck/pull/4000)
 
 ### Fixed
 
+- Fix sorting stacks [#4116](https://github.com/nextcloud/deck/pull/4116)
+- Fix issue with duedate format [#4140](https://github.com/nextcloud/deck/pull/4140)
+- Fix missing icon for activity rendering [#4090](https://github.com/nextcloud/deck/pull/4090)
+- disables autocomplete on card creation [#4142](https://github.com/nextcloud/deck/pull/4142)
+- Set event link also for notifications that get emitted from activities [#4117](https://github.com/nextcloud/deck/pull/4117)
+- Fix attachment creator name: show display name @eneiluj [#4036](https://github.com/nextcloud/deck/pull/4036)
+- Fix reference provider when caching @eneiluj [#4056](https://github.com/nextcloud/deck/pull/4056)
+- Use global import for nextcloud-vue [#4072](https://github.com/nextcloud/deck/pull/4072)
+- Disable Create card button while no stack is chosen @icewind1991 [#4014](https://github.com/nextcloud/deck/pull/4014)
+- Adjust testing matrix for Nextcloud 25 on stable25 @nickvergessen [#4068](https://github.com/nextcloud/deck/pull/4068)
+- Fix Card menu not displaying when description is not set  @marcelklehr [#4105](https://github.com/nextcloud/deck/pull/4105)
+- Reference widget adjustments for Text [#4075](https://github.com/nextcloud/deck/pull/4075)
+- use OCP\Collaboration\Reference\Reference [#4078](https://github.com/nextcloud/deck/pull/4078)
+- Cache user membership for circles [#4141](https://github.com/nextcloud/deck/pull/4141)
 - set last modified when the card was found. Fixes #3763 @ylebre [#3796](https://github.com/nextcloud/deck/pull/3796)
 - Increase file count after sharing @luka-nextcloud [#3682](https://github.com/nextcloud/deck/pull/3682)
 - Align Duedate-delete icon properly - fixes nextcloud/deck#3791 @Ben-Ro [#3811](https://github.com/nextcloud/deck/pull/3811)
@@ -462,7 +485,7 @@ Android app team for helping to improve our REST API:
 - Fix comment activities on Nextcloud 15
 - Fix issues with Edge
 - API: Fix numeric types that were returned as strings
-- API: Fix If-Modified-Since header parsing  
+- API: Fix If-Modified-Since header parsing
 
 
 ## 0.5.1 - 2018-12-05
@@ -589,7 +612,7 @@ Android app team for helping to improve our REST API:
 ### Fixed
 - Various frontend fixes
 - Fix sidebar drag issues
-- Improvements for IE11 
+- Improvements for IE11
 - Fix bug when draging a card to an empty stack
 
 ## 0.2.1 - 2017-07-04
@@ -663,7 +686,7 @@ Android app team for helping to improve our REST API:
 
 ### Fixed
 - Various styling improvements
-- Fix problems with MySQL and PostgreSQL 
+- Fix problems with MySQL and PostgreSQL
 - Select first color by default when creating boards
 - Fix error when changing board permissions
 
@@ -671,9 +694,9 @@ Android app team for helping to improve our REST API:
 
 ### Added
 - Sharing boards with other users
-- Create and manage boards 
+- Create and manage boards
 - Sort cards on stacks by drag-and-drop
 - Assign labels
 - Markdown notes for each card
-- Archive cards 
+- Archive cards
 

appinfo/info.xml

@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.8.0-beta.1</version>
+    <version>1.8.1</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>

composer.json

@@ -14,12 +14,12 @@
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
-		"christophwurst/nextcloud": "dev-master",
 		"phpunit/phpunit": "^9",
 		"nextcloud/coding-standard": "^1.0.0",
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
-		"php-parallel-lint/php-parallel-lint": "^1.2"
+		"php-parallel-lint/php-parallel-lint": "^1.2",
+		"nextcloud/ocp": "dev-stable25"
 	},
 	"config": {
 		"optimize-autoloader": true,
@@ -44,5 +44,10 @@
 		],
 		"test:unit": "phpunit -c tests/phpunit.xml",
 		"test:integration": "phpunit -c tests/phpunit.integration.xml && cd tests/integration && ./run.sh"
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"OCP\\": "vendor/nextcloud/ocp/OCP"
+		}
 	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "33c2fe0cccf29841e021001c6430310a",
+    "content-hash": "445858d371d9a1c7057d0603c566966a",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -299,50 +299,6 @@
             ],
             "time": "2021-03-30T17:13:30+00:00"
         },
-        {
-            "name": "christophwurst/nextcloud",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "6a6fe9467e4427f17b1fade97d6252793fc7a9e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/6a6fe9467e4427f17b1fade97d6252793fc7a9e8",
-                "reference": "6a6fe9467e4427f17b1fade97d6252793fc7a9e8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ~8.0 || ~8.1",
-                "psr/container": "^1.1.1",
-                "psr/event-dispatcher": "^1.0",
-                "psr/log": "^1.1"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "25.0.0-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Christoph Wurst",
-                    "email": "christoph@winzerhof-wurst.at"
-                }
-            ],
-            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
-            "support": {
-                "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
-                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master"
-            },
-            "time": "2022-07-06T02:28:38+00:00"
-        },
         {
             "name": "composer/package-versions-deprecated",
             "version": "1.11.99.5",
@@ -1234,6 +1190,49 @@
             },
             "time": "2021-11-10T08:44:10+00:00"
         },
+        {
+            "name": "nextcloud/ocp",
+            "version": "dev-stable25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nextcloud-deps/ocp.git",
+                "reference": "a11e9d9784052363158c97904062daa855518505"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/a11e9d9784052363158c97904062daa855518505",
+                "reference": "a11e9d9784052363158c97904062daa855518505",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ~8.0 || ~8.1",
+                "psr/container": "^1.1.1",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "26.0.0-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "AGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Christoph Wurst",
+                    "email": "christoph@winzerhof-wurst.at"
+                }
+            ],
+            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
+            "support": {
+                "issues": "https://github.com/nextcloud-deps/ocp/issues",
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable25"
+            },
+            "time": "2022-10-20T00:52:59+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.14.0",
@@ -5392,7 +5391,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "roave/security-advisories": 20,
-        "christophwurst/nextcloud": 20
+        "nextcloud/ocp": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

img/archive.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g transform="translate(0 -1036.362)"><path d="M1.93 1041.296c-.185 0-.336.138-.336.31v9.842c0 .172.15.313.336.313h12.517c.185 0 .333-.14.333-.313v-9.842c0-.172-.148-.31-.333-.31H1.93zm4.124 1.507h4.223c.39 0 .705.314.705.704v.43c0 .39-.315.705-.705.705H6.054a.703.703 0 0 1-.705-.705v-.43c0-.39.314-.704.705-.704z"/><rect width="15.742" height="2.296" x=".136" y="1037.543" ry=".42"/></g></svg>

lib/Activity/ActivityManager.php

@@ -367,7 +367,15 @@ class ActivityManager {
 			case self::SUBJECT_CARD_USER_ASSIGN:
 			case self::SUBJECT_CARD_USER_UNASSIGN:
 				$subjectParams = $this->findDetailsForCard($entity->getId(), $subject);
-				break;
+
+				if (isset($additionalParams['after']) && $additionalParams['after'] instanceof \DateTimeInterface) {
+					$additionalParams['after'] = $additionalParams['after']->format('c');
+				}
+				if (isset($additionalParams['before']) && $additionalParams['before'] instanceof \DateTimeInterface) {
+					$additionalParams['before'] = $additionalParams['before']->format('c');
+				}
+
+			break;
 			case self::SUBJECT_ATTACHMENT_CREATE:
 			case self::SUBJECT_ATTACHMENT_UPDATE:
 			case self::SUBJECT_ATTACHMENT_DELETE:

lib/Activity/DeckProvider.php

@@ -121,6 +121,7 @@ class DeckProvider implements IProvider {
 				'link' => $this->deckUrl('/board/' . $event->getObjectId()),
 			];
 			$params['board'] = $board;
+			$event->setLink($this->deckUrl('/board/' . $event->getObjectId()));
 		}
 
 		if (isset($subjectParams['card']) && $event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
@@ -134,8 +135,8 @@ class DeckProvider implements IProvider {
 			];
 
 			if (array_key_exists('board', $subjectParams)) {
-				$archivedParam = $subjectParams['card']['archived'] ? 'archived/' : '';
 				$card['link'] = $this->cardService->getRedirectUrlForCard($event->getObjectId());
+				$event->setLink($card['link']);
 			}
 			$params['card'] = $card;
 		}
@@ -311,12 +312,19 @@ class DeckProvider implements IProvider {
 			$userLanguage = $this->config->getUserValue($event->getAuthor(), 'core', 'lang', $this->l10nFactory->findLanguage());
 			$userLocale = $this->config->getUserValue($event->getAuthor(), 'core', 'locale', $this->l10nFactory->findLocale());
 			$l10n = $this->l10nFactory->get('deck', $userLanguage, $userLocale);
-			$date = new \DateTime($subjectParams['after']);
-			$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			if (is_array($subjectParams['after'])) {
+				// Unluckily there was a time when we stored jsonSerialized date objects in the database
+				// Broken in 1.8.0 and fixed again in 1.8.1
+				$date = new \DateTime($subjectParams['after']['date']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			} else {
+				$date = new \DateTime($subjectParams['after']);
+				$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+			}
 			$params['after'] = [
 				'type' => 'highlight',
 				'id' => 'dt:' . $subjectParams['after'],
-				'name' => $l10n->l('datetime', $date)
+				'name' => $l10n->l('datetime', $date),
 			];
 		}
 		return $params;

lib/Db/Card.php

@@ -108,7 +108,7 @@ class Card extends RelationalEntity {
 		$this->addType('archived', 'boolean');
 		$this->addType('notified', 'boolean');
 		$this->addType('deletedAt', 'integer');
-		$this->addType('duedate', 'string');
+		$this->addType('duedate', 'datetime');
 		$this->addRelation('labels');
 		$this->addRelation('assignedUsers');
 		$this->addRelation('attachments');
@@ -126,20 +126,6 @@ class Card extends RelationalEntity {
 		$this->databaseType = $type;
 	}
 
-	public function getDueDateTime(): ?DateTime {
-		return $this->duedate ? new DateTime($this->duedate) : null;
-	}
-
-	public function getDuedate($isoFormat = false): ?string {
-		$dt = $this->getDueDateTime();
-		$format = 'c';
-		if (!$isoFormat && $this->databaseType === 'mysql') {
-			$format = 'Y-m-d H:i:s';
-		}
-
-		return $dt ? $dt->format($format) : null;
-	}
-
 	public function getCalendarObject(): VCalendar {
 		$calendar = new VCalendar();
 		$event = $calendar->createComponent('VTODO');
@@ -148,7 +134,7 @@ class Card extends RelationalEntity {
 			$creationDate = new DateTime();
 			$creationDate->setTimestamp($this->createdAt);
 			$event->DTSTAMP = $creationDate;
-			$event->DUE = new DateTime($this->getDuedate(true), new DateTimeZone('UTC'));
+			$event->DUE = new DateTime($this->getDuedate()->format('c'), new DateTimeZone('UTC'));
 		}
 		$event->add('RELATED-TO', 'deck-stack-' . $this->getStackId());
 

lib/Db/RelationalEntity.php

@@ -72,6 +72,9 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 				$propertyReflection = $reflection->getProperty($property);
 				if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
 					$json[$property] = $this->getter($property);
+					if ($json[$property] instanceof \DateTimeInterface) {
+						$json[$property] = $json[$property]->format('c');
+					}
 				}
 			}
 		}

lib/Model/CardDetails.php

@@ -54,7 +54,7 @@ class CardDetails extends Card {
 		$today = new DateTime();
 		$today->setTime(0, 0);
 
-		$match_date = $this->card->getDueDateTime();
+		$match_date = $this->card->getDuedate();
 		if (!$match_date) {
 			return Card::DUEDATE_FUTURE;
 		}

lib/Notification/NotificationHelper.php

@@ -129,7 +129,7 @@ class NotificationHelper {
 					->setSubject('card-overdue', [
 						$card->getTitle(), $board->getTitle()
 					])
-					->setDateTime(new DateTime($card->getDuedate()));
+					->setDateTime($card->getDuedate());
 				$this->notificationManager->notify($notification);
 			}
 		}
@@ -242,7 +242,7 @@ class NotificationHelper {
 		}
 		return $this->boards[$boardId];
 	}
-	
+
 	private function generateBoardShared(Board $board, string $userId): INotification {
 		$notification = $this->notificationManager->createNotification();
 		$notification

lib/Reference/CardReferenceProvider.php

@@ -22,7 +22,6 @@
 
 namespace OCA\Deck\Reference;
 
-use OC\Collaboration\Reference\Reference;
 use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\Attachment;
@@ -33,6 +32,7 @@ use OCA\Deck\Service\CardService;
 use OCA\Deck\Service\StackService;
 use OCP\Collaboration\Reference\IReference;
 use OCP\Collaboration\Reference\IReferenceProvider;
+use OCP\Collaboration\Reference\Reference;
 use OCP\IURLGenerator;
 
 class CardReferenceProvider implements IReferenceProvider {

lib/Service/CardService.php

@@ -337,11 +337,11 @@ class CardService {
 		$card->setType($type);
 		$card->setOrder($order);
 		$card->setOwner($owner);
-		$card->setDuedate($duedate);
+		$card->setDuedate($duedate ? new \DateTime($duedate) : null);
 		$resetDuedateNotification = false;
 		if (
 			$card->getDuedate() === null ||
-			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate() ?? ''))
+			($card->getDuedate()) != ($changes->getBefore()->getDuedate())
 		) {
 			$card->setNotified(false);
 			$resetDuedateNotification = true;

lib/Service/CirclesService.php

@@ -41,6 +41,8 @@ use Throwable;
 class CirclesService {
 	private bool $circlesEnabled;
 
+	private $userCircleCache = [];
+
 	public function __construct(IAppManager $appManager) {
 		$this->circlesEnabled = $appManager->isEnabledForUser('circles');
 	}
@@ -70,13 +72,24 @@ class CirclesService {
 			return false;
 		}
 
+		if (isset($this->userCircleCache[$circleId][$userId])) {
+			return $this->userCircleCache[$circleId][$userId];
+		}
+
 		try {
 			$circlesManager = Server::get(CirclesManager::class);
 			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
 			$circlesManager->startSession($federatedUser);
 			$circle = $circlesManager->getCircle($circleId);
 			$member = $circle->getInitiator();
-			return $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
+			$isUserInCircle = $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
+
+			if (!isset($this->userCircleCache[$circleId])) {
+				$this->userCircleCache[$circleId] = [];
+			}
+			$this->userCircleCache[$circleId][$userId] = $isUserInCircle;
+
+			return $isUserInCircle;
 		} catch (Throwable $e) {
 		}
 		return false;

lib/Service/StackService.php

@@ -352,6 +352,7 @@ class StackService {
 		$this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
 		$stackToSort = $this->stackMapper->find($id);
 		$stacks = $this->stackMapper->findAll($stackToSort->getBoardId());
+		usort($stacks, static fn (Stack $stackA, Stack $stackB) => $stackA->getOrder() - $stackB->getOrder());
 		$result = [];
 		$i = 0;
 		foreach ($stacks as $stack) {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "deck",
-  "version": "1.8.0-beta.1",
+  "version": "1.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "deck",
-      "version": "1.8.0-beta.1",
+      "version": "1.8.0",
       "license": "agpl",
       "dependencies": {
         "@babel/polyfill": "^7.12.1",

package.json

@@ -1,106 +1,106 @@
 {
-  "name": "deck",
-  "description": "",
-  "version": "1.8.0-beta.1",
-  "authors": [
-    {
-      "name": "Julius Härtl",
-      "email": "jus@bitgrid.net",
-      "role": "Developer"
-    },
-    {
-      "name": "Michael Weimann",
-      "email": "mail@michael-weimann.eu",
-      "role": "Developer"
-    }
-  ],
-  "license": "agpl",
-  "private": true,
-  "scripts": {
-    "build": "NODE_ENV=production webpack --progress --config webpack.js",
-    "dev": "NODE_ENV=development webpack --progress --config webpack.js",
-    "watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
-    "lint": "eslint --ext .js,.vue src",
-    "lint:fix": "eslint --ext .js,.vue src --fix",
-    "stylelint": "stylelint src",
-    "stylelint:fix": "stylelint src --fix",
-    "test": "jest",
-    "test:coverage": "jest --coverage"
-  },
-  "dependencies": {
-    "@babel/polyfill": "^7.12.1",
-    "@babel/runtime": "^7.19.0",
-    "@juliushaertl/vue-richtext": "^1.0.1",
-    "@nextcloud/auth": "^2.0.0",
-    "@nextcloud/axios": "^2.0.0",
-    "@nextcloud/dialogs": "^3.2.0",
-    "@nextcloud/event-bus": "^3.0.2",
-    "@nextcloud/files": "^2.1.0",
-    "@nextcloud/initial-state": "^2.0.0",
-    "@nextcloud/l10n": "^1.6.0",
-    "@nextcloud/moment": "^1.2.1",
-    "@nextcloud/router": "^2.0.0",
-    "@nextcloud/vue": "^7.0.0-beta.4",
-    "@nextcloud/vue-dashboard": "^2.0.1",
-    "@nextcloud/vue-richtext": "^2.0.1",
-    "blueimp-md5": "^2.19.0",
-    "dompurify": "^2.4.0",
-    "lodash": "^4.17.21",
-    "markdown-it": "^13.0.1",
-    "markdown-it-link-attributes": "^4.0.1",
-    "markdown-it-task-checkbox": "^1.0.6",
-    "moment": "^2.29.4",
-    "nextcloud-vue-collections": "^0.10.0",
-    "p-queue": "^7.3.0",
-    "url-search-params-polyfill": "^8.1.1",
-    "vue": "^2.7.9",
-    "vue-at": "^2.5.0",
-    "vue-click-outside": "^1.1.0",
-    "vue-easymde": "^2.0.0",
-    "vue-infinite-loading": "^2.4.5",
-    "vue-material-design-icons": "^5.1.2",
-    "vue-router": "^3.6.5",
-    "vue-smooth-dnd": "^0.8.1",
-    "vuex": "^3.6.2",
-    "vuex-router-sync": "^5.0.0"
-  },
-  "browserslist": [
-    "extends @nextcloud/browserslist-config"
-  ],
-  "engines": {
-    "node": "^16.0.0",
-    "npm": "^7.0.0 || ^8.0.0"
-  },
-  "devDependencies": {
-    "@nextcloud/babel-config": "^1.0.0",
-    "@nextcloud/browserslist-config": "^2.3.0",
-    "@nextcloud/eslint-config": "^8.0.0",
-    "@nextcloud/stylelint-config": "^2.2.0",
-    "@nextcloud/webpack-vue-config": "^5.3.0",
-    "@relative-ci/agent": "^4.1.0",
-    "@vue/test-utils": "^1.3.0",
-    "cypress": "^10.8.0",
-    "eslint-webpack-plugin": "^3.2.0",
-    "jest": "^29.0.1",
-    "jest-serializer-vue": "^2.0.2",
-    "stylelint-webpack-plugin": "^3.3.0",
-    "vue-jest": "^3.0.7",
-    "vue-template-compiler": "^2.7.9"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "vue"
-    ],
-    "moduleNameMapper": {
-      "^@/(.*)$": "<rootDir>/src/$1"
-    },
-    "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-      ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
-    },
-    "snapshotSerializers": [
-      "<rootDir>/node_modules/jest-serializer-vue"
-    ]
-  }
+	"name": "deck",
+	"description": "",
+	"version": "1.8.1",
+	"authors": [
+		{
+			"name": "Julius Härtl",
+			"email": "jus@bitgrid.net",
+			"role": "Developer"
+		},
+		{
+			"name": "Michael Weimann",
+			"email": "mail@michael-weimann.eu",
+			"role": "Developer"
+		}
+	],
+	"license": "agpl",
+	"private": true,
+	"scripts": {
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
+		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
+		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
+		"lint": "eslint --ext .js,.vue src",
+		"lint:fix": "eslint --ext .js,.vue src --fix",
+		"stylelint": "stylelint src",
+		"stylelint:fix": "stylelint src --fix",
+		"test": "jest",
+		"test:coverage": "jest --coverage"
+	},
+	"dependencies": {
+		"@babel/polyfill": "^7.12.1",
+		"@babel/runtime": "^7.19.0",
+		"@juliushaertl/vue-richtext": "^1.0.1",
+		"@nextcloud/auth": "^2.0.0",
+		"@nextcloud/axios": "^2.0.0",
+		"@nextcloud/dialogs": "^3.2.0",
+		"@nextcloud/event-bus": "^3.0.2",
+		"@nextcloud/files": "^2.1.0",
+		"@nextcloud/initial-state": "^2.0.0",
+		"@nextcloud/l10n": "^1.6.0",
+		"@nextcloud/moment": "^1.2.1",
+		"@nextcloud/router": "^2.0.0",
+		"@nextcloud/vue": "^7.0.0-beta.4",
+		"@nextcloud/vue-dashboard": "^2.0.1",
+		"@nextcloud/vue-richtext": "^2.0.1",
+		"blueimp-md5": "^2.19.0",
+		"dompurify": "^2.4.0",
+		"lodash": "^4.17.21",
+		"markdown-it": "^13.0.1",
+		"markdown-it-link-attributes": "^4.0.1",
+		"markdown-it-task-checkbox": "^1.0.6",
+		"moment": "^2.29.4",
+		"nextcloud-vue-collections": "^0.10.0",
+		"p-queue": "^7.3.0",
+		"url-search-params-polyfill": "^8.1.1",
+		"vue": "^2.7.9",
+		"vue-at": "^2.5.0",
+		"vue-click-outside": "^1.1.0",
+		"vue-easymde": "^2.0.0",
+		"vue-infinite-loading": "^2.4.5",
+		"vue-material-design-icons": "^5.1.2",
+		"vue-router": "^3.6.5",
+		"vue-smooth-dnd": "^0.8.1",
+		"vuex": "^3.6.2",
+		"vuex-router-sync": "^5.0.0"
+	},
+	"browserslist": [
+		"extends @nextcloud/browserslist-config"
+	],
+	"engines": {
+		"node": "^16.0.0",
+		"npm": "^7.0.0 || ^8.0.0"
+	},
+	"devDependencies": {
+		"@nextcloud/babel-config": "^1.0.0",
+		"@nextcloud/browserslist-config": "^2.3.0",
+		"@nextcloud/eslint-config": "^8.0.0",
+		"@nextcloud/stylelint-config": "^2.2.0",
+		"@nextcloud/webpack-vue-config": "^5.3.0",
+		"@relative-ci/agent": "^4.1.0",
+		"@vue/test-utils": "^1.3.0",
+		"cypress": "^10.8.0",
+		"eslint-webpack-plugin": "^3.2.0",
+		"jest": "^29.0.1",
+		"jest-serializer-vue": "^2.0.2",
+		"stylelint-webpack-plugin": "^3.3.0",
+		"vue-jest": "^3.0.7",
+		"vue-template-compiler": "^2.7.9"
+	},
+	"jest": {
+		"moduleFileExtensions": [
+			"js",
+			"vue"
+		],
+		"moduleNameMapper": {
+			"^@/(.*)$": "<rootDir>/src/$1"
+		},
+		"transform": {
+			"^.+\\.js$": "<rootDir>/node_modules/babel-jest",
+			".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
+		},
+		"snapshotSerializers": [
+			"<rootDir>/node_modules/jest-serializer-vue"
+		]
+	}
 }

src/BoardSelector.vue

@@ -41,7 +41,7 @@
 	</NcModal>
 </template>
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
+import { NcModal } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 

src/CardCreateDialog.vue

@@ -92,9 +92,7 @@
 
 <script>
 import { generateUrl } from '@nextcloud/router'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { NcModal, NcMultiselect, NcEmptyContent } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { CardApi } from './services/CardApi.js'
 

src/CardSelector.vue

@@ -62,8 +62,7 @@
 
 <script>
 import { generateUrl } from '@nextcloud/router'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import { NcModal, NcMultiselect } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 
 export default {

src/components/board/SharingTabSidebar.vue

@@ -41,9 +41,9 @@
 					<span v-if="acl.type===7">{{ t('deck', '(Circle)') }}</span>
 				</span>
 
-				<ActionCheckbox v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0) && (canManage || (canEdit && canShare))" :checked="acl.permissionEdit" @change="clickEditAcl(acl)">
+				<NcActionCheckbox v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0) && (canManage || (canEdit && canShare))" :checked="acl.permissionEdit" @change="clickEditAcl(acl)">
 					{{ t('deck', 'Can edit') }}
-				</ActionCheckbox>
+				</NcActionCheckbox>
 				<NcActions v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0)" :force-menu="true">
 					<ActionCheckbox v-if="canManage || canShare" :checked="acl.permissionShare" @change="clickShareAcl(acl)">
 						{{ t('deck', 'Can share') }}
@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import { NcAvatar, NcMultiselect, NcActions, NcActionButton, ActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
+import { NcAvatar, NcMultiselect, NcActions, NcActionButton, NcActionCheckbox, NcRelatedResourcesPanel } from '@nextcloud/vue'
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters, mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -87,7 +87,7 @@ export default {
 		NcAvatar,
 		NcActions,
 		NcActionButton,
-		ActionCheckbox,
+		NcActionCheckbox,
 		NcMultiselect,
 		CollectionList,
 		NcRelatedResourcesPanel,

src/components/card/AttachmentList.vue

@@ -76,15 +76,15 @@
 					</NcActionButton>
 				</NcActions>
 				<NcActions v-if="removable && !isReadOnly" :force-menu="true">
-					<ActionLink v-if="attachment.extendedData.fileid" icon="icon-folder" :href="internalLink(attachment)">
+					<NcActionLink v-if="attachment.extendedData.fileid" icon="icon-folder" :href="internalLink(attachment)">
 						{{ t('deck', 'Show in Files') }}
-					</ActionLink>
-					<ActionLink v-if="attachment.extendedData.fileid"
+					</NcActionLink>
+					<NcActionLink v-if="attachment.extendedData.fileid"
 						icon="icon-download"
 						:href="downloadLink(attachment)"
 						download>
 						{{ t('deck', 'Download') }}
-					</ActionLink>
+					</NcActionLink>
 					<NcActionButton v-if="attachment.extendedData.fileid && !isReadOnly" icon="icon-delete" @click="unshareAttachment(attachment)">
 						{{ t('deck', 'Remove attachment') }}
 					</NcActionButton>
@@ -103,7 +103,7 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import { NcActions, NcActionButton, ActionLink } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcActionLink } from '@nextcloud/vue'
 import AttachmentDragAndDrop from '../AttachmentDragAndDrop.vue'
 import relativeDate from '../../mixins/relativeDate.js'
 import { formatFileSize } from '@nextcloud/files'
@@ -127,7 +127,7 @@ export default {
 	components: {
 		NcActions,
 		NcActionButton,
-		ActionLink,
+		NcActionLink,
 		AttachmentDragAndDrop,
 	},
 	mixins: [relativeDate, attachmentUpload],

src/components/cards/CardBadges.vue

@@ -36,7 +36,7 @@
 			<span>{{ checkListCheckedCount }}/{{ checkListCount }}</span>
 		</div>
 
-		<TextIcon v-else-if="card.description.trim() && checkListCount == 0" :size="16" decorative />
+		<TextIcon v-else-if="card.description && card.description.trim() && checkListCount == 0" :size="16" decorative />
 
 		<div v-if="card.attachmentCount > 0" class="icon-badge">
 			<AttachmentIcon :size="16" />

src/components/cards/CardItem.vue

@@ -55,6 +55,7 @@
 					<input v-model="copiedCard.title"
 						v-focus
 						type="text"
+						autocomplete="off"
 						required
 						pattern=".*\S+.*">
 					<input type="submit" value="" class="icon-confirm">

src/init-card-reference.js

@@ -20,7 +20,7 @@
  */
 
 import { registerWidget } from '@nextcloud/vue-richtext'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+import { Tooltip } from '@nextcloud/vue'
 import Vue from 'vue'
 import CardReferenceWidget from './views/CardReferenceWidget.vue'
 
@@ -36,7 +36,6 @@ registerWidget('deck-card', (el, { richObjectType, richObject, accessible }) =>
 	// trick to change the wrapper element size, otherwise it always is 100%
 	// which is not very nice with a simple card
 	el.parentNode.style['max-width'] = '400px'
-	el.parentNode.style['min-width'] = '200px'
 	el.parentNode.style['margin-left'] = '0'
 	el.parentNode.style['margin-right'] = '0'
 

src/views/CardReferenceWidget.vue

@@ -62,9 +62,14 @@
 		<div class="line description-assignees">
 			<TextIcon v-if="card.description" :size="20" class="icon" />
 			<div v-if="card.description"
-				class="description"
-				:title="card.description">
-				{{ card.description }}
+				:class="{
+					'description': true,
+					'short-description': shortDescription,
+				}">
+				<RichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
+					:text="card.description"
+					:use-markdown="true"
+					@click.native="shortDescription = !shortDescription" />
 			</div>
 			<div v-if="card.assignedUsers .length > 0"
 				class="spacer" />
@@ -83,6 +88,7 @@ import DeckIcon from '../components/icons/DeckIcon.vue'
 import AvatarList from '../components/cards/AvatarList.vue'
 import labelStyle from '../mixins/labelStyle.js'
 
+import { RichText } from '@nextcloud/vue-richtext'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
@@ -94,6 +100,7 @@ export default {
 		DeckIcon,
 		CalendarBlankIcon,
 		TextIcon,
+		RichText,
 	},
 
 	mixins: [labelStyle],
@@ -115,6 +122,7 @@ export default {
 
 	data() {
 		return {
+			shortDescription: true,
 		}
 	},
 
@@ -171,11 +179,17 @@ export default {
 
 .deck-card-reference {
 	width: 100%;
+	// needed for the specific case of Text
+	.editor__content & {
+		width: calc(100% - 24px);
+	}
 	white-space: normal;
 	padding: 12px;
 
 	.link {
 		text-decoration: underline;
+		color: var(--color-main-text) !important;
+		padding: 0 !important;
 	}
 
 	.line {
@@ -201,13 +215,22 @@ export default {
 	.description-assignees {
 		width: 100%;
 		display: flex;
-		align-items: center;
+		align-items: start;
+
+		.icon {
+			align-self: start;
+			margin-top: 8px;
+		}
 
 		.description {
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: nowrap;
 			margin-right: 8px;
+			padding-top: 6px;
+			max-height: 250px;
+			overflow: scroll;
+			&.short-description {
+				max-height: 25px;
+				overflow: hidden;
+			}
 		}
 
 		.card-assignees {

src/views/Dashboard.vue

@@ -61,13 +61,12 @@
 
 <script>
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
-import { NcDashboardWidget } from '@nextcloud/vue'
+import { NcButton, NcDashboardWidget } from '@nextcloud/vue'
 import { mapGetters } from 'vuex'
 import labelStyle from './../mixins/labelStyle.js'
 import DueDate from '../components/cards/badges/DueDate.vue'
 import { generateUrl } from '@nextcloud/router'
 import CardCreateDialog from '../CardCreateDialog.vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 export default {
 	name: 'Dashboard',

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.23.0@f1fe6ff483bf325c803df9f510d09a03fd796f88">
+<files psalm-version="4.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff">
   <file src="lib/Activity/ActivityManager.php">
     <TypeDoesNotContainType occurrences="1">
       <code>$message !== null</code>
@@ -10,6 +10,11 @@
       <code>(int)$subjectParams['comment']</code>
     </InvalidScalarArgument>
   </file>
+  <file src="lib/Activity/Filter.php">
+    <MethodSignatureMismatch occurrences="1">
+      <code>$types</code>
+    </MethodSignatureMismatch>
+  </file>
   <file src="lib/Command/UserExport.php">
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>void</code>

tests/unit/Db/CardTest.php

@@ -117,14 +117,6 @@ class CardTest extends TestCase {
 		], (new CardDetails($card))->jsonSerialize());
 	}
 
-	public function testMysqlDateFallback() {
-		$date = new DateTime();
-		$card = new Card();
-		$card->setDuedate($date->format('c'));
-		$card->setDatabaseType('mysql');
-		$this->assertEquals($date->format('Y-m-d H:i:s'), $card->getDuedate(false));
-	}
-
 	public function testJsonSerializeAsignedUsers() {
 		$card = $this->createCard();
 		$card->setAssignedUsers([ 'user1' ]);

tests/unit/Service/CardServiceTest.php

@@ -221,7 +221,7 @@ class CardServiceTest extends TestCase {
 		$this->assertEquals('text', $actual->getType());
 		$this->assertEquals(999, $actual->getOrder());
 		$this->assertEquals('foo', $actual->getDescription());
-		$this->assertEquals('2017-01-01T00:00:00+00:00', $actual->getDuedate());
+		$this->assertEquals(new \DateTime('2017-01-01T00:00:00+00:00'), $actual->getDuedate());
 	}
 
 	public function testUpdateArchived() {