Update Stack.vue

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

.github/workflows/cypress.yml

@@ -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

@@ -79,7 +79,7 @@ jobs:
 
       - name: Set up PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        run: composer i --no-dev
 
       - name: Set up Nextcloud
         run: |

.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@v4
+        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

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-master"
 	},
 	"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": "ef9413dedd4d47de717c4dea87a07000",
     "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,50 @@
             },
             "time": "2021-11-10T08:44:10+00:00"
         },
+        {
+            "name": "nextcloud/ocp",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nextcloud-deps/ocp.git",
+                "reference": "3c68cd0de0c5dea151f28f414d9a30e37950217f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/3c68cd0de0c5dea151f28f414d9a30e37950217f",
+                "reference": "3c68cd0de0c5dea151f28f414d9a30e37950217f",
+                "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": "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/master"
+            },
+            "time": "2022-10-22T00:59:51+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.15.1",
@@ -5402,7 +5402,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "roave/security-advisories": 20,
-        "christophwurst/nextcloud": 20
+        "nextcloud/ocp": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

l10n/kab.js

@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "deck",
+    {
+    "Personal" : "Udmawan",
+    "Finished" : "Immed",
+    "The file was uploaded" : "Ulac afaylu yettwaznen",
+    "The file was only partially uploaded" : "Afaylu, cwiṭ kan i yettwaznen segs",
+    "No file was uploaded" : "Ulac afaylu i d-yettwasulin",
+    "Missing a temporary folder" : "Ixuṣ ukaram akudan",
+    "Cancel" : "Sefsex",
+    "Close" : "Mdel",
+    "Details" : "Talqayt",
+    "Sharing" : "Beṭṭu",
+    "Tags" : "Tibzimin",
+    "Delete" : "Kkes",
+    "Edit" : "Ẓreg",
+    "Download" : "Sider",
+    "Modified" : "Yettwabeddel",
+    "Today" : "Ass-a",
+    "Save" : "Sekles",
+    "No notifications" : "Ulac tisezmal",
+    "Share" : "Bḍu",
+    "This week" : "Dduṛt agi"
+},
+"nplurals=2; plural=(n != 1);");

l10n/kab.json

@@ -0,0 +1,23 @@
+{ "translations": {
+    "Personal" : "Udmawan",
+    "Finished" : "Immed",
+    "The file was uploaded" : "Ulac afaylu yettwaznen",
+    "The file was only partially uploaded" : "Afaylu, cwiṭ kan i yettwaznen segs",
+    "No file was uploaded" : "Ulac afaylu i d-yettwasulin",
+    "Missing a temporary folder" : "Ixuṣ ukaram akudan",
+    "Cancel" : "Sefsex",
+    "Close" : "Mdel",
+    "Details" : "Talqayt",
+    "Sharing" : "Beṭṭu",
+    "Tags" : "Tibzimin",
+    "Delete" : "Kkes",
+    "Edit" : "Ẓreg",
+    "Download" : "Sider",
+    "Modified" : "Yettwabeddel",
+    "Today" : "Ass-a",
+    "Save" : "Sekles",
+    "No notifications" : "Ulac tisezmal",
+    "Share" : "Bḍu",
+    "This week" : "Dduṛt agi"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

l10n/uk.js

@@ -98,7 +98,7 @@ OC.L10N.register(
     "Details" : "Деталі",
     "Loading board" : "Завантаження дошки",
     "Board not found" : "Дошку не знайдено",
-    "Sharing" : "Поділитись",
+    "Sharing" : "Поділитися",
     "Tags" : "Теги",
     "Deleted items" : "Вилучені елементи",
     "Timeline" : "Дії",
@@ -170,6 +170,7 @@ OC.L10N.register(
     "All boards" : "Усі дошки",
     "Archived boards" : "Архівні дошки",
     "Shared with you" : "Вам надано доступ",
+    "Show boards in calendar/tasks" : "Показувати дошки в календарі та завданнях",
     "Limit deck usage of groups" : "Обмежити доступ до колоди для груп",
     "Board details" : "Деталі дошки",
     "Edit board" : "Редагувати дошку",

l10n/uk.json

@@ -96,7 +96,7 @@
     "Details" : "Деталі",
     "Loading board" : "Завантаження дошки",
     "Board not found" : "Дошку не знайдено",
-    "Sharing" : "Поділитись",
+    "Sharing" : "Поділитися",
     "Tags" : "Теги",
     "Deleted items" : "Вилучені елементи",
     "Timeline" : "Дії",
@@ -168,6 +168,7 @@
     "All boards" : "Усі дошки",
     "Archived boards" : "Архівні дошки",
     "Shared with you" : "Вам надано доступ",
+    "Show boards in calendar/tasks" : "Показувати дошки в календарі та завданнях",
     "Limit deck usage of groups" : "Обмежити доступ до колоди для груп",
     "Board details" : "Деталі дошки",
     "Edit board" : "Редагувати дошку",

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

@@ -312,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']);
+			if (is_array($subjectParams['after'])) {
-			$date->setTimezone(new \DateTimeZone(\date_default_timezone_get()));
+				// 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/AppInfo/Application.php

@@ -75,9 +75,7 @@ use OCP\Notification\IManager as NotificationManager;
 use OCP\Share\IManager;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
-use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'deck';
@@ -104,16 +102,7 @@ class Application extends App implements IBootstrap {
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
 
 		$context->injectFn(function (IManager $shareManager) {
-			try {
+			$shareManager->registerShareProvider(DeckShareProvider::class);
-				$shareManager->registerShareProvider(DeckShareProvider::class);
-			} catch (\Throwable $e) {
-				if (!$e instanceof ContainerExceptionInterface) {
-					Server::get(LoggerInterface::class)->error(
-						$e->getMessage(),
-						['exception' => $e]
-					);
-				}
-			}
 		});
 
 		$context->injectFn(function (Listener $listener, IEventDispatcher $eventDispatcher) {

lib/Service/AttachmentService.php

@@ -40,9 +40,6 @@ use OCP\AppFramework\Db\IMapperException;
 use OCP\AppFramework\Http\Response;
 use OCP\IL10N;
 use OCP\IUserManager;
-use OCP\Server;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Log\LoggerInterface;
 
 class AttachmentService {
 	private $attachmentMapper;
@@ -97,16 +94,7 @@ class AttachmentService {
 	 * @throws \OCP\AppFramework\QueryException
 	 */
 	public function registerAttachmentService($type, $class) {
-		try {
+		$this->services[$type] = $this->application->getContainer()->query($class);
-			$this->services[$type] = $this->application->getContainer()->query($class);
-		} catch (\Throwable $e) {
-			if (!$e instanceof ContainerExceptionInterface) {
-				Server::get(LoggerInterface::class)->error(
-					$e->getMessage(),
-					['exception' => $e]
-				);
-			}
-		}
 	}
 
 	/**

package.json

@@ -40,7 +40,7 @@
     "@nextcloud/l10n": "^1.6.0",
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/router": "^2.0.0",
-    "@nextcloud/vue": "^7.0.0",
+    "@nextcloud/vue": "^7.0.1",
     "@nextcloud/vue-dashboard": "^2.0.1",
     "@nextcloud/vue-richtext": "^2.0.4",
     "blueimp-md5": "^2.19.0",
@@ -81,7 +81,7 @@
     "@vue/test-utils": "^1.3.0",
     "cypress": "^10.10.0",
     "eslint-webpack-plugin": "^3.2.0",
-    "jest": "^29.2.0",
+    "jest": "^29.2.1",
     "jest-serializer-vue": "^2.0.2",
     "stylelint-webpack-plugin": "^3.3.0",
     "vue-jest": "^3.0.7",

src/components/board/Stack.vue

@@ -53,12 +53,18 @@
 				</form>
 			</transition>
 			<NcActions v-if="canManage && !isArchived" :force-menu="true">
-				<NcActionButton @click="modalArchivAllCardsShow=true">
+				<NcActionButton v-if="!showArchived" icon="icon-archive" @click="modalArchivAllCardsShow=true">
 					<template #icon>
 						<ArchiveIcon decorative />
 					</template>
 					{{ t('deck', 'Archive all cards') }}
 				</NcActionButton>
+				<NcActionButton v-if="showArchived" @click="modalArchivAllCardsShow=true">
+					<template #icon>
+						<ArchiveIcon decorative />
+					</template>
+					{{ t('deck', 'Unarchive all cards') }}
+				</NcActionButton>
 				<NcActionButton icon="icon-delete" @click="deleteStack(stack)">
 					{{ t('deck', 'Delete list') }}
 				</NcActionButton>
@@ -72,11 +78,20 @@
 
 		<NcModal v-if="modalArchivAllCardsShow" @close="modalArchivAllCardsShow=false">
 			<div class="modal__content">
-				<h3>{{ t('deck', 'Archive all cards in this list') }}</h3>
+				<h3 v-if="!showArchived">
+					{{ t('deck', 'Archive all cards in this list') }}
+				</h3>
+				<h3 v-else>
+					{{ t('deck', 'Unarchive all cards in this list') }}
+				</h3>
+
 				<progress :value="stackTransfer.current" :max="stackTransfer.total" />
-				<button class="primary" @click="archiveAllCardsFromStack(stack)">
+				<button v-if="!showArchived" class="primary" @click="setArchivedToAllCardsFromStack(stack, !showArchived)">
 					{{ t('deck', 'Archive all cards') }}
 				</button>
+				<button v-else class="primary" @click="setArchivedToAllCardsFromStack(stack, !showArchived)">
+					{{ t('deck', 'Unarchive all cards') }}
+				</button>
 				<button @click="modalArchivAllCardsShow=false">
 					{{ t('deck', 'Cancel') }}
 				</button>
@@ -240,12 +255,12 @@ export default {
 			this.$store.dispatch('deleteStack', stack)
 			showUndo(t('deck', 'List deleted'), () => this.$store.dispatch('stackUndoDelete', stack))
 		},
-		archiveAllCardsFromStack(stack) {
+		setArchivedToAllCardsFromStack(stack, isArchived) {
 
 			this.stackTransfer.total = this.cardsByStack.length
 			this.cardsByStack.forEach((card, index) => {
 				this.stackTransfer.current = index
-				this.$store.dispatch('archiveUnarchiveCard', { ...card, archived: true })
+				this.$store.dispatch('archiveUnarchiveCard', { ...card, archived: isArchived })
 			})
 			this.modalArchivAllCardsShow = false
 		},

tests/integration/run.sh

@@ -20,7 +20,6 @@ else
 fi
 
 composer install
-composer dump-autoload
 
 # avoid port collision on jenkins - use $EXECUTOR_NUMBER
 if [ -z "$EXECUTOR_NUMBER" ]; then

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.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
   <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>