Skip to content

Issue 36702 asset picker - #36944

Open
nicobytes wants to merge 19 commits into
mainfrom
issue-36702-asset-picker
Open

Issue 36702 asset picker#36944
nicobytes wants to merge 19 commits into
mainfrom
issue-36702-asset-picker

Conversation

@nicobytes

@nicobytes nicobytes commented Aug 7, 2026

Copy link
Copy Markdown
Member

This pull request introduces a set of improvements and refactorings to the folder tree utilities and related data-access APIs, aimed at enhancing code reuse, maintainability, and consistency across the Content Drive and Host Folder Field features. The changes include moving folder tree logic into shared utilities, updating service providers, and aligning data models.

Core refactoring and utility extraction:

  • Introduced new shared utilities folder-tree.utils.ts and folder-tree-load.utils.ts in @dotcms/data-access, centralizing the logic for building, loading, and paginating folder trees. This includes new functions such as generateAllParentPaths, createTreeNode, and buildTreeFolderNodes, as well as utilities for paginated loading and "Load more" node handling. [1] [2]

API and provider updates:

  • Updated DotContentDriveService to use Angular's providedIn: 'root' for global availability, and removed it from route-level providers. This ensures the service can be used from dialogs and other contexts without explicit injection in every route. [1] [2]

Imports and dependency cleanup:

  • Updated imports in various portlet files to use the new shared utilities from @dotcms/data-access instead of local utility definitions, and cleaned up duplicate or outdated imports for components such as DotFolderListViewComponent. [1] [2] [3] [4]

Data model alignment:

  • Extended the TreeNodeContentData model to include additional metadata fields (inode, defaultBaseType, fromTable) for improved folder selection and upload behavior in the Content Drive and AssetPicker.

Constants and type re-exports:

  • Refactored and re-exported shared folder tree page size constants from the new utilities, ensuring consistent pagination limits across features, and deprecated local type definitions in favor of those from @dotcms/data-access. [1] [2] [3] [4]

These changes improve code maintainability, reduce duplication, and ensure that folder tree behaviors remain consistent across all consuming features.

This PR fixes: #36702

AssetPicker series — all seven sub-issues are resolved in this PR:

Fixes #36831 — AssetPicker 1/7: Migrate DotFolderListView to @dotcms/ui
Fixes #36832 — AssetPicker 2/7: Lift folder-tree helpers and harden drive data-access
Fixes #36833 — AssetPicker 3/7: Decouple Content Drive toolbar chrome for AssetPicker reuse
Fixes #36834 — AssetPicker 4/7: Headless browse store (no URL) for AssetPicker
Fixes #36835 — AssetPicker 5/7: Build DotAssetPicker shell in @dotcms/ui
Fixes #36836 — AssetPicker 6/7: File/Image entry configs, silent mime, CT limits, global last path
Fixes #36837 — AssetPicker 7/7: Wire AssetPicker into Edit Content File/Image fields

- Extracted DotFolderListView component and related models/constants/mocks into the new `@dotcms/ui` library.
- Updated imports in the Content Drive shell to reference the new location.
- Introduced `selectionMode` input to support both single and multiple selection.
- Re-exported necessary symbols from `@dotcms/ui` in the Content Drive UI for compatibility.
- Added tests for the new component and selection mode functionality.

This migration aims to share the folder/asset list component between Content Drive and future AssetPicker implementations, enhancing code reuse and maintainability.
Copilot AI lite review requested due to automatic review settings August 7, 2026 14:45
@github-actions github-actions Bot added the Area : Frontend PR changes Angular/TypeScript frontend code label Aug 7, 2026
@claude

claude Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Claude finished @nicobytes's task in 2m 53s —— View job


Code Review — AssetPicker (PR #36944)

I reviewed the diff against origin/main, focusing on the AssetPicker store/features/components and the folder-tree utilities, and re-checked every finding raised in the earlier Copilot passes.

New Issues

No new blocking issues found. One minor note below.

  • 🟡 Medium: core-web/libs/data-access/src/lib/dot-folder/folder-tree-load.utils.ts:30 — the deep-link hierarchy fetch uses FOLDER_TREE_HIERARCHY_PAGE_SIZE (10000, page 1) while the "Load more" sentinel it appends is wired to resume at nextPage: 2 with the interactive page size of 40 (FOLDER_TREE_PAGE_SIZE). If a single folder level ever exceeds 10000 children, clicking Load more fetches rows 41–80 — which are already displayed — producing duplicates. In practice a 10k-folder level is unreachable, so this is a latent inconsistency rather than a live bug; worth a comment noting the page-size assumption. Assumption: no folder level has >10000 children. What to verify: whether any real dataset approaches that.

Resolved

The earlier reviews' findings are all addressed in the current diff:

  • with-asset-folder-tree.feature.ts:78-107 — folder-tree error status is no longer masked. The success work now lives in tap before catchError, and the error branch returns EMPTY (not of([])), so a failed load stays ERROR instead of being patched back to LOADED. The code comment explicitly documents why.
  • dot-asset-picker-toolbar.component.ts:57 — File mode no longer offers every base type. $allowedBaseTypes reads config.allowedBaseTypes (what the selector may offer), kept separate from baseTypes (the pre-selection). buildAssetPickerConfig sets allowedBaseTypes: [DOTASSET, FILEASSET] in both modes; only Image pre-selects.
  • dot-asset-picker.component.html:22-23 / .ts:130 — double-click routes to onSelect and only marks the row; confirming stays an explicit action, matching the "single click and double click both just select" behavior without closing the dialog on a single click.
  • folder-tree.utils.ts:96 (isLeaf) — flagged as marking every path node a leaf. This logic is copied verbatim from the pre-existing tree-folder.utils.ts on origin/main, so it is not a regression introduced by this PR.
  • with-asset-browse.feature.ts:120-133loadItems now clears selectedAsset: null when a new request starts, so Confirm can't stay enabled for a row that scrolled out of the list. withAssetSelection is composed before withAssetBrowse so the slot exists.
  • dot-asset-picker.store.ts:104-118 (setSearch) — resetting folder scope now also calls selectRootNode(), moving the tree highlight (and therefore $targetFolder upload destination) back to the site root, so the sidebar no longer contradicts the site-wide list.
  • dot-file-field.component.ts:829-881 — the File/Image "Select existing" flow now opens DotAssetPickerComponent (via buildAssetPickerConfig with mode, site, and contentlet language) instead of DotBrowserSelectorComponent, so the 7/7 wiring and the /api/v1/drive/search path are actually reachable.

Nice work — the store composition ordering, cursor/paging invariants, and the "selection is only a highlight; persist on confirm" contract are all well-reasoned and documented.

issue-36702-asset-picker

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR refactors the existing Folder List View used by Content Drive into a reusable presentational component in @dotcms/ui, adding a single-selection mode intended for the upcoming AssetPicker (while preserving current Content Drive behavior via the default multiple selection mode).

Changes:

  • Moved Folder List View domain-agnostic types/constants into @dotcms/ui and re-exported them from the Content Drive UI package for compatibility.
  • Added selectionMode: 'single' | 'multiple' support to the table (checkboxes in multiple mode, radios in single mode) and normalized emitted selections to an array.
  • Updated Content Drive shell imports and updated/extended unit tests accordingly.

Reviewed changes

Copilot reviewed 12 out of 13 changed files in this pull request and generated no comments.

Show a summary per file
File Description
core-web/libs/ui/src/lib/components/dot-folder-list-view/models.ts Introduces shared column typing and selectionMode model for the Folder List View.
core-web/libs/ui/src/lib/components/dot-folder-list-view/constants.ts Defines header column config and drag MIME type local to the component folder.
core-web/libs/ui/src/lib/components/dot-folder-list-view/mocks.ts Moves test mocks alongside the component.
core-web/libs/ui/src/lib/components/dot-folder-list-view/dot-folder-list-view.component.ts Adds selectionMode input, normalizes selection output, and updates internal imports to local UI sources.
core-web/libs/ui/src/lib/components/dot-folder-list-view/dot-folder-list-view.component.html Switches checkbox vs radio rendering based on selectionMode and updates selection binding.
core-web/libs/ui/src/lib/components/dot-folder-list-view/dot-folder-list-view.component.scss Fixes relative SCSS imports to match the libs layout.
core-web/libs/ui/src/lib/components/dot-folder-list-view/dot-folder-list-view.component.spec.ts Updates tests for the new selection model and adds coverage for single-selection behavior.
core-web/libs/ui/src/index.ts Exposes Folder List View component + related models/constants from @dotcms/ui.
core-web/libs/portlets/dot-content-drive/ui/src/lib/shared/models.ts Removes Folder List View column typing now owned by @dotcms/ui.
core-web/libs/portlets/dot-content-drive/ui/src/lib/shared/constants.ts Removes list-view constants now owned by @dotcms/ui.
core-web/libs/portlets/dot-content-drive/ui/src/index.ts Re-exports the Folder List View API surface from @dotcms/ui for Content Drive consumers.
core-web/libs/portlets/dot-content-drive/portlet/src/lib/dot-content-drive-shell/dot-content-drive-shell.component.ts Updates imports to use @dotcms/ui for the presentational list component/types.
core-web/libs/portlets/dot-content-drive/portlet/src/lib/dot-content-drive-shell/dot-content-drive-shell.component.spec.ts Aligns test imports with the updated component export location.

- Introduced new utility functions for managing folder hierarchies, including `getFolderHierarchyByPath` and `getFolderNodesByPath`, to improve folder navigation and loading in the content drive.
- Added `folder-tree-load.utils.ts` and `folder-tree.utils.ts` files to encapsulate the new logic.
- Implemented comprehensive unit tests for the new utilities to ensure functionality and reliability.
- Updated existing services to utilize the new utilities, enhancing code organization and maintainability.

These changes aim to streamline folder management and improve the user experience in the content drive interface.
Extracts the content-type, language, and search filter components (plus the
chip-filter/list-item primitives and upload button) out of the content-drive
portlet into @dotcms/ui so they can be shared with the AssetPicker. Store-
specific logic stays behind thin adapter components in the portlet.
- serve target lacked a dependsOn, so dotcms-webcomponents could be
  stale or missing when dotcms-ui starts serving
- webcomponents build target was missing outputs, preventing Nx from
  caching/detecting its build artifacts correctly
- Introduces DotAssetPickerStore in @dotcms/ui to power the upcoming
  AssetPicker dialog with a search request builder mirroring Content
  Drive's, but with no router/URL coupling so it can run inside a
  dialog over Edit Contentlet without corrupting host navigation.
- Relocates ALL_FOLDER/SYSTEM_HOST_ID out of the Content Drive UI
  library into shared dot-folder-tree constants so both Content
  Drive and the new picker consume a single source.
@nicobytes
nicobytes requested a lite review from Copilot August 7, 2026 17:55

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 76 out of 78 changed files in this pull request and generated no new comments.

Suppressed comments (1)

core-web/libs/ui/src/lib/components/dot-asset-picker/store/features/with-asset-folder-tree.feature.ts:97

  • loadFolders sets foldersStatus to ERROR in catchError, but then the subscribe block unconditionally patches it back to LOADED (because catchError returns an empty array). This masks folder-tree failures and makes the UI indistinguishable from a successful empty tree.

The AssetPicker (browse/pick a single asset) now composes the dropzone, upload-type selector, and folder sidebar/toolbar that Content Drive already had, so both features share one implementation instead of duplicating upload flow logic.

- Move `dot-content-drive-dropzone` and the upload-type-selector dialog out of the Content Drive portlet into `@dotcms/ui` as `DotUploadDropzoneComponent` and `DotUploadTypeSelectorComponent`, decoupled from `DotContentDriveStore` (folder/drag-state now passed via inputs/outputs)
- Add `DotAssetPickerComponent` with sidebar/toolbar subcomponents, wiring the shared dropzone, upload selector, and folder tree to a new `DotAssetPickerStore`
- Update Content Drive shell to consume the relocated shared components and derive drag/target-folder state locally
Adds a global last-used-path store, a config builder that translates
Edit Content field type (File/Image) into picker filters, and
server-side base-type narrowing for the content type filter so
restricted hosts don't page through mostly-discarded results.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 97 out of 101 changed files in this pull request and generated 2 comments.

Suppressed comments (5)

core-web/libs/ui/src/lib/components/dot-asset-picker/components/dot-asset-picker-toolbar/dot-asset-picker-toolbar.component.ts:58

  • This returns null for File mode because that config intentionally has no preselected base types, but null makes the selector offer every base type, including Content and Widget. The acceptance criteria restrict the selector in both File and Image modes; selection and allowed options must be separate so File starts with no selection while still only offering DOTASSET/FILEASSET.
    core-web/libs/ui/src/lib/components/dot-asset-picker/dot-asset-picker.component.html:22
  • Double-click only selects the row, whereas the AssetPicker acceptance criteria require it to select and confirm. Note that DotFolderListViewComponent.doubleClick is also emitted by single clicks on the title/thumbnail, so directly calling confirm() here would close on a single click; introduce a distinct actual-double-click confirmation path without restoring editor navigation.
    core-web/libs/data-access/src/lib/dot-folder/folder-tree.utils.ts:96
  • This predicate is true for every valid level (length >= index + 1), so every node on the target path is marked as a leaf even when child levels are attached below it. PrimeNG then hides the expansion control, making expanded ancestors impossible to reopen after collapse. Only the final hierarchy level should be marked as a leaf.
    const isLeaf = (levelIndex: number) => folderHierarchyLevels.length >= levelIndex + 1;

core-web/libs/ui/src/lib/components/dot-asset-picker/store/features/with-asset-browse.feature.ts:120

  • Starting a new request leaves selectedAsset untouched. Since the list clears its own PrimeNG selection silently when items changes, changing folder/filter/page/sort can leave Confirm enabled for an asset no longer visible and return that stale asset. Clear the picker selection whenever a new browse request starts (or when its result replaces items).
    core-web/libs/ui/src/lib/components/dot-asset-picker/store/features/with-asset-folder-tree.feature.ts:83
  • The error status is immediately overwritten: catchError emits an empty hierarchy, so the subscription runs and patches foldersStatus to LOADED. A failed folder request therefore looks like a successfully loaded empty tree. Stop the success callback from running for the error fallback.

Comment on lines +10 to +11
export * from './lib/components/dot-asset-picker/dot-asset-picker.component';
export * from './lib/components/dot-asset-picker/asset-picker-config';
delete filters.title;
}

patchState(store, { filters, path: undefined, ...resetPaging() });
- The dotAsset/File Asset picker now uses the Content Drive-backed
  AssetPicker instead of DotBrowserSelectorComponent, restricting by
  base type/mime for image fields and resolving site/locale via
  GlobalStore and DotEditContentStore.
- Guards against opening the picker before a site has resolved.
- Updates specs to mock GlobalStore's siteDetails and cover the new
  picker config, locale fallback, and open/close guards.
- Add `allowedBaseTypes` to the picker config so both File and Image
  modes restrict the content-type selector to DOTASSET/FILEASSET,
  independent of `baseTypes` (which only controls pre-selection). The
  File field previously fell back to "no restriction" and listed
  Widget/Content.
- Reorder `withAssetSelection` before `withAssetBrowse` so a new
  browse result can clear a stale selection instead of leaving
  Confirm enabled for a row no longer in the list.
- Fix folder-tree hierarchy loading to only patch LOADED state on
  success (in `tap`, before `catchError`), so a failed request stays
  in ERROR instead of looking like an empty tree.
- Reset the tree highlight to the site root when a search widens the
  list back to site-wide, since `$targetFolder` reads the highlight
  to pick the upload destination.
Adds a `{ state: type<DotAssetPickerState>() }` constraint to the signal store feature so it correctly composes with `withAssetBrowse`, which now runs after it and depends on `selectedAsset`. Also fixes a Prettier import formatting issue in the file field spec.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI: Safe To Rollback Area : Frontend PR changes Angular/TypeScript frontend code

Projects

Status: No status

2 participants