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

Merge remote-tracking branch 'origin/main' into feature/header-apps

Browse Source
This commit is contained in:
Niels Lyngsø
2022-12-14 11:42:11 +01:00
parent 0786826b96 7e3dceef8c
commit e856ee6d3d
19 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
View File

@@ -37,7 +37,7 @@ import { manifests as editorManifests } from './editors/manifests';
import { manifests as propertyActionManifests } from './property-actions/manifests';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestTypes, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestTypes } from '@umbraco-cms/models';
@defineElement('umb-backoffice')
export class UmbBackofficeElement extends UmbContextConsumerMixin(UmbContextProviderMixin(LitElement)) {
@@ -82,7 +82,7 @@ export class UmbBackofficeElement extends UmbContextConsumerMixin(UmbContextProv
this.provideContext('umbSectionStore', new UmbSectionStore());
}
private _registerExtensions(manifests: Array<ManifestWithLoader<ManifestTypes>> | Array<ManifestTypes>) {
private _registerExtensions(manifests: Array<ManifestTypes> | Array<ManifestTypes>) {
manifests.forEach((manifest) => {
if (umbExtensionsRegistry.isRegistered(manifest.alias)) return;
umbExtensionsRegistry.register(manifest);

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
View File

@@ -8,7 +8,7 @@ import { DocumentTypeEntity } from '../../../core/mocks/data/document-type.data'
import { UmbDocumentTypeContext } from './document-type.context';
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import type { ManifestTypes, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestTypes } from '@umbraco-cms/models';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import '../../property-editor-uis/icon-picker/property-editor-ui-icon-picker.element';
@@ -56,7 +56,7 @@ export class UmbEditorDocumentTypeElement extends UmbContextProviderMixin(
}
private _registerExtensions() {
const extensions: Array<ManifestWithLoader<ManifestTypes>> = [
const extensions: Array<ManifestTypes> = [
{
type: 'editorView',
alias: 'Umb.EditorView.DocumentType.Design',

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts
View File

@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, html, LitElement } from 'lit';
import { customElement, property } from 'lit/decorators.js';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestEditorView, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestEditorView } from '@umbraco-cms/models';
import '../shared/node/editor-node.element';
@@ -29,7 +29,7 @@ export class UmbEditorDocumentElement extends LitElement {
}
private _registerEditorViews() {
const dashboards: Array<ManifestWithLoader<ManifestEditorView>> = [
const dashboards: Array<ManifestEditorView> = [
{
type: 'editorView',
alias: 'Umb.EditorView.Document.Edit',

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts
View File

@@ -1,6 +1,6 @@
import type { ManifestEditor, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestEditor } from '@umbraco-cms/models';
export const manifests: Array<ManifestWithLoader<ManifestEditor>> = [
export const manifests: Array<ManifestEditor> = [
{
type: 'editor',
alias: 'Umb.Editor.Member',

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts
View File

@@ -1,7 +1,7 @@
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, html, LitElement } from 'lit';
import { customElement, property } from 'lit/decorators.js';
import type { ManifestEditorView, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestEditorView } from '@umbraco-cms/models';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import '../shared/node/editor-node.element';
@@ -29,7 +29,7 @@ export class UmbEditorMediaElement extends LitElement {
}
private _registerEditorViews() {
const dashboards: Array<ManifestWithLoader<ManifestEditorView>> = [
const dashboards: Array<ManifestEditorView> = [
{
type: 'editorView',
alias: 'Umb.EditorView.Media.Edit',

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
View File

@@ -8,7 +8,7 @@ import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import '@umbraco-cms/components/input-user/input-user.element';
import '@umbraco-cms/components/input-section/input-section.element';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import type { ManifestEditorAction, ManifestWithLoader, UserDetails, UserGroupDetails } from '@umbraco-cms/models';
import type { ManifestEditorAction, UserDetails, UserGroupDetails } from '@umbraco-cms/models';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import { UmbUserGroupStore } from '@umbraco-cms/stores/user/user-group.store';
import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
@@ -205,7 +205,7 @@ export class UmbEditorUserGroupElement extends UmbContextProviderMixin(
}
private _registerEditorActions() {
const manifests: Array<ManifestWithLoader<ManifestEditorAction>> = [
const manifests: Array<ManifestEditorAction> = [
{
type: 'editorAction',
alias: 'Umb.EditorAction.UserGroup.Save',

4
src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
View File

@@ -11,7 +11,7 @@ import { UmbUserStore } from '@umbraco-cms/stores/user/user.store';
import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestEditorAction, ManifestWithLoader, UserDetails } from '@umbraco-cms/models';
import type { ManifestEditorAction, UserDetails } from '@umbraco-cms/models';
import { UmbObserverMixin } from '@umbraco-cms/observable-api';
import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element';
@@ -101,7 +101,7 @@ export class UmbEditorUserElement extends UmbContextProviderMixin(
}
private _registerEditorActions() {
const manifests: Array<ManifestWithLoader<ManifestEditorAction>> = [
const manifests: Array<ManifestEditorAction> = [
{
type: 'editorAction',
alias: 'Umb.EditorAction.User.Save',

4
src/Umbraco.Web.UI.Client/src/backoffice/property-actions/manifests.ts
View File

@@ -1,6 +1,6 @@
import type { ManifestPropertyAction, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestPropertyAction } from '@umbraco-cms/models';
export const manifests: Array<ManifestWithLoader<ManifestPropertyAction>> = [
export const manifests: Array<ManifestPropertyAction> = [
{
type: 'propertyAction',
alias: 'Umb.PropertyAction.Copy',

4
src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/manifests.ts
View File

@@ -1,6 +1,6 @@
import type { ManifestPropertyEditorUI, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestPropertyEditorUI } from '@umbraco-cms/models';
export const manifests: Array<ManifestWithLoader<ManifestPropertyEditorUI>> = [
export const manifests: Array<ManifestPropertyEditorUI> = [
{
type: 'propertyEditorUI',
alias: 'Umb.PropertyEditorUI.BlockList',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
View File

@@ -1,7 +1,7 @@
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestDashboard } from '@umbraco-cms/models';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
@customElement('umb-content-section')
@@ -15,7 +15,7 @@ export class UmbContentSection extends LitElement {
}
private _registerDashboards() {
const dashboards: Array<ManifestWithLoader<ManifestDashboard>> = [
const dashboards: Array<ManifestDashboard> = [
{
type: 'dashboard',
alias: 'Umb.Dashboard.Welcome',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/manifests.ts
View File

@@ -1,6 +1,6 @@
import type { ManifestSection, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestSection } from '@umbraco-cms/models';
export const manifests: Array<ManifestWithLoader<ManifestSection>> = [
export const manifests: Array<ManifestSection> = [
{
type: 'section',
alias: 'Umb.Section.Content',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/media/media-section.element.ts
View File

@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestDashboard } from '@umbraco-cms/models';
@customElement('umb-media-section')
export class UmbMediaSection extends LitElement {
@@ -14,7 +14,7 @@ export class UmbMediaSection extends LitElement {
}
private _registerDashboards() {
const dashboards: Array<ManifestWithLoader<ManifestDashboard>> = [
const dashboards: Array<ManifestDashboard> = [
{
type: 'dashboard',
alias: 'Umb.Dashboard.MediaManagement',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/section-packages.element.ts
View File

@@ -2,7 +2,7 @@ import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
import type { ManifestSectionView, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestSectionView } from '@umbraco-cms/models';
@customElement('umb-section-packages')
export class UmbSectionPackages extends UmbContextConsumerMixin(LitElement) {
@@ -13,7 +13,7 @@ export class UmbSectionPackages extends UmbContextConsumerMixin(LitElement) {
}
private _registerSectionViews() {
const manifests: Array<ManifestWithLoader<ManifestSectionView>> = [
const manifests: Array<ManifestSectionView> = [
{
type: 'sectionView',
alias: 'Umb.SectionView.Packages.Repo',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts
View File

@@ -1,7 +1,7 @@
import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestDashboard } from '@umbraco-cms/models';
@customElement('umb-section-settings')
export class UmbSectionSettingsElement extends LitElement {
@@ -12,7 +12,7 @@ export class UmbSectionSettingsElement extends LitElement {
}
private _registerDashboards() {
const dashboards: Array<ManifestWithLoader<ManifestDashboard>> = [
const dashboards: Array<ManifestDashboard> = [
{
type: 'dashboard',
alias: 'Umb.Dashboard.SettingsWelcome',

4
src/Umbraco.Web.UI.Client/src/backoffice/sections/users/section-users.element.ts
View File

@@ -1,7 +1,7 @@
import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestSectionView, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestSectionView } from '@umbraco-cms/models';
@customElement('umb-section-users')
export class UmbSectionUsersElement extends LitElement {
@@ -12,7 +12,7 @@ export class UmbSectionUsersElement extends LitElement {
}
private _registerSectionViews() {
const manifests: Array<ManifestWithLoader<ManifestSectionView>> = [
const manifests: Array<ManifestSectionView> = [
{
type: 'sectionView',
alias: 'Umb.SectionView.Users.Users',

4
src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts
View File

@@ -5,7 +5,7 @@ import { UmbTreeBase } from '../shared/tree-base.element';
import { UmbTreeDataTypesDataContext } from './tree-data-types-data.context';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
import type { ManifestTreeItemAction, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestTreeItemAction } from '@umbraco-cms/models';
import '../shared/tree-navigator.element';
@@ -26,7 +26,7 @@ export class UmbTreeDataTypesElement extends UmbContextProviderMixin(UmbContextC
}
private _registerTreeItemActions() {
const dashboards: Array<ManifestWithLoader<ManifestTreeItemAction>> = [
const dashboards: Array<ManifestTreeItemAction> = [
{
type: 'treeItemAction',
alias: 'Umb.TreeItemAction.DataType.Create',

4
src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts
View File

@@ -4,7 +4,7 @@ import { UmbEntityStore } from '../../../core/stores/entity.store';
import { UmbTreeBase } from '../shared/tree-base.element';
import { UmbTreeDocumentDataContext } from './tree-documents-data.context';
import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
import type { ManifestTreeItemAction, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestTreeItemAction } from '@umbraco-cms/models';
import '../shared/tree-navigator.element';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
@@ -25,7 +25,7 @@ export class UmbTreeDocumentElement extends UmbContextProviderMixin(UmbContextCo
}
private _registerTreeItemActions() {
const dashboards: Array<ManifestWithLoader<ManifestTreeItemAction>> = [
const dashboards: Array<ManifestTreeItemAction> = [
{
type: 'treeItemAction',
alias: 'Umb.TreeItemAction.Document.Create',

4
src/Umbraco.Web.UI.Client/src/backoffice/trees/manifests.ts
View File

@@ -1,6 +1,6 @@
import type { ManifestTree, ManifestWithLoader } from '@umbraco-cms/models';
import type { ManifestTree } from '@umbraco-cms/models';
export const manifests: Array<ManifestWithLoader<ManifestTree>> = [
export const manifests: Array<ManifestTree> = [
{
type: 'tree',
alias: 'Umb.Tree.Extensions',

4
src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts
View File

@@ -81,6 +81,7 @@ export interface ManifestElement extends ManifestBase {
type: ManifestStandardTypes;
js?: string;
elementName?: string;
loader?: () => Promise<object | HTMLElement>;
meta?: any;
}
@@ -93,6 +94,3 @@ export interface ManifestEntrypoint extends ManifestBase {
type: 'entrypoint';
js: string;
}
// TODO: couldn't we make loader optional on all manifests? and not just the internal ones?
export type ManifestWithLoader<T> = T & { loader: () => Promise<object | HTMLElement> };