Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a12db87
extend controller base
madsrasmussen Aug 11, 2025
5d6415f
extend controller base
madsrasmussen Aug 11, 2025
05a4235
add package for management api
madsrasmussen Aug 11, 2025
6212027
add signalr as external package
madsrasmussen Aug 11, 2025
2b1be18
connect to server event hub
madsrasmussen Aug 11, 2025
2490bf8
do no act on undefined
madsrasmussen Aug 11, 2025
8c592e3
add event subject
madsrasmussen Aug 11, 2025
c139362
correct alias
madsrasmussen Aug 11, 2025
62799bd
export token
madsrasmussen Aug 11, 2025
5a3f8f9
add helper methods
madsrasmussen Aug 11, 2025
2deb7cc
cache server responses
madsrasmussen Aug 11, 2025
ad257cf
fix import
madsrasmussen Aug 11, 2025
03c1fc8
use helpers
madsrasmussen Aug 11, 2025
1f1baa6
add detail request manager
madsrasmussen Aug 12, 2025
a2c3283
implement for document type
madsrasmussen Aug 12, 2025
9aa73a7
implement for data type
madsrasmussen Aug 12, 2025
9d33c00
add method for update
madsrasmussen Aug 12, 2025
ba732e3
add support for create method
madsrasmussen Aug 12, 2025
9e1deb6
align code
madsrasmussen Aug 12, 2025
cefc5e0
Update detail-request.manager.ts
madsrasmussen Aug 12, 2025
b38cdf2
move explicit naming
madsrasmussen Aug 12, 2025
9905302
move into folder
madsrasmussen Aug 12, 2025
eef5acb
collect server code in folder
madsrasmussen Aug 12, 2025
0045a74
add implementation for data type request manager
madsrasmussen Aug 12, 2025
9058d26
implement for document type
madsrasmussen Aug 12, 2025
c9f701f
only cache when we have connection to the server events
madsrasmussen Aug 13, 2025
da203e6
update
madsrasmussen Aug 14, 2025
de86ac7
fix imports
madsrasmussen Aug 14, 2025
ebdb339
Create cache.test.ts
madsrasmussen Aug 15, 2025
1f181c3
use sync method to lookup data type item
madsrasmussen Aug 15, 2025
82be7df
Merge branch 'main' into v16/feature/entity-detail-runtime-cache
madsrasmussen Aug 15, 2025
2cdfef1
use correct alias
madsrasmussen Aug 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 128 additions & 7 deletions src/Umbraco.Web.UI.Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/Umbraco.Web.UI.Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"./lit-element": "./dist-cms/packages/core/lit-element/index.js",
"./localization": "./dist-cms/packages/core/localization/index.js",
"./log-viewer": "./dist-cms/packages/log-viewer/index.js",
"./management-api": "./dist-cms/packages/management-api/index.js",
"./markdown-editor": "./dist-cms/packages/markdown-editor/index.js",
"./media-type": "./dist-cms/packages/media/media-types/index.js",
"./media": "./dist-cms/packages/media/media/index.js",
Expand Down Expand Up @@ -126,6 +127,7 @@
"./external/monaco-editor": "./dist-cms/external/monaco-editor/index.js",
"./external/openid": "./dist-cms/external/openid/index.js",
"./external/rxjs": "./dist-cms/external/rxjs/index.js",
"./external/signalr": "./dist-cms/external/signalr/index.js",
"./external/tiptap": "./dist-cms/external/tiptap/index.js",
"./external/uui": "./dist-cms/external/uui/index.js"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const CORE_PACKAGES = [
import('../../packages/block/umbraco-package.js'),
import('../../packages/clipboard/umbraco-package.js'),
import('../../packages/code-editor/umbraco-package.js'),
import('../../packages/content/umbraco-package.js'),
import('../../packages/data-type/umbraco-package.js'),
import('../../packages/dictionary/umbraco-package.js'),
import('../../packages/documents/umbraco-package.js'),
Expand All @@ -24,6 +25,7 @@ const CORE_PACKAGES = [
import('../../packages/help/umbraco-package.js'),
import('../../packages/language/umbraco-package.js'),
import('../../packages/log-viewer/umbraco-package.js'),
import('../../packages/management-api/umbraco-package.js'),
import('../../packages/markdown-editor/umbraco-package.js'),
import('../../packages/media/umbraco-package.js'),
import('../../packages/members/umbraco-package.js'),
Expand All @@ -48,7 +50,6 @@ const CORE_PACKAGES = [
import('../../packages/umbraco-news/umbraco-package.js'),
import('../../packages/user/umbraco-package.js'),
import('../../packages/webhook/umbraco-package.js'),
import('../../packages/content/umbraco-package.js'),
];

@customElement('umb-backoffice')
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/external/signalr/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@microsoft/signalr';
11 changes: 11 additions & 0 deletions src/Umbraco.Web.UI.Client/src/external/signalr/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@umbraco-backoffice/signalr",
"private": true,
"type": "module",
"scripts": {
"build": "vite build"
},
"dependencies": {
"@microsoft/signalr": "9.0.6"
}
}
18 changes: 18 additions & 0 deletions src/Umbraco.Web.UI.Client/src/external/signalr/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineConfig } from 'vite';
import { rmSync } from 'fs';
import { getDefaultConfig } from '../../vite-config-base';

const dist = '../../../dist-cms/external/signalr';

// delete the unbundled dist folder
rmSync(dist, { recursive: true, force: true });

export default defineConfig({
...getDefaultConfig({
dist,
base: '/umbraco/backoffice/external/signalr',
entry: {
index: './index.ts',
},
}),
});
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
}

readonly #dataTypeItemManager = new UmbDataTypeItemRepositoryManager(this);
#dataTypeSchemaAliasMap = new Map<string, string>();

readonly structure = new UmbContentTypeStructureManager<UmbContentTypeModel>(
this,
Expand Down Expand Up @@ -91,18 +90,6 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
},
null,
);
this.observe(
this.#dataTypeItemManager.items,
(dataTypes) => {
// Make a map of the data type unique and editorAlias:
this.#dataTypeSchemaAliasMap = new Map(
dataTypes.map((dataType) => {
return [dataType.unique, dataType.propertyEditorSchemaAlias];
}),
);
},
null,
);
}

public isLoaded() {
Expand Down Expand Up @@ -217,8 +204,9 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
throw new Error(`Property alias "${alias}" not found.`);
}

// TODO: I think we should await this in the same way as we do for Content Detail Workspace Context. [NL]
const editorAlias = this.#dataTypeSchemaAliasMap.get(property.dataType.unique);
const dataTypeItem = await this.#dataTypeItemManager.getItemByUnique(property.dataType.unique);
const editorAlias = dataTypeItem?.propertyEditorSchemaAlias;

if (!editorAlias) {
throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { UmbDataTypeDetailModel } from '../../types.js';
import { UmbDataTypeServerDataSource } from './data-type-detail.server.data-source.js';
import { UmbDataTypeServerDataSource } from './server-data-source/data-type-detail.server.data-source.js';
import type { UmbDataTypeDetailStore } from './data-type-detail.store.js';
import { UMB_DATA_TYPE_DETAIL_STORE_CONTEXT } from './data-type-detail.store.context-token.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
Expand Down
Loading
Loading