Conversation
nilsding
left a comment
There was a problem hiding this comment.
Some comments -- the Talk cleanup and potential refactoring can be done in a follow-up PR.
There was a problem hiding this comment.
this change seems unrelated to this PR
| trayWindowHeader.currentAccountHeaderButton.accountMenu.close(); | ||
| trayWindowHeader.appsMenu.close(); | ||
| trayWindowHeader.openLocalFolderButton.closeMenu() | ||
| UserModel.refreshSyncErrorUsers() |
There was a problem hiding this comment.
this is missing in the updated version
| || trayWindowUnifiedSearchInputContainer.activateSearchFocus | ||
|
|
||
| anchors.fill: parent | ||
| anchors.margins: Style.trayWindowBorderWidth |
There was a problem hiding this comment.
this is missing in the updated version, not sure if it was intentional that this got removed
|
|
||
| bool User::isFeaturedAppEnabled() const | ||
| { | ||
| return isNcAssistantEnabled() || serverHasTalk(); |
There was a problem hiding this comment.
so the Talk button is no more, even if assistant is disabled?
in that case we should clean up references to that as well (remove talk-app.svg and other methods in here since they're no longer used)
| anchors.top: trayWindowSyncWarning.visible | ||
| ? trayWindowSyncWarning.bottom | ||
| : trayWindowHeader.bottom |
There was a problem hiding this comment.
this is missing in the updated version
src/gui/tray/MainWindow.qml
Outdated
There was a problem hiding this comment.
would rather move these to a separate component outside of MainWindow for better maintainability where possible
There was a problem hiding this comment.
100% agree. Good next step
| const auto textValue = nestedObject.value("text"_L1); | ||
| if (textValue.isString()) { | ||
| return textValue.toString(); | ||
| } | ||
| const auto answerValue = nestedObject.value("answer"_L1); | ||
| if (answerValue.isString()) { | ||
| return answerValue.toString(); | ||
| } | ||
| } | ||
|
|
||
| const auto textValue = outputObject.value("text"_L1); | ||
| if (textValue.isString()) { | ||
| return textValue.toString(); | ||
| } | ||
| const auto answerValue = outputObject.value("answer"_L1); | ||
| if (answerValue.isString()) { | ||
| return answerValue.toString(); | ||
| } |
There was a problem hiding this comment.
| const auto textValue = nestedObject.value("text"_L1); | |
| if (textValue.isString()) { | |
| return textValue.toString(); | |
| } | |
| const auto answerValue = nestedObject.value("answer"_L1); | |
| if (answerValue.isString()) { | |
| return answerValue.toString(); | |
| } | |
| } | |
| const auto textValue = outputObject.value("text"_L1); | |
| if (textValue.isString()) { | |
| return textValue.toString(); | |
| } | |
| const auto answerValue = outputObject.value("answer"_L1); | |
| if (answerValue.isString()) { | |
| return answerValue.toString(); | |
| } | |
| if (const auto textValue = nestedObject.value("text"_L1); textValue.isString()) { | |
| return textValue.toString(); | |
| } | |
| if (const auto answerValue = nestedObject.value("answer"_L1); answerValue.isString()) { | |
| return answerValue.toString(); | |
| } | |
| } | |
| if (const auto textValue = outputObject.value("text"_L1); textValue.isString()) { | |
| return textValue.toString(); | |
| } | |
| if (const auto answerValue = outputObject.value("answer"_L1); answerValue.isString()) { | |
| return answerValue.toString(); | |
| } |
| Q_INVOKABLE void submitAssistantQuestion(const QString &question); | ||
| Q_INVOKABLE void clearAssistantResponse(); |
There was a problem hiding this comment.
These could be moved to public slots:, that way there's no need for Q_INVOKABLE
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
known issue is that we forget to wait long enough for the reply we also probably would fail to handle more than one request in parallel so we should prevent submitting more than one at a time Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
delete completed tasks being success or error should not matter in case of error assistant reply is empty Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Removed the check for NcAssistant feature and its associated URL opening. Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com> Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
otherwise the window would be empty Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
1249397 to
39ebd52
Compare
|
rebased on master (with the help of noticed some minor bugs with the assistant view regarding the sync-error-display and unified-search |
|
Artifact containing the AppImage: nextcloud-appimage-pr-9431.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
|
nilsding
left a comment
There was a problem hiding this comment.
fine for now, let's do further cleanup/refactorings in followup-PRs to avoid this PR from growing too large





No description provided.