Skip to content

User-Status Followup - #22109

Merged
skjnldsv merged 3 commits into
masterfrom
feature/20931/followup-1
Aug 17, 2020
Merged

User-Status Followup#22109
skjnldsv merged 3 commits into
masterfrom
feature/20931/followup-1

Conversation

@georgehrke

@georgehrkegeorgehrke commented Aug 5, 2020•
edited
Loading

Copy link
Copy Markdown
Member

Related Issue: #20931
Previous PR: #21186
Requires nextcloud-libraries/nextcloud-vue#1259

ListSearch
3E2CD53A-2CBF-48A6-BBB4-74008D80957C543AE73A-121B-4444-AF5F-FBF886516AB3

@georgehrkegeorgehrke added the 2. developing Work in progress label Aug 5, 2020
@georgehrkegeorgehrke mentioned this pull request Aug 5, 2020
Closed
8 tasks
@georgehrkegeorgehrke added this to the Nextcloud 20 milestone Aug 5, 2020
@georgehrke
georgehrkeforce-pushed the feature/20931/followup-1 branch from f016533 to d221d14CompareAugust 5, 2020 11:09
@MorrisJobkeMorrisJobke mentioned this pull request Aug 11, 2020
Merged
57 tasks
@georgehrke
georgehrkeforce-pushed the feature/20931/followup-1 branch from d221d14 to ba3f0e9CompareAugust 14, 2020 10:07
@georgehrke
Expose status via Collaborators API
5b26487
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
georgehrkeforce-pushed the feature/20931/followup-1 branch from 9116399 to b457a4eCompareAugust 14, 2020 15:05
@georgehrkegeorgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 14, 2020
@georgehrke
georgehrke marked this pull request as ready for review August 14, 2020 15:10
@faily-bot

faily-botBot commented Aug 14, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31817: failure

jsunit

Show full log
PhantomJS 2.1.1 (Linux 0.0.0) LOG: 'JQMIGRATE: Migrate is installed, version 1.4.1'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'jQuery is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: '$ is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'Handlebars is deprecated: please ship your own, this will be removed in Nextcloud 20'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Settings initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Sidebar initialized'
PhantomJS 2.1.1 (Linux 0.0.0) ERROR
PhantomJS 2.1.1 (Linux 0.0.0): Executed 0 of 0 ERROR (0.704 secs / 0 secs)

acceptance-app-files

  • tests/acceptance/features/app-files.feature:262
Show full log
 Scenario: unmarking a file as favorite causes the file list to be sorted again # /drone/src/tests/acceptance/features/app-files.feature:262
Given I am logged in # LoginPageContext::iAmLoggedIn()
And I create a new folder named "A name alphabetically lower than welcome.txt" # FileListContext::iCreateANewFolderNamed()
And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
And I close the details view # FilesAppContext::iCloseTheDetailsView()
And I see that the details view is closed # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
And I mark "welcome.txt" as favorite # FileListContext::iMarkAsFavorite()
And I see that "welcome.txt" is marked as favorite # FileListContext::iSeeThatIsMarkedAsFavorite()
And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
When I unmark "welcome.txt" as favorite # FileListContext::iUnmarkAsFavorite()
Then I see that "welcome.txt" is not marked as favorite # FileListContext::iSeeThatIsNotMarkedAsFavorite()
Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()

skjnldsv
skjnldsv reviewed Aug 17, 2020
View reviewed changes
Comment threadapps/files_sharing/lib/Controller/ShareAPIController.php
Comment on lines +234 to +240
$result['status'] = [
'status' => $userStatus->getStatus(),
'message' => $userStatus->getMessage(),
'icon' => $userStatus->getIcon(),
'clearAt' => $userStatus->getClearAt()
? (int)$userStatus->getClearAt()->format('U')
: null,

@skjnldsvskjnldsvAug 17, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I see you're also usingthis code on lib/private/Collaboration/Collaborators/UserPlugin.php

Maybe it would make sense as a dedicated function? :)

@georgehrkegeorgehrkeAug 17, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I was thinking about about that as well, but then it's merely 6 lines of code and it's in two completely different components (an app vs. class in private OC namespace)

@skjnldsv

skjnldsv commented Aug 17, 2020

Copy link
Copy Markdown
Member

/compile amend /

@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 17, 2020
@georgehrke@skjnldsv
Display user-status in sharing list
4485cb3
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke@skjnldsv
Limit custom message input to 80 chars
40bf38a
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@skjnldsv
skjnldsvforce-pushed the feature/20931/followup-1 branch from e395687 to 40bf38aCompareAugust 17, 2020 19:55
@skjnldsv
skjnldsv merged commit 565ccb0 into masterAug 17, 2020
@skjnldsv
skjnldsv deleted the feature/20931/followup-1 branch August 17, 2020 20:13
@juliusknorrjuliusknorr mentioned this pull request Jul 31, 2023
Merged
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@rullzerrullzerAwaiting requested review from rullzer

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: status

Projects

None yet

Milestone

Nextcloud 20

Development

Successfully merging this pull request may close these issues.

3 participants

@georgehrke@skjnldsv@juliusknorr