diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts index 169f15716b..f92693902a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts @@ -15,9 +15,7 @@ export * from './document-type-picker-modal.token.js'; export * from './embedded-media-modal.token.js'; export * from './entity-user-permission-settings-modal.token.js'; export * from './examine-fields-settings-modal.token.js'; -export * from './export-dictionary-modal.token.js'; export * from './icon-picker-modal.token.js'; -export * from './import-dictionary-modal.token.js'; export * from './language-picker-modal.token.js'; export * from './link-picker-modal.token.js'; export * from './media-tree-picker-modal.token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/export-dictionary-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export-dictionary-modal.token.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/token/export-dictionary-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export-dictionary-modal.token.ts index a17c34dcaa..93233e9652 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/export-dictionary-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export-dictionary-modal.token.ts @@ -5,7 +5,7 @@ export interface UmbExportDictionaryModalData { } export interface UmbExportDictionaryModalValue { - includeChildren?: boolean; + includeChildren: boolean; } export const UMB_EXPORT_DICTIONARY_MODAL = new UmbModalToken< diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export.action.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export.action.ts index f9e0736f63..58502935a1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/export/export.action.ts @@ -1,9 +1,10 @@ import type { UmbDictionaryExportRepository } from '../../repository/index.js'; +import { UMB_EXPORT_DICTIONARY_MODAL } from './export-dictionary-modal.token.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; -import { UMB_MODAL_MANAGER_CONTEXT, UMB_EXPORT_DICTIONARY_MODAL } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; export default class UmbExportDictionaryEntityAction extends UmbEntityActionBase { static styles = [UmbTextStyles]; @@ -24,7 +25,6 @@ export default class UmbExportDictionaryEntityAction extends UmbEntityActionBase const modalContext = this.#modalContext?.open(UMB_EXPORT_DICTIONARY_MODAL, { data: { unique: this.unique } }); const { includeChildren } = await modalContext.onSubmit(); - if (includeChildren === undefined) return; // Export the file const result = await this.repository?.export(this.unique, includeChildren); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/import-dictionary-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.token.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/token/import-dictionary-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import-dictionary-modal.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts index a3f342be7a..ed471451b1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts @@ -1,9 +1,10 @@ import type { UmbDictionaryImportRepository } from '../../repository/index.js'; +import { UMB_IMPORT_DICTIONARY_MODAL } from './import-dictionary-modal.token.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; -import { UMB_MODAL_MANAGER_CONTEXT, UMB_IMPORT_DICTIONARY_MODAL } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; export default class UmbImportDictionaryEntityAction extends UmbEntityActionBase { static styles = [UmbTextStyles];