Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display the NC assistant in the main Window #6637

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Display the NC assistant in the main Window #6637

merged 2 commits into from
Jun 25, 2024

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Apr 16, 2024 •
edited
Loading

Implements #6601:

  • If NC assistant is enabled in the server, display the icon
    to open it instead of Talk. Talk is then displayed in the
    list with the other apps.
  • The direct link is only available in the assistant app >= 1.0.9.
Screenshot 2024-04-16 at 22 52 18

@camilasan camilasan mentioned this pull request Apr 16, 2024
Closed
@camilasan camilasan force-pushed the feature/nc-assistance branch 2 times, most recently from 6b3dc2e to d5ffd28 Compare April 25, 2024 14:19
@camilasan camilasan marked this pull request as ready for review April 25, 2024 14:20
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 25, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
3 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@camilasan
Copy link
Member Author

/backport to stable-3.13

jancborchardt
jancborchardt approved these changes May 16, 2024
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks nice design-wise, great idea :)

claucambra
claucambra reviewed May 16, 2024
View reviewed changes
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically it LGTM, though maybe it would be nicer to handle this on the cpp side rather than the QML side? We could just have "featuredApp..." type properties that move this logic out of the UI code

src/gui/tray/Window.qml Outdated Show resolved Hide resolved
src/gui/tray/Window.qml Outdated Show resolved Hide resolved
mgallien
mgallien requested changes Jun 5, 2024
View reviewed changes
src/gui/tray/usermodel.h Outdated Show resolved Hide resolved
src/gui/tray/usermodel.cpp Outdated Show resolved Hide resolved
src/gui/tray/usermodel.cpp Outdated Show resolved Hide resolved
src/gui/tray/usermodel.cpp Show resolved Hide resolved
src/gui/tray/usermodel.cpp Show resolved Hide resolved
src/gui/tray/usermodel.cpp Outdated Show resolved Hide resolved
claucambra
claucambra requested changes Jun 5, 2024
View reviewed changes
src/gui/tray/usermodel.cpp Outdated Show resolved Hide resolved
src/libsync/capabilities.cpp Outdated Show resolved Hide resolved
@camilasan camilasan enabled auto-merge June 24, 2024 17:50
@camilasan
Copy link
Member Author

/rebase

claucambra
claucambra requested changes Jun 25, 2024
View reviewed changes
src/gui/tray/usermodel.cpp Outdated Show resolved Hide resolved
@camilasan camilasan force-pushed the feature/nc-assistance branch 2 times, most recently from 7451c55 to 4d897e4 Compare June 25, 2024 13:29
@camilasan
Display the Nextcloud assistant icon in the main window.
b7bf608 
- If NC assistant is enabled in the server, display the icon
to open it instead of Talk. Talk is then displayed in the
list with the other apps.
- The direct link is only available in the assistant app >= 1.0.9.

Signed-off-by: Camila Ayres <[email protected]>
@camilasan
Move the logic for handling the featured app qml to cpp.
fcf07b6 
Signed-off-by: Camila Ayres <[email protected]>
@camilasan camilasan added this to the 3.13.1 milestone Jun 25, 2024
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6637-fcf07b60c4ea4ea9f7d3c2431d159b75686f81ae-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@camilasan camilasan removed this from the 3.13.1 milestone Jun 25, 2024
@camilasan camilasan merged commit 7db343b into master Jun 25, 2024
12 of 14 checks passed
@camilasan camilasan deleted the feature/nc-assistance branch June 25, 2024 14:26
@backportbot backportbot bot mentioned this pull request Jun 25, 2024
Closed
2 tasks
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jun 25, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
11 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@joshtrichards joshtrichards mentioned this pull request Aug 14, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra approved these changes

@jancborchardt jancborchardt jancborchardt approved these changes

@mgallien mgallien mgallien approved these changes

@allexzander allexzander Awaiting requested review from allexzander

@szaimen szaimen Awaiting requested review from szaimen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@camilasan @nextcloud-desktop-bot @mgallien @jancborchardt @claucambra