[PB-2424] Feat: working with ancestors to display shared item details #1403
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
CandelR
reviewed
Dec 26, 2024
Comment on lines
138
to
148
| let location = '/'; | ||
| if (item.view === 'Shared') { | ||
| location += translate('sideNav.shared'); | ||
| if (item.isFolder) { | ||
| location += getPathName.length > 0 ? '/' + getPathName.shift() : ''; | ||
| } | ||
| } else { | ||
| if (item.isFolder) { | ||
| getPathName.pop(); | ||
| } | ||
| location += rootPathName + (getPathName.length > 0 ? '/' + getPathName.join('/') : ''); |
There was a problem hiding this comment.
Separate this logic into functions for ease of understanding and maintenance
Deploying drive-web with
|
| Latest commit: |
12e60b2
|
| Status: | ⚡️ Build in progress... |
|
CandelR
requested changes
Dec 30, 2024
Comment on lines
+126
to
+156
| function getSharedLocation(item: DriveItemDetails, ancestorPathNames: string[]): string { | ||
| let location = translate('sideNav.shared'); | ||
| if (item.isFolder && ancestorPathNames.length > 0) { | ||
| location += '/' + ancestorPathNames.shift(); | ||
| } | ||
| return location; | ||
| } | ||
|
|
||
| function getRegularLocation(item: DriveItemDetails, ancestorPathNames: string[]): string { | ||
| if (item.isFolder) { | ||
| ancestorPathNames.pop(); | ||
| } | ||
| return item.view + (ancestorPathNames.length > 0 ? '/' + ancestorPathNames.join('/') : ''); | ||
| } | ||
|
|
||
| function getLocation(item: DriveItemDetails, ancestors: DriveItemData[]): string { | ||
| const itemViewName = item.view; | ||
| const ancestorPathNames = ancestors.map((ancestor) => getItemPlainName(ancestor)).reverse(); | ||
| ancestorPathNames.shift(); // Remove root parent | ||
|
|
||
| let location = '/'; | ||
|
|
||
| if (itemViewName === 'Shared') { | ||
| location += getSharedLocation(item, ancestorPathNames); | ||
| return location; | ||
| } | ||
|
|
||
| location += getRegularLocation(item, ancestorPathNames); | ||
| return location; | ||
| } | ||
|
|
There was a problem hiding this comment.
Remember to add tests for these functions, you will probably need to extract them from this file to add the unit tests
|
@jvedrson check the comments in order to finish the task |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adapted a NEW VERSION ENDPOINT of ancestors for Workspaces.
Fixed a bug when displaying details of items in the drive and shared folders for both individual and workspace.
Related Issues
Related Pull Requests
Checklist
How Has This Been Tested?
Additional Notes
When opening the details and looking at the location, it was set to show only /Shared to avoid showing folders that the owner user does not want to reveal or share as a security measure.
The share icon has been removed from internal folders and files. The icon only appears on the item that was initially shared. This is to allow the user to know which item they need to remove share access from. However, if there are folders or files that have been shared separately and are inside another shared folder, then the icon will be displayed.
File with change: src/app/share/views/SharedLinksView/components/SharedItemList.tsx