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.

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

Display indirect shares for links #2932

Merged
merged 5 commits into from
Jan 30, 2020
Merged

Conversation

PVince81
Copy link
Contributor

@PVince81 PVince81 commented Jan 29, 2020

Description

Display indirect link shares in the links panel when link shares exist on any parent resource.

Related Issue

Fixes #2897

Motivation and Context

How Has This Been Tested?

  • manual test web UI
  • acceptance tests

Screenshots (if appropriate):

image

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • fix styling, especially the "via" part
  • tests
  • changelog

@PVince81 PVince81 self-assigned this Jan 29, 2020
@PVince81 PVince81 force-pushed the share-indirect-outgoing-links branch 2 times, most recently from 62f785d to b4f290f Compare January 29, 2020 16:43
@PVince81
Copy link
Contributor Author

The feature works now and the tests pass.

However the styling isn't looking good, we have the "via" link alignment problem here as well.
Maybe this needs to be moved into a table as well like we did for collaborators.

@kulmann

Public link shares from parent resources are now shown in the public
link share panel with a "via" link to jump to the parent resource.
@PVince81 PVince81 force-pushed the share-indirect-outgoing-links branch from b4f290f to 390b149 Compare January 29, 2020 19:30
@PVince81
Copy link
Contributor Author

@kulmann apart from the styling I think the PR would be ready, CI has passed last time and I've just rebased.

Please review the current code. If you have time, can you take care of adjusting the styling like you did for collaborators, maybe with the table ?

@PVince81 PVince81 marked this pull request as ready for review January 29, 2020 19:56
@PVince81 PVince81 requested a review from kulmann January 29, 2020 19:56
Copy link
Member

@kulmann kulmann left a comment

Choose a reason for hiding this comment

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

Changed some minor issues myself

  • added a commit for proper list item styling when having via-links
  • moved list items in a separate component to avoid code duplication

@kulmann kulmann self-assigned this Jan 30, 2020
duplication and fix styling of indirect link shares.
@kulmann kulmann force-pushed the share-indirect-outgoing-links branch from f854fc9 to fc55d87 Compare January 30, 2020 11:45
@kulmann
Copy link
Member

kulmann commented Jan 30, 2020

Bildschirmfoto 2020-01-30 um 12 46 01

kulmann and others added 3 commits January 30, 2020 12:52
Intention is to make copy to clipboard, which is visible for direct and
indirect link shares, the rightmost button, so that the alignment is
correct.
After refactoring the file list item into PublicLinkListItem, the method
formDateFromNow was not accessible any more as it was present in the
mixin from the original component.

This fix adds the mixing to PublicLinkListItem to make that function
work again and fixes the issue where links that have an expiration date
set would not be shown.
@PVince81
Copy link
Contributor Author

@kulmann seems you missed the mixin: 4b0340d

@PVince81
Copy link
Contributor Author

last commits from @kulmann are ok 👍

@PVince81 PVince81 merged commit 211ed1e into master Jan 30, 2020
@delete-merged-branch delete-merged-branch bot deleted the share-indirect-outgoing-links branch January 30, 2020 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

See collaborators and links from share inherited from parent
2 participants