yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/navigate_to_edit_path_when_created

Browse Source 
# Conflicts:
#	libs/router/route.context.ts
#	src/backoffice/settings/languages/workspace/language/language-workspace.element.ts
This commit is contained in:
Niels Lyngsø
2023-04-11 15:31:36 +02:00
parent 244a126b77 114c2e5d57
commit e5bbb10638
106 changed files with 1099 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/libs/router/generate-route-path-builder.function.ts
View File

@@ -1,4 +1,4 @@
import type { ISlashOptions } from '@umbraco-cms/internal/router';
import type { ISlashOptions } from '@umbraco-cms/backoffice/router';
const PARAM_IDENTIFIER = /:([^\\/]+)/g;

2
src/Umbraco.Web.UI.Client/libs/router/index.ts
View File

@@ -1,3 +1,5 @@
export type * from 'router-slot/model';
export * from 'router-slot/util';
export * from './route-location.interface';
export * from './route.context';
export * from './route.interface';

11
src/Umbraco.Web.UI.Client/libs/router/route.context.ts
View File

@@ -1,12 +1,13 @@
import type { IRoutingInfo, ISlashOptions } from 'router-slot';
import { UmbRoute } from './route.interface';
import { generateRoutePathBuilder } from '.';
// eslint-disable-next-line local-rules/no-external-imports
import type { IRoutingInfo } from 'router-slot/model';
import type { UmbRoute } from './route.interface';
import { generateRoutePathBuilder } from './generate-route-path-builder.function';
import {
UmbContextConsumerController,
UmbContextProviderController,
UmbContextToken,
} from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalRouteRegistration } from '@umbraco-cms/backoffice/modal';
const EmptyDiv = document.createElement('div');
@@ -48,7 +49,7 @@ export class UmbRouteContext {
return {
path: this.#getModalRoutePath(modalRegistration),
component: EmptyDiv,
setup: (component: HTMLElement, info: IRoutingInfo<any, any>) => {
setup: (component, info) => {
if (!this.#modalContext) return;
const modalHandler = modalRegistration.routeSetup(this.#modalContext, info.match.params);
if (modalHandler) {

4
src/Umbraco.Web.UI.Client/libs/router/route.interface.ts
View File

@@ -1,3 +1 @@
import type { IRoute } from 'router-slot/model';
export type UmbRoute = IRoute;
export type { IRoute as UmbRoute } from 'router-slot/model';