-
Notifications
You must be signed in to change notification settings - Fork 12
Populate ChooseFile modal via file-meta entries in index #3949
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
lukemelia
wants to merge
5
commits into
main
Choose a base branch
from
cs-10109-populate-choosefile-modal-via-file-meta-entries-in-index
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.
+433
−6
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
446d15b
Populate ChooseFile modal via file-meta entries in index
lukemelia b401f28
Fix autotracking error in FileTreeFromIndexResource
lukemelia bb36bc8
Remove early-return optimization in FileTreeFromIndexResource
lukemelia 07c14a0
Force IndexedFileTree recreation when realm changes in ChooseFileModal
lukemelia 0458b9c
Add loading indicator to IndexedFileTree while query is running
lukemelia 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
259 changes: 259 additions & 0 deletions
259
packages/host/app/components/editor/indexed-file-tree.gts
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 | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,259 @@ | ||||||
| import { fn } from '@ember/helper'; | ||||||
| import { on } from '@ember/modifier'; | ||||||
| import { action } from '@ember/object'; | ||||||
| import type Owner from '@ember/owner'; | ||||||
| import Component from '@glimmer/component'; | ||||||
| import { tracked } from '@glimmer/tracking'; | ||||||
|
|
||||||
| import { restartableTask, timeout } from 'ember-concurrency'; | ||||||
| import { TrackedSet } from 'tracked-built-ins'; | ||||||
|
|
||||||
| import { LoadingIndicator } from '@cardstack/boxel-ui/components'; | ||||||
| import { eq } from '@cardstack/boxel-ui/helpers'; | ||||||
| import { DropdownArrowDown } from '@cardstack/boxel-ui/icons'; | ||||||
|
|
||||||
| import type { LocalPath } from '@cardstack/runtime-common/paths'; | ||||||
|
|
||||||
| import scrollIntoViewModifier from '@cardstack/host/modifiers/scroll-into-view'; | ||||||
| import { | ||||||
| fileTreeFromIndex, | ||||||
| type FileTreeNode, | ||||||
| } from '@cardstack/host/resources/file-tree-from-index'; | ||||||
| import { normalizeDirPath } from '@cardstack/host/utils/normalized-dir-path'; | ||||||
|
|
||||||
| interface Signature { | ||||||
| Args: { | ||||||
| realmURL: string; | ||||||
| selectedFile?: LocalPath; | ||||||
| openDirs?: LocalPath[]; | ||||||
| onFileSelected?: (entryPath: LocalPath) => void; | ||||||
| onDirectorySelected?: (entryPath: LocalPath) => void; | ||||||
| scrollPositionKey?: LocalPath; | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| export default class IndexedFileTree extends Component<Signature> { | ||||||
| <template> | ||||||
| <nav> | ||||||
| <TreeLevel | ||||||
| @entries={{this.fileTree.entries}} | ||||||
| @fileTree={{this.fileTree}} | ||||||
| @selectedFile={{if @selectedFile @selectedFile this.selectedFile}} | ||||||
| @openDirs={{this.effectiveOpenDirs}} | ||||||
| @onFileSelected={{this.selectFile}} | ||||||
| @onDirectorySelected={{this.toggleDirectory}} | ||||||
| @scrollPositionKey={{@scrollPositionKey}} | ||||||
| @relativePath='' | ||||||
| /> | ||||||
| {{#if this.showMask}} | ||||||
| <div class='mask' data-test-file-tree-mask> | ||||||
| {{#if this.fileTree.isLoading}} | ||||||
| <LoadingIndicator /> | ||||||
| {{/if}} | ||||||
| </div> | ||||||
| {{/if}} | ||||||
| </nav> | ||||||
|
|
||||||
| <style scoped> | ||||||
| .mask { | ||||||
| position: absolute; | ||||||
| top: 0; | ||||||
| left: 0; | ||||||
| background-color: white; | ||||||
| height: 100%; | ||||||
| width: 100%; | ||||||
| display: flex; | ||||||
| align-items: center; | ||||||
| justify-content: center; | ||||||
| } | ||||||
| nav { | ||||||
| position: relative; | ||||||
| } | ||||||
| </style> | ||||||
| </template> | ||||||
|
|
||||||
| private fileTree = fileTreeFromIndex(this, () => this.args.realmURL); | ||||||
| private localOpenDirs = new TrackedSet<string>(); | ||||||
| @tracked private selectedFile?: LocalPath; | ||||||
| @tracked private maskDismissed = false; | ||||||
|
|
||||||
| constructor(owner: Owner, args: Signature['Args']) { | ||||||
| super(owner, args); | ||||||
| this.hideMask.perform(); | ||||||
| } | ||||||
|
|
||||||
| private get showMask(): boolean { | ||||||
| if (this.fileTree.isLoading) { | ||||||
| return true; | ||||||
| } | ||||||
| return !this.maskDismissed; | ||||||
| } | ||||||
|
|
||||||
| private hideMask = restartableTask(async () => { | ||||||
| // fine tuned to coincide with debounce in RestoreScrollPosition modifier | ||||||
| await timeout(300); | ||||||
| this.maskDismissed = true; | ||||||
| }); | ||||||
|
|
||||||
| private get effectiveOpenDirs(): Set<string> { | ||||||
| if (this.args.openDirs) { | ||||||
| return new Set(this.args.openDirs); | ||||||
| } | ||||||
| return this.localOpenDirs; | ||||||
| } | ||||||
|
|
||||||
| @action | ||||||
| private selectFile(entryPath: LocalPath) { | ||||||
| this.selectedFile = entryPath; | ||||||
| this.args.onFileSelected?.(entryPath); | ||||||
| } | ||||||
|
|
||||||
| @action | ||||||
| private toggleDirectory(entryPath: LocalPath) { | ||||||
| let dirPath = normalizeDirPath(entryPath); | ||||||
|
|
||||||
| if (this.localOpenDirs.has(dirPath)) { | ||||||
| this.localOpenDirs.delete(dirPath); | ||||||
| } else { | ||||||
| this.localOpenDirs.add(dirPath); | ||||||
| } | ||||||
|
|
||||||
| this.args.onDirectorySelected?.(dirPath); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| interface TreeLevelSignature { | ||||||
| Args: { | ||||||
| entries: FileTreeNode[]; | ||||||
| fileTree: ReturnType<typeof fileTreeFromIndex>; | ||||||
| selectedFile?: LocalPath; | ||||||
| openDirs: Set<string>; | ||||||
| onFileSelected: (entryPath: LocalPath) => void; | ||||||
| onDirectorySelected: (entryPath: LocalPath) => void; | ||||||
| scrollPositionKey?: LocalPath; | ||||||
| relativePath: string; | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| class TreeLevel extends Component<TreeLevelSignature> { | ||||||
| <template> | ||||||
| {{#each @entries as |entry|}} | ||||||
|
||||||
| {{#each @entries as |entry|}} | |
| {{#each @entries key="path" as |entry|}} |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The relativePath parameter is declared in the TreeLevelSignature but is never used in the TreeLevel component. It's passed down recursively but has no effect on the component's behavior. Consider removing it if it's not needed, or document why it's being tracked for future use.