Skip to content

Commit 3b65ead

Browse files
loivseniOvergaard
authored andcommitted
upload to correct folder when dropping file
1 parent f5b321f commit 3b65ead

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/packages/media/media/collection/media-collection.element.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { UMB_MEDIA_WORKSPACE_CONTEXT } from '../workspace/media-workspace.context-token.js';
12
import type { UmbMediaCollectionContext } from './media-collection.context.js';
23
import { UMB_MEDIA_COLLECTION_CONTEXT } from './media-collection.context-token.js';
34
import { customElement, html, state, when } from '@umbraco-cms/backoffice/external/lit';
@@ -13,11 +14,19 @@ export class UmbMediaCollectionElement extends UmbCollectionDefaultElement {
1314
@state()
1415
private _progress = -1;
1516

17+
@state()
18+
private _unique: string | null = null;
19+
1620
constructor() {
1721
super();
1822
this.consumeContext(UMB_MEDIA_COLLECTION_CONTEXT, (instance) => {
1923
this.#mediaCollection = instance;
2024
});
25+
this.consumeContext(UMB_MEDIA_WORKSPACE_CONTEXT, (instance) => {
26+
this.observe(instance.unique, (unique) => {
27+
this._unique = unique ?? null;
28+
});
29+
});
2130
}
2231

2332
#onChange() {
@@ -33,7 +42,10 @@ export class UmbMediaCollectionElement extends UmbCollectionDefaultElement {
3342
return html`
3443
<umb-media-collection-toolbar slot="header"></umb-media-collection-toolbar>
3544
${when(this._progress >= 0, () => html`<uui-loader-bar progress=${this._progress}></uui-loader-bar>`)}
36-
<umb-dropzone @change=${this.#onChange} @progress=${this.#onProgress}></umb-dropzone>
45+
<umb-dropzone
46+
.parentUnique=${this._unique}
47+
@change=${this.#onChange}
48+
@progress=${this.#onProgress}></umb-dropzone>
3749
`;
3850
}
3951
}

src/packages/media/media/dropzone/dropzone-manager.class.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,15 @@ export class UmbDropzoneManager extends UmbControllerBase {
187187
fileExtensions: Array<string>,
188188
parentUnique: string | null,
189189
): Promise<Array<UmbUploadableExtensionModel>> {
190-
// Getting all media types allowed in our current position based on parent unique.
191-
const { data: allAllowedMediaTypes } = await this.#mediaTypeStructure.requestAllowedChildrenOf(parentUnique);
190+
let parentMediaType: string | null = null;
191+
if (parentUnique) {
192+
const { data } = await this.#mediaDetailRepository.requestByUnique(parentUnique);
193+
parentMediaType = data?.mediaType.unique ?? null;
194+
}
195+
196+
// Getting all media types allowed in our current position based on parent's media type.
197+
198+
const { data: allAllowedMediaTypes } = await this.#mediaTypeStructure.requestAllowedChildrenOf(parentMediaType);
192199
if (!allAllowedMediaTypes?.items.length) return [];
193200

194201
const allowedByParent = allAllowedMediaTypes.items;

0 commit comments

Comments
 (0)