diff --git a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts index efe0bdefc2e3..7f3350388343 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts @@ -1,4 +1,4 @@ -import { handlers as backofficeHandlers } from './handlers/backoffice.handlers.js'; +import { handlers as backofficeHandlers } from './handlers/backoffice/backoffice.handlers.js'; import { handlers as configHandlers } from './handlers/config.handlers.js'; import { handlers as cultureHandlers } from './handlers/culture.handlers.js'; import { handlers as dataTypeHandlers } from './handlers/data-type/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/login.jpg b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/login.jpg new file mode 100644 index 000000000000..ed893bf3c00f Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/login.jpg differ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo.svg b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo.svg new file mode 100644 index 000000000000..9372e25d3ee9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_dark.svg b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_dark.svg new file mode 100644 index 000000000000..578bf592f68e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_dark.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_light.svg b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_light.svg new file mode 100644 index 000000000000..01f7260cd3b4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_light.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/backoffice.handlers.ts similarity index 55% rename from src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice.handlers.ts rename to src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/backoffice.handlers.ts index 5ee5c0963b22..ddf3473bbf6e 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/backoffice.handlers.ts @@ -1,50 +1,46 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import logoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo.svg'; -import loginLogoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_light.svg'; -import loginLogoAlternativeUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_dark.svg'; -import loginBackgroundUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/login.jpg'; +const logoUrl = './src/mocks/handlers/backoffice/assets/logo.svg'; +const loginLogoUrl = './src/mocks/handlers/backoffice/assets/logo_light.svg'; +const loginLogoAlternativeUrl = './src/mocks/handlers/backoffice/assets/logo_dark.svg'; +const loginBackgroundUrl = './src/mocks/handlers/backoffice/assets/login.jpg'; export const handlers = [ rest.get(umbracoPath('/security/back-office/graphics/logo'), async (req, res, ctx) => { - const imageBuffer = await fetch(logoUrl) - .then((res) => res.arrayBuffer()); + const imageBuffer = await fetch(logoUrl).then((res) => res.arrayBuffer()); return res( ctx.set('Content-Length', imageBuffer.byteLength.toString()), ctx.set('Content-Type', 'image/svg+xml'), - ctx.body(imageBuffer) + ctx.body(imageBuffer), ); }), rest.get(umbracoPath('/security/back-office/graphics/login-logo'), async (req, res, ctx) => { - const imageBuffer = await fetch(loginLogoUrl) - .then((res) => res.arrayBuffer()); + const imageBuffer = await fetch(loginLogoUrl).then((res) => res.arrayBuffer()); return res( ctx.set('Content-Length', imageBuffer.byteLength.toString()), ctx.set('Content-Type', 'image/svg+xml'), - ctx.body(imageBuffer) + ctx.body(imageBuffer), ); }), rest.get(umbracoPath('/security/back-office/graphics/login-logo-alternative'), async (req, res, ctx) => { - const imageBuffer = await fetch(loginLogoAlternativeUrl) - .then((res) => res.arrayBuffer()); + const imageBuffer = await fetch(loginLogoAlternativeUrl).then((res) => res.arrayBuffer()); return res( ctx.set('Content-Length', imageBuffer.byteLength.toString()), ctx.set('Content-Type', 'image/svg+xml'), - ctx.body(imageBuffer) + ctx.body(imageBuffer), ); }), rest.get(umbracoPath('/security/back-office/graphics/login-background'), async (req, res, ctx) => { - const imageBuffer = await fetch(loginBackgroundUrl) - .then((res) => res.arrayBuffer()); + const imageBuffer = await fetch(loginBackgroundUrl).then((res) => res.arrayBuffer()); return res( ctx.set('Content-Length', imageBuffer.byteLength.toString()), ctx.set('Content-Type', 'image/jpeg'), - ctx.body(imageBuffer) + ctx.body(imageBuffer), ); }), ]; diff --git a/src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts b/src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts index b7973df0bbc5..53a950a28e5f 100644 --- a/src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts +++ b/src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts @@ -96,7 +96,7 @@ export const foundConsts = [{ }, { path: '@umbraco-cms/backoffice/content', - consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"] + consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_PROPERTY_DATASET_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"] }, { path: '@umbraco-cms/backoffice/culture', @@ -216,7 +216,7 @@ export const foundConsts = [{ }, { path: '@umbraco-cms/backoffice/member', - consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"] + consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_VALIDATION_REPOSITORY_ALIAS","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"] }, { path: '@umbraco-cms/backoffice/menu', diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.index.ts b/src/Umbraco.Web.UI.Client/web-test-runner.index.ts index 3a21fef3d112..4812325ea867 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.index.ts +++ b/src/Umbraco.Web.UI.Client/web-test-runner.index.ts @@ -1,7 +1,7 @@ import { handlers } from './src/mocks/browser-handlers.js'; import { onUnhandledRequest } from './src/mocks/index.js'; -const { setupWorker, rest } = window.MockServiceWorker; +const { setupWorker } = window.MockServiceWorker; const worker = setupWorker(...handlers);