correct settings condition plus route fix

This commit is contained in:
Niels Lyngsø
2024-06-24 21:25:49 +02:00
parent 25ff21ce01
commit 08333eff68
2 changed files with 11 additions and 10 deletions

View File

@@ -1,6 +1,6 @@
import { UMB_BLOCK_WORKSPACE_ALIAS } from './index.js';
import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
import { UMB_BLOCK_WORKSPACE_ALIAS } from './index.js';
export const manifests: Array<ManifestTypes> = [
{
@@ -73,8 +73,6 @@ export const manifests: Array<ManifestTypes> = [
alias: 'Umb.Condition.WorkspaceAlias',
match: UMB_BLOCK_WORKSPACE_ALIAS,
},
],
TODO_conditions: [
{
alias: 'Umb.Condition.BlockWorkspaceHasSettings',
},

View File

@@ -56,10 +56,10 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
}
private _createRoutes() {
this._routes = [];
let newRoutes: UmbRoute[] = [];
if (this._workspaceViews.length > 0) {
this._routes = this._workspaceViews.map((manifest) => {
newRoutes = this._workspaceViews.map((manifest) => {
return {
path: `view/${manifest.meta.pathname}`,
component: () => createExtensionElement(manifest),
@@ -72,14 +72,17 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
});
// If we have a post fix then we need to add a direct from the empty url of the split-view-index:
const firstView = this._workspaceViews[0];
if (firstView) {
this._routes.push({
// TODO: This is problematic, cause if a workspaceView appears later, then this takes over. And it is also a problem if it does not use redirect, but just a view defined with and empty path.
/*const firstRoute = newRoutes[0];
if (firstRoute) {
newRoutes.push({
path: ``,
redirectTo: `view/${firstView.meta.pathname}`,
redirectTo: firstRoute.path,
});
}
}*/
}
this._routes = newRoutes;
}
override render() {