Skip to content

Commit 853ceff

Browse files
committed
Merge branch 'main' into v14/bugfix/document-public-access-cancelled-server-requests
2 parents 42fdb3a + 328e723 commit 853ceff

File tree

21 files changed

+185
-92
lines changed

21 files changed

+185
-92
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"local-rules/enforce-umbraco-external-imports": [
5353
"error",
5454
{
55-
"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", "."]
55+
"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", ".", "vite"]
5656
}
5757
],
5858
"local-rules/exported-string-constant-naming": [

package-lock.json

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@
126126
"url": "https://umbraco.com"
127127
},
128128
"workspaces": [
129-
"./src/packages/dictionary"
129+
"./src/packages/data-type",
130+
"./src/packages/dictionary",
131+
"./src/packages/webhook"
130132
],
131133
"scripts": {
132134
"backoffice:test:e2e": "npx playwright test",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export default class UmbTinyMceMockPlugin {
2+
/**
3+
* @param {TinyMcePluginArguments} args
4+
*/
5+
constructor(args) {
6+
// Add your plugin code here
7+
console.log('editor initialized', args)
8+
}
9+
}

src/mocks/handlers/manifests.handlers.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ const privateManifests: PackageManifestResponse = [
4545
propertyEditorSchema: 'Umbraco.TextBox',
4646
},
4747
},
48+
{
49+
type: 'tinyMcePlugin',
50+
alias: 'My.TinyMcePlugin.Custom',
51+
name: 'My Custom TinyMce Plugin',
52+
js: '/App_Plugins/tinyMcePlugin.js',
53+
meta: {
54+
config: {
55+
plugins: ['wordcount'],
56+
statusbar: true,
57+
},
58+
},
59+
},
4860
],
4961
},
5062
{

src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
8585

8686
async #onFirstActionClick(event: PointerEvent) {
8787
event.stopPropagation();
88+
this.#sectionSidebarContext?.closeContextMenu();
8889
await this._firstActionApi?.execute();
8990
}
9091

src/packages/core/extension-registry/models/tinymce-plugin.model.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/tiny-mce';
22
import type { ManifestApi } from '@umbraco-cms/backoffice/extension-api';
3+
import type { RawEditorOptions } from '@umbraco-cms/backoffice/external/tinymce';
34

45
export interface MetaTinyMcePlugin {
56
/**
@@ -26,6 +27,20 @@ export interface MetaTinyMcePlugin {
2627
*/
2728
icon?: string;
2829
}>;
30+
31+
/**
32+
* Sets the default configuration for the TinyMCE editor. This configuration will be used when the editor is initialized.
33+
*
34+
* @see [TinyMCE Configuration](https://www.tiny.cloud/docs/configure/) for more information.
35+
* @optional
36+
* @examples [
37+
* {
38+
* "plugins": "wordcount",
39+
* "statusbar": true
40+
* }
41+
* ]
42+
*/
43+
config?: RawEditorOptions;
2944
}
3045

3146
/**

src/packages/data-type/entity-actions/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UMB_DATA_TYPE_ENTITY_TYPE } from '../entity.js';
22
import { UMB_DATA_TYPE_DETAIL_REPOSITORY_ALIAS } from '../repository/detail/index.js';
3-
import { UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS } from '../repository/item/manifests.js';
3+
import { UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS } from '../repository/item/index.js';
44
import { manifests as createManifests } from './create/manifests.js';
55
import { manifests as moveManifests } from './move-to/manifests.js';
66
import { manifests as duplicateManifests } from './duplicate/manifests.js';

src/packages/data-type/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "@umbraco-backoffice/data-type",
3+
"private": true,
4+
"type": "module",
5+
"scripts": {
6+
"build": "vite build"
7+
}
8+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const UMB_DATA_TYPE_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.DataType.Detail';
2+
export const UMB_DATA_TYPE_DETAIL_STORE_ALIAS = 'Umb.Store.DataType.Detail';

0 commit comments

Comments
 (0)