From 635f898bd3d0a2cb747060ac7fe4958ca5f5b20e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 2 Feb 2024 15:49:56 +0100 Subject: [PATCH] mapping --- .../import/import-dictionary-modal.element.ts | 8 ++++---- .../dictionary/repository/dictionary.repository.ts | 7 ------- .../repository/detail/user-detail.server.data-source.ts | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.ts index 48f8d576a8..fb359abb35 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/import/import-dictionary-modal.element.ts @@ -11,6 +11,7 @@ import type { UmbTreeElement, UmbTreeSelectionConfiguration, } from '@umbraco-cms/backoffice/tree'; +import { UmbTemporaryFileRepository } from '@umbraco-cms/backoffice/temporary-file'; interface UmbDictionaryItemPreview { id: string; @@ -45,12 +46,12 @@ export class UmbImportDictionaryModalLayout extends UmbModalBaseElement< #fileReader; #fileNodes!: NodeListOf; #fileContent: Array = []; - #dictionaryImportRepository: UmbDictionaryImportRepository; + #dictionaryImportRepository = new UmbDictionaryImportRepository(this); + #temporaryFileRepository = new UmbTemporaryFileRepository(this); constructor() { super(); - this.#dictionaryImportRepository = new UmbDictionaryImportRepository(this); this.#fileReader = new FileReader(); this.#fileReader.onload = (e) => { @@ -135,13 +136,12 @@ export class UmbImportDictionaryModalLayout extends UmbModalBaseElement< e.preventDefault(); const formData = new FormData(this._form); const file = formData.get('file') as File; - if (!file) throw new Error('File is missing'); this.#fileReader.readAsText(file); this._temporaryFileId = UmbId.new(); - this.#dictionaryImportRepository.upload(this._temporaryFileId, file); + this.#temporaryFileRepository.upload(this._temporaryFileId, file); } #onParentChange() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts index 7d74669c9c..a480f46238 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts @@ -13,11 +13,4 @@ export class UmbDictionaryRepository extends UmbBaseController implements UmbApi async list(skip = 0, take = 1000) { return this.#detailSource.list(skip, take); } - - async upload(UmbId: string, file: File) { - if (!UmbId) throw new Error('UmbId is missing'); - if (!file) throw new Error('File is missing'); - - return this.#temporaryFileRepository.upload(UmbId, file); - } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts index 80612c741e..1b15a8e4bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts @@ -119,8 +119,8 @@ export class UmbUserServerDataSource implements UmbDetailDataSource