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

move tree data source interface

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-14 14:56:38 +01:00
parent 80fc3eb2c9
commit 8571c615e9
23 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.server.data.ts
View File

@@ -1,4 +1,4 @@
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -48,7 +48,7 @@ export class UmbDataTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DataTypeResource.getTreeDataTypeChildren({
parentId,
})
}),
);
}
}
@@ -65,7 +65,7 @@ export class UmbDataTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DataTypeResource.getDataTypeItem({
id: ids,
})
}),
);
}
}

1
src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts
View File

@@ -7,5 +7,4 @@ export * from './extend-data-source-response-data.function.js';
export * from './folder-data-source.interface.js';
export * from './item-data-source.interface.js';
export * from './move-data-source.interface.js';
export * from './tree-data-source.interface.js';
export * from './types.js';

7
src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree.repository.ts
View File

@@ -1,11 +1,8 @@
import { UmbTreeStore } from '../store/tree-store.interface.js';
import { type UmbEntityTreeItemModel } from './types.js';
import { UmbTreeRepository } from './tree-repository.interface.js';
import {
type UmbTreeDataSource,
UmbRepositoryBase,
UmbTreeDataSourceConstructor,
} from '@umbraco-cms/backoffice/repository';
import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeDataSource, UmbTreeDataSourceConstructor } from '@umbraco-cms/backoffice/tree';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';

1
src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts
View File

@@ -8,5 +8,6 @@ export * from './tree.context.js';
export * from './tree.element.js';
export * from './types.js';
export * from './tree-repository.interface.js';
export * from './tree-data-source.interface.js';
export { UmbEntityTreeRepositoryBase } from './entity-tree.repository.js';

4
src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/tree-data-source.interface.ts → src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-data-source.interface.ts
View File

@@ -1,5 +1,5 @@
import type { UmbPagedData } from './types.js';
import type { DataSourceResponse } from './data-source-response.interface.js';
import type { UmbPagedData } from '../repository/data-source/types.js';
import type { DataSourceResponse } from '../repository/data-source/data-source-response.interface.js';
import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbEntityTreeRootModel, UmbTreeItemModel, UmbTreeItemModelBase } from '@umbraco-cms/backoffice/tree';

4
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts
View File

@@ -3,8 +3,8 @@ import { UmbDictionaryDetailServerDataSource } from './sources/dictionary.detail
import { UmbDictionaryTreeStore, UMB_DICTIONARY_TREE_STORE_CONTEXT_TOKEN } from './dictionary.tree.store.js';
import { UmbDictionaryTreeServerDataSource } from './sources/dictionary.tree.server.data.js';
import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbTreeDataSource, UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import {
CreateDictionaryItemRequestModel,
DictionaryOverviewResponseModel,

6
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/sources/dictionary.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -48,7 +48,7 @@ export class UmbDictionaryTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DictionaryResource.getTreeDictionaryChildren({
parentId,
})
}),
);
}
}
@@ -68,7 +68,7 @@ export class UmbDictionaryTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DictionaryResource.getDictionaryItem({
id: ids,
})
}),
);
}
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
View File

@@ -4,8 +4,8 @@ import { UmbDocumentTypeTreeStore, UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN }
import { UmbDocumentTypeStore, UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN } from './document-type.store.js';
import { UMB_DOCUMENT_TYPE_ITEM_STORE_CONTEXT_TOKEN, UmbDocumentTypeItemStore } from './document-type-item.store.js';
import { UmbDocumentTypeItemServerDataSource } from './sources/document-type-item.server.data.js';
import type { UmbTreeDataSource, UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import { type UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbBaseController, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
CreateDocumentTypeRequestModel,

10
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/sources/document-type.tree.server.data.ts
View File

@@ -1,4 +1,4 @@
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -23,7 +23,7 @@ export class UmbDocumentTypeTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -37,7 +37,7 @@ export class UmbDocumentTypeTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -77,7 +77,7 @@ export class UmbDocumentTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DocumentTypeResource.getTreeDocumentTypeChildren({
parentId,
})
}),
);
}
}
@@ -97,7 +97,7 @@ export class UmbDocumentTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DocumentTypeResource.getDocumentTypeItem({
id: ids,
})
}),
);
}
}

3
src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle-bin.repository.ts
View File

@@ -3,8 +3,7 @@ import {
UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT,
UmbDocumentRecycleBinTreeStore,
} from './document-recycle.bin.tree.store.js';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import type { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/sources/document-recycle-bin.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { DocumentResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
View File

@@ -4,8 +4,8 @@ import { UmbDocumentTreeStore, UMB_DOCUMENT_TREE_STORE_CONTEXT_TOKEN } from './d
import { UmbDocumentTreeServerDataSource } from './sources/document.tree.server.data.js';
import { UMB_DOCUMENT_ITEM_STORE_CONTEXT_TOKEN, type UmbDocumentItemStore } from './document-item.store.js';
import { UmbDocumentItemServerDataSource } from './sources/document-item.server.data.js';
import type { UmbTreeDataSource, UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import type { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
DocumentResponseModel,

12
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { DocumentResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -23,7 +23,7 @@ export class UmbDocumentTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -37,7 +37,7 @@ export class UmbDocumentTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -77,7 +77,7 @@ export class UmbDocumentTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DocumentResource.getTreeDocumentChildren({
parentId,
})
}),
);
}
}
@@ -97,7 +97,7 @@ export class UmbDocumentTreeServerDataSource implements UmbTreeDataSource {
this.#host,
DocumentResource.getDocumentItem({
id: ids,
})
}),
);
}
}

3
src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.repository.ts
View File

@@ -7,13 +7,12 @@ import { UmbMediaTypeItemServerDataSource } from './sources/media-type-item.serv
import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import {
UmbTreeDataSource,
UmbDataSource,
UmbItemRepository,
UmbDetailRepository,
UmbItemDataSource,
} from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import {
CreateMediaTypeRequestModel,
FolderTreeItemResponseModel,

8
src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/sources/media-type.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -48,7 +48,7 @@ export class UmbMediaTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MediaTypeResource.getTreeMediaTypeChildren({
parentId,
})
}),
);
}
}
@@ -68,7 +68,7 @@ export class UmbMediaTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MediaTypeResource.getMediaTypeItem({
id: ids,
})
}),
);
}
}

3
src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.repository.ts
View File

@@ -5,8 +5,7 @@ import { UmbMediaStore, UMB_MEDIA_STORE_CONTEXT_TOKEN } from './media.store.js';
import { UmbMediaDetailServerDataSource } from './sources/media.detail.server.data.js';
import { UmbMediaItemServerDataSource } from './sources/media-item.server.data.js';
import { UmbMediaItemStore } from './media-item.store.js';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import type { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
CreateMediaRequestModel,

12
src/Umbraco.Web.UI.Client/src/packages/media/media/repository/sources/media.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { MediaResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -23,7 +23,7 @@ export class UmbMediaTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -37,7 +37,7 @@ export class UmbMediaTreeServerDataSource implements UmbTreeDataSource {
headers: {
'Content-Type': 'application/json',
},
})
}),
);
}
@@ -77,7 +77,7 @@ export class UmbMediaTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MediaResource.getTreeMediaChildren({
parentId,
})
}),
);
}
}
@@ -97,7 +97,7 @@ export class UmbMediaTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MediaResource.getTreeMediaItem({
id: ids,
})
}),
);
}
}

4
src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.repository.ts
View File

@@ -5,8 +5,8 @@ import { UmbMemberGroupStore, UMB_MEMBER_GROUP_STORE_CONTEXT_TOKEN } from './mem
import { UmbMemberGroupTreeServerDataSource } from './sources/member-group.tree.server.data.js';
import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import type { UmbTreeDataSource, UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
import { UmbApi } from '@umbraco-cms/backoffice/extension-api';

6
src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/sources/member-group.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import { MemberGroupResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -56,7 +56,7 @@ export class UmbMemberGroupTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MemberGroupResource.getMemberGroupItem({
id: ids,
})
}),
);
}
}

4
src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/member-type.repository.ts
View File

@@ -4,8 +4,8 @@ import { UmbMemberTypeTreeStore, UMB_MEMBER_TYPE_TREE_STORE_CONTEXT_TOKEN } from
import { UmbMemberTypeStore, UMB_MEMBER_TYPE_STORE_CONTEXT_TOKEN } from './member-type.store.js';
import { UmbMemberTypeDetailServerDataSource } from './sources/member-type.detail.server.data.js';
import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbTreeDataSource, UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';

4
src/Umbraco.Web.UI.Client/src/packages/members/member-types/repository/sources/member-type.tree.server.data.ts
View File

@@ -1,6 +1,6 @@
import { ApiError, MemberTypeResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import { type UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
/**
@@ -56,7 +56,7 @@ export class UmbMemberTypeTreeServerDataSource implements UmbTreeDataSource {
this.#host,
MemberTypeResource.getMemberTypeItem({
id: ids,
})
}),
);
}
}

6
src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/sources/stylesheet.tree.server.data.ts
View File

@@ -1,7 +1,7 @@
import { FileSystemTreeItemPresentationModel, StylesheetResource } from '@umbraco-cms/backoffice/backend-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
import { UmbTreeDataSource } from '@umbraco-cms/backoffice/repository';
import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
/**
* A data source for the Stylesheet tree that fetches data from the server
@@ -48,7 +48,7 @@ export class UmbStylesheetTreeServerDataSource implements UmbTreeDataSource<File
this.#host,
StylesheetResource.getTreeStylesheetChildren({
path,
})
}),
);
}
}
@@ -64,7 +64,7 @@ export class UmbStylesheetTreeServerDataSource implements UmbTreeDataSource<File
this.#host,
StylesheetResource.getStylesheetItem({
path,
})
}),
);
}
}

9
src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
View File

@@ -6,13 +6,8 @@ import { UMB_TEMPLATE_ITEM_STORE_CONTEXT_TOKEN, UmbTemplateItemStore } from './t
import { UmbTemplateItemServerDataSource } from './sources/template.item.server.data.js';
import { UmbTemplateQueryBuilderServerDataSource } from './sources/template.query-builder.server.data.js';
import { Observable } from '@umbraco-cms/backoffice/external/rxjs';
import type {
UmbDetailRepository,
UmbItemDataSource,
UmbItemRepository,
UmbTreeDataSource,
} from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository } from '@umbraco-cms/backoffice/tree';
import type { UmbDetailRepository, UmbItemDataSource, UmbItemRepository } from '@umbraco-cms/backoffice/repository';
import { UmbTreeRepository, UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import type {