Compare commits
355 Commits
backport/6
...
v1.12.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c325a15971 | ||
|
|
34741c3efd | ||
|
|
36646f8be8 | ||
|
|
231b6e5be3 | ||
|
|
8398dcdb6f | ||
|
|
63846cb72a | ||
|
|
040f48657a | ||
|
|
16c44c36dc | ||
|
|
d5a443ebbd | ||
|
|
bba0d951d5 | ||
|
|
2dd0c09a38 | ||
|
|
01a527b748 | ||
|
|
dd2641d250 | ||
|
|
2c6a38d2ba | ||
|
|
af27b4ff05 | ||
|
|
91347360aa | ||
|
|
49ce3ea9b3 | ||
|
|
2dde00690c | ||
|
|
7eac5db40a | ||
|
|
e93526fde0 | ||
|
|
405a48ba57 | ||
|
|
6dd9edb2af | ||
|
|
4e3493c047 | ||
|
|
566c521139 | ||
|
|
83d80d65d7 | ||
|
|
810ff87893 | ||
|
|
c458a201be | ||
|
|
3810b1ed03 | ||
|
|
7e0c336eef | ||
|
|
547dcbc35b | ||
|
|
52032dd3d1 | ||
|
|
7d7edfb3b0 | ||
|
|
2f124c2f14 | ||
|
|
e0f88e6a27 | ||
|
|
3896c1c9ee | ||
|
|
8670380001 | ||
|
|
9cd58cae17 | ||
|
|
304a4e290e | ||
|
|
e43ad40335 | ||
|
|
5c9df98aee | ||
|
|
548637155c | ||
|
|
4ac0ba920b | ||
|
|
16f7f5453a | ||
|
|
35ee8dc5d1 | ||
|
|
55849d0efb | ||
|
|
1ebae75d25 | ||
|
|
224921e033 | ||
|
|
b942ac9cc1 | ||
|
|
ca063c0f6c | ||
|
|
29d7abd76a | ||
|
|
a9b8fce30e | ||
|
|
6a41c6403e | ||
|
|
e9bf197b29 | ||
|
|
55a28b0853 | ||
|
|
d35f15d65d | ||
|
|
a448546f43 | ||
|
|
a83bcbc00c | ||
|
|
d1b9db0c51 | ||
|
|
2b3c43d658 | ||
|
|
7d6e9feab0 | ||
|
|
53c79253ff | ||
|
|
00dbcd962e | ||
|
|
4eeb67bb56 | ||
|
|
59fe26b1ba | ||
|
|
567ecd782e | ||
|
|
3b5b471c87 | ||
|
|
7211d73159 | ||
|
|
6da7aa5480 | ||
|
|
8832a345b8 | ||
|
|
4e7d50bf2c | ||
|
|
6a6bd5b72b | ||
|
|
5767b70613 | ||
|
|
dc4b77edc8 | ||
|
|
2c1835a287 | ||
|
|
1fd3592ebe | ||
|
|
e5417f0eed | ||
|
|
ee6be8404c | ||
|
|
f5b0077de4 | ||
|
|
97f05e6374 | ||
|
|
4e2b33127c | ||
|
|
20def97ddf | ||
|
|
a1c486cefa | ||
|
|
224a8a059d | ||
|
|
50587f2202 | ||
|
|
b1793e12f8 | ||
|
|
305315c031 | ||
|
|
0803b9bdc2 | ||
|
|
ff3a2ae3c0 | ||
|
|
13e89ae68f | ||
|
|
1b83dfc372 | ||
|
|
cf5ff3cd55 | ||
|
|
0be801dee3 | ||
|
|
f975dc6863 | ||
|
|
c8e94b5b2f | ||
|
|
ea8a982f78 | ||
|
|
e4db0f9286 | ||
|
|
9bb6d1b04f | ||
|
|
6ad1c94060 | ||
|
|
ec281c2068 | ||
|
|
56bb9affea | ||
|
|
c8672ee464 | ||
|
|
3613c2cd68 | ||
|
|
e5dcd211de | ||
|
|
f0e64228fc | ||
|
|
cd72557078 | ||
|
|
e9d0c0131d | ||
|
|
417b7b13e7 | ||
|
|
a1347d6db7 | ||
|
|
c7ecbc99a7 | ||
|
|
e7d5e52c00 | ||
|
|
bb6cc695b6 | ||
|
|
4613c0ccd5 | ||
|
|
566cae9682 | ||
|
|
1375d33091 | ||
|
|
e51aba4e79 | ||
|
|
3e964e3277 | ||
|
|
91a61283e6 | ||
|
|
752fb198f1 | ||
|
|
8fc87997f6 | ||
|
|
cf3fad4f18 | ||
|
|
1bb26481ba | ||
|
|
63325ef0da | ||
|
|
0b1006ff57 | ||
|
|
c52afdb059 | ||
|
|
b13a8014d7 | ||
|
|
869e8a8b88 | ||
|
|
59dedc9d9a | ||
|
|
28b6fbf7b4 | ||
|
|
243a3ba349 | ||
|
|
4fea944207 | ||
|
|
303a4ee737 | ||
|
|
808f28125e | ||
|
|
d4fa66050b | ||
|
|
129d972a37 | ||
|
|
0ee347ab9f | ||
|
|
e7a0c7bee5 | ||
|
|
735579fd1d | ||
|
|
c3168429d8 | ||
|
|
672b301a14 | ||
|
|
7aafcbf80d | ||
|
|
11466c32ea | ||
|
|
3775f53ff8 | ||
|
|
2e7cdcbeec | ||
|
|
1bb2a849b4 | ||
|
|
78e876f9e4 | ||
|
|
d1496a6b95 | ||
|
|
66d4841359 | ||
|
|
8521de277a | ||
|
|
189125aca3 | ||
|
|
eacd219938 | ||
|
|
c48d3b7cb7 | ||
|
|
161fad4df3 | ||
|
|
ae02338f5e | ||
|
|
2cfeeed597 | ||
|
|
2b7804f296 | ||
|
|
eb18d27bc5 | ||
|
|
e85ad0c402 | ||
|
|
7542c44d57 | ||
|
|
fdb157eff7 | ||
|
|
6f0dcbba03 | ||
|
|
061dd35449 | ||
|
|
66a27691e4 | ||
|
|
88ccbdcf5b | ||
|
|
a8d581cbc2 | ||
|
|
f4736861f9 | ||
|
|
1e1fe22154 | ||
|
|
c8931128e7 | ||
|
|
c9b1adbbb6 | ||
|
|
0cc580d46c | ||
|
|
697db29456 | ||
|
|
87eb65ce0b | ||
|
|
1cfaa5ee3c | ||
|
|
888fd674a2 | ||
|
|
5334fc8673 | ||
|
|
a7f486d6b1 | ||
|
|
f1aabb35fd | ||
|
|
8bf087fa87 | ||
|
|
b5440e99a0 | ||
|
|
694a3e8525 | ||
|
|
30a43423f7 | ||
|
|
444e3a967b | ||
|
|
d9689533ed | ||
|
|
a2690e2a6f | ||
|
|
dc6748c6a9 | ||
|
|
d7d6c9ba5e | ||
|
|
a00e42d97f | ||
|
|
142a7e7e44 | ||
|
|
11cf8214ef | ||
|
|
98391cf3de | ||
|
|
52ae8b0261 | ||
|
|
46b2be0532 | ||
|
|
c538a5dce0 | ||
|
|
d28d6f7ca1 | ||
|
|
f0e2459f86 | ||
|
|
d87e8a5f9d | ||
|
|
39ecb4c9ed | ||
|
|
afcd3b7dd2 | ||
|
|
21c34d8000 | ||
|
|
089c55c989 | ||
|
|
d8090331a0 | ||
|
|
de0163f377 | ||
|
|
41c88bd529 | ||
|
|
b740814786 | ||
|
|
52e30a7ca8 | ||
|
|
4faa460afc | ||
|
|
3a461f5e12 | ||
|
|
7520da3455 | ||
|
|
5f790264f4 | ||
|
|
bb38a505a8 | ||
|
|
215925740e | ||
|
|
2cad880bd2 | ||
|
|
8cf754d5e1 | ||
|
|
86f9325542 | ||
|
|
b173684e66 | ||
|
|
01d242077e | ||
|
|
8d1fc3e08d | ||
|
|
1b000264a0 | ||
|
|
357397a2dd | ||
|
|
8d092053bf | ||
|
|
a302b554c8 | ||
|
|
04351d8778 | ||
|
|
4128af5a8d | ||
|
|
4ae731339f | ||
|
|
419b6a223c | ||
|
|
17f31a39a1 | ||
|
|
b34a301936 | ||
|
|
99dcce4d2e | ||
|
|
cdd0796814 | ||
|
|
bf0efbfe51 | ||
|
|
a3ce3c9939 | ||
|
|
d187637bc2 | ||
|
|
501084dc89 | ||
|
|
eaa2cccf55 | ||
|
|
dbac248ff2 | ||
|
|
bf39c2b2b0 | ||
|
|
69d446aaa7 | ||
|
|
2ddf10ef33 | ||
|
|
7702a577a9 | ||
|
|
6834a8cb39 | ||
|
|
485f11a38e | ||
|
|
46ace17a65 | ||
|
|
8f3382191e | ||
|
|
c4bd2995c3 | ||
|
|
61c6d7f005 | ||
|
|
59ecf6936b | ||
|
|
5ede270690 | ||
|
|
fc41410812 | ||
|
|
ec11bf0468 | ||
|
|
ee0b6bfea9 | ||
|
|
7459424216 | ||
|
|
3995b326e4 | ||
|
|
c42a5241fb | ||
|
|
2494770bab | ||
|
|
32a72c8335 | ||
|
|
9ee235d24e | ||
|
|
14236e7934 | ||
|
|
7dd6c19e0d | ||
|
|
cfc1f38378 | ||
|
|
4751517e9a | ||
|
|
9e7224a561 | ||
|
|
f41070c777 | ||
|
|
8965bc2d15 | ||
|
|
2c499601ca | ||
|
|
c80ac4ab9d | ||
|
|
473b481183 | ||
|
|
aeda808d67 | ||
|
|
9b5552663f | ||
|
|
e7a20c18b0 | ||
|
|
899ee5d459 | ||
|
|
778e6980a1 | ||
|
|
9710013a9d | ||
|
|
2e41be3b83 | ||
|
|
334788f4ba | ||
|
|
5f9fcdf3dd | ||
|
|
ec04eadd3b | ||
|
|
68b598f047 | ||
|
|
41d224d7ab | ||
|
|
295d80ec28 | ||
|
|
7aeec0199d | ||
|
|
f6eb4929ca | ||
|
|
01f3514a44 | ||
|
|
443d3f7585 | ||
|
|
22f07394ef | ||
|
|
f760d1b159 | ||
|
|
a950d76e4d | ||
|
|
968cbc39eb | ||
|
|
3fe2e37e64 | ||
|
|
8623e9f3af | ||
|
|
91344b296d | ||
|
|
174756e486 | ||
|
|
47dd5cfdf6 | ||
|
|
170dc6f9b3 | ||
|
|
75e065bcb9 | ||
|
|
07b3d91e4f | ||
|
|
aecd332d5b | ||
|
|
22f4742a73 | ||
|
|
ba645054ea | ||
|
|
ac437b99de | ||
|
|
e537e41254 | ||
|
|
64308791fd | ||
|
|
23a29c62cd | ||
|
|
6d31ba2b04 | ||
|
|
8920bddfd5 | ||
|
|
7b2f32e6a5 | ||
|
|
a464c5c785 | ||
|
|
dc9a0cb31b | ||
|
|
e03b7aa385 | ||
|
|
ab1d89f5b4 | ||
|
|
4e6a7bcd30 | ||
|
|
f3c408abb6 | ||
|
|
3cd514e722 | ||
|
|
471b724ae8 | ||
|
|
e58981577c | ||
|
|
3768013c17 | ||
|
|
d72aa4b047 | ||
|
|
4dcf91e691 | ||
|
|
1cd787fb31 | ||
|
|
6434c7afc4 | ||
|
|
44e61bdc49 | ||
|
|
23c4730ef0 | ||
|
|
744812f01f | ||
|
|
008732aba1 | ||
|
|
7446acebff | ||
|
|
ecc9cbab33 | ||
|
|
3898d17b83 | ||
|
|
365639e9dc | ||
|
|
b5ff812e84 | ||
|
|
8800053905 | ||
|
|
0a77443c5c | ||
|
|
49d9f975f8 | ||
|
|
363812fa4b | ||
|
|
e8ab1adb50 | ||
|
|
0bfa2ac16b | ||
|
|
6b6ce1a3a9 | ||
|
|
0589d4dd61 | ||
|
|
581755e520 | ||
|
|
2d30564a69 | ||
|
|
1474e84640 | ||
|
|
33572a6af9 | ||
|
|
4e2ea13c2c | ||
|
|
216967e976 | ||
|
|
2d9febf8a4 | ||
|
|
2cdca8250c | ||
|
|
81a41ffd6f | ||
|
|
bd02944bf3 | ||
|
|
c34c1bbbf1 | ||
|
|
44fc8a3931 | ||
|
|
44d072647e | ||
|
|
3cb8821dca | ||
|
|
0a649768fa | ||
|
|
c624d51586 | ||
|
|
12514b8c55 | ||
|
|
4d3953ec13 | ||
|
|
1a45c2dba3 | ||
|
|
4b886c6097 |
40
.github/dependabot.yml
vendored
40
.github/dependabot.yml
vendored
@@ -11,24 +11,6 @@ updates:
|
||||
open-pull-requests-limit: 10
|
||||
reviewers:
|
||||
- juliushaertl
|
||||
- luka-nextcloud
|
||||
|
||||
- package-ecosystem: npm
|
||||
target-branch: stable28
|
||||
versioning-strategy: lockfile-only
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: weekly
|
||||
day: saturday
|
||||
time: "03:00"
|
||||
timezone: Europe/Paris
|
||||
ignore:
|
||||
- dependency-name: "*"
|
||||
update-types: ["version-update:semver-major"]
|
||||
open-pull-requests-limit: 30
|
||||
labels:
|
||||
- 3. to review
|
||||
- dependencies
|
||||
|
||||
- package-ecosystem: npm
|
||||
target-branch: stable27
|
||||
@@ -47,6 +29,23 @@ updates:
|
||||
- 3. to review
|
||||
- dependencies
|
||||
|
||||
- package-ecosystem: npm
|
||||
target-branch: stable26
|
||||
versioning-strategy: lockfile-only
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: weekly
|
||||
day: saturday
|
||||
time: "03:00"
|
||||
timezone: Europe/Paris
|
||||
ignore:
|
||||
- dependency-name: "*"
|
||||
update-types: ["version-update:semver-major"]
|
||||
open-pull-requests-limit: 30
|
||||
labels:
|
||||
- 3. to review
|
||||
- dependencies
|
||||
|
||||
- package-ecosystem: composer
|
||||
directory: "/"
|
||||
schedule:
|
||||
@@ -57,8 +56,6 @@ updates:
|
||||
open-pull-requests-limit: 10
|
||||
reviewers:
|
||||
- juliushaertl
|
||||
- luka-nextcloud
|
||||
|
||||
- package-ecosystem: composer
|
||||
directory: "/tests/integration"
|
||||
schedule:
|
||||
@@ -69,8 +66,6 @@ updates:
|
||||
open-pull-requests-limit: 10
|
||||
reviewers:
|
||||
- juliushaertl
|
||||
- luka-nextcloud
|
||||
|
||||
- package-ecosystem: github-actions
|
||||
directory: "/"
|
||||
schedule:
|
||||
@@ -81,4 +76,3 @@ updates:
|
||||
open-pull-requests-limit: 10
|
||||
reviewers:
|
||||
- juliushaertl
|
||||
- luka-nextcloud
|
||||
|
||||
8
.github/workflows/appbuild.yml
vendored
8
.github/workflows/appbuild.yml
vendored
@@ -16,15 +16,15 @@ jobs:
|
||||
node-version: [16.x]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4.1.1
|
||||
- uses: actions/checkout@v4
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v4.0.2
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
- name: Set up npm7
|
||||
run: npm i -g npm@7
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@2.30.0
|
||||
uses: shivammathur/setup-php@2.27.1
|
||||
with:
|
||||
php-version: '7.4'
|
||||
tools: composer
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
uname -a
|
||||
RUST_BACKTRACE=1 krankerl --version
|
||||
RUST_BACKTRACE=1 krankerl package
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Deck app tarball
|
||||
path: build/artifacts/deck.tar.gz
|
||||
|
||||
8
.github/workflows/appstore-build-publish.yml
vendored
8
.github/workflows/appstore-build-publish.yml
vendored
@@ -51,12 +51,12 @@ jobs:
|
||||
with:
|
||||
path: ${{ env.APP_NAME }}
|
||||
fallbackNode: '^20'
|
||||
fallbackNpm: '^9'
|
||||
fallbackNpm: '^10'
|
||||
|
||||
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
|
||||
# Skip if no package.json
|
||||
if: ${{ steps.versions.outputs.nodeVersion }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
|
||||
with:
|
||||
node-version: ${{ steps.versions.outputs.nodeVersion }}
|
||||
|
||||
@@ -66,7 +66,7 @@ jobs:
|
||||
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
|
||||
|
||||
- name: Set up php ${{ env.PHP_VERSION }}
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
|
||||
with:
|
||||
php-version: ${{ env.PHP_VERSION }}
|
||||
coverage: none
|
||||
@@ -151,7 +151,7 @@ jobs:
|
||||
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
|
||||
|
||||
- name: Attach tarball to github release
|
||||
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2
|
||||
uses: svenstaro/upload-release-action@1beeb572c19a9242f4361f4cee78f8e0d9aec5df # v2
|
||||
id: attach_to_release
|
||||
with:
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
6
.github/workflows/command-rebase.yml
vendored
6
.github/workflows/command-rebase.yml
vendored
@@ -23,7 +23,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Add reaction on start
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
with:
|
||||
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
repository: ${{ github.event.repository.full_name }}
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
reaction-type: "+1"
|
||||
|
||||
- name: Checkout the latest code
|
||||
uses: actions/checkout@v4.1.1 # v3.5.2
|
||||
uses: actions/checkout@v4 # v3.5.2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
|
||||
- name: Add reaction on failure
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
if: failure()
|
||||
with:
|
||||
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
|
||||
16
.github/workflows/cypress.yml
vendored
16
.github/workflows/cypress.yml
vendored
@@ -23,11 +23,11 @@ jobs:
|
||||
# containers: [1, 2, 3]
|
||||
php-versions: [ '8.0' ]
|
||||
databases: [ 'sqlite' ]
|
||||
server-versions: [ 'stable29' ]
|
||||
server-versions: [ 'stable28' ]
|
||||
|
||||
steps:
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v4.0.2
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@v4.1.1
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: nextcloud/server
|
||||
ref: ${{ matrix.server-versions }}
|
||||
@@ -50,19 +50,19 @@ jobs:
|
||||
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
|
||||
|
||||
- name: Checkout ${{ env.APP_NAME }}
|
||||
uses: actions/checkout@v4.1.1
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Checkout text
|
||||
uses: actions/checkout@v4.1.1
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: nextcloud/text
|
||||
ref: ${{ env.text_app_ref }}
|
||||
path: apps/text
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@2.30.0
|
||||
uses: shivammathur/setup-php@2.27.1
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
|
||||
@@ -106,7 +106,7 @@ jobs:
|
||||
npm_package_name: ${{ env.APP_NAME }}
|
||||
|
||||
- name: Upload test failure screenshots
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
if: failure()
|
||||
with:
|
||||
name: Upload screenshots
|
||||
@@ -114,7 +114,7 @@ jobs:
|
||||
retention-days: 5
|
||||
|
||||
- name: Upload nextcloud logs
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
if: failure()
|
||||
with:
|
||||
name: Upload nextcloud log
|
||||
|
||||
@@ -22,7 +22,7 @@ concurrency:
|
||||
jobs:
|
||||
auto-approve-merge:
|
||||
if: github.actor == 'dependabot[bot]'
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-latest-low
|
||||
permissions:
|
||||
# for hmarr/auto-approve-action to approve PRs
|
||||
pull-requests: write
|
||||
|
||||
2
.github/workflows/fixup.yml
vendored
2
.github/workflows/fixup.yml
vendored
@@ -24,7 +24,7 @@ jobs:
|
||||
pull-requests: write
|
||||
name: Block fixup and squash commits
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-latest-low
|
||||
|
||||
steps:
|
||||
- name: Run check
|
||||
|
||||
10
.github/workflows/integration.yml
vendored
10
.github/workflows/integration.yml
vendored
@@ -28,7 +28,7 @@ jobs:
|
||||
matrix:
|
||||
php-versions: ['8.1']
|
||||
databases: ['sqlite', 'mysql', 'pgsql']
|
||||
server-versions: ['stable29']
|
||||
server-versions: ['stable28']
|
||||
|
||||
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
|
||||
|
||||
@@ -52,7 +52,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@v4.1.1
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: nextcloud/server
|
||||
ref: ${{ matrix.server-versions }}
|
||||
@@ -66,19 +66,19 @@ jobs:
|
||||
cd build/integration && composer require --dev phpunit/phpunit:~9
|
||||
|
||||
- name: Checkout app
|
||||
uses: actions/checkout@v4.1.1
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Checkout activity
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
|
||||
with:
|
||||
repository: nextcloud/activity
|
||||
ref: ${{ matrix.server-versions }}
|
||||
path: apps/activity
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@2.30.0
|
||||
uses: shivammathur/setup-php@2.27.1
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, apcu
|
||||
|
||||
10
.github/workflows/lint-eslint.yml
vendored
10
.github/workflows/lint-eslint.yml
vendored
@@ -19,13 +19,13 @@ concurrency:
|
||||
|
||||
jobs:
|
||||
changes:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-latest-low
|
||||
|
||||
outputs:
|
||||
src: ${{ steps.changes.outputs.src}}
|
||||
|
||||
steps:
|
||||
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
|
||||
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
|
||||
id: changes
|
||||
continue-on-error: true
|
||||
with:
|
||||
@@ -60,10 +60,10 @@ jobs:
|
||||
id: versions
|
||||
with:
|
||||
fallbackNode: '^20'
|
||||
fallbackNpm: '^9'
|
||||
fallbackNpm: '^10'
|
||||
|
||||
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
|
||||
with:
|
||||
node-version: ${{ steps.versions.outputs.nodeVersion }}
|
||||
|
||||
@@ -82,7 +82,7 @@ jobs:
|
||||
summary:
|
||||
permissions:
|
||||
contents: none
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-latest-low
|
||||
needs: [changes, lint]
|
||||
|
||||
if: always()
|
||||
|
||||
3
.github/workflows/lint-php-cs.yml
vendored
3
.github/workflows/lint-php-cs.yml
vendored
@@ -25,9 +25,10 @@ jobs:
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Set up php8.2
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
|
||||
with:
|
||||
php-version: 8.2
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
|
||||
5
.github/workflows/lint-php.yml
vendored
5
.github/workflows/lint-php.yml
vendored
@@ -28,9 +28,10 @@ jobs:
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
@@ -42,7 +43,7 @@ jobs:
|
||||
summary:
|
||||
permissions:
|
||||
contents: none
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-latest-low
|
||||
needs: php-lint
|
||||
|
||||
if: always()
|
||||
|
||||
4
.github/workflows/lint-stylelint.yml
vendored
4
.github/workflows/lint-stylelint.yml
vendored
@@ -29,10 +29,10 @@ jobs:
|
||||
id: versions
|
||||
with:
|
||||
fallbackNode: '^20'
|
||||
fallbackNpm: '^9'
|
||||
fallbackNpm: '^10'
|
||||
|
||||
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
|
||||
with:
|
||||
node-version: ${{ steps.versions.outputs.nodeVersion }}
|
||||
|
||||
|
||||
4
.github/workflows/nodejs.yml
vendored
4
.github/workflows/nodejs.yml
vendored
@@ -12,9 +12,9 @@ jobs:
|
||||
node-version: [14.x]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4.1.1
|
||||
- uses: actions/checkout@v4
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v4.0.2
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
- name: Set up npm7
|
||||
|
||||
6
.github/workflows/npm-audit-fix.yml
vendored
6
.github/workflows/npm-audit-fix.yml
vendored
@@ -33,10 +33,10 @@ jobs:
|
||||
id: versions
|
||||
with:
|
||||
fallbackNode: '^20'
|
||||
fallbackNpm: '^9'
|
||||
fallbackNpm: '^10'
|
||||
|
||||
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
|
||||
with:
|
||||
node-version: ${{ steps.versions.outputs.nodeVersion }}
|
||||
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
|
||||
- name: Create Pull Request
|
||||
if: always()
|
||||
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v5
|
||||
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v5
|
||||
with:
|
||||
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
commit-message: "chore(deps): fix npm audit"
|
||||
|
||||
185
.github/workflows/phpunit-mysql.yml
vendored
185
.github/workflows/phpunit-mysql.yml
vendored
@@ -1,185 +0,0 @@
|
||||
# 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: PHPUnit MySQL
|
||||
|
||||
on: pull_request
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: phpunit-mysql-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
matrix:
|
||||
runs-on: ubuntu-latest-low
|
||||
outputs:
|
||||
matrix: ${{ steps.versions.outputs.sparse-matrix }}
|
||||
steps:
|
||||
- name: Checkout app
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Get version matrix
|
||||
id: versions
|
||||
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
|
||||
with:
|
||||
matrix: '{"mysql-versions": ["8.1"]}'
|
||||
|
||||
changes:
|
||||
runs-on: ubuntu-latest-low
|
||||
|
||||
outputs:
|
||||
src: ${{ steps.changes.outputs.src}}
|
||||
|
||||
steps:
|
||||
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
|
||||
id: changes
|
||||
continue-on-error: true
|
||||
with:
|
||||
filters: |
|
||||
src:
|
||||
- '.github/workflows/**'
|
||||
- 'appinfo/**'
|
||||
- 'lib/**'
|
||||
- 'templates/**'
|
||||
- 'tests/**'
|
||||
- 'vendor/**'
|
||||
- 'vendor-bin/**'
|
||||
- '.php-cs-fixer.dist.php'
|
||||
- 'composer.json'
|
||||
- 'composer.lock'
|
||||
|
||||
phpunit-mysql:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
needs: [changes, matrix]
|
||||
if: needs.changes.outputs.src != 'false'
|
||||
|
||||
strategy:
|
||||
matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
|
||||
|
||||
name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
|
||||
|
||||
services:
|
||||
mysql:
|
||||
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest
|
||||
ports:
|
||||
- 4444:3306/tcp
|
||||
env:
|
||||
MYSQL_ROOT_PASSWORD: rootpassword
|
||||
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
|
||||
|
||||
steps:
|
||||
- name: Set app env
|
||||
run: |
|
||||
# Split and keep last
|
||||
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
submodules: true
|
||||
repository: nextcloud/server
|
||||
ref: ${{ matrix.server-versions }}
|
||||
|
||||
- name: Checkout app
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Enable ONLY_FULL_GROUP_BY MySQL option
|
||||
run: |
|
||||
echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
|
||||
echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
|
||||
|
||||
- name: Check composer file existence
|
||||
id: check_composer
|
||||
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
|
||||
with:
|
||||
files: apps/${{ env.APP_NAME }}/composer.json
|
||||
|
||||
- name: Set up dependencies
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_composer.outputs.files_exists == 'true'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer i
|
||||
|
||||
- name: Set up Nextcloud
|
||||
env:
|
||||
DB_PORT: 4444
|
||||
run: |
|
||||
mkdir data
|
||||
./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
|
||||
./occ app:enable --force ${{ env.APP_NAME }}
|
||||
|
||||
- name: Check PHPUnit script is defined
|
||||
id: check_phpunit
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:unit " | wc -l | grep 1
|
||||
|
||||
- name: PHPUnit
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_phpunit.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:unit
|
||||
|
||||
- name: Check PHPUnit integration script is defined
|
||||
id: check_integration
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:integration " | wc -l | grep 1
|
||||
|
||||
- name: Run Nextcloud
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
run: php -S localhost:8080 &
|
||||
|
||||
- name: PHPUnit integration
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:integration
|
||||
|
||||
- name: Print logs
|
||||
if: always()
|
||||
run: |
|
||||
cat data/nextcloud.log
|
||||
|
||||
- name: Skipped
|
||||
# Fail the action when neither unit nor integration tests ran
|
||||
if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
|
||||
run: |
|
||||
echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
|
||||
exit 1
|
||||
|
||||
summary:
|
||||
permissions:
|
||||
contents: none
|
||||
runs-on: ubuntu-latest-low
|
||||
needs: [changes, phpunit-mysql]
|
||||
|
||||
if: always()
|
||||
|
||||
name: phpunit-mysql-summary
|
||||
|
||||
steps:
|
||||
- name: Summary status
|
||||
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
|
||||
168
.github/workflows/phpunit-pgsql.yml
vendored
168
.github/workflows/phpunit-pgsql.yml
vendored
@@ -1,168 +0,0 @@
|
||||
# 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: PHPUnit pgsql
|
||||
|
||||
on: pull_request
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: phpunit-pgsql-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
changes:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
outputs:
|
||||
src: ${{ steps.changes.outputs.src}}
|
||||
|
||||
steps:
|
||||
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
|
||||
id: changes
|
||||
continue-on-error: true
|
||||
with:
|
||||
filters: |
|
||||
src:
|
||||
- '.github/workflows/**'
|
||||
- 'appinfo/**'
|
||||
- 'lib/**'
|
||||
- 'templates/**'
|
||||
- 'tests/**'
|
||||
- 'vendor/**'
|
||||
- 'vendor-bin/**'
|
||||
- '.php-cs-fixer.dist.php'
|
||||
- 'composer.json'
|
||||
- 'composer.lock'
|
||||
|
||||
phpunit-pgsql:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
needs: changes
|
||||
if: needs.changes.outputs.src != 'false'
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
php-versions: ['8.2']
|
||||
server-versions: ['stable29']
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
|
||||
ports:
|
||||
- 4444:5432/tcp
|
||||
env:
|
||||
POSTGRES_USER: root
|
||||
POSTGRES_PASSWORD: rootpassword
|
||||
POSTGRES_DB: nextcloud
|
||||
options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
|
||||
|
||||
steps:
|
||||
- name: Set app env
|
||||
run: |
|
||||
# Split and keep last
|
||||
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
submodules: true
|
||||
repository: nextcloud/server
|
||||
ref: ${{ matrix.server-versions }}
|
||||
|
||||
- name: Checkout app
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Check composer file existence
|
||||
id: check_composer
|
||||
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v2
|
||||
with:
|
||||
files: apps/${{ env.APP_NAME }}/composer.json
|
||||
|
||||
- name: Set up dependencies
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_composer.outputs.files_exists == 'true'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer i
|
||||
|
||||
- name: Set up Nextcloud
|
||||
env:
|
||||
DB_PORT: 4444
|
||||
run: |
|
||||
mkdir data
|
||||
./occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
|
||||
./occ app:enable --force ${{ env.APP_NAME }}
|
||||
|
||||
- name: Check PHPUnit script is defined
|
||||
id: check_phpunit
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:unit " | wc -l | grep 1
|
||||
|
||||
- name: PHPUnit
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_phpunit.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:unit
|
||||
|
||||
- name: Check PHPUnit integration script is defined
|
||||
id: check_integration
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:integration " | wc -l | grep 1
|
||||
|
||||
- name: Run Nextcloud
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
run: php -S localhost:8080 &
|
||||
|
||||
- name: PHPUnit integration
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:integration
|
||||
|
||||
- name: Print logs
|
||||
if: always()
|
||||
run: |
|
||||
cat data/nextcloud.log
|
||||
|
||||
- name: Skipped
|
||||
# Fail the action when neither unit nor integration tests ran
|
||||
if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
|
||||
run: |
|
||||
echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
|
||||
exit 1
|
||||
|
||||
summary:
|
||||
permissions:
|
||||
contents: none
|
||||
runs-on: ubuntu-latest
|
||||
needs: [changes, phpunit-pgsql]
|
||||
|
||||
if: always()
|
||||
|
||||
name: phpunit-pgsql-summary
|
||||
|
||||
steps:
|
||||
- name: Summary status
|
||||
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
|
||||
157
.github/workflows/phpunit-sqlite.yml
vendored
157
.github/workflows/phpunit-sqlite.yml
vendored
@@ -1,157 +0,0 @@
|
||||
# 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: PHPUnit sqlite
|
||||
|
||||
on: pull_request
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: phpunit-sqlite-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
changes:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
outputs:
|
||||
src: ${{ steps.changes.outputs.src}}
|
||||
|
||||
steps:
|
||||
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
|
||||
id: changes
|
||||
continue-on-error: true
|
||||
with:
|
||||
filters: |
|
||||
src:
|
||||
- '.github/workflows/**'
|
||||
- 'appinfo/**'
|
||||
- 'lib/**'
|
||||
- 'templates/**'
|
||||
- 'tests/**'
|
||||
- 'vendor/**'
|
||||
- 'vendor-bin/**'
|
||||
- '.php-cs-fixer.dist.php'
|
||||
- 'composer.json'
|
||||
- 'composer.lock'
|
||||
|
||||
phpunit-sqlite:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
needs: changes
|
||||
if: needs.changes.outputs.src != 'false'
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
php-versions: ['8.2']
|
||||
server-versions: ['stable29']
|
||||
|
||||
steps:
|
||||
- name: Set app env
|
||||
run: |
|
||||
# Split and keep last
|
||||
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
submodules: true
|
||||
repository: nextcloud/server
|
||||
ref: ${{ matrix.server-versions }}
|
||||
|
||||
- name: Checkout app
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Check composer file existence
|
||||
id: check_composer
|
||||
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v2
|
||||
with:
|
||||
files: apps/${{ env.APP_NAME }}/composer.json
|
||||
|
||||
- name: Set up dependencies
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_composer.outputs.files_exists == 'true'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer i
|
||||
|
||||
- name: Set up Nextcloud
|
||||
env:
|
||||
DB_PORT: 4444
|
||||
run: |
|
||||
mkdir data
|
||||
./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
|
||||
./occ app:enable --force ${{ env.APP_NAME }}
|
||||
|
||||
- name: Check PHPUnit script is defined
|
||||
id: check_phpunit
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:unit " | wc -l | grep 1
|
||||
|
||||
- name: PHPUnit
|
||||
# Only run if phpunit config file exists
|
||||
if: steps.check_phpunit.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:unit
|
||||
|
||||
- name: Check PHPUnit integration script is defined
|
||||
id: check_integration
|
||||
continue-on-error: true
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: |
|
||||
composer run --list | grep "^ test:integration " | wc -l | grep 1
|
||||
|
||||
- name: Run Nextcloud
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
run: php -S localhost:8080 &
|
||||
|
||||
- name: PHPUnit integration
|
||||
# Only run if phpunit integration config file exists
|
||||
if: steps.check_integration.outcome == 'success'
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer run test:integration
|
||||
|
||||
- name: Print logs
|
||||
if: always()
|
||||
run: |
|
||||
cat data/nextcloud.log
|
||||
|
||||
- name: Skipped
|
||||
# Fail the action when neither unit nor integration tests ran
|
||||
if: steps.check_phpunit.outcome == 'failure' && steps.check_integration.outcome == 'failure'
|
||||
run: |
|
||||
echo 'Neither PHPUnit nor PHPUnit integration tests are specified in composer.json scripts'
|
||||
exit 1
|
||||
|
||||
summary:
|
||||
permissions:
|
||||
contents: none
|
||||
runs-on: ubuntu-latest
|
||||
needs: [changes, phpunit-sqlite]
|
||||
|
||||
if: always()
|
||||
|
||||
name: phpunit-sqlite-summary
|
||||
|
||||
steps:
|
||||
- name: Summary status
|
||||
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi
|
||||
102
.github/workflows/phpunit.yml
vendored
Normal file
102
.github/workflows/phpunit.yml
vendored
Normal file
@@ -0,0 +1,102 @@
|
||||
name: PHPUnit
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
- '.github/workflows/phpunit.yml'
|
||||
- 'appinfo/**'
|
||||
- 'lib/**'
|
||||
- 'templates/**'
|
||||
- 'tests/**'
|
||||
- 'composer.json'
|
||||
- 'composer.lock'
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- stable*
|
||||
|
||||
env:
|
||||
APP_NAME: deck
|
||||
|
||||
|
||||
jobs:
|
||||
integration:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php-versions: ['8.0', '8.1', '8.2', '8.3']
|
||||
databases: ['sqlite', 'mysql', 'pgsql']
|
||||
server-versions: ['stable28']
|
||||
|
||||
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:14
|
||||
ports:
|
||||
- 4445:5432/tcp
|
||||
env:
|
||||
POSTGRES_USER: root
|
||||
POSTGRES_PASSWORD: rootpassword
|
||||
POSTGRES_DB: nextcloud
|
||||
options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
|
||||
mysql:
|
||||
image: mariadb:10.5
|
||||
ports:
|
||||
- 4444:3306/tcp
|
||||
env:
|
||||
MYSQL_ROOT_PASSWORD: rootpassword
|
||||
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
|
||||
|
||||
steps:
|
||||
- name: Checkout server
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
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
|
||||
with:
|
||||
path: apps/${{ env.APP_NAME }}
|
||||
|
||||
- name: Set up php ${{ matrix.php-versions }}
|
||||
uses: shivammathur/setup-php@2.27.1
|
||||
with:
|
||||
php-version: ${{ matrix.php-versions }}
|
||||
tools: phpunit
|
||||
extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql
|
||||
coverage: none
|
||||
|
||||
- name: Set up PHPUnit
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: composer i
|
||||
|
||||
- name: Set up Nextcloud
|
||||
run: |
|
||||
if [ "${{ matrix.databases }}" = "mysql" ]; then
|
||||
export DB_PORT=4444
|
||||
elif [ "${{ matrix.databases }}" = "pgsql" ]; then
|
||||
export DB_PORT=4445
|
||||
fi
|
||||
mkdir data
|
||||
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
|
||||
./occ app:enable --force ${{ env.APP_NAME }}
|
||||
php -S localhost:8080 &
|
||||
|
||||
- name: PHPUnit
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
|
||||
|
||||
- name: PHPUnit integration
|
||||
working-directory: apps/${{ env.APP_NAME }}
|
||||
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.integration.xml
|
||||
3
.github/workflows/psalm.yml
vendored
3
.github/workflows/psalm.yml
vendored
@@ -21,9 +21,10 @@ jobs:
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Set up php8.2
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
|
||||
with:
|
||||
php-version: 8.2
|
||||
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
|
||||
coverage: none
|
||||
ini-file: development
|
||||
env:
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
# 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: Auto approve nextcloud/ocp
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
branches:
|
||||
- main
|
||||
- master
|
||||
- stable*
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: update-nextcloud-ocp-approve-merge-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
auto-approve-merge:
|
||||
if: github.actor == 'nextcloud-command'
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
# for hmarr/auto-approve-action to approve PRs
|
||||
pull-requests: write
|
||||
# for alexwilson/enable-github-automerge-action to approve PRs
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0
|
||||
id: branchname
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# GitHub actions bot approve
|
||||
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
|
||||
if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# Enable GitHub auto merge
|
||||
- name: Auto merge
|
||||
uses: alexwilson/enable-github-automerge-action@d8d24b8699d9749aca9279609909abca856457c8 # main
|
||||
if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
8
.github/workflows/update-nextcloud-ocp.yml
vendored
8
.github/workflows/update-nextcloud-ocp.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
||||
|
||||
- name: Set up php8.2
|
||||
if: steps.checkout.outcome == 'success'
|
||||
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
|
||||
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
|
||||
with:
|
||||
php-version: 8.2
|
||||
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
|
||||
|
||||
- name: Raise on issue on failure
|
||||
uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
|
||||
uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
|
||||
if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -70,7 +70,7 @@ jobs:
|
||||
run: composer require --dev nextcloud/ocp:dev-master
|
||||
|
||||
- name: Raise on issue on failure
|
||||
uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
|
||||
uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
|
||||
if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_main.conclusion == 'failure' }}
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -100,7 +100,7 @@ jobs:
|
||||
|
||||
- name: Create Pull Request
|
||||
if: steps.checkout.outcome == 'success'
|
||||
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v3
|
||||
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v3
|
||||
with:
|
||||
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||
commit-message: "chore(dev-deps): Bump nextcloud/ocp package"
|
||||
|
||||
147
CHANGELOG.md
147
CHANGELOG.md
@@ -1,63 +1,122 @@
|
||||
# Changelog
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## 1.13.1
|
||||
### Fixed
|
||||
- fix: Adjust dependencies to fix filepicker #6038
|
||||
- Fix npm audit #6028
|
||||
- Fix npm audit #6001
|
||||
- fix: Avoid optional before required parameter #5820
|
||||
- fix: permission check for cloning board #5853
|
||||
## 1.12.3
|
||||
- don't reset update time when no update was written to db #6035
|
||||
- Clarify config file not found exception message #5725
|
||||
- fix: permission check for cloning board #5854
|
||||
- fix: Avoid conflicts on deck attachments folder name #5704
|
||||
- Update dependencies
|
||||
|
||||
## 1.13.0
|
||||
|
||||
### Added
|
||||
|
||||
- feat: Rename to teams @juliushaertl [#5611](https://github.com/nextcloud/deck/pull/5611)
|
||||
- feat: Implement a team resource provider @juliushaertl [#5625](https://github.com/nextcloud/deck/pull/5625)
|
||||
- Interactive board widget @juliushaertl [#5630](https://github.com/nextcloud/deck/pull/5630)
|
||||
- introduce done and open filters @grnd-alt [#5488](https://github.com/nextcloud/deck/pull/5488)
|
||||
## 1.12.2
|
||||
|
||||
### Fixed
|
||||
|
||||
- fixed sorting for upcoming cards @elzody [#5493](https://github.com/nextcloud/deck/pull/5493)
|
||||
- fix(PermissionService#getPermissions): Catch exceptions from getBoard method @marcelklehr [#5542](https://github.com/nextcloud/deck/pull/5542)
|
||||
- fix(activity): Fix permission checks when rendering activities in bac… @nickvergessen [#5533](https://github.com/nextcloud/deck/pull/5533)
|
||||
- fix: Safeguard sync requests to hopefully not spam then server @juliushaertl [#5590](https://github.com/nextcloud/deck/pull/5590)
|
||||
- fix: card move dialog auto close @luka-nextcloud [#5537](https://github.com/nextcloud/deck/pull/5537)
|
||||
- fix: Avoid conflicts on deck attachments folder name @juliushaertl [#5703](https://github.com/nextcloud/deck/pull/5703)
|
||||
- fix: Adapt NcAppSidebar props to new version @backportbot[bot] [#5768](https://github.com/nextcloud/deck/pull/5768)
|
||||
- Fix tags' display when they are numerous @backportbot[bot] [#5727](https://github.com/nextcloud/deck/pull/5727)
|
||||
- Clarify config file not found exception message @backportbot[bot] [#5724](https://github.com/nextcloud/deck/pull/5724)
|
||||
- fix(done): Mark card as undone when updating card [#5492](https://github.com/nextcloud/deck/pull/5492)
|
||||
- fix(activity): Fix permission checks when rendering activities in bac… @backportbot[bot] [#5543](https://github.com/nextcloud/deck/pull/5543)
|
||||
- fix(PermissionService#getPermissions): Catch exceptions from getBoard method @backportbot[bot] [#5546](https://github.com/nextcloud/deck/pull/5546)
|
||||
- fix: Safeguard sync requests to hopefully not spam then server @backportbot[bot] [#5593](https://github.com/nextcloud/deck/pull/5593)
|
||||
- fix: card move dialog auto close @backportbot[bot] [#5596](https://github.com/nextcloud/deck/pull/5596)
|
||||
|
||||
### Other
|
||||
|
||||
- chore(CI): Adjust testing matrix for Nextcloud 29 on stable29 @nickvergessen [#5711](https://github.com/nextcloud/deck/pull/5711)
|
||||
- fix(i18n): Improved wording [#5497](https://github.com/nextcloud/deck/pull/5497)
|
||||
|
||||
## 1.13.0-beta.1
|
||||
|
||||
### Added
|
||||
|
||||
- feat: Rename to teams @juliushaertl [#5611](https://github.com/nextcloud/deck/pull/5611)
|
||||
- feat: Implement a team resource provider @juliushaertl [#5625](https://github.com/nextcloud/deck/pull/5625)
|
||||
- Interactive board widget @juliushaertl [#5630](https://github.com/nextcloud/deck/pull/5630)
|
||||
## 1.12.1
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix deleted card/board issues @juliushaertl [#5423](https://github.com/nextcloud/deck/pull/5423)
|
||||
- Fixing #5451 @mintsoft [#5455](https://github.com/nextcloud/deck/pull/5455)
|
||||
- fix: Add debounce to update due date @juliushaertl [#5458](https://github.com/nextcloud/deck/pull/5458)
|
||||
- fix(done): Mark card as undone when updating card @stefan-niedermann [#5491](https://github.com/nextcloud/deck/pull/5491)
|
||||
- fixed sorting for upcoming cards @elzody [#5493](https://github.com/nextcloud/deck/pull/5493)
|
||||
- fix(PermissionService#getPermissions): Catch exceptions from getBoard method @marcelklehr [#5542](https://github.com/nextcloud/deck/pull/5542)
|
||||
- fix(activity): Fix permission checks when rendering activities in bac… @nickvergessen [#5533](https://github.com/nextcloud/deck/pull/5533)
|
||||
- fix: Safeguard sync requests to hopefully not spam then server @juliushaertl [#5590](https://github.com/nextcloud/deck/pull/5590)
|
||||
- fix: card move dialog auto close @luka-nextcloud [#5537](https://github.com/nextcloud/deck/pull/5537)
|
||||
- also filter by storage when getting shares in folder @icewind1991 [#5452](https://github.com/nextcloud/deck/pull/5452)
|
||||
- Fix deleted card/board issues @juliushaertl [#5441](https://github.com/nextcloud/deck/pull/5441)
|
||||
- Fixing #5451 [#5457](https://github.com/nextcloud/deck/pull/5457)
|
||||
- fix: Add debounce to update due date [#5483](https://github.com/nextcloud/deck/pull/5483)
|
||||
- fix(i18n): Fixed typo [#5424](https://github.com/nextcloud/deck/pull/5424)
|
||||
|
||||
### Other
|
||||
## 1.12.0
|
||||
|
||||
- fix(i18n): Improved wording @rakekniven [#5496](https://github.com/nextcloud/deck/pull/5496)
|
||||
### Added
|
||||
|
||||
- Added ability to mark a card as done @TehThanos [#4137](https://github.com/nextcloud/deck/pull/4137)
|
||||
- Card Cover Images @jszeibert [#5035](https://github.com/nextcloud/deck/pull/5035)
|
||||
- Upcoming/Today/Tomorrow dashboard widgets @BKapelari [#2658](https://github.com/nextcloud/deck/pull/2658)
|
||||
- Enabled advanced fields option on tag color picker @faab007nl [#4362](https://github.com/nextcloud/deck/pull/4362)
|
||||
- Remember last board, list for new card dialog @luka-nextcloud [#5046](https://github.com/nextcloud/deck/pull/5046)
|
||||
- Add support for bidirectional text @jamazi [#5258](https://github.com/nextcloud/deck/pull/5258)
|
||||
- Card layout polishing @juliushaertl [#5264](https://github.com/nextcloud/deck/pull/5264)
|
||||
- feat: Move to contenteditable for inline title editing @juliushaertl [#5282](https://github.com/nextcloud/deck/pull/5282)
|
||||
- scroll board by dragging @shoetten [#5293](https://github.com/nextcloud/deck/pull/5293)
|
||||
- Keyboard shortcuts [#5358](https://github.com/nextcloud/deck/pull/5358)
|
||||
|
||||
### Fixed
|
||||
|
||||
- fix: allow null label colors in trello json importer [#5355](https://github.com/nextcloud/deck/pull/5355)
|
||||
- fix: Get proper rich object for card actions [#5352](https://github.com/nextcloud/deck/pull/5352)
|
||||
- fix: Use text content as result for comments @juliushaertl [#5294](https://github.com/nextcloud/deck/pull/5294)
|
||||
- fix: Bring back due date indicator to compact mode @juliushaertl [#5292](https://github.com/nextcloud/deck/pull/5292)
|
||||
- Fix small issues around delete/undo @juliushaertl [#5296](https://github.com/nextcloud/deck/pull/5296)
|
||||
- fix(controls): use primary when filter is active @fitrahfm [#5299](https://github.com/nextcloud/deck/pull/5299)
|
||||
- fix: Properly get done state for dav @juliushaertl [#5287](https://github.com/nextcloud/deck/pull/5287)
|
||||
- Fix upcoming cards and label input @juliushaertl [#5290](https://github.com/nextcloud/deck/pull/5290)
|
||||
- fix: Properly handle adding new tags through multiselect @juliushaertl [#5285](https://github.com/nextcloud/deck/pull/5285)
|
||||
- fix: Avoid throwing errors if no token provided on close @juliushaertl [#5284](https://github.com/nextcloud/deck/pull/5284)
|
||||
- fix: Expose card actions in the card menu (fix #3180) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Use full card menu everywhere (fix #3993) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Detect end of the activity responses (fix #3395) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Add title with absolute date time to activity (fix #4508, fix #2122) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Disable dragging archived cards (fix #3271) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Hide unavailable card menu entries for archived card view [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Use localCompare to sort labels (fix #2736) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: More fitting click target for title editing [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Always load proper dashboard js (fixes a log error) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Set fixed height for card modal (fix #4296) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- fix: Make sure to always update card description when navigating away (fix #5254 #2705) [#5280](https://github.com/nextcloud/deck/pull/5280)
|
||||
- perf: Already pass board list as initial state @juliushaertl [#5281](https://github.com/nextcloud/deck/pull/5281)
|
||||
- Deck card comment notification label improvement @Jerome-Herbinet [#4748](https://github.com/nextcloud/deck/pull/4748)
|
||||
- update smart picker links @luka-nextcloud [#5047](https://github.com/nextcloud/deck/pull/5047)
|
||||
- feat: Enhance dark mode @juliushaertl [#5045](https://github.com/nextcloud/deck/pull/5045)
|
||||
- fix: export doesn't handle lists with no cards @magikmw [#5096](https://github.com/nextcloud/deck/pull/5096)
|
||||
- add attributes aria-label= and title= to Filters & View Modes buttons @privatemaker [#5133](https://github.com/nextcloud/deck/pull/5133)
|
||||
- fix: Check both card reference url patterns @juliushaertl [#5262](https://github.com/nextcloud/deck/pull/5262)
|
||||
- fix: Avoid too large index on postgres as indexing just the last_editor column is enough @juliushaertl [#5260](https://github.com/nextcloud/deck/pull/5260)
|
||||
- feat: error msg on CreateNewCardCustomPicker & only show available bo… @luka-nextcloud [#5029](https://github.com/nextcloud/deck/pull/5029)
|
||||
- test: add cypress tests for create new deck card @luka-nextcloud [#5025](https://github.com/nextcloud/deck/pull/5025)
|
||||
- Remove duplicate button @solracsf [#4850](https://github.com/nextcloud/deck/pull/4850)
|
||||
- [stable27] fix cypress for new file picker [#5088](https://github.com/nextcloud/deck/pull/5088)
|
||||
- Replace "Timeline" wording with "Activity" in order to be consistent with equivalent contexts throughout Nextcloud @Jerome-Herbinet [#5164](https://github.com/nextcloud/deck/pull/5164)
|
||||
- Board creation limitation : More understandable wordings @Jerome-Herbinet [#5168](https://github.com/nextcloud/deck/pull/5168)
|
||||
- ci(cypress): Fix file picker selector @juliushaertl [#5212](https://github.com/nextcloud/deck/pull/5212)
|
||||
- Switch to native date picker @juliushaertl [#4668](https://github.com/nextcloud/deck/pull/4668)
|
||||
- fixes minor spelling error @FundreasFrohsinn [#5216](https://github.com/nextcloud/deck/pull/5216)
|
||||
- feat(card): tooltip for comment timestamp @fitrahfm [#5253](https://github.com/nextcloud/deck/pull/5253)
|
||||
|
||||
## 1.12.0-beta.5
|
||||
|
||||
### Added
|
||||
|
||||
- Keyboard shortcuts [#5358](https://github.com/nextcloud/deck/pull/5358)
|
||||
|
||||
### Fixed
|
||||
|
||||
- fix: allow null label colors in trello json importer [#5355](https://github.com/nextcloud/deck/pull/5355)
|
||||
- fix: Get proper rich object for card actions [#5352](https://github.com/nextcloud/deck/pull/5352)
|
||||
|
||||
### Dependencies
|
||||
|
||||
- Update nextcloud/ocp dependency @nextcloud-command [#5343](https://github.com/nextcloud/deck/pull/5343)
|
||||
- Chore(deps): Bump @babel/runtime from 7.23.4 to 7.23.5 @dependabot[bot] [#5338](https://github.com/nextcloud/deck/pull/5338)
|
||||
|
||||
|
||||
## 1.12.0-beta.4
|
||||
|
||||
### Added
|
||||
|
||||
- scroll board by dragging @shoetten [#5293](https://github.com/nextcloud/deck/pull/5293)
|
||||
|
||||
### Fixed
|
||||
|
||||
- fix: Use text content as result for comments @juliushaertl [#5294](https://github.com/nextcloud/deck/pull/5294)
|
||||
- fix: Bring back due date indicator to compact mode @juliushaertl [#5292](https://github.com/nextcloud/deck/pull/5292)
|
||||
- Fix small issues around delete/undo @juliushaertl [#5296](https://github.com/nextcloud/deck/pull/5296)
|
||||
- fix(controls): use primary when filter is active @fitrahfm [#5299](https://github.com/nextcloud/deck/pull/5299)
|
||||
|
||||
## 1.12.0-beta.3
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
- 🚀 Get your project organized
|
||||
|
||||
</description>
|
||||
<version>1.13.1</version>
|
||||
<version>1.12.3</version>
|
||||
<licence>agpl</licence>
|
||||
<author>Julius Härtl</author>
|
||||
<documentation>
|
||||
@@ -38,7 +38,7 @@
|
||||
<database min-version="9.4">pgsql</database>
|
||||
<database>sqlite</database>
|
||||
<database min-version="8.0">mysql</database>
|
||||
<nextcloud min-version="29" max-version="29"/>
|
||||
<nextcloud min-version="28" max-version="28"/>
|
||||
</dependencies>
|
||||
<background-jobs>
|
||||
<job>OCA\Deck\Cron\DeleteCron</job>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
"roave/security-advisories": "dev-master",
|
||||
"phpunit/phpunit": "^9",
|
||||
"nextcloud/coding-standard": "^1.1",
|
||||
"nextcloud/ocp": "dev-stable29",
|
||||
"nextcloud/ocp": "dev-stable28",
|
||||
"psalm/phar": "^5.13"
|
||||
},
|
||||
"config": {
|
||||
|
||||
530
composer.lock
generated
530
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -69,13 +69,11 @@ describe('Card', function() {
|
||||
.first().click()
|
||||
cy.get('.modal-mask.card-selector .card-title').should('be.visible').click().type(newCardTitle)
|
||||
cy.get('.modal-mask.card-selector .multiselect-board').should('be.visible').click()
|
||||
cy.get('.vs__dropdown-menu [data-cy="board-select-title"]:contains("' + boardData.title + '")').should('be.visible').click()
|
||||
|
||||
cy.get('.modal-mask.card-selector .multiselect-board li:contains("' + boardData.title + '")').should('be.visible').click()
|
||||
cy.wait('@getBoard', { timeout: 7000 })
|
||||
|
||||
cy.get('.modal-mask.card-selector .multiselect-list').should('be.visible').click()
|
||||
cy.get('.vs__dropdown-menu span[title="TestList"]').should('be.visible').click()
|
||||
|
||||
cy.get('.modal-mask.card-selector .multiselect-list li').eq(0).should('be.visible').click()
|
||||
cy.get('.modal-mask.card-selector button.button-vue--vue-primary').should('be.visible').click()
|
||||
cy.wait('@save', { timeout: 7000 })
|
||||
|
||||
@@ -103,13 +101,13 @@ describe('Card', function() {
|
||||
})
|
||||
|
||||
cy.get('.modal__card').should('be.visible')
|
||||
cy.get('.app-sidebar-header__mainname').contains('Hello world')
|
||||
cy.get('.app-sidebar-header__maintitle').contains('Hello world')
|
||||
})
|
||||
|
||||
it('Attachment from files app', () => {
|
||||
cy.get('.card:contains("Hello world")').should('be.visible').click()
|
||||
cy.get('.modal__card').should('be.visible')
|
||||
cy.get('#tab-button-attachments').click()
|
||||
cy.get('.app-sidebar-tabs__tab [data-id="attachments"]').click()
|
||||
cy.get('button.icon-upload').should('be.visible')
|
||||
cy.get('button.icon-folder').should('be.visible')
|
||||
.click()
|
||||
@@ -120,11 +118,11 @@ describe('Card', function() {
|
||||
cy.get('.attachment-list .basename').contains('welcome.txt')
|
||||
})
|
||||
|
||||
it.only('Shows the modal with the editor', () => {
|
||||
it('Shows the modal with the editor', () => {
|
||||
cy.get('.card:contains("Hello world")').should('be.visible').click()
|
||||
cy.intercept({ method: 'PUT', url: '**/apps/deck/cards/*' }).as('save')
|
||||
cy.get('.modal__card').should('be.visible')
|
||||
cy.get('.app-sidebar-header__mainname').contains('Hello world')
|
||||
cy.get('.app-sidebar-header__maintitle').contains('Hello world')
|
||||
cy.get('.modal__card .ProseMirror h1').contains('Hello world').should('be.visible')
|
||||
cy.get('.modal__card .ProseMirror h1')
|
||||
.click()
|
||||
@@ -231,13 +229,20 @@ describe('Card', function() {
|
||||
cy.get(`.card:contains("${newCardTitle}")`).should('be.visible').click()
|
||||
|
||||
cy.get('#app-sidebar-vue [data-test="tag-selector"]').should('be.visible').click()
|
||||
cy.get('.vs__dropdown-menu .tag:contains("Action needed")').should('be.visible').click()
|
||||
cy.get('.vs__selected .tag:contains("Action needed")').should('be.visible')
|
||||
cy.get('.vs__dropdown-menu .tag:contains("Later")').should('be.visible').click()
|
||||
cy.get('.multiselect__option:contains("Action needed")').should('be.visible').click()
|
||||
|
||||
cy.get('.vs__selected .tag:contains("Action needed")').should('be.visible')
|
||||
cy.get('.vs__selected .tag:contains("Action needed")')
|
||||
.parent().find('button').click()
|
||||
cy.get('[data-test="tag-selector"] .selector-wrapper--icon').click()
|
||||
cy.get('.multiselect__option:contains("Action needed")').should('not.be.visible')
|
||||
|
||||
cy.get('[data-test="tag-selector"] .multiselect__tags .tag:contains("Action needed")')
|
||||
.should('be.visible')
|
||||
|
||||
cy.get(`.card:contains("${newCardTitle}")`).find('.labels li:contains("Action needed")')
|
||||
.should('be.visible')
|
||||
|
||||
cy.get('#app-sidebar-vue [data-test="tag-selector"]').should('be.visible').click()
|
||||
cy.get('.multiselect__option:contains("Later")').should('be.visible').click()
|
||||
cy.get('.multiselect__option:contains("Action needed")').should('be.visible').click()
|
||||
|
||||
cy.get(`.card:contains("${newCardTitle}")`).find('.labels li:contains("Later")')
|
||||
.should('be.visible')
|
||||
|
||||
@@ -38,10 +38,7 @@ describe('Board', function() {
|
||||
cy.get('.board-title').contains(board.title)
|
||||
|
||||
cy.shareBoardWithUi(recipient.userId)
|
||||
|
||||
cy.intercept({ method: 'PUT', url: '**/apps/deck/boards/*/acl/*' }).as('setAcl')
|
||||
cy.get(`[data-cy="acl-participant:${recipient.userId}"]`).find('[data-cy="action:permission-edit"]').click()
|
||||
cy.wait('@setAcl')
|
||||
|
||||
cy.login(recipient)
|
||||
cy.visit(`/apps/deck/#/board/${boardId}`)
|
||||
|
||||
@@ -107,14 +107,11 @@ Cypress.Commands.add('getNavigationEntry', (boardTitle) => {
|
||||
})
|
||||
|
||||
Cypress.Commands.add('shareBoardWithUi', (userId) => {
|
||||
cy.intercept({ method: 'GET', url: `**/ocs/v2.php/apps/files_sharing/api/v1/sharees?search=${userId}*` }).as('fetchRecipients')
|
||||
cy.get('[aria-label="Open details"]').click()
|
||||
cy.get('.app-sidebar').should('be.visible')
|
||||
cy.get('.select input').type(`${userId}`)
|
||||
cy.wait('@fetchRecipients', { timeout: 7000 })
|
||||
|
||||
cy.get('.vs__dropdown-menu .option').first().contains(userId)
|
||||
cy.get('.select input').type('{enter}')
|
||||
cy.get('.multiselect__input').type(`${userId}`)
|
||||
cy.get('.multiselect__content .multiselect__element').first().contains(userId)
|
||||
cy.get('.multiselect__input').type('{enter}')
|
||||
|
||||
cy.get('.shareWithList').contains(userId)
|
||||
})
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
|
||||
<g fill="currentColor">
|
||||
<rect ry="1" height="8" width="14" y="7" x="1"/>
|
||||
<rect ry=".5" height="1" width="12" y="5" x="2"/>
|
||||
<rect ry=".5" height="1" width="10" y="3" x="3"/>
|
||||
<rect ry=".5" height="1" width="8" y="1" x="4"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 372 B |
@@ -23,12 +23,12 @@
|
||||
|
||||
namespace OCA\Deck\Activity;
|
||||
|
||||
use \OCP\Comments\ICommentsEventHandler;
|
||||
use OCA\Deck\Db\CardMapper;
|
||||
use OCA\Deck\Db\ChangeHelper;
|
||||
use OCA\Deck\Notification\NotificationHelper;
|
||||
use OCP\Comments\CommentsEvent;
|
||||
use OCP\Comments\IComment;
|
||||
use OCP\Comments\ICommentsEventHandler;
|
||||
|
||||
class CommentEventHandler implements ICommentsEventHandler {
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ class DeckProvider implements IProvider {
|
||||
* @throws \InvalidArgumentException Should be thrown if your provider does not know this event
|
||||
* @since 11.0.0
|
||||
*/
|
||||
public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
|
||||
public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
|
||||
if ($event->getApp() !== 'deck') {
|
||||
throw new \InvalidArgumentException();
|
||||
}
|
||||
|
||||
@@ -62,7 +62,6 @@ use OCA\Deck\Search\DeckProvider;
|
||||
use OCA\Deck\Service\PermissionService;
|
||||
use OCA\Deck\Sharing\DeckShareProvider;
|
||||
use OCA\Deck\Sharing\Listener;
|
||||
use OCA\Deck\Teams\DeckTeamResourceProvider;
|
||||
use OCA\Text\Event\LoadEditor;
|
||||
use OCP\AppFramework\App;
|
||||
use OCP\AppFramework\Bootstrap\IBootContext;
|
||||
@@ -180,8 +179,6 @@ class Application extends App implements IBootstrap {
|
||||
|
||||
$context->registerNotifierService(Notifier::class);
|
||||
$context->registerEventListener(LoadAdditionalScriptsEvent::class, ResourceAdditionalScriptsListener::class);
|
||||
|
||||
$context->registerTeamResourceProvider(DeckTeamResourceProvider::class);
|
||||
}
|
||||
|
||||
public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
|
||||
|
||||
@@ -55,7 +55,7 @@ class BoardController extends ApiController {
|
||||
* @param $boardId
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
*/
|
||||
public function read(int $boardId) {
|
||||
public function read($boardId) {
|
||||
return $this->boardService->find($boardId);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
namespace OCA\Deck\Controller;
|
||||
|
||||
use \OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCA\Deck\Db\Acl;
|
||||
use OCA\Deck\Db\CardMapper;
|
||||
use OCA\Deck\Service\BoardService;
|
||||
@@ -36,7 +37,6 @@ use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\ContentSecurityPolicy;
|
||||
use OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\AppFramework\Services\IInitialState;
|
||||
use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
|
||||
|
||||
@@ -68,7 +68,7 @@ class SessionController extends OCSController {
|
||||
|
||||
#[NoAdminRequired]
|
||||
#[NoCSRFRequired]
|
||||
public function close(int $boardId, ?string $token = null): DataResponse {
|
||||
public function close(int $boardId, string $token = null): DataResponse {
|
||||
if ($token === null) {
|
||||
return new DataResponse();
|
||||
}
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
|
||||
namespace OCA\Deck\Db;
|
||||
|
||||
use OC\Cache\CappedMemoryCache;
|
||||
use OCA\Deck\Service\CirclesService;
|
||||
use OCP\AppFramework\Db\DoesNotExistException;
|
||||
use OCP\AppFramework\Db\QBMapper;
|
||||
use OCP\Cache\CappedMemoryCache;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\IGroupManager;
|
||||
@@ -35,22 +35,37 @@ use Psr\Log\LoggerInterface;
|
||||
|
||||
/** @template-extends QBMapper<Board> */
|
||||
class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
private $labelMapper;
|
||||
private $aclMapper;
|
||||
private $stackMapper;
|
||||
private $userManager;
|
||||
private $groupManager;
|
||||
private $circlesService;
|
||||
private $logger;
|
||||
|
||||
/** @var CappedMemoryCache<Board[]> */
|
||||
private CappedMemoryCache $userBoardCache;
|
||||
private $userBoardCache;
|
||||
/** @var CappedMemoryCache<Board> */
|
||||
private CappedMemoryCache $boardCache;
|
||||
private $boardCache;
|
||||
|
||||
public function __construct(
|
||||
IDBConnection $db,
|
||||
private LabelMapper $labelMapper,
|
||||
private AclMapper $aclMapper,
|
||||
private StackMapper $stackMapper,
|
||||
private IUserManager $userManager,
|
||||
private IGroupManager $groupManager,
|
||||
private CirclesService $circlesService,
|
||||
private LoggerInterface $logger
|
||||
LabelMapper $labelMapper,
|
||||
AclMapper $aclMapper,
|
||||
StackMapper $stackMapper,
|
||||
IUserManager $userManager,
|
||||
IGroupManager $groupManager,
|
||||
CirclesService $circlesService,
|
||||
LoggerInterface $logger
|
||||
) {
|
||||
parent::__construct($db, 'deck_boards', Board::class);
|
||||
$this->labelMapper = $labelMapper;
|
||||
$this->aclMapper = $aclMapper;
|
||||
$this->stackMapper = $stackMapper;
|
||||
$this->userManager = $userManager;
|
||||
$this->groupManager = $groupManager;
|
||||
$this->circlesService = $circlesService;
|
||||
$this->logger = $logger;
|
||||
|
||||
$this->userBoardCache = new CappedMemoryCache();
|
||||
$this->boardCache = new CappedMemoryCache();
|
||||
@@ -66,8 +81,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
* @throws DoesNotExistException
|
||||
*/
|
||||
public function find(int $id, bool $withLabels = false, bool $withAcl = false, bool $allowDeleted = false): Board {
|
||||
$cacheKey = (string)$id;
|
||||
if (!isset($this->boardCache[$cacheKey])) {
|
||||
if (!isset($this->boardCache[$id])) {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$deletedWhere = $allowDeleted ? $qb->expr()->gte('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)) : $qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT));
|
||||
$qb->select('*')
|
||||
@@ -75,22 +89,22 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
|
||||
->andWhere($deletedWhere)
|
||||
->orderBy('id');
|
||||
$this->boardCache[(string)$id] = $this->findEntity($qb);
|
||||
$this->boardCache[$id] = $this->findEntity($qb);
|
||||
}
|
||||
|
||||
// Add labels
|
||||
if ($withLabels && $this->boardCache[$cacheKey]->getLabels() === null) {
|
||||
if ($withLabels && $this->boardCache[$id]->getLabels() === null) {
|
||||
$labels = $this->labelMapper->findAll($id);
|
||||
$this->boardCache[$cacheKey]->setLabels($labels);
|
||||
$this->boardCache[$id]->setLabels($labels);
|
||||
}
|
||||
|
||||
// Add acl
|
||||
if ($withAcl && $this->boardCache[$cacheKey]->getAcl() === null) {
|
||||
if ($withAcl && $this->boardCache[$id]->getAcl() === null) {
|
||||
$acl = $this->aclMapper->findAll($id);
|
||||
$this->boardCache[$cacheKey]->setAcl($acl);
|
||||
$this->boardCache[$id]->setAcl($acl);
|
||||
}
|
||||
|
||||
return $this->boardCache[$cacheKey];
|
||||
return $this->boardCache[$id];
|
||||
}
|
||||
|
||||
public function findBoardIds(string $userId): array {
|
||||
@@ -400,51 +414,6 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
return $entries;
|
||||
}
|
||||
|
||||
public function findAllByTeam(string $teamId): array {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
|
||||
->from('deck_boards', 'b')
|
||||
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
|
||||
->where($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
|
||||
->andWhere($qb->expr()->eq('acl.participant', $qb->createNamedParameter($teamId, IQueryBuilder::PARAM_STR)));
|
||||
$entries = $this->findEntities($qb);
|
||||
foreach ($entries as $entry) {
|
||||
$entry->setShared(2);
|
||||
}
|
||||
return $entries;
|
||||
}
|
||||
|
||||
public function findTeamsForBoard(int $boardId): array {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->select('acl.participant')
|
||||
->from('deck_boards', 'b')
|
||||
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
|
||||
->where($qb->expr()->eq('b.id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
|
||||
->andWhere($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)));
|
||||
|
||||
$result = $qb->executeQuery();
|
||||
return array_map(function ($entry) {
|
||||
return $entry['participant'];
|
||||
}, $result->fetchAll());
|
||||
}
|
||||
|
||||
public function isSharedWithTeam(int $boardId, string $teamId): bool {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
|
||||
->from('deck_boards', 'b')
|
||||
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
|
||||
->where($qb->expr()->eq('b.id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
|
||||
->andWhere($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
|
||||
->andWhere($qb->expr()->eq('acl.participant', $qb->createNamedParameter($teamId, IQueryBuilder::PARAM_STR)));
|
||||
try {
|
||||
$this->findEntity($qb);
|
||||
return true;
|
||||
} catch (DoesNotExistException $e) {
|
||||
// Expected return falue
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function findAll(): array {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->select('id')
|
||||
@@ -495,7 +464,8 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
}
|
||||
|
||||
public function mapAcl(Acl &$acl) {
|
||||
$acl->resolveRelation('participant', function ($participant) use (&$acl) {
|
||||
$groupManager = $this->groupManager;
|
||||
$acl->resolveRelation('participant', function ($participant) use (&$acl, &$userManager, &$groupManager) {
|
||||
if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {
|
||||
if ($this->userManager->userExists($acl->getParticipant())) {
|
||||
return new User($acl->getParticipant(), $this->userManager);
|
||||
@@ -504,7 +474,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
|
||||
return null;
|
||||
}
|
||||
if ($acl->getType() === Acl::PERMISSION_TYPE_GROUP) {
|
||||
$group = $this->groupManager->get($participant);
|
||||
$group = $groupManager->get($participant);
|
||||
if ($group !== null) {
|
||||
return new Group($group);
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
|
||||
public function queryCardsByBoards(array $boardIds): IQueryBuilder {
|
||||
$qb = $this->db->getQueryBuilder();
|
||||
$qb->selectDistinct('c.*')
|
||||
$qb->select('c.*')
|
||||
->from('deck_cards', 'c')
|
||||
->innerJoin('c', 'deck_stacks', 's', $qb->expr()->eq('s.id', 'c.stack_id'))
|
||||
->andWhere($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY)));
|
||||
@@ -313,7 +313,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
return $this->findEntities($qb);
|
||||
}
|
||||
|
||||
public function search(array $boardIds, SearchQuery $query, ?int $limit = null, ?int $offset = null): array {
|
||||
public function search(array $boardIds, SearchQuery $query, int $limit = null, int $offset = null): array {
|
||||
$qb = $this->queryCardsByBoards($boardIds);
|
||||
$this->extendQueryByFilter($qb, $query);
|
||||
|
||||
@@ -339,6 +339,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
);
|
||||
}
|
||||
|
||||
$qb->groupBy('c.id');
|
||||
$qb->orderBy('c.last_modified', 'DESC');
|
||||
if ($limit !== null) {
|
||||
$qb->setMaxResults($limit);
|
||||
@@ -356,7 +357,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
return $entities;
|
||||
}
|
||||
|
||||
public function searchComments(array $boardIds, SearchQuery $query, ?int $limit = null, ?int $offset = null): array {
|
||||
public function searchComments(array $boardIds, SearchQuery $query, int $limit = null, int $offset = null): array {
|
||||
if (count($query->getTextTokens()) === 0) {
|
||||
return [];
|
||||
}
|
||||
@@ -382,6 +383,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
$tokenMatching
|
||||
);
|
||||
|
||||
$qb->groupBy('comments.id', 'c.id');
|
||||
$qb->orderBy('comments.id', 'DESC');
|
||||
if ($limit !== null) {
|
||||
$qb->setMaxResults($limit);
|
||||
@@ -614,7 +616,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
||||
});
|
||||
}
|
||||
|
||||
public function transferOwnership(string $ownerId, string $newOwnerId, ?int $boardId = null): void {
|
||||
public function transferOwnership(string $ownerId, string $newOwnerId, int $boardId = null): void {
|
||||
$params = [
|
||||
'owner' => $ownerId,
|
||||
'newOwner' => $newOwnerId
|
||||
|
||||
@@ -31,7 +31,7 @@ use OCA\Deck\Db\Card;
|
||||
class CardUpdatedEvent extends ACardEvent {
|
||||
private $cardBefore;
|
||||
|
||||
public function __construct(Card $card, ?Card $before = null) {
|
||||
public function __construct(Card $card, Card $before = null) {
|
||||
parent::__construct($card);
|
||||
$this->cardBefore = $before;
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ class ConfigService {
|
||||
return false;
|
||||
}
|
||||
|
||||
public function isCalendarEnabled(?int $boardId = null): bool {
|
||||
public function isCalendarEnabled(int $boardId = null): bool {
|
||||
if ($this->getUserId() === null) {
|
||||
return false;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ class ConfigService {
|
||||
return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'board:' . $boardId . ':calendar', $defaultState);
|
||||
}
|
||||
|
||||
public function isCardDetailsInModal(?int $boardId = null): bool {
|
||||
public function isCardDetailsInModal(int $boardId = null): bool {
|
||||
if ($this->getUserId() === null) {
|
||||
return false;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ class ConfigService {
|
||||
return array_filter($groups);
|
||||
}
|
||||
|
||||
public function getAttachmentFolder(?string $userId = null): string {
|
||||
public function getAttachmentFolder(string $userId = null): string {
|
||||
if ($userId === null && $this->getUserId() === null) {
|
||||
throw new NoPermissionException('Must be logged in get the attachment folder');
|
||||
}
|
||||
@@ -231,7 +231,7 @@ class ConfigService {
|
||||
return $this->config->getUserValue($userId ?? $this->getUserId(), 'deck', 'attachment_folder', '/Deck');
|
||||
}
|
||||
|
||||
public function setAttachmentFolder(?string $userId, string $path): void {
|
||||
public function setAttachmentFolder(?string $userId = null, string $path): void {
|
||||
if ($userId === null && $this->getUserId() === null) {
|
||||
throw new NoPermissionException('Must be logged in get the attachment folder');
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ class SearchService {
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
}
|
||||
|
||||
public function searchCards(string $term, ?int $limit = null, ?int $cursor = null): array {
|
||||
public function searchCards(string $term, int $limit = null, ?int $cursor = null): array {
|
||||
$boards = $this->boardService->getUserBoards();
|
||||
$boardIds = array_map(static function (Board $board) {
|
||||
return $board->getId();
|
||||
|
||||
@@ -516,7 +516,6 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
|
||||
}
|
||||
|
||||
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
|
||||
$qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT)));
|
||||
if ($shallow) {
|
||||
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
|
||||
} else {
|
||||
@@ -848,7 +847,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
|
||||
$pathSections = explode('/', $data['path'], 2);
|
||||
// FIXME: would not detect rare md5'd home storage case properly
|
||||
if ($pathSections[0] !== 'files'
|
||||
&& (strpos($data['storage_string_id'], 'home::') === 0 || strpos($data['storage_string_id'], 'object::user') === 0)) {
|
||||
&& in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace OCA\Deck\Teams;
|
||||
|
||||
use OCA\Deck\AppInfo\Application;
|
||||
use OCA\Deck\Db\Board;
|
||||
use OCA\Deck\Db\BoardMapper;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\Teams\TeamResource;
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2024 Julius Härtl <jus@bitgrid.net>
|
||||
*
|
||||
* @author Julius Härtl <jus@bitgrid.net>
|
||||
*
|
||||
* @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/>.
|
||||
*/
|
||||
|
||||
class DeckTeamResourceProvider implements \OCP\Teams\ITeamResourceProvider {
|
||||
|
||||
public function __construct(
|
||||
private BoardMapper $boardMapper,
|
||||
private IURLGenerator $urlGenerator,
|
||||
) {
|
||||
}
|
||||
|
||||
|
||||
public function getId(): string {
|
||||
return Application::APP_ID;
|
||||
}
|
||||
|
||||
public function getName(): string {
|
||||
return 'Deck';
|
||||
}
|
||||
|
||||
public function getIconSvg(): string {
|
||||
return file_get_contents(__DIR__ . '/../../img/deck-current.svg');
|
||||
}
|
||||
|
||||
public function getSharedWith($teamId): array {
|
||||
$boards = $this->boardMapper->findAllByTeam($teamId);
|
||||
return array_map(function (Board $board) {
|
||||
return new TeamResource(
|
||||
$this,
|
||||
(string)$board->getId(),
|
||||
$board->getTitle(),
|
||||
$this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#/board/' . $board->getId(),
|
||||
$this->getBoardBulletIcon($board),
|
||||
$this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('deck', 'deck-current.svg')),
|
||||
);
|
||||
}, $boards);
|
||||
}
|
||||
|
||||
public function isSharedWithTeam(string $teamId, string $resourceId): bool {
|
||||
return $this->boardMapper->isSharedWithTeam((int)$resourceId, $teamId);
|
||||
}
|
||||
|
||||
public function getTeamsForResource(string $resourceId): array {
|
||||
return $this->boardMapper->findTeamsForBoard((int)$resourceId);
|
||||
}
|
||||
|
||||
public function getBoardBulletIcon(Board $board): string {
|
||||
return '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><g fill="#' . $board->getColor(). '"><rect ry="15" height="14" width="14" y="1" x="1"/></g></svg>';
|
||||
}
|
||||
}
|
||||
6552
package-lock.json
generated
6552
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
47
package.json
47
package.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "deck",
|
||||
"description": "",
|
||||
"version": "1.13.1",
|
||||
"version": "1.12.3",
|
||||
"authors": [
|
||||
{
|
||||
"name": "Julius Härtl",
|
||||
@@ -31,36 +31,35 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/polyfill": "^7.12.1",
|
||||
"@babel/runtime": "^7.24.1",
|
||||
"@nextcloud/auth": "^2.3.0",
|
||||
"@babel/runtime": "^7.23.2",
|
||||
"@nextcloud/auth": "^2.2.1",
|
||||
"@nextcloud/axios": "^2.4.0",
|
||||
"@nextcloud/capabilities": "^1.1.0",
|
||||
"@nextcloud/dialogs": "^5.3.2",
|
||||
"@nextcloud/dialogs": "^4.2.2",
|
||||
"@nextcloud/event-bus": "^3.1.0",
|
||||
"@nextcloud/files": "^3.4.0",
|
||||
"@nextcloud/files": "^3.0.0",
|
||||
"@nextcloud/initial-state": "^2.1.0",
|
||||
"@nextcloud/l10n": "^2.2.0",
|
||||
"@nextcloud/moment": "^1.3.1",
|
||||
"@nextcloud/notify_push": "^1.1.4",
|
||||
"@nextcloud/router": "^3.0.0",
|
||||
"@nextcloud/vue": "^8.12.0",
|
||||
"@nextcloud/moment": "^1.2.2",
|
||||
"@nextcloud/notify_push": "^1.1.3",
|
||||
"@nextcloud/router": "^2.2.0",
|
||||
"@nextcloud/vue": "^7.12.6",
|
||||
"blueimp-md5": "^2.19.0",
|
||||
"chroma-js": "^2.4.2",
|
||||
"dompurify": "^3.0.11",
|
||||
"dompurify": "^3.0.6",
|
||||
"lodash": "^4.17.21",
|
||||
"markdown-it": "^14.1.0",
|
||||
"markdown-it": "^13.0.2",
|
||||
"markdown-it-link-attributes": "^4.0.1",
|
||||
"markdown-it-task-checkbox": "^1.0.6",
|
||||
"moment": "^2.30.1",
|
||||
"nextcloud-vue-collections": "^0.12.0",
|
||||
"p-queue": "^8.0.1",
|
||||
"moment": "^2.29.4",
|
||||
"nextcloud-vue-collections": "^0.11.1",
|
||||
"p-queue": "^7.4.1",
|
||||
"url-search-params-polyfill": "^8.2.5",
|
||||
"vue": "^2.7.15",
|
||||
"vue-at": "^2.5.1",
|
||||
"vue-click-outside": "^1.1.0",
|
||||
"vue-easymde": "^2.0.0",
|
||||
"vue-infinite-loading": "^2.4.5",
|
||||
"vue-material-design-icons": "^5.3.0",
|
||||
"vue-material-design-icons": "^5.2.0",
|
||||
"vue-router": "^3.6.5",
|
||||
"vue-smooth-dnd": "^0.8.1",
|
||||
"vuex": "^3.6.2",
|
||||
@@ -76,20 +75,20 @@
|
||||
"devDependencies": {
|
||||
"@nextcloud/babel-config": "^1.0.0",
|
||||
"@nextcloud/browserslist-config": "^3.0.0",
|
||||
"@nextcloud/cypress": "^1.0.0-beta.7",
|
||||
"@nextcloud/cypress": "^1.0.0-beta.6",
|
||||
"@nextcloud/eslint-config": "^8.3.0",
|
||||
"@nextcloud/stylelint-config": "^2.4.0",
|
||||
"@nextcloud/stylelint-config": "^2.3.1",
|
||||
"@nextcloud/webpack-vue-config": "^6.0.0",
|
||||
"@relative-ci/agent": "^4.2.5",
|
||||
"@vue/test-utils": "^2.4.5",
|
||||
"@relative-ci/agent": "^4.2.1",
|
||||
"@vue/test-utils": "^1.3.6",
|
||||
"@vue/vue2-jest": "^29.2.6",
|
||||
"cypress": "^13.7.1",
|
||||
"cypress": "^13.5.1",
|
||||
"eslint-plugin-cypress": "^2.15.1",
|
||||
"eslint-webpack-plugin": "^4.1.0",
|
||||
"eslint-webpack-plugin": "^4.0.1",
|
||||
"jest": "^29.7.0",
|
||||
"jest-serializer-vue": "^3.1.0",
|
||||
"stylelint-webpack-plugin": "^5.0.0",
|
||||
"vue-template-compiler": "^2.7.16"
|
||||
"stylelint-webpack-plugin": "^4.1.1",
|
||||
"vue-template-compiler": "^2.7.15"
|
||||
},
|
||||
"jest": {
|
||||
"moduleFileExtensions": [
|
||||
|
||||
@@ -200,13 +200,11 @@ export default {
|
||||
background-image: url('../img/color_picker.svg');
|
||||
}
|
||||
|
||||
.v-select {
|
||||
.multiselect {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.modal__card {
|
||||
width: 100%;
|
||||
min-width: 100%;
|
||||
height: 100vh;
|
||||
max-height: calc(100vh - 120px);
|
||||
overflow: auto;
|
||||
|
||||
@@ -2,20 +2,21 @@
|
||||
<NcModal v-if="modalShow" :title="t('deck', 'Move card to another board')" @close="modalShow=false">
|
||||
<div class="modal__content">
|
||||
<h3>{{ t('deck', 'Move card to another board') }}</h3>
|
||||
<NcSelect v-model="selectedBoard"
|
||||
:input-label="t('deck', 'Select a board')"
|
||||
<NcMultiselect v-model="selectedBoard"
|
||||
:placeholder="t('deck', 'Select a board')"
|
||||
:options="activeBoards"
|
||||
:max-height="100"
|
||||
label="title"
|
||||
@option:selected="loadStacksFromBoard" />
|
||||
<NcSelect v-model="selectedStack"
|
||||
:disabled="stacksFromBoard.length === 0"
|
||||
:placeholder="stacksFromBoard.length === 0 ? t('deck', 'No lists available') : t('deck', 'Select a list')"
|
||||
:input-label="t('deck', 'Select a list')"
|
||||
@select="loadStacksFromBoard" />
|
||||
<NcMultiselect v-model="selectedStack"
|
||||
:placeholder="t('deck', 'Select a list')"
|
||||
:options="stacksFromBoard"
|
||||
:max-height="100"
|
||||
label="title" />
|
||||
label="title">
|
||||
<span slot="noOptions">
|
||||
{{ t('deck', 'List is empty') }}
|
||||
</span>
|
||||
</NcMultiselect>
|
||||
|
||||
<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">
|
||||
{{ t('deck', 'Move card') }}
|
||||
@@ -28,14 +29,14 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcModal, NcSelect } from '@nextcloud/vue'
|
||||
import { NcModal, NcMultiselect } from '@nextcloud/vue'
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
import axios from '@nextcloud/axios'
|
||||
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
|
||||
|
||||
export default {
|
||||
name: 'CardMoveDialog',
|
||||
components: { NcModal, NcSelect },
|
||||
components: { NcModal, NcMultiselect },
|
||||
data() {
|
||||
return {
|
||||
card: null,
|
||||
@@ -91,15 +92,11 @@ export default {
|
||||
width: 25vw;
|
||||
min-width: 250px;
|
||||
min-height: 120px;
|
||||
text-align: center;
|
||||
margin: 20px 20px 100px 20px;
|
||||
|
||||
h3 {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.select {
|
||||
margin-bottom: 12px;
|
||||
.multiselect {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,12 +24,12 @@
|
||||
<NcModal class="card-selector" @close="close">
|
||||
<div id="modal-inner" :class="{ 'icon-loading': loading }">
|
||||
<h3>{{ title }}</h3>
|
||||
<NcSelect v-model="selectedBoard"
|
||||
<NcMultiselect v-model="selectedBoard"
|
||||
:placeholder="t('deck', 'Select a board')"
|
||||
:options="boards"
|
||||
:disabled="loading"
|
||||
label="title"
|
||||
@option:selected="fetchCardsFromBoard">
|
||||
@select="fetchCardsFromBoard">
|
||||
<template slot="singleLabel" slot-scope="props">
|
||||
<span>
|
||||
<span :style="{ 'backgroundColor': '#' + props.option.color }" class="board-bullet" />
|
||||
@@ -42,9 +42,9 @@
|
||||
<span>{{ props.option.title }}</span>
|
||||
</span>
|
||||
</template>
|
||||
</NcSelect>
|
||||
</NcMultiselect>
|
||||
|
||||
<NcSelect v-model="selectedCard"
|
||||
<NcMultiselect v-model="selectedCard"
|
||||
:placeholder="t('deck', 'Select a card')"
|
||||
:options="cardsFromBoard"
|
||||
:disabled="loading || selectedBoard === ''"
|
||||
@@ -62,14 +62,14 @@
|
||||
|
||||
<script>
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
import { NcModal, NcSelect } from '@nextcloud/vue'
|
||||
import { NcModal, NcMultiselect } from '@nextcloud/vue'
|
||||
import axios from '@nextcloud/axios'
|
||||
|
||||
export default {
|
||||
name: 'CardSelector',
|
||||
components: {
|
||||
NcModal,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
},
|
||||
props: {
|
||||
title: {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<div class="activity--header">
|
||||
<img :src="activity.icon" class="activity--icon">
|
||||
<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
|
||||
<div class="activity--timestamp" :name="formatReadableDate(activity.datetime)">
|
||||
<div class="activity--timestamp" :title="formatReadableDate(activity.datetime)">
|
||||
{{ relativeDate(activity.datetime) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
</div>
|
||||
</transition>
|
||||
|
||||
<NcModal v-if="modalShow" :name="t('deck', 'File already exists')" @close="modalShow=false">
|
||||
<NcModal v-if="modalShow" :title="t('deck', 'File already exists')" @close="modalShow=false">
|
||||
<div class="modal__content">
|
||||
<h2>{{ t('deck', 'File already exists') }}</h2>
|
||||
<p>
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
required
|
||||
@focus="$store.dispatch('toggleShortcutLock', true)"
|
||||
@blur="$store.dispatch('toggleShortcutLock', false)">
|
||||
<input :title="t('deck', 'Add list')"
|
||||
<input v-tooltip="t('deck', 'Add list')"
|
||||
class="icon-confirm"
|
||||
type="submit"
|
||||
value="">
|
||||
@@ -86,24 +86,24 @@
|
||||
</div>
|
||||
<div v-if="board" class="board-action-buttons">
|
||||
<div class="board-action-buttons__filter">
|
||||
<NcPopover :placement="'bottom-end'"
|
||||
<NcPopover container=".board-action-buttons__filter"
|
||||
:placement="'bottom-end'"
|
||||
:aria-label="t('deck', 'Active filters')"
|
||||
:name="t('deck', 'Active filters')"
|
||||
:title="t('deck', 'Active filters')"
|
||||
:tooltip="t('deck', 'Active filters')"
|
||||
@show="filterVisible=true"
|
||||
@hide="filterVisible=false">
|
||||
<!-- We cannot use NcActions here are the popover trigger does not update on reactive icons -->
|
||||
<template #trigger>
|
||||
<NcButton ref="filterPopover"
|
||||
:title="t('deck', 'Apply filter')"
|
||||
:aria-label="t('deck', 'Apply filter')"
|
||||
class="filter-button"
|
||||
:type="isFilterActive ? 'primary' : 'tertiary'">
|
||||
<template #icon>
|
||||
<FilterIcon v-if="isFilterActive" :size="20" decorative />
|
||||
<FilterOffIcon v-else :size="20" decorative />
|
||||
</template>
|
||||
</NcButton>
|
||||
</template>
|
||||
<NcButton slot="trigger"
|
||||
ref="filterPopover"
|
||||
:title="t('deck', 'Apply filter')"
|
||||
class="filter-button"
|
||||
:type="isFilterActive ? 'primary' : 'tertiary'">
|
||||
<template #icon>
|
||||
<FilterIcon v-if="isFilterActive" :size="20" decorative />
|
||||
<FilterOffIcon v-else :size="20" decorative />
|
||||
</template>
|
||||
</NcButton>
|
||||
|
||||
<div v-if="filterVisible" class="filter">
|
||||
<h3>{{ t('deck', 'Filter by tag') }}</h3>
|
||||
@@ -138,40 +138,8 @@
|
||||
<label :for="user.uid"><NcAvatar :user="user.uid" :size="24" :disable-menu="true" /> {{ user.displayname }}</label>
|
||||
</div>
|
||||
|
||||
<h3>{{ t('deck', 'Filter by completed') }}</h3>
|
||||
<div class="filter--item">
|
||||
<input id="filter-option-both"
|
||||
v-model="filter.completed"
|
||||
type="radio"
|
||||
class="radio"
|
||||
value="both"
|
||||
@change="setFilter"
|
||||
@click="beforeSetFilter">
|
||||
<label for="filter-option-both">{{ t('deck', 'Open and completed') }}</label>
|
||||
</div>
|
||||
<div class="filter--item">
|
||||
<input id="filter-option-open"
|
||||
v-model="filter.completed"
|
||||
type="radio"
|
||||
class="radio"
|
||||
value="open"
|
||||
@change="setFilter"
|
||||
@click="beforeSetFilter">
|
||||
<label for="filter-option-open">{{ t('deck', 'Open') }}</label>
|
||||
</div>
|
||||
|
||||
<div class="filter--item">
|
||||
<input id="filter-option-completed"
|
||||
v-model="filter.completed"
|
||||
type="radio"
|
||||
class="radio"
|
||||
value="completed"
|
||||
@change="setFilter"
|
||||
@click="beforeSetFilter">
|
||||
<label for="filter-option-completed">{{ t('deck', 'Completed') }}</label>
|
||||
</div>
|
||||
|
||||
<h3>{{ t('deck', 'Filter by due date') }}</h3>
|
||||
|
||||
<div class="filter--item">
|
||||
<input id="overdue"
|
||||
v-model="filter.due"
|
||||
@@ -235,7 +203,7 @@
|
||||
</div>
|
||||
|
||||
<NcActions :aria-label="t('deck', 'View Modes')"
|
||||
:name="t('deck', 'Toggle View Modes')">
|
||||
:title="t('deck', 'Toggle View Modes')">
|
||||
<NcActionButton @click="toggleShowArchived">
|
||||
<template #icon>
|
||||
<ArchiveIcon :size="20" decorative />
|
||||
@@ -260,10 +228,10 @@
|
||||
</NcActionButton>
|
||||
</NcActions>
|
||||
<!-- FIXME: NcActionRouter currently doesn't work as an inline action -->
|
||||
<NcActions v-if="isFullApp">
|
||||
<NcActions>
|
||||
<NcActionButton icon="icon-menu-sidebar"
|
||||
:aria-label="t('deck', 'Open details')"
|
||||
:name="t('deck', 'Details')"
|
||||
:title="t('deck', 'Details')"
|
||||
@click="toggleDetailsView" />
|
||||
</NcActions>
|
||||
</div>
|
||||
@@ -325,7 +293,7 @@ export default {
|
||||
filterVisible: false,
|
||||
showArchived: false,
|
||||
isAddStackVisible: false,
|
||||
filter: { tags: [], users: [], due: '', unassigned: false, completed: 'both' },
|
||||
filter: { tags: [], users: [], due: '', unassigned: false },
|
||||
showAddCardModal: false,
|
||||
defaultPageTitle: false,
|
||||
isNotifyPushEnabled: isNotifyPushEnabled(),
|
||||
@@ -338,7 +306,6 @@ export default {
|
||||
'canManage',
|
||||
]),
|
||||
...mapState({
|
||||
isFullApp: state => state.isFullApp,
|
||||
compactMode: state => state.compactMode,
|
||||
showCardCover: state => state.showCardCover,
|
||||
searchQuery: state => state.searchQuery,
|
||||
@@ -349,7 +316,7 @@ export default {
|
||||
}
|
||||
},
|
||||
isFilterActive() {
|
||||
return this.filter.tags.length !== 0 || this.filter.users.length !== 0 || this.filter.due !== '' || this.filter.completed !== 'both'
|
||||
return this.filter.tags.length !== 0 || this.filter.users.length !== 0 || this.filter.due !== ''
|
||||
},
|
||||
labelsSorted() {
|
||||
return [...this.board.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
|
||||
@@ -392,12 +359,7 @@ export default {
|
||||
}
|
||||
if (e.target.value === 'unassigned') {
|
||||
this.filter.users = []
|
||||
this.$store.dispatch('setFilter', { ...this.filter })
|
||||
} else {
|
||||
this.filter.completed = 'both'
|
||||
this.$store.dispatch('setFilter', { ...this.filter })
|
||||
}
|
||||
this.$store.dispatch('setFilter', { ...this.filter })
|
||||
},
|
||||
setFilter() {
|
||||
if (this.filter.users.length > 0) {
|
||||
@@ -439,7 +401,7 @@ export default {
|
||||
}
|
||||
},
|
||||
clearFilter() {
|
||||
const filterReset = { tags: [], users: [], due: '', completed: 'both' }
|
||||
const filterReset = { tags: [], users: [], due: '' }
|
||||
this.$store.dispatch('setFilter', { ...filterReset })
|
||||
this.filter = filterReset
|
||||
},
|
||||
@@ -450,9 +412,6 @@ export default {
|
||||
this.showAddCardModal = false
|
||||
},
|
||||
setPageTitle(title) {
|
||||
if (!this.isFullApp) {
|
||||
return
|
||||
}
|
||||
if (this.defaultPageTitle === false) {
|
||||
this.defaultPageTitle = window.document.title
|
||||
if (this.defaultPageTitle.indexOf(' - Deck - ') !== -1) {
|
||||
@@ -556,6 +515,7 @@ export default {
|
||||
input + label {
|
||||
display: block;
|
||||
padding: 6px 0;
|
||||
vertical-align: middle;
|
||||
.avatardiv {
|
||||
vertical-align: middle;
|
||||
margin-bottom: 2px;
|
||||
@@ -599,4 +559,8 @@ export default {
|
||||
.popover:focus {
|
||||
outline: 2px solid var(--color-main-text);
|
||||
}
|
||||
|
||||
.tooltip-inner.popover-inner {
|
||||
text-align: left;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
* -->
|
||||
|
||||
<template>
|
||||
<div :title="t('text', 'Currently present people')"
|
||||
<div v-tooltip.bottom="t('text', 'Currently present people')"
|
||||
class="avatar-list">
|
||||
<div v-for="session in sessionsVisible"
|
||||
:key="session.uid"
|
||||
@@ -37,13 +37,16 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcAvatar } from '@nextcloud/vue'
|
||||
import { NcAvatar, Tooltip } from '@nextcloud/vue'
|
||||
|
||||
export default {
|
||||
name: 'SessionList',
|
||||
components: {
|
||||
NcAvatar,
|
||||
},
|
||||
directives: {
|
||||
tooltip: Tooltip,
|
||||
},
|
||||
props: {
|
||||
sessions: {
|
||||
type: Array,
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
class="no-close"
|
||||
:placeholder="t('deck', 'List name')"
|
||||
required>
|
||||
<input title="t('deck', 'Add list')"
|
||||
<input v-tooltip="t('deck', 'Add list')"
|
||||
class="icon-confirm"
|
||||
type="submit"
|
||||
value="">
|
||||
@@ -81,16 +81,7 @@
|
||||
</Container>
|
||||
</div>
|
||||
</transition>
|
||||
<GlobalSearchResults v-if="isFullApp" />
|
||||
<NcModal v-if="localModal"
|
||||
:clear-view-delay="0"
|
||||
:close-button-contained="true"
|
||||
size="large"
|
||||
@close="localModal = null">
|
||||
<div class="modal__content modal__card">
|
||||
<CardSidebar :id="localModal" @close="localModal = null" />
|
||||
</div>
|
||||
</NcModal>
|
||||
<GlobalSearchResults />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -100,11 +91,11 @@ import { mapState, mapGetters } from 'vuex'
|
||||
import Controls from '../Controls.vue'
|
||||
import DeckIcon from '../icons/DeckIcon.vue'
|
||||
import Stack from './Stack.vue'
|
||||
import { NcEmptyContent, NcModal } from '@nextcloud/vue'
|
||||
import { NcEmptyContent } from '@nextcloud/vue'
|
||||
import GlobalSearchResults from '../search/GlobalSearchResults.vue'
|
||||
import { showError } from '../../helpers/errors.js'
|
||||
import { createSession } from '../../sessions.js'
|
||||
import CardSidebar from '../card/CardSidebar.vue'
|
||||
|
||||
export default {
|
||||
name: 'Board',
|
||||
components: {
|
||||
@@ -115,8 +106,6 @@ export default {
|
||||
Draggable,
|
||||
Stack,
|
||||
NcEmptyContent,
|
||||
NcModal,
|
||||
CardSidebar,
|
||||
},
|
||||
inject: [
|
||||
'boardApi',
|
||||
@@ -134,12 +123,10 @@ export default {
|
||||
newStackTitle: '',
|
||||
currentScrollPosX: null,
|
||||
currentMousePosX: null,
|
||||
localModal: null,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState({
|
||||
isFullApp: state => state.isFullApp,
|
||||
board: state => state.currentBoard,
|
||||
showArchived: state => state.showArchived,
|
||||
}),
|
||||
@@ -168,9 +155,6 @@ export default {
|
||||
created() {
|
||||
this.session = createSession(this.id)
|
||||
this.fetchData()
|
||||
this.$root.$on('open-card', (cardId) => {
|
||||
this.localModal = cardId
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.session.close()
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<template>
|
||||
<NcAppSidebar v-if="board != null"
|
||||
:actions="[]"
|
||||
:name="board.title"
|
||||
:title="board.title"
|
||||
@close="closeSidebar">
|
||||
<NcAppSidebarTab id="sharing"
|
||||
:order="0"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<NcSelect v-if="canShare"
|
||||
<NcMultiselect v-if="canShare"
|
||||
v-model="addAcl"
|
||||
:input-label="t('deck', 'Share board with a user, group or team …')"
|
||||
:placeholder="t('deck', 'Share board with a user, group or circle …')"
|
||||
:options="formatedSharees"
|
||||
:user-select="true"
|
||||
label="displayName"
|
||||
@@ -11,20 +11,20 @@
|
||||
track-by="multiselectKey"
|
||||
:internal-search="false"
|
||||
@input="clickAddAcl"
|
||||
@search="(search, loading) => asyncFind(search, loading)">
|
||||
@search-change="asyncFind">
|
||||
<template #noOptions>
|
||||
{{ isSearching ? t('deck', 'Searching for users, groups and teams …') : t('deck', 'No participants found') }}
|
||||
{{ isSearching ? t('deck', 'Searching for users, groups and circles …') : t('deck', 'No participants found') }}
|
||||
</template>
|
||||
<template #noResult>
|
||||
{{ isSearching ? t('deck', 'Searching for users, groups and teams …') : t('deck', 'No participants found') }}
|
||||
{{ isSearching ? t('deck', 'Searching for users, groups and circles …') : t('deck', 'No participants found') }}
|
||||
</template>
|
||||
</NcSelect>
|
||||
</NcMultiselect>
|
||||
|
||||
<ul id="shareWithList"
|
||||
class="shareWithList">
|
||||
<li>
|
||||
<NcAvatar :user="board.owner.uid" />
|
||||
<span class="username">
|
||||
<span class="has-tooltip username">
|
||||
{{ board.owner.displayname }}
|
||||
<span v-if="!isCurrentUser(board.owner.uid)" class="board-owner-label">
|
||||
{{ t('deck', 'Board owner') }}
|
||||
@@ -35,10 +35,10 @@
|
||||
<NcAvatar v-if="acl.type===0" :user="acl.participant.uid" />
|
||||
<div v-if="acl.type===1" class="avatardiv icon icon-group" />
|
||||
<div v-if="acl.type===7" class="avatardiv icon icon-circles" />
|
||||
<span class="username">
|
||||
<span class="has-tooltip username">
|
||||
{{ acl.participant.displayname }}
|
||||
<span v-if="acl.type===1">{{ t('deck', '(Group)') }}</span>
|
||||
<span v-if="acl.type===7">{{ t('deck', '(Team)') }}</span>
|
||||
<span v-if="acl.type===7">{{ t('deck', '(Circle)') }}</span>
|
||||
</span>
|
||||
|
||||
<NcActionCheckbox v-if="!(isCurrentUser(acl.participant.uid) && acl.type === 0) && (canManage || (canEdit && canShare))"
|
||||
@@ -88,7 +88,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcAvatar, NcSelect, NcActions, NcActionButton, NcActionCheckbox, 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'
|
||||
@@ -103,7 +103,7 @@ export default {
|
||||
NcActions,
|
||||
NcActionButton,
|
||||
NcActionCheckbox,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
CollectionList,
|
||||
NcRelatedResourcesPanel,
|
||||
},
|
||||
@@ -170,7 +170,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.asyncFind('', () => {})
|
||||
this.asyncFind('')
|
||||
},
|
||||
methods: {
|
||||
debouncedFind: debounce(async function(query) {
|
||||
@@ -178,10 +178,8 @@ export default {
|
||||
await this.$store.dispatch('loadSharees', query)
|
||||
this.isSearching = false
|
||||
}, 300),
|
||||
async asyncFind(query, loading) {
|
||||
loading(true)
|
||||
async asyncFind(query) {
|
||||
await this.debouncedFind(query)
|
||||
loading(false)
|
||||
},
|
||||
async clickAddAcl() {
|
||||
this.addAclForAPI = {
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
{{ stack.title }}
|
||||
</h3>
|
||||
<h3 v-else-if="!editing"
|
||||
title="stack.title"
|
||||
v-tooltip="stack.title"
|
||||
dir="auto"
|
||||
tabindex="0"
|
||||
:aria-label="stack.title"
|
||||
@@ -51,7 +51,7 @@
|
||||
dir="auto"
|
||||
type="text"
|
||||
required="required">
|
||||
<input title="t('deck', 'Edit list title')"
|
||||
<input v-tooltip="t('deck', 'Edit list title')"
|
||||
class="icon-confirm"
|
||||
type="submit"
|
||||
value="">
|
||||
@@ -158,7 +158,7 @@ import { showError, showUndo } from '@nextcloud/dialogs'
|
||||
|
||||
import CardItem from '../cards/CardItem.vue'
|
||||
|
||||
import '@nextcloud/dialogs/style.css'
|
||||
import '@nextcloud/dialogs/dist/index.css'
|
||||
|
||||
export default {
|
||||
name: 'Stack',
|
||||
|
||||
@@ -12,21 +12,20 @@
|
||||
<div :style="{ backgroundColor: '#' + editingLabel.color }" class="color0 icon-colorpicker" />
|
||||
</NcColorPicker>
|
||||
<input v-model="editingLabel.title" type="text">
|
||||
<input :disabled="!editLabelObjValidated"
|
||||
<input v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }"
|
||||
:disabled="!editLabelObjValidated"
|
||||
type="submit"
|
||||
value=""
|
||||
class="icon-confirm">
|
||||
<NcActions>
|
||||
<NcActionButton :disabled="!editLabelObjValidated"
|
||||
<NcActionButton v-tooltip="{content: missingDataLabel, show: !editLabelObjValidated, trigger: 'manual' }"
|
||||
:disabled="!editLabelObjValidated"
|
||||
icon="icon-close"
|
||||
@click="editingLabelId = null">
|
||||
{{ t('deck', 'Cancel') }}
|
||||
</NcActionButton>
|
||||
</NcActions>
|
||||
</form>
|
||||
<p v-if="!editLabelObjValidated">
|
||||
{{ missingDataLabel }}
|
||||
</p>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div v-if="canManage && !isArchived" class="label-title" @click="clickEdit(label)">
|
||||
@@ -59,7 +58,8 @@
|
||||
<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
|
||||
</NcColorPicker>
|
||||
<input v-model="addLabelObj.title" type="text">
|
||||
<input :disabled="!addLabelObjValidated"
|
||||
<input v-tooltip="{content: missingDataLabel, show: !addLabelObjValidated, trigger: 'manual' }"
|
||||
:disabled="!addLabelObjValidated"
|
||||
type="submit"
|
||||
value=""
|
||||
class="icon-confirm">
|
||||
@@ -69,9 +69,6 @@
|
||||
</NcActionButton>
|
||||
</NcActions>
|
||||
</form>
|
||||
<p v-if="!addLabelObjValidated">
|
||||
{{ missingDataLabel }}
|
||||
</p>
|
||||
</li>
|
||||
<button v-if="canManage && !isArchived" @click="clickShowAddLabel()">
|
||||
<span class="icon-add" />{{ t('deck', 'Add a new tag') }}
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
class="board-list-avatar" />
|
||||
<div v-if="board.acl.length > 5" :title="otherAcl" class="avatardiv popovermenu-wrapper board-list-avatar icon-more" />
|
||||
<div v-if="board.acl.length > 5" v-tooltip="otherAcl" class="avatardiv popovermenu-wrapper board-list-avatar icon-more" />
|
||||
</div>
|
||||
<div class="board-list-actions-cell" />
|
||||
</router-link>
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
<template>
|
||||
<div class="selector-wrapper" :aria-label="t('deck', 'Assign to users/groups/team')" data-test="assignment-selector">
|
||||
<div class="selector-wrapper" :aria-label="t('deck', 'Assign to users/groups/circles')" data-test="assignment-selector">
|
||||
<div class="selector-wrapper--icon">
|
||||
<AccountMultiple :size="20" />
|
||||
</div>
|
||||
<NcSelect v-if="canEdit"
|
||||
<NcMultiselect v-if="canEdit"
|
||||
v-model="assignedUsers"
|
||||
class="selector-wrapper--selector"
|
||||
:disabled="assignables.length === 0"
|
||||
:multiple="true"
|
||||
:options="formatedAssignables"
|
||||
:user-select="true"
|
||||
:aria-label-combobox="t('deck', 'Assign a user to this card…')"
|
||||
:placeholder="t('deck', 'Select a user to assign to this card…')"
|
||||
:auto-limit="false"
|
||||
:placeholder="t('deck', 'Assign a user to this card…')"
|
||||
label="displayname"
|
||||
track-by="multiselectKey"
|
||||
@option:selected="onSelect"
|
||||
@option:deselected="onRemove">
|
||||
@select="onSelect"
|
||||
@remove="onRemove">
|
||||
<template #tag="scope">
|
||||
<div class="avatarlist--inline">
|
||||
<NcAvatar :user="scope.option.uid"
|
||||
@@ -25,7 +25,7 @@
|
||||
:disable-menu="true" />
|
||||
</div>
|
||||
</template>
|
||||
</NcSelect>
|
||||
</NcMultiselect>
|
||||
<div v-else class="avatar-list--readonly">
|
||||
<NcAvatar v-for="option in assignedUsers"
|
||||
:key="option.primaryKey"
|
||||
@@ -39,14 +39,14 @@
|
||||
|
||||
<script>
|
||||
import { defineComponent } from 'vue'
|
||||
import { NcAvatar, NcSelect } from '@nextcloud/vue'
|
||||
import { NcAvatar, NcMultiselect } from '@nextcloud/vue'
|
||||
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
|
||||
|
||||
export default defineComponent({
|
||||
name: 'AssignmentSelector',
|
||||
components: {
|
||||
AccountMultiple,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
NcAvatar,
|
||||
},
|
||||
props: {
|
||||
@@ -117,12 +117,11 @@ export default defineComponent({
|
||||
this.assignedUsers = []
|
||||
}
|
||||
},
|
||||
onSelect(options) {
|
||||
const addition = options.filter((item) => !this.card.assignedUsers.find((user) => user.participant.primaryKey === item.primaryKey))
|
||||
this.$emit('select', addition[0])
|
||||
onSelect(user) {
|
||||
this.$emit('select', user)
|
||||
},
|
||||
onRemove(removed) {
|
||||
this.$emit('remove', removed)
|
||||
onRemove(user) {
|
||||
this.$emit('remove', user)
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -117,6 +117,7 @@ const maxUploadSizeState = loadState('deck', 'maxUploadSize', -1)
|
||||
|
||||
const picker = getFilePickerBuilder(t('deck', 'File to share'))
|
||||
.setMultiSelect(false)
|
||||
.setModal(true)
|
||||
.setType(1)
|
||||
.allowDirectories()
|
||||
.build()
|
||||
|
||||
@@ -23,19 +23,19 @@
|
||||
<template>
|
||||
<NcAppSidebar v-if="currentBoard && currentCard"
|
||||
:active="tabId"
|
||||
:name="title"
|
||||
:subname="subtitle"
|
||||
:subtitle="subtitleTooltip"
|
||||
:name-editable="titleEditable"
|
||||
@update:nameEditable="handleUpdateTitleEditable"
|
||||
@update:name="handleUpdateTitle"
|
||||
@submit-name="handleSubmitTitle"
|
||||
:title="title"
|
||||
:subtitle="subtitle"
|
||||
:subtitle-tooltip="subtitleTooltip"
|
||||
:title-editable="titleEditable"
|
||||
@update:titleEditable="handleUpdateTitleEditable"
|
||||
@update:title="handleUpdateTitle"
|
||||
@submit-title="handleSubmitTitle"
|
||||
@close="closeSidebar">
|
||||
<template #secondary-actions>
|
||||
<NcActionButton v-if="cardDetailsInModal && isFullApp" icon="icon-menu-sidebar" @click.stop="closeModal()">
|
||||
<NcActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="closeModal()">
|
||||
{{ t('deck', 'Open in sidebar view') }}
|
||||
</NcActionButton>
|
||||
<NcActionButton v-else-if="isFullApp" icon="icon-external" @click.stop="showModal()">
|
||||
<NcActionButton v-else icon="icon-external" @click.stop="showModal()">
|
||||
{{ t('deck', 'Open in bigger view') }}
|
||||
</NcActionButton>
|
||||
|
||||
@@ -83,7 +83,6 @@
|
||||
|
||||
<script>
|
||||
import { NcActionButton, NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
|
||||
import { getCapabilities } from '@nextcloud/capabilities'
|
||||
import { mapState, mapGetters } from 'vuex'
|
||||
import CardSidebarTabDetails from './CardSidebarTabDetails.vue'
|
||||
import CardSidebarTabAttachments from './CardSidebarTabAttachments.vue'
|
||||
@@ -100,7 +99,7 @@ import { showError } from '@nextcloud/dialogs'
|
||||
import { getLocale } from '@nextcloud/l10n'
|
||||
import CardMenuEntries from '../cards/CardMenuEntries.vue'
|
||||
|
||||
const capabilities = getCapabilities()
|
||||
const capabilities = window.OC.getCapabilities()
|
||||
|
||||
export default {
|
||||
name: 'CardSidebar',
|
||||
@@ -145,7 +144,6 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapState({
|
||||
isFullApp: state => state.isFullApp,
|
||||
currentBoard: state => state.currentBoard,
|
||||
}),
|
||||
...mapGetters(['canEdit', 'assignables', 'cardActions', 'stackById']),
|
||||
@@ -190,8 +188,7 @@ export default {
|
||||
},
|
||||
|
||||
closeSidebar() {
|
||||
this.$router?.push({ name: 'board' })
|
||||
this.$emit('close')
|
||||
this.$router.push({ name: 'board' })
|
||||
},
|
||||
|
||||
showModal() {
|
||||
@@ -207,7 +204,7 @@ export default {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style lang="scss" scoped>
|
||||
|
||||
section.app-sidebar__tab--active {
|
||||
min-height: auto;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div>
|
||||
<div class="comment--header">
|
||||
<NcAvatar :user="currentUser.uid" />
|
||||
<span class="username">
|
||||
<span class="has-tooltip username">
|
||||
{{ currentUser.displayName }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -178,13 +178,14 @@ export default {
|
||||
},
|
||||
|
||||
async addLabelToBoardAndCard(name) {
|
||||
await this.$store.dispatch('addLabelToCurrentBoardAndCard', {
|
||||
const newLabel = await this.$store.dispatch('addLabelToCurrentBoardAndCard', {
|
||||
card: this.copiedCard,
|
||||
newLabel: {
|
||||
title: name,
|
||||
color: this.randomColor(),
|
||||
},
|
||||
})
|
||||
this.copiedCard.labels.push(newLabel)
|
||||
},
|
||||
|
||||
removeLabelFromCard(removedLabel) {
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
@blur="error = null"
|
||||
@input="validate()" />
|
||||
</At>
|
||||
<input :title="t('deck', 'Save')"
|
||||
<input v-tooltip="t('deck', 'Save')"
|
||||
class="icon-confirm"
|
||||
type="submit"
|
||||
value=""
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<li v-else class="comment">
|
||||
<div class="comment--header">
|
||||
<NcAvatar :user="comment.actorId" />
|
||||
<span class="username">
|
||||
<span class="has-tooltip username">
|
||||
{{ comment.actorDisplayName }}
|
||||
</span>
|
||||
<NcActions v-show="!edit" :force-menu="true">
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<span v-if="descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
|
||||
<span v-if="descriptionSaving">{{ t('deck', '(Saving…)') }}</span>
|
||||
<a v-if="!textAppAvailable"
|
||||
:title="t('deck', 'Formatting help')"
|
||||
v-tooltip="t('deck', 'Formatting help')"
|
||||
href="https://deck.readthedocs.io/en/latest/Markdown/"
|
||||
target="_blank"
|
||||
class="icon icon-info" />
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
<div class="due-actions">
|
||||
<NcButton v-if="!card.archived"
|
||||
type="tertiary"
|
||||
:name="t('deck', 'Not completed')"
|
||||
:title="t('deck', 'Not completed')"
|
||||
@click="changeCardDoneStatus()">
|
||||
<template #icon>
|
||||
<ClearIcon :size="20" />
|
||||
|
||||
@@ -3,48 +3,46 @@
|
||||
<div class="selector-wrapper--icon">
|
||||
<TagMultiple :size="20" />
|
||||
</div>
|
||||
<NcSelect :value="assignedLabels"
|
||||
<NcMultiselect :value="assignedLabels"
|
||||
class="selector-wrapper--selector"
|
||||
:multiple="true"
|
||||
:disabled="disabled"
|
||||
:options="labelsSorted"
|
||||
:aria-label-combobox="t('deck', 'Assign a tag to this card…')"
|
||||
:placeholder="t('deck', 'Select or create a tag…')"
|
||||
:placeholder="t('deck', 'Assign a tag to this card…')"
|
||||
:taggable="true"
|
||||
:close-on-select="false"
|
||||
label="title"
|
||||
track-by="id"
|
||||
tag-position="bottom"
|
||||
@option:selected="onSelect"
|
||||
@option:deselected="onRemove"
|
||||
@option:created="onNewTag">
|
||||
@select="onSelect"
|
||||
@remove="onRemove"
|
||||
@tag="onNewTag">
|
||||
<template #option="scope">
|
||||
<div v-if="!scope?.isTag" :style="{ backgroundColor: '#' + scope.color, color: textColor(scope.color)}" class="tag">
|
||||
{{ scope.title }}
|
||||
<div v-if="!scope.option?.isTag" :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
|
||||
{{ scope.option.title }}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ t('deck', 'Create a new tag:') }} <div class="tag">
|
||||
{{ scope.label }}
|
||||
{{ scope.option.label }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<template #selected-option="scope">
|
||||
<div :style="{ backgroundColor: '#' + scope.color, color: textColor(scope.color)}" class="tag">
|
||||
{{ scope.title }}
|
||||
<template #tag="scope">
|
||||
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
|
||||
{{ scope.option.title }}
|
||||
</div>
|
||||
</template>
|
||||
</NcSelect>
|
||||
</NcMultiselect>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcSelect } from '@nextcloud/vue'
|
||||
import { NcMultiselect } from '@nextcloud/vue'
|
||||
import Color from '../../mixins/color.js'
|
||||
import TagMultiple from 'vue-material-design-icons/TagMultiple.vue'
|
||||
|
||||
export default {
|
||||
name: 'TagSelector',
|
||||
components: { TagMultiple, NcSelect },
|
||||
components: { TagMultiple, NcMultiselect },
|
||||
mixins: [Color],
|
||||
props: {
|
||||
card: {
|
||||
@@ -63,22 +61,20 @@ export default {
|
||||
computed: {
|
||||
labelsSorted() {
|
||||
return [...this.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
|
||||
.filter(label => this.card.labels.findIndex((l) => l.id === label.id) === -1)
|
||||
},
|
||||
assignedLabels() {
|
||||
return [...this.card.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
onSelect(options) {
|
||||
const addedLabel = options.filter(option => !this.card.labels.includes(option))
|
||||
this.$emit('select', addedLabel[0])
|
||||
onSelect(newLabel) {
|
||||
this.$emit('select', newLabel)
|
||||
},
|
||||
onRemove(removedLabel) {
|
||||
this.$emit('remove', removedLabel)
|
||||
},
|
||||
async onNewTag(option) {
|
||||
this.$emit('newtag', option.title)
|
||||
async onNewTag(name) {
|
||||
this.$emit('newtag', name)
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -87,19 +83,17 @@ export default {
|
||||
<style lang="scss" scoped>
|
||||
@import '../../css/selector';
|
||||
|
||||
.v-select:deep(.vs__selected) {
|
||||
padding-left: 0 !important;
|
||||
.multiselect--active {
|
||||
z-index: 10022;
|
||||
}
|
||||
|
||||
.tag {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 1;
|
||||
overflow: hidden;
|
||||
padding: 3px 12px;
|
||||
display: inline-block;
|
||||
border-radius: var(--border-radius-pill);
|
||||
padding: 0px 5px;
|
||||
border-radius: 15px;
|
||||
font-size: 85%;
|
||||
margin-right: 3px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -22,52 +22,37 @@
|
||||
|
||||
<template>
|
||||
<div class="avatars">
|
||||
<div>
|
||||
<NcPopover>
|
||||
<template #trigger="{ attrs }">
|
||||
<button class="avatar-list" v-bind="attrs" @click.stop>
|
||||
<div v-if="popover.length > 0">
|
||||
<AccountMultiple class="avatardiv more-avatars" :size="24" />
|
||||
</div>
|
||||
<div v-for="user in firstUsers" :key="user.id">
|
||||
<NcAvatar v-if="user.type === 0"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:disable-menu="true"
|
||||
:show-user-status="false"
|
||||
:size="32" />
|
||||
<NcAvatar v-if="user.type === 1"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Group)')"
|
||||
:is-no-user="true"
|
||||
:disable-="true"
|
||||
:size="32" />
|
||||
<NcAvatar v-if="user.type === 7"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Team)')"
|
||||
:is-no-user="true"
|
||||
:disable-="true"
|
||||
:size="32" />
|
||||
</div>
|
||||
</button>
|
||||
</template>
|
||||
<div>
|
||||
<div v-for="user in users"
|
||||
:key="user.id"
|
||||
class="avatar-list-entry">
|
||||
<NcAvatar :user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:disable-menu="true"
|
||||
:is-no-user="user.type !== 0"
|
||||
:size="32" />
|
||||
<div class="avatar-list-entry__label">
|
||||
{{ user.participant.displayname }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</NcPopover>
|
||||
<div class="avatar-list" @click.stop="togglePopover">
|
||||
<div v-if="popover.length > 0">
|
||||
<AccountMultiple class="avatardiv more-avatars" :size="24" />
|
||||
</div>
|
||||
<div v-for="user in firstUsers" :key="user.id">
|
||||
<NcAvatar v-if="user.type === 0"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:disable-menu="true"
|
||||
:show-user-status="false"
|
||||
:size="32" />
|
||||
<NcAvatar v-if="user.type === 1"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Group)')"
|
||||
:is-no-user="true"
|
||||
:disable-="true"
|
||||
:size="32" />
|
||||
<NcAvatar v-if="user.type === 7"
|
||||
:user="user.participant.uid"
|
||||
:display-name="user.participant.displayname"
|
||||
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(Circle)')"
|
||||
:is-no-user="true"
|
||||
:disable-="true"
|
||||
:size="32" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-show="popoverVisible" class="popovermenu menu-right">
|
||||
<NcPopoverMenu :menu="popover" />
|
||||
<slot />
|
||||
</div>
|
||||
|
||||
<div class="avatar-print-list">
|
||||
@@ -85,7 +70,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcAvatar, NcPopover } from '@nextcloud/vue'
|
||||
import { NcAvatar, NcPopoverMenu, Tooltip } from '@nextcloud/vue'
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
|
||||
|
||||
@@ -93,9 +78,12 @@ export default {
|
||||
name: 'AvatarList',
|
||||
components: {
|
||||
NcAvatar,
|
||||
NcPopover,
|
||||
NcPopoverMenu,
|
||||
AccountMultiple,
|
||||
},
|
||||
directives: {
|
||||
tooltip: Tooltip,
|
||||
},
|
||||
props: {
|
||||
users: {
|
||||
type: Array,
|
||||
@@ -184,12 +172,8 @@ export default {
|
||||
.avatar-list {
|
||||
float: right;
|
||||
display: inline-flex;
|
||||
flex-direction: row-reverse;
|
||||
padding: 0;
|
||||
padding-right: $avatar-offset;
|
||||
margin: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
flex-direction: row-reverse;
|
||||
|
||||
& > div {
|
||||
height: 32px;
|
||||
@@ -215,15 +199,6 @@ export default {
|
||||
|
||||
}
|
||||
|
||||
.avatar-list-entry {
|
||||
display: flex;
|
||||
padding: 6px 12px;
|
||||
|
||||
&__label {
|
||||
padding: 4px 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.popovermenu {
|
||||
display: block;
|
||||
margin: 40px -6px;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<CardId v-if="idBadge" class="icon-badge" :card="card" />
|
||||
|
||||
<div v-if="card.commentsCount > 0"
|
||||
:title="commentsHint"
|
||||
v-tooltip="commentsHint"
|
||||
class="icon-badge"
|
||||
@click.stop="openComments">
|
||||
<CommentUnreadIcon v-if="card.commentsUnread > 0" :size="16" />
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
tag="ul"
|
||||
class="labels"
|
||||
@click.stop="openCard">
|
||||
<li v-for="label in labelsSorted" :key="label?.id ?? label?.title" :style="labelStyle(label)">
|
||||
<li v-for="label in labelsSorted" :key="label.id" :style="labelStyle(label)">
|
||||
<span @click.stop="applyLabelFilter(label)">{{ label.title }}</span>
|
||||
</li>
|
||||
</transition-group>
|
||||
@@ -212,14 +212,8 @@ export default {
|
||||
if (this.dragging) {
|
||||
return
|
||||
}
|
||||
const boardId = this.card && this.card.boardId ? this.card.boardId : (this.$route?.params.id ?? this.currentBoard.id)
|
||||
|
||||
if (this.$router) {
|
||||
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||
return
|
||||
}
|
||||
|
||||
this.$root.$emit('open-card', this.card.id)
|
||||
const boardId = this.card && this.card.boardId ? this.card.boardId : this.$route.params.id
|
||||
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||
},
|
||||
onTitleBlur(e) {
|
||||
// TODO Handle empty title
|
||||
|
||||
@@ -80,7 +80,7 @@ import { generateUrl } from '@nextcloud/router'
|
||||
import { getCurrentUser } from '@nextcloud/auth'
|
||||
import { showUndo } from '@nextcloud/dialogs'
|
||||
|
||||
import '@nextcloud/dialogs/style.css'
|
||||
import '@nextcloud/dialogs/dist/index.css'
|
||||
import { emit } from '@nextcloud/event-bus'
|
||||
|
||||
export default {
|
||||
@@ -144,14 +144,8 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
openCard() {
|
||||
const boardId = this.card?.boardId ? this.card.boardId : this.$route?.params.id ?? this.currentBoard.id
|
||||
|
||||
if (this.$router) {
|
||||
this.$router?.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||
return
|
||||
}
|
||||
|
||||
this.$root.$emit('open-card', this.card.id)
|
||||
const boardId = this.card?.boardId ? this.card.boardId : this.$route.params.id
|
||||
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id } }).catch(() => {})
|
||||
},
|
||||
deleteCard() {
|
||||
this.$store.dispatch('deleteCard', this.card)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<template>
|
||||
<div v-if="card" class="duedate" :data-due-state="dueState">
|
||||
<transition name="zoom">
|
||||
<div v-if="card.duedate || card.done" class="due" :name="absoluteDate">
|
||||
<div v-if="card.duedate || card.done" class="due" :title="absoluteDate">
|
||||
<CheckCircle v-if="card.done" :size="16" />
|
||||
<Clock v-else-if="overdue" :size="16" />
|
||||
<ClockOutline v-else :size="16" />
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<template>
|
||||
<NcAppNavigation :class="{'icon-loading': loading}">
|
||||
<template #list>
|
||||
<NcAppNavigationItem :name="t('deck', 'Upcoming cards')"
|
||||
<NcAppNavigationItem :title="t('deck', 'Upcoming cards')"
|
||||
:exact="true"
|
||||
to="/">
|
||||
<template #icon>
|
||||
@@ -61,7 +61,7 @@
|
||||
<AppNavigationAddBoard v-if="canCreate" />
|
||||
</template>
|
||||
<template #footer>
|
||||
<NcAppNavigationSettings :name="t('deck', 'Deck settings')">
|
||||
<NcAppNavigationSettings :title="t('deck', 'Deck settings')">
|
||||
<NcButton @click="showHelp = true">
|
||||
{{ t('deck', 'Keyboard shortcuts') }}
|
||||
</NcButton>
|
||||
@@ -97,14 +97,14 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<NcSelect v-if="isAdmin"
|
||||
<NcMultiselect v-if="isAdmin"
|
||||
v-model="groupLimit"
|
||||
:class="{'icon-loading-small': groupLimitDisabled}"
|
||||
open-direction="bottom"
|
||||
:options="groups"
|
||||
:multiple="true"
|
||||
:disabled="groupLimitDisabled"
|
||||
:input-label="t('deck', 'Limit board creation to some groups')"
|
||||
:placeholder="t('deck', 'Limit board creation to some groups')"
|
||||
label="displayname"
|
||||
track-by="id"
|
||||
@input="updateConfig" />
|
||||
@@ -121,7 +121,7 @@
|
||||
import axios from '@nextcloud/axios'
|
||||
import { mapGetters } from 'vuex'
|
||||
import ClickOutside from 'vue-click-outside'
|
||||
import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationSettings, NcSelect, NcButton } from '@nextcloud/vue'
|
||||
import { NcAppNavigation, NcAppNavigationItem, NcAppNavigationSettings, NcMultiselect, NcButton } from '@nextcloud/vue'
|
||||
import AppNavigationAddBoard from './AppNavigationAddBoard.vue'
|
||||
import AppNavigationBoardCategory from './AppNavigationBoardCategory.vue'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
@@ -144,7 +144,7 @@ export default {
|
||||
NcButton,
|
||||
AppNavigationAddBoard,
|
||||
AppNavigationBoardCategory,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
NcAppNavigationItem,
|
||||
ArchiveIcon,
|
||||
CalendarIcon,
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
-->
|
||||
<template>
|
||||
<NcAppNavigationItem v-if="!editing"
|
||||
:name="t('deck', 'Add board')"
|
||||
:title="t('deck', 'Add board')"
|
||||
icon="icon-add"
|
||||
@click.prevent.stop="startCreateBoard" />
|
||||
<div v-else class="board-create">
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
-->
|
||||
<template>
|
||||
<NcAppNavigationItem v-if="!editing"
|
||||
:name="!deleted ? board.title : undoText"
|
||||
:title="!deleted ? board.title : undoText"
|
||||
:loading="loading"
|
||||
:to="routeTo"
|
||||
:undo="deleted"
|
||||
@@ -29,9 +29,10 @@
|
||||
@undo="unDelete">
|
||||
<NcAppNavigationIconBullet slot="icon" :color="board.color" />
|
||||
|
||||
<template #counter>
|
||||
<AccountIcon v-if="board.acl.length > 0" />
|
||||
</template>
|
||||
<NcAppNavigationCounter v-if="board.acl.length"
|
||||
slot="counter"
|
||||
class="icon-shared"
|
||||
style="opacity: 0.5" />
|
||||
|
||||
<template v-if="!deleted" slot="actions">
|
||||
<template v-if="!isDueSubmenuActive">
|
||||
@@ -112,7 +113,7 @@
|
||||
</NcActionButton>
|
||||
</template>
|
||||
<NcActionButton v-else-if="!board.archived && board.acl.length > 0"
|
||||
:name="t('deck', 'Due date reminders')"
|
||||
:title="t('deck', 'Due date reminders')"
|
||||
:icon="dueDateReminderIcon"
|
||||
@click="isDueSubmenuActive=true">
|
||||
{{ dueDateReminderText }}
|
||||
@@ -143,11 +144,10 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { NcAppNavigationIconBullet, NcAppNavigationItem, NcColorPicker, NcActions, NcActionButton } from '@nextcloud/vue'
|
||||
import { NcAppNavigationIconBullet, NcAppNavigationCounter, NcAppNavigationItem, NcColorPicker, NcActions, NcActionButton } from '@nextcloud/vue'
|
||||
import ClickOutside from 'vue-click-outside'
|
||||
import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
|
||||
import CloneIcon from 'vue-material-design-icons/ContentDuplicate.vue'
|
||||
import AccountIcon from 'vue-material-design-icons/Account.vue'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
const canCreateState = loadState('deck', 'canCreate')
|
||||
@@ -156,11 +156,11 @@ export default {
|
||||
name: 'AppNavigationBoard',
|
||||
components: {
|
||||
NcAppNavigationIconBullet,
|
||||
NcAppNavigationCounter,
|
||||
NcAppNavigationItem,
|
||||
NcColorPicker,
|
||||
NcActions,
|
||||
NcActionButton,
|
||||
AccountIcon,
|
||||
ArchiveIcon,
|
||||
CloneIcon,
|
||||
},
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
-->
|
||||
<template>
|
||||
<NcAppNavigationItem v-if="boards.length > 0"
|
||||
:name="text"
|
||||
:title="text"
|
||||
:to="to"
|
||||
:exact="true"
|
||||
:allow-collapse="collapsible"
|
||||
|
||||
@@ -33,35 +33,35 @@
|
||||
<div v-else-if="isValidFilter" class="overview">
|
||||
<div class="dashboard-column">
|
||||
<h3>{{ t('deck', 'Overdue') }}</h3>
|
||||
<div v-for="card in sortCards('overdue')" :key="card.id">
|
||||
<div v-for="card in assignedCardsDashboard.overdue" :key="card.id">
|
||||
<CardItem :id="card.id" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-column">
|
||||
<h3>{{ t('deck', 'Today') }}</h3>
|
||||
<div v-for="card in sortCards('today')" :key="card.id">
|
||||
<div v-for="card in assignedCardsDashboard.today" :key="card.id">
|
||||
<CardItem :id="card.id" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-column">
|
||||
<h3>{{ t('deck', 'Tomorrow') }}</h3>
|
||||
<div v-for="card in sortCards('tomorrow')" :key="card.id">
|
||||
<div v-for="card in assignedCardsDashboard.tomorrow" :key="card.id">
|
||||
<CardItem :id="card.id" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-column">
|
||||
<h3>{{ t('deck', 'Next 7 days') }}</h3>
|
||||
<div v-for="card in sortCards('nextSevenDays')" :key="card.id">
|
||||
<div v-for="card in assignedCardsDashboard.nextSevenDays" :key="card.id">
|
||||
<CardItem :id="card.id" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-column">
|
||||
<h3>{{ t('deck', 'Later') }}</h3>
|
||||
<div v-for="card in sortCards('later')" :key="card.id">
|
||||
<div v-for="card in assignedCardsDashboard.later" :key="card.id">
|
||||
<CardItem :id="card.id" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -79,6 +79,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import Controls from '../Controls.vue'
|
||||
import CardItem from '../cards/CardItem.vue'
|
||||
import { mapGetters } from 'vuex'
|
||||
@@ -120,7 +121,9 @@ export default {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
...mapGetters(['assignedCardsDashboard']),
|
||||
...mapGetters([
|
||||
'assignedCardsDashboard',
|
||||
]),
|
||||
},
|
||||
watch: {
|
||||
'$route.params.filter'() {
|
||||
@@ -142,20 +145,6 @@ export default {
|
||||
}
|
||||
this.loading = false
|
||||
},
|
||||
sortCards(when) {
|
||||
const cards = this.assignedCardsDashboard[when]
|
||||
|
||||
if (!cards) {
|
||||
return null
|
||||
} else {
|
||||
return cards.toSorted((current, next) => {
|
||||
const currentDueDate = new Date(current.duedate)
|
||||
const nextDueDate = new Date(next.duedate)
|
||||
|
||||
return currentDueDate - nextDueDate
|
||||
})
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
/**
|
||||
*
|
||||
* @param el
|
||||
* @param binding
|
||||
*/
|
||||
function focusElement(el, binding) {
|
||||
// If directive has bound value
|
||||
if (binding.value !== undefined && !binding.value) return
|
||||
|
||||
// Focus the element
|
||||
el.focus()
|
||||
}
|
||||
|
||||
// Register a global custom directive called `v-focus`
|
||||
export default {
|
||||
bind(el, binding, vnode) {
|
||||
// When the component of the element gets activated
|
||||
vnode.context.$on('hook:activated', () => focusElement(el, binding))
|
||||
},
|
||||
// When the bound element is inserted into the DOM...
|
||||
inserted: focusElement,
|
||||
}
|
||||
@@ -19,40 +19,36 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { registerWidget, registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Functions/registerReference.js'
|
||||
import { registerWidget, registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Components/NcRichText.js'
|
||||
import { Tooltip } from '@nextcloud/vue'
|
||||
import Vue from 'vue'
|
||||
import CardReferenceWidget from './views/CardReferenceWidget.vue'
|
||||
import BoardReferenceWidget from './views/BoardReferenceWidget.vue'
|
||||
import CommentReferenceWidget from './views/CommentReferenceWidget.vue'
|
||||
|
||||
import { translate, translatePlural } from '@nextcloud/l10n'
|
||||
|
||||
import './shared-init.js'
|
||||
|
||||
const prepareVue = async (Component = null) => {
|
||||
const { default: Vue } = await import('vue')
|
||||
const { default: ClickOutside } = await import('vue-click-outside')
|
||||
Vue.prototype.t = translate
|
||||
Vue.prototype.n = translatePlural
|
||||
Vue.prototype.OC = window.OC
|
||||
Vue.prototype.OCA = window.OCA
|
||||
Vue.directive('tooltip', Tooltip)
|
||||
Vue.directive('focus', {
|
||||
inserted(el) {
|
||||
el.focus()
|
||||
},
|
||||
})
|
||||
|
||||
Vue.prototype.t = translate
|
||||
Vue.prototype.n = translatePlural
|
||||
Vue.prototype.OC = window.OC
|
||||
Vue.prototype.OCA = window.OCA
|
||||
Vue.directive('click-outside', ClickOutside)
|
||||
Vue.directive('focus', {
|
||||
inserted(el) {
|
||||
el.focus()
|
||||
},
|
||||
})
|
||||
if (!Component) {
|
||||
return Vue
|
||||
}
|
||||
|
||||
return Vue.extend(Component)
|
||||
}
|
||||
|
||||
registerWidget('deck-card', async (el, { richObjectType, richObject, accessible }) => {
|
||||
const { default: CardReferenceWidget } = await import('./views/CardReferenceWidget.vue')
|
||||
const Widget = await prepareVue(CardReferenceWidget)
|
||||
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['margin-left'] = '0'
|
||||
el.parentNode.style['margin-right'] = '0'
|
||||
|
||||
const Widget = Vue.extend(CardReferenceWidget)
|
||||
new Widget({
|
||||
propsData: {
|
||||
richObjectType,
|
||||
@@ -62,33 +58,27 @@ registerWidget('deck-card', async (el, { richObjectType, richObject, accessible
|
||||
}).$mount(el)
|
||||
})
|
||||
|
||||
const boardWidgets = {}
|
||||
registerWidget('deck-board', async (el, { richObjectType, richObject, accessible, interactive }) => {
|
||||
const { default: BoardReferenceWidget } = await import('./views/BoardReferenceWidget.vue')
|
||||
const Widget = await prepareVue(BoardReferenceWidget)
|
||||
boardWidgets[el] = new Widget({
|
||||
propsData: {
|
||||
richObjectType,
|
||||
richObject,
|
||||
accessible,
|
||||
interactive,
|
||||
},
|
||||
}).$mount(el)
|
||||
}, (el) => {
|
||||
boardWidgets[el].$destroy()
|
||||
delete boardWidgets[el]
|
||||
}, {
|
||||
fullWidth: true,
|
||||
})
|
||||
|
||||
registerWidget('deck-comment', async (el, { richObjectType, richObject, accessible }) => {
|
||||
const { default: CommentReferenceWidget } = await import('./views/CommentReferenceWidget.vue')
|
||||
const Widget = await prepareVue(CommentReferenceWidget)
|
||||
|
||||
registerWidget('deck-board', (el, { richObjectType, richObject, accessible }) => {
|
||||
el.parentNode.style['max-width'] = '400px'
|
||||
el.parentNode.style['margin-left'] = '0'
|
||||
el.parentNode.style['margin-right'] = '0'
|
||||
|
||||
const Widget = Vue.extend(BoardReferenceWidget)
|
||||
new Widget({
|
||||
propsData: {
|
||||
richObjectType,
|
||||
richObject,
|
||||
accessible,
|
||||
},
|
||||
}).$mount(el)
|
||||
})
|
||||
|
||||
registerWidget('deck-comment', (el, { richObjectType, richObject, accessible }) => {
|
||||
el.parentNode.style['max-width'] = '400px'
|
||||
el.parentNode.style['margin-left'] = '0'
|
||||
el.parentNode.style['margin-right'] = '0'
|
||||
|
||||
const Widget = Vue.extend(CommentReferenceWidget)
|
||||
new Widget({
|
||||
propsData: {
|
||||
richObjectType,
|
||||
@@ -99,8 +89,10 @@ registerWidget('deck-comment', async (el, { richObjectType, richObject, accessib
|
||||
})
|
||||
|
||||
registerCustomPickerElement('create-new-deck-card', async (el, { providerId, accessible }) => {
|
||||
const { default: CreateNewCardCustomPicker } = await import('./views/CreateNewCardCustomPicker.vue')
|
||||
const Element = await prepareVue(CreateNewCardCustomPicker)
|
||||
const { default: Vue } = await import(/* webpackChunkName: "reference-picker-lazy" */'vue')
|
||||
Vue.mixin({ methods: { t, n } })
|
||||
const { default: CreateNewCardCustomPicker } = await import(/* webpackChunkName: "reference-picker-lazy" */'./views/CreateNewCardCustomPicker.vue')
|
||||
const Element = Vue.extend(CreateNewCardCustomPicker)
|
||||
const vueElement = new Element({
|
||||
propsData: {
|
||||
providerId,
|
||||
|
||||
@@ -27,6 +27,7 @@ import { sync } from 'vuex-router-sync'
|
||||
import { translate, translatePlural } from '@nextcloud/l10n'
|
||||
import { showError } from '@nextcloud/dialogs'
|
||||
import { subscribe } from '@nextcloud/event-bus'
|
||||
import { Tooltip } from '@nextcloud/vue'
|
||||
import ClickOutside from 'vue-click-outside'
|
||||
import './shared-init.js'
|
||||
import './models/index.js'
|
||||
@@ -40,6 +41,7 @@ sync(store, router)
|
||||
Vue.prototype.t = translate
|
||||
Vue.prototype.n = translatePlural
|
||||
|
||||
Vue.directive('tooltip', Tooltip)
|
||||
Vue.directive('click-outside', ClickOutside)
|
||||
|
||||
Vue.directive('focus', {
|
||||
|
||||
@@ -33,10 +33,7 @@ export default {
|
||||
getters: {
|
||||
cardsByStack: (state, getters, rootState) => (id) => {
|
||||
return state.cards.filter((card) => {
|
||||
const { tags, users, due, unassigned, completed } = rootState.filter
|
||||
|
||||
if (completed === 'open' && card.done !== null) { return false }
|
||||
if (completed === 'completed' && card.done == null) { return false }
|
||||
const { tags, users, due, unassigned } = rootState.filter
|
||||
let allTagsMatch = true
|
||||
let allUsersMatch = true
|
||||
|
||||
|
||||
@@ -58,7 +58,6 @@ export default new Vuex.Store({
|
||||
},
|
||||
strict: debug,
|
||||
state: {
|
||||
isFullApp: true,
|
||||
config: loadState('deck', 'config', {}),
|
||||
showArchived: false,
|
||||
navShown: localStorage.getItem('deck.navShown') === null || localStorage.getItem('deck.navShown') === 'true',
|
||||
@@ -74,15 +73,11 @@ export default new Vuex.Store({
|
||||
searchQuery: '',
|
||||
activity: [],
|
||||
activityLoadMore: true,
|
||||
filter: { tags: [], users: [], due: '', completed: 'both' },
|
||||
filter: { tags: [], users: [], due: '' },
|
||||
shortcutLock: false,
|
||||
},
|
||||
getters: {
|
||||
config: state => (key) => {
|
||||
if (!state.isFullApp && key === 'cardDetailsInModal') {
|
||||
return true
|
||||
}
|
||||
|
||||
return state.config[key]
|
||||
},
|
||||
getSearchQuery: state => {
|
||||
@@ -145,9 +140,6 @@ export default new Vuex.Store({
|
||||
},
|
||||
},
|
||||
mutations: {
|
||||
setFullApp(state, isFullApp) {
|
||||
Vue.set(state, 'isFullApp', isFullApp)
|
||||
},
|
||||
SET_CONFIG(state, { key, value }) {
|
||||
const [scope, id, configKey] = key.split(':', 3)
|
||||
let indexExisting = -1
|
||||
@@ -321,9 +313,6 @@ export default new Vuex.Store({
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
setFullApp({ commit }, isFullApp) {
|
||||
commit('setFullApp', isFullApp)
|
||||
},
|
||||
async setConfig({ commit }, config) {
|
||||
for (const key in config) {
|
||||
try {
|
||||
|
||||
@@ -20,10 +20,7 @@
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div v-if="interactive" class="deck-board-reference-interactive">
|
||||
<Board :id="board.id" />
|
||||
</div>
|
||||
<div v-else class="deck-board-reference">
|
||||
<div class="deck-board-reference">
|
||||
<div class="line">
|
||||
<DeckIcon :size="20" class="title-icon" />
|
||||
<strong>
|
||||
@@ -44,33 +41,19 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Board from '../components/board/Board.vue'
|
||||
import DeckIcon from '../components/icons/DeckIcon.vue'
|
||||
import { BoardApi } from './../services/BoardApi.js'
|
||||
import store from './../store/main.js'
|
||||
|
||||
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
|
||||
|
||||
import moment from '@nextcloud/moment'
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
|
||||
const boardApi = new BoardApi()
|
||||
|
||||
export default {
|
||||
name: 'BoardReferenceWidget',
|
||||
|
||||
store,
|
||||
|
||||
components: {
|
||||
DeckIcon,
|
||||
NcUserBubble,
|
||||
Board,
|
||||
},
|
||||
|
||||
provide() {
|
||||
return {
|
||||
boardApi,
|
||||
}
|
||||
},
|
||||
|
||||
props: {
|
||||
@@ -86,10 +69,6 @@ export default {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
interactive: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
|
||||
computed: {
|
||||
@@ -113,10 +92,8 @@ export default {
|
||||
},
|
||||
},
|
||||
|
||||
created() {
|
||||
this.$store.commit('setFullApp', false)
|
||||
methods: {
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -146,22 +123,6 @@ export default {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.deck-board-reference-interactive {
|
||||
width: 100%;
|
||||
min-height: min(50vh, calc(100vh - 100px));
|
||||
max-height: calc(100vh - 120px);
|
||||
&:deep(.controls) {
|
||||
padding-left: 12px;
|
||||
}
|
||||
&:deep(.board) {
|
||||
padding-left: 0;
|
||||
}
|
||||
&:deep(*) {
|
||||
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
|
||||
-moz-box-sizing: border-box; /* Firefox, other Gecko */
|
||||
box-sizing: border-box; /* Opera/IE 8+ */
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</strong>
|
||||
<div v-if="dueDate" class="spacer" />
|
||||
<span v-if="dueDate"
|
||||
:title="t('Due date') + ': ' + formattedDueDate"
|
||||
v-tooltip.top="{ content: formattedDueDate }"
|
||||
class="due-date">
|
||||
<CalendarBlankIcon :size="20"
|
||||
class="icon" />
|
||||
@@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div class="line">
|
||||
<DeckIcon :size="20" class="title-icon" />
|
||||
<a :title="stackTooltip"
|
||||
<a v-tooltip.top="{ content: stackTooltip }"
|
||||
:href="boardLink"
|
||||
target="_blank"
|
||||
class="link">
|
||||
@@ -67,7 +67,7 @@
|
||||
'description': true,
|
||||
'short-description': shortDescription,
|
||||
}">
|
||||
<NcRichText :title="shortDescription ? t('deck', 'Click to expand description') : undefined"
|
||||
<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
|
||||
:text="card.description"
|
||||
:use-markdown="true"
|
||||
@click.native="shortDescription = !shortDescription" />
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</strong>
|
||||
<div v-if="dueDate" class="spacer" />
|
||||
<span v-if="dueDate"
|
||||
:title="t('Due date') + ': ' + formattedDueDate"
|
||||
v-tooltip.top="{ content: formattedDueDate }"
|
||||
class="due-date">
|
||||
<CalendarBlankIcon :size="20"
|
||||
class="icon" />
|
||||
@@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div class="line">
|
||||
<DeckIcon :size="20" class="title-icon" />
|
||||
<a :title="stackTooltip"
|
||||
<a v-tooltip.top="{ content: stackTooltip }"
|
||||
:href="boardLink"
|
||||
target="_blank"
|
||||
class="link">
|
||||
@@ -67,7 +67,7 @@
|
||||
'description': true,
|
||||
'short-description': shortDescription,
|
||||
}">
|
||||
<NcRichText :title="shortDescription ? t('deck', 'Click to expand description') : undefined"
|
||||
<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
|
||||
:text="card.description"
|
||||
:use-markdown="true"
|
||||
@click.native="shortDescription = !shortDescription" />
|
||||
@@ -84,7 +84,7 @@
|
||||
'comment': true,
|
||||
'short-comment': shortComment,
|
||||
}">
|
||||
<NcRichText :title="shortComment ? t('deck', 'Click to expand comment') : undefined"
|
||||
<NcRichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
|
||||
:text="commentMessageText"
|
||||
:use-markdown="false"
|
||||
@click.native="shortComment = !shortComment" />
|
||||
|
||||
@@ -15,40 +15,40 @@
|
||||
<div class="selector-wrapper--icon">
|
||||
<DeckIcon :size="20" />
|
||||
</div>
|
||||
<NcSelect v-model="selectedBoard"
|
||||
<NcMultiselect v-model="selectedBoard"
|
||||
:placeholder="t('deck', 'Select a board')"
|
||||
:options="boards"
|
||||
:disabled="loading"
|
||||
label="title"
|
||||
class="selector-wrapper--selector multiselect-board"
|
||||
@option:selected="onSelectBoard">
|
||||
<template #selected-option="option">
|
||||
@select="onSelectBoard">
|
||||
<template slot="singleLabel" slot-scope="props">
|
||||
<span>
|
||||
<span :style="{ 'backgroundColor': '#' + option.color }" class="board-bullet" />
|
||||
<span data-cy="board-select-title">{{ option.title }}</span>
|
||||
<span :style="{ 'backgroundColor': '#' + props.option.color }" class="board-bullet" />
|
||||
<span>{{ props.option.title }}</span>
|
||||
</span>
|
||||
</template>
|
||||
<template #option="option">
|
||||
<template slot="option" slot-scope="props">
|
||||
<span>
|
||||
<span :style="{ 'backgroundColor': '#' + option.color }" class="board-bullet" />
|
||||
<span data-cy="board-select-title">{{ option.title }}</span>
|
||||
<span :style="{ 'backgroundColor': '#' + props.option.color }" class="board-bullet" />
|
||||
<span>{{ props.option.title }}</span>
|
||||
</span>
|
||||
</template>
|
||||
</NcSelect>
|
||||
</NcMultiselect>
|
||||
</div>
|
||||
|
||||
<div class="col selector-wrapper">
|
||||
<div class="selector-wrapper--icon">
|
||||
<FormatColumnsIcon :size="20" />
|
||||
</div>
|
||||
<NcSelect v-model="selectedStack"
|
||||
<NcMultiselect v-model="selectedStack"
|
||||
:placeholder="t('deck', 'Select a list')"
|
||||
:options="stacksFromBoard"
|
||||
:max-height="100"
|
||||
:disabled="loading || !selectedBoard"
|
||||
class="selector-wrapper--selector multiselect-list"
|
||||
label="title"
|
||||
@option:selected="onSelectStack" />
|
||||
@select="onSelectStack" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
import {
|
||||
NcButton,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
NcEmptyContent,
|
||||
NcLoadingIcon,
|
||||
} from '@nextcloud/vue'
|
||||
@@ -148,7 +148,7 @@ export default {
|
||||
TagSelector,
|
||||
AssignmentSelector,
|
||||
NcButton,
|
||||
NcSelect,
|
||||
NcMultiselect,
|
||||
NcEmptyContent,
|
||||
NcLoadingIcon,
|
||||
},
|
||||
@@ -373,7 +373,7 @@ h2 {
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.v-select {
|
||||
.multiselect {
|
||||
min-width: auto !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
68446
|
||||
66366
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~9",
|
||||
"behat/behat": "~3.14.0",
|
||||
"guzzlehttp/guzzle": "7.8.1",
|
||||
"behat/behat": "~3.13.0",
|
||||
"guzzlehttp/guzzle": "7.8.0",
|
||||
"jarnaiz/behat-junit-formatter": "^1.3",
|
||||
"sabre/dav": "4.6.0",
|
||||
"sabre/dav": "4.5.0",
|
||||
"symfony/event-dispatcher": "~5.4"
|
||||
},
|
||||
"autoload": {
|
||||
|
||||
@@ -55,13 +55,6 @@ class AssignmentMapperTest extends \Test\TestCase {
|
||||
/** @var AssignmentService */
|
||||
private $assignmentService;
|
||||
|
||||
/** @var Board */
|
||||
private $board;
|
||||
/** @var Card[] */
|
||||
private $cards;
|
||||
/** @var Stack[] */
|
||||
private $stacks;
|
||||
|
||||
public static function setUpBeforeClass(): void {
|
||||
parent::setUpBeforeClass();
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ class BoardContext implements Context {
|
||||
/**
|
||||
* @When shares the board with user :user
|
||||
*/
|
||||
public function sharesTheBoardWithUser($user, ?TableNode $permissions = null) {
|
||||
public function sharesTheBoardWithUser($user, TableNode $permissions = null) {
|
||||
$defaults = [
|
||||
'permissionEdit' => '0',
|
||||
'permissionShare' => '0',
|
||||
@@ -103,7 +103,7 @@ class BoardContext implements Context {
|
||||
/**
|
||||
* @When shares the board with group :group
|
||||
*/
|
||||
public function sharesTheBoardWithGroup($group, ?TableNode $permissions = null) {
|
||||
public function sharesTheBoardWithGroup($group, TableNode $permissions = null) {
|
||||
$defaults = [
|
||||
'permissionEdit' => '0',
|
||||
'permissionShare' => '0',
|
||||
|
||||
@@ -9,9 +9,13 @@ require_once __DIR__ . '/../../vendor/autoload.php';
|
||||
class SessionContext implements Context {
|
||||
use RequestTrait;
|
||||
|
||||
private ServerContext $serverContext;
|
||||
private BoardContext $boardContext;
|
||||
private array $tokens = [];
|
||||
/** @var ServerContext */
|
||||
private $serverContext;
|
||||
|
||||
/** @var BoardContext */
|
||||
private $boardContext;
|
||||
|
||||
private $tokens = [];
|
||||
|
||||
/** @BeforeScenario */
|
||||
public function gatherContexts(BeforeScenarioScope $scope) {
|
||||
@@ -36,7 +40,7 @@ class SessionContext implements Context {
|
||||
|
||||
// store token
|
||||
$user = $this->serverContext->getCurrentUser();
|
||||
$this->tokens[$user] = $res['ocs']['data']['token'];
|
||||
$this->token[$user] = $res['ocs']['data']['token'];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -66,7 +70,7 @@ class SessionContext implements Context {
|
||||
}
|
||||
|
||||
$user = $this->serverContext->getCurrentUser();
|
||||
$token = $this->tokens[$user];
|
||||
$token = $this->token[$user];
|
||||
Assert::assertNotEmpty($token, "no token for the user found");
|
||||
$this->requestContext->sendOCSRequest('POST', '/apps/deck/api/v1.0/session/close', [
|
||||
'boardId' => $board['id'],
|
||||
|
||||
@@ -39,8 +39,6 @@ class CommentEventHandlerTest extends TestCase {
|
||||
private $activityManager;
|
||||
/** @var NotificationHelper */
|
||||
private $notificationHelper;
|
||||
/** @var ChangeHelper */
|
||||
private $changeHelper;
|
||||
/** @var CardMapper */
|
||||
private $cardMapper;
|
||||
|
||||
|
||||
@@ -41,12 +41,10 @@ use PHPUnit\Framework\TestCase;
|
||||
use PHPUnit_Framework_MockObject_MockObject as MockObject;
|
||||
|
||||
class DeckProviderTest extends TestCase {
|
||||
|
||||
/** @var DeckProvider */
|
||||
private $provider;
|
||||
|
||||
/** @var IL10N */
|
||||
private $l10n;
|
||||
|
||||
/** @var IURLGenerator|MockObject */
|
||||
private $urlGenerator;
|
||||
|
||||
@@ -59,9 +57,6 @@ class DeckProviderTest extends TestCase {
|
||||
/** @var ICommentsManager|MockObject */
|
||||
private $commentsManager;
|
||||
|
||||
private $l10nFactory;
|
||||
private $config;
|
||||
|
||||
/** @var CardService|MockObject */
|
||||
private $cardService;
|
||||
|
||||
@@ -76,6 +71,7 @@ class DeckProviderTest extends TestCase {
|
||||
$this->commentsManager = $this->createMock(ICommentsManager::class);
|
||||
$this->l10nFactory = $this->createMock(IFactory::class);
|
||||
$this->config = $this->createMock(IConfig::class);
|
||||
$this->config = $this->createMock(IConfig::class);
|
||||
$this->cardService = $this->createMock(CardService::class);
|
||||
$this->provider = new DeckProvider($this->urlGenerator, $this->activityManager, $this->userManager, $this->commentsManager, $this->l10nFactory, $this->config, $this->userId, $this->cardService);
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ class BoardMapperTest extends TestCase {
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $dbConnection;
|
||||
private $labelMapper;
|
||||
/** @var AclMapper|\PHPUnit\Framework\MockObject\MockObject */
|
||||
private $aclMapper;
|
||||
/** @var BoardMapper */
|
||||
|
||||
@@ -23,22 +23,18 @@
|
||||
|
||||
namespace OCA\Deck\Db;
|
||||
|
||||
class MyRelationalEntity extends RelationalEntity {
|
||||
protected $foo;
|
||||
}
|
||||
|
||||
class RelationalEntityTest extends \Test\TestCase {
|
||||
public function testRelation() {
|
||||
$entity = new MyRelationalEntity();
|
||||
$entity->setFoo(null);
|
||||
$entity = new RelationalEntity();
|
||||
$entity->foo = null;
|
||||
$entity->addRelation('foo');
|
||||
$entity->setFoo('test');
|
||||
$this->assertEquals([], $entity->getUpdatedFields());
|
||||
}
|
||||
|
||||
public function testWithoutRelation() {
|
||||
$entity = new MyRelationalEntity();
|
||||
$entity->setFoo(null);
|
||||
$entity = new RelationalEntity();
|
||||
$entity->foo = null;
|
||||
$entity->setFoo('test');
|
||||
$this->assertEquals(['foo' => true], $entity->getUpdatedFields());
|
||||
}
|
||||
|
||||
@@ -41,7 +41,6 @@ class ExceptionMiddlewareTest extends \Test\TestCase {
|
||||
private $logger;
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
private $request;
|
||||
private $controller;
|
||||
private $exceptionMiddleware;
|
||||
|
||||
|
||||
@@ -34,14 +34,6 @@ use OCP\IURLGenerator;
|
||||
use Test\TestCase;
|
||||
|
||||
class CardReferenceProviderTest extends TestCase {
|
||||
private $cardService;
|
||||
private $boardService;
|
||||
private $stackService;
|
||||
private $urlGenerator;
|
||||
private $l10n;
|
||||
private $userId;
|
||||
private $provider;
|
||||
|
||||
public function setUp() : void {
|
||||
parent::setUp();
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
namespace OCA\Deck\Service;
|
||||
|
||||
use \Test\TestCase;
|
||||
use OC\L10N\L10N;
|
||||
use OCA\Deck\Activity\ActivityManager;
|
||||
use OCA\Deck\Db\Acl;
|
||||
@@ -50,14 +51,11 @@ use OCP\IURLGenerator;
|
||||
use OCP\IUser;
|
||||
use OCP\IUserManager;
|
||||
use PHPUnit\Framework\MockObject\MockObject;
|
||||
use Test\TestCase;
|
||||
|
||||
class BoardServiceTest extends TestCase {
|
||||
|
||||
/** @var BoardService */
|
||||
private $service;
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
/** @var L10N */
|
||||
private $l10n;
|
||||
/** @var LabelMapper */
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
namespace OCA\Deck\Service;
|
||||
|
||||
use \Test\TestCase;
|
||||
use OCA\Deck\Db\Board;
|
||||
use OCA\Deck\Db\BoardMapper;
|
||||
use OCA\Deck\Db\Card;
|
||||
use OCA\Deck\Db\Stack;
|
||||
use OCP\IConfig;
|
||||
use OCP\IL10N;
|
||||
use Test\TestCase;
|
||||
|
||||
class DefaultBoardServiceTest extends TestCase {
|
||||
|
||||
|
||||
@@ -42,9 +42,6 @@ use OCP\Share\IManager;
|
||||
|
||||
class PermissionServiceTest extends \Test\TestCase {
|
||||
|
||||
/** @var IRequest */
|
||||
private $request;
|
||||
private $circlesService;
|
||||
/** @var PermissionService*/
|
||||
private $service;
|
||||
/** @var ILogger */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user