Skip to content

Inidicate preview availability in share api responses - #23350

Merged
MorrisJobke merged 1 commit into
nextcloud:masterfrom
st3iny:fix/14849/share-api-preview-availability
Oct 13, 2020
Merged

Inidicate preview availability in share api responses#23350
MorrisJobke merged 1 commit into
nextcloud:masterfrom
st3iny:fix/14849/share-api-preview-availability

Conversation

@st3iny

@st3inyst3iny commented Oct 11, 2020

Copy link
Copy Markdown
Member

Fixes#14849

The share api does not indicate if a preview is available for a share. This causes data-has-preview="true" for every entry in the share file list. The border around items without a preview is a consequence of this missing indication.

@st3iny

st3iny commented Oct 12, 2020

Copy link
Copy Markdown
MemberAuthor

@juliushaertl This PR is ready to be reviewed.

juliusknorr
juliusknorr approved these changes Oct 12, 2020
View reviewed changes

@juliusknorrjuliusknorr left a comment

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.

Nice catch 👍

@juliusknorrjuliusknorr added 3. to review Waiting for reviews bug labels Oct 12, 2020
@juliusknorrjuliusknorr added this to the Nextcloud 21 milestone Oct 12, 2020
@juliusknorr

juliusknorr commented Oct 12, 2020

Copy link
Copy Markdown
Member

/backport to stable20

@juliusknorr

juliusknorr commented Oct 12, 2020

Copy link
Copy Markdown
Member

/backport to stable19

@juliusknorr

juliusknorr commented Oct 12, 2020

Copy link
Copy Markdown
Member

/backport to stable18

@skjnldsv

skjnldsv commented Oct 12, 2020

Copy link
Copy Markdown
Member

Nice!!

@skjnldsv

skjnldsv commented Oct 12, 2020

Copy link
Copy Markdown
Member

Please rebase :)

@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 Oct 12, 2020
@MorrisJobke

MorrisJobke commented Oct 12, 2020

Copy link
Copy Markdown
Member

Please rebase :)

Done

@MorrisJobke

MorrisJobke commented Oct 12, 2020

Copy link
Copy Markdown
Member

/compile /

@skjnldsv

This comment has been minimized.

Sign in to view
@skjnldsv

This comment has been minimized.

Sign in to view
@skjnldsv

skjnldsv commented Oct 12, 2020

Copy link
Copy Markdown
Member

Oh right, no conflicts because that is only hanging apps/files_sharing/js/dist/files_sharing.js
Cool! LGTM then! 🚀

@MorrisJobke

MorrisJobke commented Oct 12, 2020

Copy link
Copy Markdown
Member

PHUnit tests are broken:

There were 124 errors:
94 95	1) OCA\Files_Sharing\Tests\Controller\ShareAPIControllerTest::testDeleteShareShareNotFound
96	ArgumentCountError: Too few arguments to function OCA\Files_Sharing\Controller\ShareAPIController::__construct(), 13 passed in /drone/src/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php on line 151 and exactly 14 expected

@st3iny

st3iny commented Oct 12, 2020

Copy link
Copy Markdown
MemberAuthor

Oops ... Just saw the tests. I'm on it but fixing this might take some time.

@skjnldsv

skjnldsv commented Oct 12, 2020

Copy link
Copy Markdown
Member

but fixing this might take some time.

Take all you need, there is no rush :)

@MorrisJobkeMorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Oct 12, 2020
@st3iny

st3iny commented Oct 13, 2020

Copy link
Copy Markdown
MemberAuthor

I fixed all the existing tests by always expecting no preview and added an new test data set to ShareApiControllerTest::testFormatShare to test a file with a preview available (should return has_preview=true).

@skjnldsv

skjnldsv commented Oct 13, 2020

Copy link
Copy Markdown
Member

Lint / php-cs check is failing

@st3iny
Indicate preview availability in share api responses
89f7e2a
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Oct 13, 2020
@MorrisJobke
MorrisJobke merged commit 7525fb3 into nextcloud:masterOct 13, 2020
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Oct 13, 2020
Merged
@MorrisJobke

MorrisJobke commented Nov 3, 2020

Copy link
Copy Markdown
Member

/backport to stable19

@MorrisJobke

MorrisJobke commented Nov 3, 2020

Copy link
Copy Markdown
Member

/backport to stable18

This was referenced Nov 3, 2020
Merged
Merged
@st3iny
st3iny deleted the fix/14849/share-api-preview-availability branch November 7, 2020 00:40
@st3inyst3iny mentioned this pull request Dec 10, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 21

Development

Successfully merging this pull request may close these issues.

Border around mime icon in file list

4 participants

@st3iny@juliusknorr@skjnldsv@MorrisJobke