diff --git a/src/Umbraco.Web.UI.Client/libs/models/index.ts b/src/Umbraco.Web.UI.Client/libs/models/index.ts index 0b8f2907f5..e1d7078fdc 100644 --- a/src/Umbraco.Web.UI.Client/libs/models/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/models/index.ts @@ -4,7 +4,6 @@ import type { EntityTreeItemResponseModel, FolderTreeItemResponseModel, PackageManifestResponseModel, - ProblemDetailsModel, } from '@umbraco-cms/backoffice/backend-api'; // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -141,11 +140,6 @@ export interface DocumentBlueprintDetails { documentTypeKey: string; } -export interface DataSourceResponse { - data?: T; - error?: ProblemDetailsModel; -} - export interface SwatchDetails { label: string; value: string; diff --git a/src/Umbraco.Web.UI.Client/libs/repository/data-source-response.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/data-source-response.interface.ts new file mode 100644 index 0000000000..a3ee6e90f0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/repository/data-source-response.interface.ts @@ -0,0 +1,6 @@ +import type { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; + +export interface DataSourceResponse { + data?: T; + error?: ProblemDetailsModel; +} diff --git a/src/Umbraco.Web.UI.Client/libs/repository/index.ts b/src/Umbraco.Web.UI.Client/libs/repository/index.ts index c90aed53e7..cd4c9e7d46 100644 --- a/src/Umbraco.Web.UI.Client/libs/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/repository/index.ts @@ -1,3 +1,4 @@ +export * from './data-source-response.interface'; export * from './detail-repository.interface'; export * from './tree-repository.interface'; export * from './repository-tree-data-source.interface'; diff --git a/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts index fe06b8d271..ff4cdd3a6a 100644 --- a/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface RepositoryDetailDataSource { createScaffold(parentKey: string | null): Promise>; diff --git a/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts index 639237d65b..c131d41fff 100644 --- a/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts @@ -1,5 +1,5 @@ import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface RepositoryTreeDataSource { getRootItems(): Promise>; diff --git a/src/Umbraco.Web.UI.Client/libs/resources/resource.controller.ts b/src/Umbraco.Web.UI.Client/libs/resources/resource.controller.ts index c2b3acd578..aa12fa3adc 100644 --- a/src/Umbraco.Web.UI.Client/libs/resources/resource.controller.ts +++ b/src/Umbraco.Web.UI.Client/libs/resources/resource.controller.ts @@ -7,7 +7,7 @@ import { import { ApiError, CancelablePromise, ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbController, UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export class UmbResourceController extends UmbController { #promise: Promise; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts index 6ff622d5db..ac6a6497ed 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts @@ -1,6 +1,5 @@ import type { DocumentResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; -import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository'; +import { RepositoryDetailDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface UmbDocumentDataSource extends RepositoryDetailDataSource { createScaffold(documentTypeKey: string): Promise>; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/repository/sources/media-type.details.server.data.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/repository/sources/media-type.details.server.data.interface.ts index 21f43f7f94..8182c5d0f1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/repository/sources/media-type.details.server.data.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/repository/sources/media-type.details.server.data.interface.ts @@ -1,4 +1,5 @@ -import type { DataSourceResponse, MediaTypeDetails } from '@umbraco-cms/backoffice/models'; +import type { MediaTypeDetails } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; // TODO => Use models when they exist export interface MediaTypeDetailDataSource { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts index 6680f2b499..c327035dfc 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; import type { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts index 00eaeeffbe..a365433abe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts @@ -1,5 +1,5 @@ import { PagedCultureReponseModel } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; // TODO: This is a temporary solution until we have a proper paging interface type paging = { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts index 64ba64d222..3a2bfbb366 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts @@ -1,6 +1,5 @@ import { LanguageResponseModel, PagedLanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; -import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository'; +import { RepositoryDetailDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository'; // TODO: This is a temporary solution until we have a proper paging interface type paging = { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts index 25de74156d..944990c6d9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts @@ -8,7 +8,7 @@ import type { PagedSavedLogSearchResponseModel, SavedLogSearchResponseModel, } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface LogSearchDataSource { getAllSavedSearches({ diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/index.ts index 2aa585d817..5080a513de 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/index.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; export interface RelationTypeTreeDataSource { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts index d8b5c3bf58..b30af84dcf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; import type { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts index ad1ba420da..c2b90a69a1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts @@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'; import { ProblemDetailsModel, TemplateResponseModel, TemplateResource } from '@umbraco-cms/backoffice/backend-api'; import type { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { DataSourceResponse } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface TemplateDetailDataSource { createScaffold(): Promise>; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts index 38eab1a299..0cd4ff682a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts @@ -4,7 +4,8 @@ import { PagedDictionaryOverviewResponseModel, PagedLanguageResponseModel, } from '@umbraco-cms/backoffice/backend-api'; -import type { DataSourceResponse, DictionaryDetails } from '@umbraco-cms/backoffice/models'; +import type { DictionaryDetails } from '@umbraco-cms/backoffice/models'; +import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface DictionaryDetailDataSource { createScaffold(parentKey: string): Promise>;