Merge branch 'main' into bugfix/block-grid-row-span-corrections

This commit is contained in:
Niels Lyngsø
2024-05-22 11:57:43 +02:00
committed by GitHub
5 changed files with 15 additions and 2 deletions

View File

@@ -11,7 +11,7 @@ export async function createExtensionElement<ElementType extends HTMLElement>(
const elementConstructor = await loadManifestElement<ElementType>(elementPropValue);
if (elementConstructor) {
return new elementConstructor();
} else {
} else if (!manifest.elementName) {
console.error(
`-- Extension of alias "${manifest.alias}" did not succeed creating an element class instance via the extension manifest property '${elementPropValue}'. The imported Element JS file did not export a 'element' or 'default'. Alternatively define the 'elementName' in the manifest.`,
manifest,

View File

@@ -8,6 +8,7 @@ export default {
} as Meta;
const Template: Story = () => {
const approvedIcons = icons.filter((x) => x.legacy !== true);
return html`
<div
style="display: grid;
@@ -17,7 +18,7 @@ const Template: Story = () => {
place-items: start;
justify-content: space-between;">
${repeat(
icons,
approvedIcons,
(icon) => icon.name,
(icon) =>
html` <div

View File

@@ -86,6 +86,7 @@ const entityActions: Array<ManifestEntityAction> = [
},
],
},
/* TODO: Implement Permissions Entity Action
{
type: 'entityAction',
kind: 'default',
@@ -108,6 +109,8 @@ const entityActions: Array<ManifestEntityAction> = [
},
],
},
*/
/* TODO: Implement Notifications Entity Action
{
type: 'entityAction',
kind: 'default',
@@ -130,6 +133,7 @@ const entityActions: Array<ManifestEntityAction> = [
},
],
},
*/
];
export const manifests: Array<ManifestTypes> = [

View File

@@ -57,6 +57,7 @@ export const manifests: Array<ManifestEntityBulkAction> = [
},
],
},
/* TODO: implement bulk duplicate action
{
type: 'entityBulkAction',
kind: 'default',
@@ -79,6 +80,8 @@ export const manifests: Array<ManifestEntityBulkAction> = [
},
],
},
*/
/* TODO: implement bulk move action
{
type: 'entityBulkAction',
kind: 'default',
@@ -101,6 +104,8 @@ export const manifests: Array<ManifestEntityBulkAction> = [
},
],
},
*/
/* TODO: implement bulk trash action
{
type: 'entityBulkAction',
kind: 'default',
@@ -123,4 +128,5 @@ export const manifests: Array<ManifestEntityBulkAction> = [
},
],
},
*/
];

View File

@@ -8,6 +8,7 @@ import type { ManifestEntityBulkAction, ManifestTypes } from '@umbraco-cms/backo
import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
const entityActions: Array<ManifestEntityBulkAction> = [
/* TODO: Implement SetGroup entity action
{
type: 'entityBulkAction',
alias: 'Umb.EntityBulkAction.User.SetGroup',
@@ -25,6 +26,7 @@ const entityActions: Array<ManifestEntityBulkAction> = [
},
],
},
*/
{
type: 'entityBulkAction',
alias: 'Umb.EntityBulkAction.User.Enable',