@umbraco-cms/backoffice 14.0.0-8a5fc0ad → 14.0.0-8d2a75e2

package/dist-cms/mocks/data/partial-views.data.js

@@ -1,7 +1,8 @@
 import { UmbEntityData } from './entity.data.js';
-import { createFileSystemTreeItem } from './utils.js';
-export const data = [
+import { createFileSystemTreeItem, createTextFileItem } from './utils.js';
+export const treeData = [
     {
+        id: 'blockgrid',
         path: 'blockgrid',
         isFolder: true,
         name: 'blockgrid',
@@ -9,6 +10,7 @@ export const data = [
         hasChildren: true,
     },
     {
+        id: 'blocklist',
         path: 'blocklist',
         isFolder: true,
         name: 'blocklist',
@@ -16,6 +18,7 @@ export const data = [
         hasChildren: true,
     },
     {
+        id: 'grid',
         path: 'grid',
         isFolder: true,
         name: 'grid',
@@ -23,48 +26,86 @@ export const data = [
         hasChildren: true,
     },
     {
+        id: 'blockgrid/area.cshtml',
         path: 'blockgrid/area.cshtml',
         isFolder: false,
         name: 'area.cshtml',
         type: 'partial-view',
         hasChildren: false,
+        content: `@using Umbraco.Extensions
+		@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea>
+		
+		<div class="umb-block-grid__area"
+			 data-area-col-span="@Model.ColumnSpan"
+			 data-area-row-span="@Model.RowSpan"
+			 data-area-alias="@Model.Alias"
+			 style="--umb-block-grid--grid-columns: @Model.ColumnSpan;--umb-block-grid--area-column-span: @Model.ColumnSpan; --umb-block-grid--area-row-span: @Model.RowSpan;">
+			@await Html.GetBlockGridItemsHtmlAsync(Model)
+		</div>
+		`,
     },
     {
+        id: 'blockgrid/items.cshtml',
         path: 'blockgrid/items.cshtml',
         isFolder: false,
         name: 'items.cshtml',
         type: 'partial-view',
         hasChildren: false,
+        content: '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage',
     },
     {
+        id: 'blocklist/default.cshtml',
         path: 'blocklist/default.cshtml',
         isFolder: false,
         name: 'default.cshtml',
         type: 'partial-view',
         hasChildren: false,
+        content: `@using Umbraco.Extensions
+		@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridModel>
+		@{
+			if (Model?.Any() != true) { return; }
+		}
+		
+		<div class="umb-block-grid"
+			 data-grid-columns="@(Model.GridColumns?.ToString() ?? "12");"
+			 style="--umb-block-grid--grid-columns: @(Model.GridColumns?.ToString() ?? "12");">
+			@await Html.GetBlockGridItemsHtmlAsync(Model)
+		</div>
+		`,
     },
     {
-        path: 'grid/editors',
+        id: 'grid/embed.cshtm',
+        path: 'grid/embed.cshtm',
         isFolder: false,
-        name: 'editors',
+        name: 'embed.cshtml',
         type: 'partial-view',
         hasChildren: false,
+        content: `@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
+
+		@if (Model is not null)
+		{
+		  string embedValue = Convert.ToString(Model.value);
+		  embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value;
+		
+		  <div class="video-wrapper">
+			@Html.Raw(embedValue)
+		  </div>
+		}
+		`,
     },
     {
+        id: 'grid/default.cshtml',
         path: 'grid/default.cshtml',
         isFolder: false,
         name: 'items.cshtml',
         type: 'partial-view',
         hasChildren: false,
+        content: '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage',
     },
 ];
-// Temp mocked database
-// TODO: all properties are optional in the server schema. I don't think this is correct.
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-class UmbPartialViewsData extends UmbEntityData {
+class UmbPartialViewsTreeData extends UmbEntityData {
     constructor() {
-        super(data);
+        super(treeData);
     }
     getTreeRoot() {
         const items = this.data.filter((item) => item.path?.includes('/') === false);
@@ -83,4 +124,230 @@ class UmbPartialViewsData extends UmbEntityData {
         return items.map((item) => createFileSystemTreeItem(item));
     }
 }
+export const umbPartialViewsTreeData = new UmbPartialViewsTreeData();
+export const snippets = [
+    {
+        name: 'Empty',
+        content: '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage',
+    },
+    {
+        name: 'Breadcrumb',
+        content: `@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+		@using Umbraco.Cms.Core.Routing
+		@using Umbraco.Extensions
+		
+		@inject IPublishedUrlProvider PublishedUrlProvider
+		@*
+			This snippet makes a breadcrumb of parents using an unordered HTML list.
+		
+			How it works:
+			- It uses the Ancestors() method to get all parents and then generates links so the visitor can go back
+			- Finally it outputs the name of the current page (without a link)
+		*@
+		
+		@{ var selection = Model.Ancestors().ToArray(); }
+		
+		@if (selection?.Length > 0)
+		{
+			<ul class="breadcrumb">
+				@* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@
+				@foreach (var item in selection.OrderBy(x => x.Level))
+				{
+					<li><a href="@item.Url(PublishedUrlProvider)">@item.Name</a> <span class="divider">/</span></li>
+				}
+		
+				@* Display the current page as the last item in the list *@
+				<li class="active">@Model.Name</li>
+			</ul>
+		}`,
+    },
+    {
+        name: 'EditProfile',
+        content: `@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+
+		@using Umbraco.Cms.Core.Services
+		@using Umbraco.Cms.Web.Common.Security
+		@using Umbraco.Cms.Web.Website.Controllers
+		@using Umbraco.Cms.Web.Website.Models
+		@using Umbraco.Extensions
+		@inject MemberModelBuilderFactory memberModelBuilderFactory;
+		@inject IMemberExternalLoginProviders memberExternalLoginProviders
+		@inject IExternalLoginWithKeyService externalLoginWithKeyService
+		@{
+		
+			// Build a profile model to edit
+			var profileModel = await memberModelBuilderFactory
+				.CreateProfileModel()
+				// If null or not set, this will redirect to the current page
+				.WithRedirectUrl(null)
+				// Include editable custom properties on the form
+				.WithCustomProperties(true)
+				.BuildForCurrentMemberAsync();
+		
+			var success = TempData["FormSuccess"] != null;
+		
+			var loginProviders = await memberExternalLoginProviders.GetMemberProvidersAsync();
+			var externalSignInError = ViewData.GetExternalSignInProviderErrors();
+		
+			var currentExternalLogin = profileModel is null
+				? new Dictionary<string, string>()
+				: externalLoginWithKeyService.GetExternalLogins(profileModel.Key).ToDictionary(x=>x.LoginProvider, x=>x.ProviderKey);
+		}
+		
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"></script>
+		
+		@if (profileModel != null)
+		{
+			if (success)
+			{
+				@* This message will show if profileModel.RedirectUrl is not defined (default) *@
+				<p class="text-success">Profile updated</p>
+			}
+		
+			using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile", new { RedirectUrl = profileModel.RedirectUrl }))
+			{
+				<h2>Update your account.</h2>
+				<hr />
+				<div asp-validation-summary="All" class="text-danger"></div>
+				<div class="mb-3">
+					<label asp-for="@profileModel.Name" class="form-label"></label>
+					<input asp-for="@profileModel.Name" class="form-control" aria-required="true" />
+					<span asp-validation-for="@profileModel.Name" class="form-text text-danger"></span>
+				</div>
+				<div class="mb-3">
+					<label asp-for="@profileModel.Email" class="form-label"></label>
+					<input asp-for="@profileModel.Email" class="form-control" autocomplete="username" aria-required="true" />
+					<span asp-validation-for="@profileModel.Email" class="form-text text-danger"></span>
+				</div>
+		
+				@if (!string.IsNullOrWhiteSpace(profileModel.UserName))
+				{
+					<div class="mb-3">
+						<label asp-for="@profileModel.UserName" class="form-label"></label>
+						<input asp-for="@profileModel.UserName" class="form-control" autocomplete="username" aria-required="true" />
+						<span asp-validation-for="@profileModel.UserName" class="form-text text-danger"></span>
+					</div>
+				}
+		
+				@if (profileModel.MemberProperties != null)
+				{
+					for (var i = 0; i < profileModel.MemberProperties.Count; i++)
+					{
+						<div class="mb-3">
+							@Html.LabelFor(m => profileModel.MemberProperties[i].Value, profileModel.MemberProperties[i].Name)
+							<input asp-for="@profileModel.MemberProperties[i].Value" class="form-control" />
+							@Html.HiddenFor(m => profileModel.MemberProperties[i].Alias)
+							<span asp-validation-for="@profileModel.MemberProperties[i].Value" class="form-text text-danger"></span>
+						</div>
+					}
+				}
+		
+				<button type="submit" class="btn btn-primary">Update</button>
+		
+				if (loginProviders.Any())
+				{
+					<hr/>
+					<h4>Link external accounts</h4>
+		
+					if (externalSignInError?.AuthenticationType is null && externalSignInError?.Errors.Any() == true)
+					{
+						@Html.DisplayFor(x => externalSignInError.Errors);
+					}
+		
+					@foreach (var login in loginProviders)
+					{
+						if (currentExternalLogin.TryGetValue(login.ExternalLoginProvider.AuthenticationType, out var providerKey))
+						{
+							@using (Html.BeginUmbracoForm<UmbExternalLoginController>(nameof(UmbExternalLoginController.Disassociate)))
+							{
+								<input type="hidden" name="providerKey" value="@providerKey"/>
+								<button type="submit" name="provider" value="@login.ExternalLoginProvider.AuthenticationType">
+									Un-Link your @login.AuthenticationScheme.DisplayName account
+								</button>
+		
+								if (externalSignInError?.AuthenticationType == login.ExternalLoginProvider.AuthenticationType)
+								{
+									@Html.DisplayFor(x => externalSignInError.Errors);
+								}
+							}
+						}
+						else
+						{
+							@using (Html.BeginUmbracoForm<UmbExternalLoginController>(nameof(UmbExternalLoginController.LinkLogin)))
+							{
+								<button type="submit" name="provider" value="@login.ExternalLoginProvider.AuthenticationType">
+									Link your @login.AuthenticationScheme.DisplayName account
+								</button>
+		
+								if (externalSignInError?.AuthenticationType == login.ExternalLoginProvider.AuthenticationType)
+								{
+									@Html.DisplayFor(x => externalSignInError.Errors);
+								}
+							}
+						}
+		
+					}
+				}
+			}
+		}`,
+    },
+    {
+        name: 'Login',
+        content: 'login',
+    },
+    {
+        name: 'LoginStatus',
+        content: 'loginStatus',
+    },
+    {
+        name: 'MultinodeTree-picker',
+        content: 'MultinodeTree-picker',
+    },
+    {
+        name: 'Navigation',
+        content: 'Navigation',
+    },
+    {
+        name: 'RegisterMember',
+        content: 'RegisterMember',
+    },
+    {
+        name: 'SiteMap',
+        content: 'SiteMap',
+    },
+];
+class UmbPartialViewSnippetsData extends UmbEntityData {
+    constructor() {
+        super(snippets);
+    }
+    getSnippets() {
+        return this.data;
+    }
+    getSnippetByName(name) {
+        return this.data.find((item) => item.name === name);
+    }
+}
+class UmbPartialViewsData extends UmbEntityData {
+    constructor() {
+        super(treeData);
+    }
+    getPartialView(path) {
+        return createTextFileItem(this.data.find((item) => item.path === path));
+    }
+    insertPartialView(item) {
+        const newItem = {
+            ...item,
+            path: `${item.parentPath}/${item.name}.cshtml}`,
+            id: `${item.parentPath}/${item.name}.cshtml}`,
+            isFolder: false,
+            hasChildren: false,
+            type: 'partial-view',
+        };
+        this.insert(newItem);
+        return newItem;
+    }
+}
+export const umbPartialViewSnippetsData = new UmbPartialViewSnippetsData();
 export const umbPartialViewsData = new UmbPartialViewsData();

package/dist-cms/mocks/data/utils.d.ts

@@ -1,4 +1,4 @@
-import type { ContentTreeItemResponseModel, DocumentTreeItemResponseModel, DocumentTypeTreeItemResponseModel, EntityTreeItemResponseModel, FolderTreeItemResponseModel, DocumentTypeResponseModel, FileSystemTreeItemPresentationModel, DocumentResponseModel } from '../../external/backend-api/index.js';
+import type { ContentTreeItemResponseModel, DocumentTreeItemResponseModel, DocumentTypeTreeItemResponseModel, EntityTreeItemResponseModel, FolderTreeItemResponseModel, DocumentTypeResponseModel, FileSystemTreeItemPresentationModel, DocumentResponseModel, TextFileResponseModelBaseModel } from '../../external/backend-api/index.js';
 export declare const createEntityTreeItem: (item: any) => EntityTreeItemResponseModel;
 export declare const createFolderTreeItem: (item: any) => FolderTreeItemResponseModel;
 export declare const createContentTreeItem: (item: any) => ContentTreeItemResponseModel & {
@@ -9,3 +9,4 @@ export declare const createDocumentTreeItem: (item: DocumentResponseModel) => Do
 };
 export declare const createDocumentTypeTreeItem: (item: DocumentTypeResponseModel) => DocumentTypeTreeItemResponseModel;
 export declare const createFileSystemTreeItem: (item: any) => FileSystemTreeItemPresentationModel;
+export declare const createTextFileItem: (item: any) => TextFileResponseModelBaseModel;

package/dist-cms/mocks/data/utils.js

@@ -55,3 +55,8 @@ export const createFileSystemTreeItem = (item) => {
         isFolder: item.isFolder,
     };
 };
+export const createTextFileItem = (item) => ({
+    path: item.path,
+    name: item.name,
+    content: item.content,
+});

package/dist-cms/mocks/handlers/manifests.handlers.js

@@ -30,7 +30,7 @@ export const manifestDevelopmentHandler = rest.get(umbracoPath('/package/manifes
                         label: 'My Custom Property',
                         icon: 'document',
                         group: 'Common',
-                        propertyEditorSchema: 'Umbraco.JSON',
+                        propertyEditorSchema: 'Umbraco.TextBox',
                     },
                 },
             ],

package/dist-cms/mocks/handlers/partial-views.handlers.d.ts

@@ -1 +1,2 @@
-export declare const handlers: import("msw").RestHandler<import("msw/lib/glossary-de6278a9.js").M<import("msw/lib/glossary-de6278a9.js").h>>[];
+import { RestHandler, MockedRequest, DefaultBodyType } from 'msw';
+export declare const handlers: RestHandler<MockedRequest<DefaultBodyType>>[];

package/dist-cms/mocks/handlers/partial-views.handlers.js

@@ -1,23 +1,55 @@
 const { rest } = window.MockServiceWorker;
-import { umbPartialViewsData } from '../data/partial-views.data.js';
+import { umbPartialViewsData, umbPartialViewsTreeData } from '../data/partial-views.data.js';
 import { umbracoPath } from '../../shared/utils/index.js';
-export const handlers = [
+const treeHandlers = [
     rest.get(umbracoPath('/tree/partial-view/root'), (req, res, ctx) => {
-        const response = umbPartialViewsData.getTreeRoot();
+        const response = umbPartialViewsTreeData.getTreeRoot();
         return res(ctx.status(200), ctx.json(response));
     }),
     rest.get(umbracoPath('/tree/partial-view/children'), (req, res, ctx) => {
         const path = req.url.searchParams.get('path');
         if (!path)
             return;
-        const response = umbPartialViewsData.getTreeItemChildren(path);
+        const response = umbPartialViewsTreeData.getTreeItemChildren(path);
         return res(ctx.status(200), ctx.json(response));
     }),
     rest.get(umbracoPath('/tree/partial-view/item'), (req, res, ctx) => {
         const paths = req.url.searchParams.getAll('paths');
         if (!paths)
             return;
-        const items = umbPartialViewsData.getTreeItem(paths);
+        const items = umbPartialViewsTreeData.getTreeItem(paths);
         return res(ctx.status(200), ctx.json(items));
     }),
 ];
+const detailHandlers = [
+    rest.get(umbracoPath('/partial-view'), (req, res, ctx) => {
+        const path = decodeURIComponent(req.url.searchParams.get('path') ?? '').replace('-cshtml', '.cshtml');
+        if (!path)
+            return res(ctx.status(400));
+        const response = umbPartialViewsData.getPartialView(path);
+        return res(ctx.status(200), ctx.json(response));
+    }),
+    rest.post(umbracoPath('/partial-view'), (req, res, ctx) => {
+        const requestBody = req.json();
+        if (!requestBody)
+            return res(ctx.status(400, 'no body found'));
+        const response = umbPartialViewsData.insertPartialView(requestBody);
+        return res(ctx.status(200), ctx.json(response));
+    }),
+    rest.delete(umbracoPath('/partial-view'), (req, res, ctx) => {
+        const path = req.url.searchParams.get('path');
+        if (!path)
+            return res(ctx.status(400));
+        const response = umbPartialViewsData.delete([path]);
+        return res(ctx.status(200), ctx.json(response));
+    }),
+    rest.put(umbracoPath('/partial-view'), (req, res, ctx) => {
+        const requestBody = req.json();
+        if (!requestBody)
+            return res(ctx.status(400, 'no body found'));
+        const response = umbPartialViewsData.updateData(requestBody);
+        return res(ctx.status(200));
+    }),
+];
+const folderHandlers = [];
+export const handlers = [...treeHandlers, ...detailHandlers, ...folderHandlers];

package/dist-cms/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.js

@@ -33,7 +33,7 @@ export let UmbEntityActionsBundleElement = class UmbEntityActionsBundleElement e
     #observeEntityActions() {
         this.observe(umbExtensionsRegistry
             .extensionsOfType('entityAction')
-            .pipe(map((actions) => actions.filter((action) => action.conditions.entityTypes.includes(this.entityType)))), (actions) => {
+            .pipe(map((actions) => actions.filter((action) => action.meta.entityTypes.includes(this.entityType)))), (actions) => {
             this._hasActions = actions.length > 0;
         }, 'observeEntityAction');
     }

package/dist-cms/packages/core/components/extension-slot/extension-slot.element.d.ts

@@ -1,13 +1,9 @@
 import { TemplateResult } from '../../../../external/lit/index.js';
+import { type UmbExtensionElementController } from '../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-export type InitializedExtension = {
-    alias: string;
-    weight: number;
-    component: HTMLElement | null;
-};
 /**
  * @element umb-extension-slot
- * @description
+ * @description A element which renderers the extensions of a given type or types.
  * @slot default - slot for inserting additional things into this slot.
  * @export
  * @class UmbExtensionSlot
@@ -15,18 +11,46 @@ export type InitializedExtension = {
  */
 export declare class UmbExtensionSlotElement extends UmbLitElement {
     #private;
-    private _extensions;
-    type: string;
-    filter: (manifest: any) => boolean;
-    private _props?;
-    get props(): Record<string, any> | undefined;
-    set props(newVal: Record<string, any> | undefined);
+    private _permittedExts;
+    /**
+     * The type or types of extensions to render.
+     * @type {string | string[]}
+     * @memberof UmbExtensionSlot
+     * @example
+     * <umb-extension-slot type="my-extension-type"></umb-extension-slot>
+     * or multiple:
+     * <umb-extension-slot .type=${['my-extension-type','another-extension-type']}></umb-extension-slot>
+     *
+     */
+    get type(): string | string[] | undefined;
+    set type(value: string | string[] | undefined);
+    /**
+     * Filter method for extension manifests.
+     * This is an initial filter taking effect before conditions or overwrites, the extensions will still be filtered by the conditions defined in the manifest.
+     * @type {(manifest: any) => boolean}
+     * @memberof UmbExtensionSlot
+     * @example
+     * <umb-extension-slot type="my-extension-type" .filter=${(ext) => ext.meta.anyPropToFilter === 'foo'}></umb-extension-slot>
+     *
+     */
+    get filter(): (manifest: any) => boolean;
+    set filter(value: (manifest: any) => boolean);
+    /**
+     * Properties to pass to the extensions elements.
+     * Notice: The individual manifest of the extension is parsed to each extension element no matter if this is set or not.
+     * @type {Record<string, any>}
+     * @memberof UmbExtensionSlot
+     * @example
+     * <umb-extension-slot type="my-extension-type" .props=${{foo: 'bar'}}></umb-extension-slot>
+     */
+    get props(): Record<string, unknown> | undefined;
+    set props(newVal: Record<string, unknown> | undefined);
     defaultElement: string;
-    renderMethod?: (extension: InitializedExtension) => TemplateResult<1 | 2> | HTMLElement | null;
+    renderMethod?: (extension: UmbExtensionElementController) => TemplateResult | HTMLElement | null | undefined;
     connectedCallback(): void;
     private _observeExtensions;
     render(): unknown;
-    static styles: import("@lit/reactive-element/css-tag").CSSResult;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult;
 }
 declare global {
     interface HTMLElementTagNameMap {