Skip to content

Issue 36702 asset picker - #36944

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

Issue 36702 asset picker#36944
nicobytes wants to merge 40 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 35s —— View job


Claude PR Review

I re-checked every prior review finding (Copilot + @adrianjm-dotCMS) against the current HEAD and looked for new issues introduced by the diff. The store/feature files now carry detailed comments that map one-to-one onto the earlier findings, and the File/Image field wiring is present. Summary below.

New Issues

No new blocking issues found in the diff.

Existing

  • 🟡 Medium: core-web/libs/data-access/src/lib/dot-folder/folder-tree.utils.ts:96isLeaf = (levelIndex) => folderHierarchyLevels.length >= levelIndex + 1 is true for every level, so every on-target-path node is marked leaf, hiding the expand toggle on ancestors that actually have children (Copilot's earlier note). However, this logic is carried over verbatim from dot-content-drive/.../utils/tree-folder.utils.ts on origin/main — it's a pre-existing bug in the Content Drive path, not a regression introduced here, and the AssetPicker doesn't use buildTreeFolderNodes (it goes through site-tree.utils + buildTreeByPaths). Worth fixing while the code is being relocated, but not a merge blocker. Correct predicate would be levelIndex + 1 === folderHierarchyLevels.length. Fix this →

Resolved

  • store/features/with-asset-folder-tree.feature.ts:272-337 — folder-load error masking is fixed: success work lives in tap before catchError, and catchError returns EMPTY (not of([])), so a failure sets ERROR and can never be patched back to LOADED.
  • store/features/with-asset-folder-tree.feature.ts:153-159 — the browsed site no longer vanishes when the search term matches a folder but not the hostname: existingRoot ?? browsingService.mapSiteToTreeNode(site) re-inserts it into roots.
  • store/features/with-asset-folder-tree.feature.ts:315-324TreeLoadResult's "absent selectedNode = leave highlight alone" contract is honored via conditional spread ...(selectedNode !== undefined ? { selectedNode } : {}).
  • store/dot-asset-picker.store.ts:140-153 — free-text search now calls store.selectRootNode() after dropping path, so the tree highlight (and $targetFolder upload destination) follows the site-wide scope instead of pointing at a stale folder.
  • store/features/with-asset-browse.feature.ts:135-145loadItems clears selectedAsset when a new request starts, so Confirm can't stay enabled for a row that scrolled out of the list.
  • components/dot-asset-picker-toolbar/dot-asset-picker-toolbar.component.ts:57-63$allowedBaseTypes reads config.allowedBaseTypes (not baseTypes), so File mode still restricts the selector to DOTASSET/FILEASSET while starting with no selection.
  • dot-asset-picker.component.ts:176-198confirm()'s getContentletByInodeWithContent subscription now has an error: handler (toast + dialog stays open), matching #uploadByBaseType.
  • ui/src/index.ts / dot-file-field.component.ts:838-920 — the AssetPicker is now wired into the File/Image field: showSelectExistingFileDialog()#openAssetPicker(site) opens DotAssetPickerComponent with buildAssetPickerConfig({ mode, site, title, languageId }), replacing the legacy DotBrowserSelectorComponent.
  • dot-asset-picker.component.html:33 — double-click binds to onSelect([$event]) (select only). This is a deliberate design choice documented in the component header ("double-clicking a row selects it rather than opening an editor… confirming stays an explicit action"), diverging from Copilot's reading of the AC. Flagging for product awareness, not as a defect.

Nice work — the inline comments explaining each of these decisions made the recheck straightforward.
· issue-36702-asset-picker

  • Gather context (diff, key files)
  • Recheck prior review findings
  • Review new/changed code for bugs, security, conventions
  • Post review

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.
Lazy-load tap/catchError handlers mutated the tree node captured before
the request fired, but publish() replaces the whole folders array with
a clone on every update, orphaning that reference — so the loading
spinner and expanded state landed on a node the tree no longer rendered.
mutateNode()/findNodeByKey() re-locate the target by key against the
current state before each mutation, and publish() re-derives
selectedNode by key so the highlight survives across a load. Also adds
a showActions input to DotFolderListViewComponent to hide the kebab
menu in the picker's single-selection context.
Switch the width/height caps from fixed pixels (1120px/58rem) to
rem-based caps (114rem/68rem) so the dialog scales with content
sizing and only clamps on large external monitors, while the
viewport-relative min() still governs on typical laptop screens.
Previously, clearing the base-type chip (or starting with none, as File
fields do) dropped the restriction entirely and let the picker list
Pages and other non-asset content types. Now allowedBaseTypes acts as
a floor that always constrains the request, while a user-selected
baseType filter can narrow further.
- Add createDotAsset helper to seed dotAsset contentlets via a single
  multipart workflow call, so picker tests can seed real assets without
  going through the /api/v1/temp fingerprinting endpoint
- Introduce AssetPickerDialog page object and wire it into file/image
  field specs to cover selecting, confirming, and cancelling an
  existing asset, plus mimetype filtering for image fields
- Add data-testid="asset-picker" to the picker root so the new tests
  have a stable selector
- Give each search input its own testId so the asset-picker's two search
  boxes (asset search vs tree search) are no longer ambiguous to e2e
  selectors and each other
- Preserve the browsed site in the folder tree when a tree search term
  matches no site hostname, so folder search doesn't return an empty tree
- Stop patchState from wiping selectedNode when a tree load result omits
  it, since destructuring turned "leave alone" into "set to undefined"
- Surface a user-facing error toast when confirming a selection whose
  contentlet can no longer be loaded, instead of silently doing nothing
- Expose DotBrowsingService's site-to-tree-node mapping publicly so it
  can be reused to reinsert a filtered-out site
Injecting GlobalStore pulled in withBreadcrumbs, which eagerly injects
Router and threw NG0201 when this component rendered inside the legacy
Dojo custom element (no router/app-shell providers there). Switch to
DotSiteService.getCurrentSite() instead, resolved asynchronously on
picker open, and update the specs' site mocking accordingly.
- Add `--disable-dev-shm-usage` to Chromium launch options: containers default
  to 64MB /dev/shm, and exhausting it crashes the browser with a SIGSEGV and
  no test output
- Raise Node's old-space heap ceiling via NODE_OPTIONS on the Playwright
  runner process to prevent "Reached heap limit" aborts (exit 134)
- Keep CI at 2 workers rather than dropping to 1, since these two fixes
  target the actual crash causes directly
- Clarifies that the 1->2 worker bump was a measured fix from #36567/#36647
  cutting Playwright CI time from ~49m to a <30m target
- Redirects future concurrency-related changes to a dedicated issue against
  #36567 rather than reverting inline in unrelated PRs
The preview renders text assets as an editable code block and other
types as thumbnail + metadata, so a .txt seed never produced the file
name assertion this test relied on. Also assert thumbnail visibility.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area : Frontend PR changes Angular/TypeScript frontend code

Projects

Status: No status

3 participants