yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/move-entity-action' into bugfix-duplicate-to-entity-action-(part-1)

Browse Source
This commit is contained in:
Mads Rasmussen
2024-04-12 10:52:50 +02:00
parent 85acd939d8 9c88b4104e
commit dfa80b58af
19 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/index.ts
View File

@@ -1,5 +1,5 @@
export * from './duplicate/index.js';
export * from './move-to/index.js';
export * from './move/index.js';
export * from './delete/delete.action.js';
export * from './move-to/move-to.action.js';
export * from './move/move-to.action.js';
export * from './sort-children-of/sort-children-of.action.js';

3
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/index.ts
View File

@@ -1,3 +0,0 @@
export type { UmbMoveToDataSource } from './move-to-data-source.interface.js';
export type { UmbMoveToRepository } from './move-to-repository.interface.js';
export type { UmbMoveToRequestArgs } from './types.js';

3
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/index.ts Normal file
View File

@@ -0,0 +1,3 @@
export type { UmbMoveDataSource as UmbMoveToDataSource } from './move-data-source.interface.js';
export type { UmbMoveRepository as UmbMoveToRepository } from './move-repository.interface.js';
export type { UmbMoveToRequestArgs } from './types.js';

0
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/manifests.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/manifests.ts
View File

2
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-data-source.interface.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-data-source.interface.ts
View File

@@ -1,6 +1,6 @@
import type { UmbMoveToRequestArgs } from './types.js';
import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository';
export interface UmbMoveToDataSource {
export interface UmbMoveDataSource {
moveTo(args: UmbMoveToRequestArgs): Promise<UmbDataSourceErrorResponse>;
}

2
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-repository.interface.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-repository.interface.ts
View File

@@ -2,6 +2,6 @@ import type { UmbRepositoryErrorResponse } from '../../../repository/types.js';
import type { UmbMoveToRequestArgs } from './types.js';
import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
export interface UmbMoveToRepository extends UmbApi {
export interface UmbMoveRepository extends UmbApi {
requestMoveTo(args: UmbMoveToRequestArgs): Promise<UmbRepositoryErrorResponse>;
}

2
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.kind.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.kind.ts
View File

@@ -17,7 +17,7 @@ export const manifest: UmbBackofficeManifestKind = {
icon: 'icon-enter',
label: '#actions_move',
treeRepositoryAlias: '',
moveToRepositoryAlias: '',
moveRepositoryAlias: '',
treePickerModal: '',
},
},

7
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.ts
View File

@@ -1,6 +1,6 @@
import { UmbEntityActionBase } from '../../entity-action-base.js';
import { UmbRequestReloadStructureForEntityEvent } from '../../request-reload-structure-for-entity.event.js';
import type { UmbMoveToRepository } from './move-to-repository.interface.js';
import type { UmbMoveRepository } from './move-repository.interface.js';
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import type { MetaEntityActionMoveToKind } from '@umbraco-cms/backoffice/extension-registry';
import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
@@ -17,10 +17,7 @@ export class UmbMoveToEntityAction extends UmbEntityActionBase<MetaEntityActionM
const destinationUnique = value.selection[0];
if (destinationUnique === undefined) throw new Error('Destination Unique is not available');
const moveRepository = await createExtensionApiByAlias<UmbMoveToRepository>(
this,
this.args.meta.moveToRepositoryAlias,
);
const moveRepository = await createExtensionApiByAlias<UmbMoveRepository>(this, this.args.meta.moveRepositoryAlias);
if (!moveRepository) throw new Error('Move Repository is not available');
await moveRepository.requestMoveTo({ unique: this.args.unique, destination: { unique: destinationUnique } });

0
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/types.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/types.ts
View File

8
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts
View File

@@ -1,13 +1,13 @@
import { manifests as defaultEntityActionManifests } from './default/manifests.js';
import { manifests as deleteEntityActionManifests } from './common/delete/manifests.js';
import { manifests as duplicateToEntityActionManifests } from './common/duplicate/manifests.js';
import { manifests as moveToEntityActionManifests } from './common/move-to/manifests.js';
import { manifests as duplicateEntityActionManifests } from './common/duplicate/manifests.js';
import { manifests as moveEntityActionManifests } from './common/move/manifests.js';
import { manifests as sortChildrenOfEntityActionManifests } from './common/sort-children-of/manifests.js';
export const manifests = [
...defaultEntityActionManifests,
...deleteEntityActionManifests,
...duplicateToEntityActionManifests,
...moveToEntityActionManifests,
...duplicateEntityActionManifests,
...moveEntityActionManifests,
...sortChildrenOfEntityActionManifests,
];

2
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts
View File

@@ -132,7 +132,7 @@ export interface ManifestEntityActionMoveToKind extends ManifestEntityAction<Met
}
export interface MetaEntityActionMoveToKind extends MetaEntityActionDefaultKind {
moveToRepositoryAlias: string;
moveRepositoryAlias: string;
treeRepositoryAlias: string;
treePickerModal: UmbModalToken | string;
}

4
src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move-to/manifests.ts
View File

@@ -9,12 +9,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.DataType.Move',
alias: 'Umb.EntityAction.DataType.MoveTo',
name: 'Move Data Type Entity Action',
forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_DATA_TYPE_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS,
treePickerModal: UMB_DATA_TYPE_PICKER_MODAL,
},
},

4
src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/move-to/manifests.ts
View File

@@ -9,12 +9,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.Dictionary.Move',
alias: 'Umb.EntityAction.Dictionary.MoveTo',
name: 'Move Dictionary Entity Action',
forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_DICTIONARY_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_DICTIONARY_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_DICTIONARY_REPOSITORY_ALIAS,
treePickerModal: UMB_DICTIONARY_PICKER_MODAL,
},
},

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts
View File

@@ -9,12 +9,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.DocumentType.Move',
alias: 'Umb.EntityAction.DocumentType.MoveTo',
name: 'Move Document Type Entity Action',
forEntityTypes: [UMB_DOCUMENT_TYPE_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_DOCUMENT_TYPE_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_DOCUMENT_TYPE_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_DOCUMENT_TYPE_REPOSITORY_ALIAS,
treePickerModal: UMB_DOCUMENT_TYPE_PICKER_MODAL,
},
},

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts
View File

@@ -10,12 +10,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.Document.Move',
alias: 'Umb.EntityAction.Document.MoveTo',
name: 'Move Document Entity Action',
forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_DOCUMENT_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_DOCUMENT_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_DOCUMENT_REPOSITORY_ALIAS,
treePickerModal: UMB_DOCUMENT_PICKER_MODAL,
},
conditions: [

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts
View File

@@ -82,7 +82,7 @@ export const manifests: Array<ManifestEntityBulkAction> = [
{
type: 'entityBulkAction',
kind: 'default',
alias: 'Umb.EntityBulkAction.Document.Move',
alias: 'Umb.EntityBulkAction.Document.MoveTo',
name: 'Move Document Entity Bulk Action',
weight: 20,
api: UmbMoveDocumentEntityBulkAction,

4
src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/move-to/manifests.ts
View File

@@ -8,12 +8,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.MediaType.Move',
alias: 'Umb.EntityAction.MediaType.MoveTo',
name: 'Move Media Type Entity Action',
forEntityTypes: [UMB_MEDIA_TYPE_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_MEDIA_TYPE_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_MEDIA_TYPE_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_MEDIA_TYPE_REPOSITORY_ALIAS,
treePickerModal: UMB_MEDIA_TYPE_PICKER_MODAL,
},
},

4
src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/move-to/manifests.ts
View File

@@ -8,12 +8,12 @@ const entityActions: Array<ManifestTypes> = [
{
type: 'entityAction',
kind: 'moveTo',
alias: 'Umb.EntityAction.Media.Move',
alias: 'Umb.EntityAction.Media.MoveTo',
name: 'Move Media Entity Action',
forEntityTypes: [UMB_MEDIA_ENTITY_TYPE],
meta: {
treeRepositoryAlias: UMB_MEDIA_TREE_REPOSITORY_ALIAS,
moveToRepositoryAlias: UMB_MOVE_MEDIA_REPOSITORY_ALIAS,
moveRepositoryAlias: UMB_MOVE_MEDIA_REPOSITORY_ALIAS,
treePickerModal: UMB_MEDIA_TREE_PICKER_MODAL,
},
},

2
src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/manifests.ts
View File

@@ -32,7 +32,7 @@ export const manifests: Array<ManifestTypes> = [
},
{
type: 'entityBulkAction',
alias: 'Umb.EntityBulkAction.Media.Move',
alias: 'Umb.EntityBulkAction.Media.MoveTo',
name: 'Move Media Entity Bulk Action',
weight: 20,
api: UmbMediaMoveEntityBulkAction,