From 79e1cd875320551f54e25d1ec8fa489cdc43668c Mon Sep 17 00:00:00 2001 From: Julia Gru <56249914+julczka@users.noreply.github.com> Date: Wed, 10 May 2023 09:53:53 +0200 Subject: [PATCH] fix build errors --- .../token/partial-view-picker-modal.token.ts | 2 +- .../src/backoffice/core/components/index.ts | 2 ++ .../partial-view-picker-modal.element.ts | 4 ++-- .../create/create-empty.action.ts | 4 ++-- .../create/create-from-snippet.action.ts | 4 ++-- .../partial-views/entity-actions/manifests.ts | 6 ++--- .../repository/partial-views.repository.ts | 24 ++++++++++++++++++- .../partial-views.detail.server.data.ts | 2 +- .../sources/partial-views.tree.server.data.ts | 4 ++-- .../partial-views/tree/manifests.ts | 2 +- .../partial-views/workspace/manifests.ts | 10 ++------ .../partial-views-workspace.context.ts | 2 +- .../template-workspace-edit.element.ts | 4 ++-- 13 files changed, 44 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/libs/modal/token/partial-view-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/partial-view-picker-modal.token.ts index ecd3904051..19419c1187 100644 --- a/src/Umbraco.Web.UI.Client/libs/modal/token/partial-view-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/token/partial-view-picker-modal.token.ts @@ -6,7 +6,7 @@ export interface UmbPartialViewPickerModalData { } export interface UmbPartialViewPickerModalResult { - selection: string[] | undefined; + selection: Array | undefined; } export const UMB_PARTIAL_VIEW_PICKER_MODAL_ALIAS = 'Umb.Modal.PartialViewPicker'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts index a485d7735e..c2fa96e763 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts @@ -73,5 +73,7 @@ import './variant-selector/variant-selector.element'; import './code-editor'; export * from './table'; +export * from './tree/tree.element'; +export * from './code-editor'; export const manifests = [...debugManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/modals/partial-view-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/modals/partial-view-picker-modal.element.ts index 8ab315a292..824b2469bf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/modals/partial-view-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/modals/partial-view-picker-modal.element.ts @@ -1,9 +1,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbTreeElement } from '../../shared/components/tree/tree.element'; import { UmbPartialViewPickerModalData, UmbPartialViewPickerModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; +import { UmbTreeElement } from '@umbraco-cms/backoffice/core/components'; @customElement('umb-partial-view-picker-modal') export default class UmbPartialViewPickerModalElement extends UmbModalBaseElement< @@ -11,7 +11,7 @@ export default class UmbPartialViewPickerModalElement extends UmbModalBaseElemen UmbPartialViewPickerModalResult > { @state() - _selection: Array = []; + _selection: Array = []; @state() _multiple = false; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-empty.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-empty.action.ts index 25d7b8f11d..b00aee6830 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-empty.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-empty.action.ts @@ -1,8 +1,8 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; -import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller'; +import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; export class UmbCreateEmptyPartialViewAction }> extends UmbEntityActionBase { - constructor(host: UmbControllerHostInterface, repositoryAlias: string, unique: string) { + constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) { super(host, repositoryAlias, unique); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-from-snippet.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-from-snippet.action.ts index cced8b5ddc..9ac777fa21 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-from-snippet.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/create/create-from-snippet.action.ts @@ -1,8 +1,8 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; -import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller'; +import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; export class UmbCreateFromSnippetPartialViewAction }> extends UmbEntityActionBase { - constructor(host: UmbControllerHostInterface, repositoryAlias: string, unique: string) { + constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) { super(host, repositoryAlias, unique); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/manifests.ts index 1260f28572..50c2cd5b4a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/entity-actions/manifests.ts @@ -19,7 +19,7 @@ const partialViewActions: Array = [ repositoryAlias: PARTIAL_VIEW_REPOSITORY_ALIAS, }, conditions: { - entityType: PARTIAL_VIEW_ENTITY_TYPE, + entityTypes: [PARTIAL_VIEW_ENTITY_TYPE], }, }, ]; @@ -38,7 +38,7 @@ const partialViewFolderActions: Array = [ repositoryAlias: PARTIAL_VIEW_REPOSITORY_ALIAS, }, conditions: { - entityType: PARTIAL_VIEW_FOLDER_ENTITY_TYPE, + entityTypes: [PARTIAL_VIEW_FOLDER_ENTITY_TYPE], }, }, { @@ -52,7 +52,7 @@ const partialViewFolderActions: Array = [ repositoryAlias: PARTIAL_VIEW_REPOSITORY_ALIAS, }, conditions: { - entityType: PARTIAL_VIEW_FOLDER_ENTITY_TYPE, + entityTypes: [PARTIAL_VIEW_FOLDER_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/partial-views.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/partial-views.repository.ts index c1e1ee44d8..8928ccafcb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/partial-views.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/partial-views.repository.ts @@ -7,6 +7,8 @@ import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbDetailRepository, UmbTreeRepository } from '@umbraco-cms/backoffice/repository'; +import { UmbTreeRootEntityModel } from '@umbraco-cms/backoffice/tree'; +import { Observable } from 'rxjs'; export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailRepository { #init; @@ -40,7 +42,27 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailR }), ]); } - + + requestTreeRoot(): Promise<{ data?: UmbTreeRootEntityModel | undefined; error?: ProblemDetailsModel | undefined }> { + throw new Error('Method not implemented.'); + } + + requestItemsLegacy?: + | (( + uniques: string[] + ) => Promise<{ + data?: any[] | undefined; + error?: ProblemDetailsModel | undefined; + asObservable?: (() => Observable) | undefined; + }>) + | undefined; + + itemsLegacy?: ((uniques: string[]) => Promise>) | undefined; + + byId(id: string): Promise> { + throw new Error('Method not implemented.'); + } + requestById(id: string): Promise<{ data?: any; error?: ProblemDetailsModel | undefined }> { throw new Error('Method not implemented.'); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.detail.server.data.ts index bbe848b399..86a65028de 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.detail.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.detail.server.data.ts @@ -4,7 +4,7 @@ import { DataSourceResponse, UmbDataSource } from '@umbraco-cms/backoffice/repos //TODO Pass proper models export class UmbPartialViewDetailServerDataSource - implements UmbDataSource + implements UmbDataSource { #host: UmbControllerHostElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.tree.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.tree.server.data.ts index 6ca9e554da..8ef71f1017 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.tree.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/repository/sources/partial-views.tree.server.data.ts @@ -25,7 +25,7 @@ export class UmbPartialViewsTreeServerDataSource implements PartialViewsTreeData }) { if (!path) { const error: ProblemDetailsModel = { title: 'Path is missing' }; - return { error }; + return error ; } return tryExecuteAndNotify( @@ -41,7 +41,7 @@ export class UmbPartialViewsTreeServerDataSource implements PartialViewsTreeData async getItem(id: Array) { if (!id) { const error: ProblemDetailsModel = { title: 'Paths are missing' }; - return { error }; + return error ; } return tryExecuteAndNotify( diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/tree/manifests.ts index a4d9cffda8..bad84fac40 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/tree/manifests.ts @@ -16,7 +16,7 @@ const treeItem: ManifestTreeItem = { alias: 'Umb.TreeItem.PartialViews', name: 'Partial Views Tree Item', conditions: { - entityType: PARTIAL_VIEW_ENTITY_TYPE, + entityTypes: [PARTIAL_VIEW_ENTITY_TYPE], }, }; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/manifests.ts index 0b950b01a2..ea7c35fe95 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/manifests.ts @@ -1,9 +1,5 @@ import { UmbSaveWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; -import type { - ManifestWorkspace, - ManifestWorkspaceAction, - ManifestWorkspaceView, -} from '@umbraco-cms/backoffice/extensions-registry'; +import type { ManifestWorkspace, ManifestWorkspaceAction } from '@umbraco-cms/backoffice/extensions-registry'; const workspace: ManifestWorkspace = { type: 'workspace', @@ -15,8 +11,6 @@ const workspace: ManifestWorkspace = { }, }; -const workspaceViews: Array = []; - const workspaceActions: Array = [ { type: 'workspaceAction', @@ -35,4 +29,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; +export const manifests = [workspace, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/partial-views-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/partial-views-workspace.context.ts index 5e3634b785..f88f6ea390 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/partial-views-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/partial-views/workspace/partial-views-workspace.context.ts @@ -1,8 +1,8 @@ import { UmbTemplateRepository } from '../repository/partial-views.repository'; -import { UmbWorkspaceContext } from '../../../shared/components/workspace/workspace-context/workspace-context'; import { createObservablePart, UmbDeepState } from '@umbraco-cms/backoffice/observable-api'; import { TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; +import { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; export class UmbPartialViewsWorkspaceContext extends UmbWorkspaceContext { getEntityId(): string | undefined { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace-edit.element.ts index 9ccad083fe..12a410a67f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace-edit.element.ts @@ -2,12 +2,12 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, query, state } from 'lit/decorators.js'; import { UUIInputElement } from '@umbraco-ui/uui'; -import { UmbCodeEditorElement } from '../../../shared/components/code-editor/code-editor.element'; import { UmbTemplatingInsertMenuElement } from '../../components/insert-menu/templating-insert-menu.element'; +import { UMB_MODAL_TEMPLATING_INSERT_SECTION_MODAL } from '../../modals/insert-section-modal/insert-section-modal.element'; import { UmbTemplateWorkspaceContext } from './template-workspace.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from '@umbraco-cms/backoffice/modal'; -import { UMB_MODAL_TEMPLATING_INSERT_SECTION_MODAL } from '../../modals/insert-section-modal/insert-section-modal.element'; +import { UmbCodeEditorElement } from '@umbraco-cms/backoffice/core/components'; @customElement('umb-template-workspace-edit') export class UmbTemplateWorkspaceEditElement extends UmbLitElement {