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

remove entity model code duplication

Browse Source
This commit is contained in:
Mads Rasmussen
2024-05-13 14:55:41 +02:00
parent 316f741d41
commit 3c139bb528
19 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts
View File

@@ -1,9 +1,8 @@
import { UMB_DUPLICATE_TO_MODAL_ALIAS } from './constants.js';
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDuplicateToModalData {
unique: string | null;
entityType: string;
export interface UmbDuplicateToModalData extends UmbEntityModel {
treeAlias: string;
}

5
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts
View File

@@ -1,9 +1,8 @@
import { UMB_SORT_CHILDREN_OF_MODAL_ALIAS } from './constants.js';
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbSortChildrenOfModalData {
unique: string | null;
entityType: string;
export interface UmbSortChildrenOfModalData extends UmbEntityModel {
treeRepositoryAlias: string;
sortChildrenOfRepositoryAlias: string;
}

6
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts
View File

@@ -1,9 +1,7 @@
import { UmbControllerEvent } from '@umbraco-cms/backoffice/controller-api';
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
export interface UmbEntityActionEventArgs {
unique: string | null;
entityType: string;
}
export interface UmbEntityActionEventArgs extends UmbEntityModel {}
export class UmbEntityActionEvent extends UmbControllerEvent {
#args: UmbEntityActionEventArgs;

6
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts
View File

@@ -1,5 +1,5 @@
export interface UmbEntityActionArgs<MetaArgsType> {
entityType: string;
unique: string | null;
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
export interface UmbEntityActionArgs<MetaArgsType> extends UmbEntityModel {
meta: MetaArgsType;
}

7
src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts
View File

@@ -1,7 +1,6 @@
export interface UmbStructureItemModelBase {
unique: string | null;
entityType: string;
}
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
export interface UmbStructureItemModelBase extends UmbEntityModel {}
export interface UmbStructureItemModel extends UmbStructureItemModelBase {
name: string;

8
src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.token.ts
View File

@@ -1,3 +1,4 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import type { UmbPickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
@@ -10,12 +11,7 @@ export interface UmbRestoreFromRecycleBinModalData {
}
export interface UmbRestoreFromRecycleBinModalValue {
destination:
| {
unique: string | null;
entityType: string;
}
| undefined;
destination: UmbEntityModel | undefined;
}
export const UMB_RESTORE_FROM_RECYCLE_BIN_MODAL = new UmbModalToken<

7
src/Umbraco.Web.UI.Client/src/packages/core/tree/data/types.ts
View File

@@ -1,13 +1,12 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
export interface UmbTreeRootItemsRequestArgs {
skip?: number;
take?: number;
}
export interface UmbTreeChildrenOfRequestArgs {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
skip?: number;
take?: number;
}

6
src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/modal/folder-create-modal.token.ts
View File

@@ -1,12 +1,10 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree';
export interface UmbFolderCreateModalData {
folderRepositoryAlias: string;
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export interface UmbFolderCreateModalValue {

6
src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDataTypeCreateOptionsModalData {
parent: {
entityType: string;
unique: string | null;
};
parent: UmbEntityModel;
}
export const UMB_DATA_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbDataTypeCreateOptionsModalData>(

6
src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/modal/document-blueprint-options-create-modal.token.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDocumentBlueprintOptionsCreateModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export interface UmbDocumentBlueprintOptionsCreateModalValue {

6
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDocumentTypeCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbDocumentTypeCreateOptionsModalData>(

6
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.token.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDocumentCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
documentType: {
unique: string;
} | null;

6
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.token.ts
View File

@@ -1,10 +1,8 @@
import { UMB_DUPLICATE_DOCUMENT_MODAL_ALIAS } from './constants.js';
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbDuplicateDocumentModalData {
unique: string | null;
entityType: string;
}
export interface UmbDuplicateDocumentModalData extends UmbEntityModel {}
export interface UmbDuplicateDocumentModalValue {
destination: {

6
src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbMediaTypeCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbMediaTypeCreateOptionsModalData>(

6
src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.token.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbMediaCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
mediaType: {
unique: string;
} | null;

6
src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/options-modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbPartialViewCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_PARTIAL_VIEW_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbPartialViewCreateOptionsModalData>(

6
src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbCreatePartialViewFromSnippetModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_PARTIAL_VIEW_FROM_SNIPPET_MODAL = new UmbModalToken<UmbCreatePartialViewFromSnippetModalData, string>(

6
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbScriptCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_SCRIPT_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbScriptCreateOptionsModalData>(

6
src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/options-modal/index.ts
View File

@@ -1,10 +1,8 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export interface UmbStylesheetCreateOptionsModalData {
parent: {
unique: string | null;
entityType: string;
};
parent: UmbEntityModel;
}
export const UMB_STYLESHEET_CREATE_OPTIONS_MODAL = new UmbModalToken<UmbStylesheetCreateOptionsModalData>(