-
Notifications
You must be signed in to change notification settings - Fork 59
feat(ContentNavigator): added more detailed path information #1597
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
Open
kpatl1
wants to merge
7
commits into
main
Choose a base branch
from
feat/kpatl1-1577
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c0622a9
feat(ContentNavigator): added more detailed path information
64965fe
feat(ContentNavigator): added optimization with parent caching, also …
0eb18fc
DCO Remediation Commit for Kishan Patel <[email protected]>
05fb7f2
feat(ContentNavigator): changed uri to have a full path to allow for …
fced7a6
DCO Remediation Commit for Kishan Patel <[email protected]>
1e5a9b6
wip(ContentNavigator): Partial working modification
6e8b68c
wip(ContentNavigator): Partial working modification
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,6 +79,8 @@ class ContentDataProvider | |
public dropMimeTypes: string[]; | ||
public dragMimeTypes: string[]; | ||
|
||
private parentPathCache = new Map<string, string>(); | ||
|
||
get treeView(): TreeView<ContentItem> { | ||
return this._treeView; | ||
} | ||
|
@@ -213,6 +215,20 @@ class ContentDataProvider | |
public async getTreeItem(item: ContentItem): Promise<TreeItem> { | ||
const isContainer = getIsContainer(item); | ||
const uri = await this.model.getUri(item, false); | ||
let tooltip = item.name; | ||
|
||
const canCopyPath = item.contextValue?.includes("copyPath"); | ||
|
||
if (canCopyPath) { | ||
try { | ||
const parentPath = await this.getCachedParentPath(item); | ||
if (parentPath) { | ||
tooltip = parentPath + "/" + item.name; | ||
} | ||
} catch { | ||
// If getting parent path fails, tooltip will remain as item.name | ||
} | ||
} | ||
|
||
return { | ||
collapsibleState: isContainer | ||
|
@@ -230,6 +246,7 @@ class ContentDataProvider | |
id: item.uid, | ||
label: item.name, | ||
resourceUri: uri, | ||
tooltip: tooltip, | ||
}; | ||
} | ||
|
||
|
@@ -735,6 +752,30 @@ class ContentDataProvider | |
} | ||
: undefined; | ||
} | ||
|
||
private async getCachedParentPath(item: ContentItem): Promise<string> { | ||
const parentUri = item.parentFolderUri; | ||
if (!parentUri) { | ||
return ""; | ||
} | ||
|
||
if (!this.parentPathCache.has(parentUri)) { | ||
try { | ||
const fullPath = await this.model.getPathOfItem(item); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It may also be worth updating |
||
if (fullPath) { | ||
const parentPath = | ||
fullPath.substring(0, fullPath.lastIndexOf("/")) || "/"; | ||
this.parentPathCache.set(parentUri, parentPath); | ||
} else { | ||
this.parentPathCache.set(parentUri, ""); | ||
} | ||
} catch { | ||
this.parentPathCache.set(parentUri, ""); | ||
} | ||
} | ||
|
||
return this.parentPathCache.get(parentUri) || ""; | ||
} | ||
} | ||
|
||
export default ContentDataProvider; | ||
|
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.