Граф коммитов

8562 Коммитов

Автор SHA1 Сообщение Дата
Vincent Petry 483040e637
Merge pull request #4757 from nextcloud/bugfix/noid/make-sure-index-name-is-unique
Use a unique index name
2020-12-14 16:43:16 +01:00
Joas Schilling 6673b33fdc
Use a unique index name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-12-14 15:58:01 +01:00
Vincent Petry af69e3b784
Merge pull request #4706 from nextcloud/enh/1763/listable-rooms
Add listable scope attribute for conversations
2020-12-14 13:02:34 +01:00
Joas Schilling 41dc403af6
Merge pull request #4756 from nextcloud/docs/noid/settings-endpoint-docs
Document read-status privacy setting
2020-12-14 13:00:03 +01:00
Joas Schilling 0e9e02b48d
Document read-status privacy setting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-12-14 12:43:27 +01:00
Vincent Petry bedea3eb51
Adjust listable setting field width
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-14 11:48:08 +01:00
Vincent Petry 71fa517686
Adjusted listable docs + increased version
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-14 11:32:37 +01:00
Nextcloud bot 6ed701c9b7
[tx-robot] updated from transifex 2020-12-14 03:15:31 +00:00
Nextcloud bot 768084257c
[tx-robot] updated from transifex 2020-12-13 03:13:22 +00:00
Joas Schilling b7a4662c62
Merge pull request #4748 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.12.10
Bump @babel/preset-env from 7.12.7 to 7.12.10
2020-12-12 12:21:38 +01:00
dependabot-preview[bot] 20c8b21de4
Bump @babel/preset-env from 7.12.7 to 7.12.10
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.7 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-preset-env)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-12 09:59:54 +00:00
Joas Schilling a7be12e163
Merge pull request #4747 from nextcloud/dependabot/npm_and_yarn/ua-parser-js-0.7.23
Bump ua-parser-js from 0.7.22 to 0.7.23
2020-12-12 10:57:57 +01:00
Joas Schilling fc0e2a22e8
Merge pull request #4749 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.6.1
Bump webpack-merge from 5.4.0 to 5.6.1
2020-12-12 10:57:31 +01:00
Joas Schilling c303f5e8c5
Merge pull request #4750 from nextcloud/dependabot/npm_and_yarn/babel/core-7.12.10
Bump @babel/core from 7.12.9 to 7.12.10
2020-12-12 10:56:51 +01:00
Nextcloud bot 8bedce129d
[tx-robot] updated from transifex 2020-12-12 03:14:22 +00:00
dependabot-preview[bot] 9641dff124
Bump @babel/core from 7.12.9 to 7.12.10
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.9 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-12 02:22:08 +00:00
dependabot-preview[bot] 3da0f79726
Bump webpack-merge from 5.4.0 to 5.6.1
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.0 to 5.6.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.4.0...v5.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-12 02:20:59 +00:00
dependabot-preview[bot] c2c2e23b71
Bump ua-parser-js from 0.7.22 to 0.7.23
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.22 to 0.7.23.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.22...0.7.23)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-12 02:17:10 +00:00
Vincent Petry 63b020a703
Remove redundant isset
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:55 +01:00
Vincent Petry f04e3b53f3
Make listable column smallint
Smallint should be enough for everyone.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:54 +01:00
Vincent Petry a4a6c02718
Improve room display name protection
In case the API would return a room for some reason, it would return the
name as "Private Conversation". The logic has been updated to also work
properly with listable vs non-listable rooms in regards to guests.

Refactored the listable check logic into a single method to make it
reusable.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:54 +01:00
Vincent Petry 5a3a55210d
Revert "Added search provider for listed conversations"
This reverts commit ba01861c22a97db75e724ba253a5887bf28c7b19 but
preserves code relevant for the listable feature.

Removes the global search provider as it's adding additional noise to
the search results. Users should only use the talk-specific search in
the left sidebar.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:54 +01:00
Vincent Petry fa74ef3294
Move listable and locking to new section
Added new conversation settings section "Conversation settings" and
moved the listable and locking settings there.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:54 +01:00
Vincent Petry 549e9ecbd0
Small adjustments to listable feature after reviews
Co-authored-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:53 +01:00
Vincent Petry 4d4a4847b2
Added listable settings to new conversation dialog
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:53 +01:00
Vincent Petry 777c7b66a4
Changed wording to say visible instead of listable
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:53 +01:00
Vincent Petry 2b54740e5b
Moved ListableSettings into an own component
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:53 +01:00
Vincent Petry 0e1ed5d1ea
Reword listable in UI by calling it findable
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:53 +01:00
Vincent Petry 10840fd4c0
Fix tests for listable conversations
Fix number detection in participantType tests

The guests app is now enabled.
The spreed app is whitelisted for guest account users.
A password is now set for the guest account users to be able to log in properly.

Added system message tests for listable and read-only attributes.

Added tests scenarios for permission checks and room type checks before
setting listable attribute.

Added integration tests for /listed-rooms endpoint
Covers permissions to search and also with and without search terms.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:52 +01:00
Vincent Petry bcc9f8fdb5
Fix updating listable attribute from occ
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:52 +01:00
Vincent Petry 0cdd4528a8
Abort php test server on ctrl+c
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:52 +01:00
Vincent Petry 7748fb93c2
Extend spreedcheats to allow creating guest account users
Added a spreedcheats endpoint to allow creating guest account
users for integration tests.

Grabs the GuestManager from the guests app to create a guest user in the
correct backend.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:51 +01:00
Vincent Petry 6d75ad2b62
Added integration tests for joining listable rooms
Added guest app to CI for callapi tests.
Added test scenarios for joining listable rooms.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:51 +01:00
Vincent Petry 52b88a9c16
Cleanup listed room code after review
Remove EVENT_BEFORE_LISTED_ROOMS_GET.
Added some comments.
Removed 503 check in JS search call.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:51 +01:00
Vincent Petry b7a118ac0c
Check that guests app is enabled when checking
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:51 +01:00
Vincent Petry 506358d442
Unit tests for system messages
Bootstrap SystemMessage/ListenerTest.
Add test cases for user add event.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:50 +01:00
Vincent Petry 74dd434228
Don't add conversation to list for guests
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:50 +01:00
Vincent Petry fea3c64586
Post a system message when joining a listable room
Whenever a logged in user joins a listable room, it is joined as
"Participant::USER". For this new situation we now also post a
system message about joining.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:50 +01:00
Vincent Petry 0aa0dcfd3e
Apply suggestions from code review of listable rooms feature
Always join as USER when joining group or public room
Allow nulls for Oracle
Changes after review
Removed populateBaseRoomData and reused the existing code by adding an
extra condition for when querying listable rooms with null participant.

Co-authored-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:50 +01:00
Vincent Petry 89f05b44a4
Add conversation to store early when joining
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:49 +01:00
Vincent Petry 3276538af5
Switch+scroll to joined listed conversation
When joining a listed conversation, the left sidebar now switches back
to the full list and displays a temporary entry while the joining
process is running.

When joining a conversation, the conversation list now automatically
scrolls to the item. It often happens that listable conversation entries
appear lower in the list, so they need to be made visible.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:49 +01:00
Vincent Petry 138aeb4ce2
Fix participant service guest user check
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:49 +01:00
Vincent Petry 4b58da2035
Fix filtering of listable rooms
This now makes the public rooms also visible in the search results.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:49 +01:00
Vincent Petry 6f8d1e6529
Make it possible to join listed group conversations
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:48 +01:00
Vincent Petry fddac323b5
Tweak left sidebar behavior with listed search results
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:48 +01:00
Vincent Petry 65238d1b8f
Adjustments for listable rooms after review
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:48 +01:00
Vincent Petry 353206e1e6
Adjust approach for search results for listable rooms
Added "/listable-room" endpoint for listing listable rooms with a similar
result format like the "/room" endpoint.
Switched left sidebar to use Conversation components for displaying
results.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:48 +01:00
Vincent Petry f4d26223b3
WIP add listed conversation to the left sidebar results
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:47 +01:00
Vincent Petry 9646678ec8
Added search provider for listed conversations
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:47 +01:00
Vincent Petry 17971cd34a
Add listable flags attribute for conversations
Added ability to set a conversation as listable for regular users and/or
guest users from the guest app.

This only implements the flag, endpoint and UI to manage it but not yet
making it appear in search results.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-11 18:15:47 +01:00