Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Hide Content Editor workspace view when no properties (Document, Media, Member) #2075

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { UmbContentWorkspaceContext } from './content-workspace-context.interface.js';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import type { UmbContentWorkspaceContext } from './content-workspace-context.interface.js';

export const UMB_CONTENT_WORKSPACE_CONTEXT = new UmbContextToken<
UmbContentWorkspaceContext,
Expand Down
1 change: 1 addition & 0 deletions src/packages/core/content/workspace/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export type * from './content-workspace-context.interface.js';
export * from './content-workspace.context-token.js';
export * from './views/edit/index.js';
4 changes: 2 additions & 2 deletions src/packages/core/content/workspace/manifests.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { contentEditorManifest } from './views/edit/manifest.js';
import { manifests as contentEditorManifests } from './views/edit/manifests.js';

export const manifests = [contentEditorManifest];
export const manifests = [...contentEditorManifests];
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION = 'Umb.Condition.Workspace.ContentHasProperties';
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api';

export const manifest: ManifestCondition = {
type: 'condition',
name: 'Content has properties Workspace Condition',
alias: 'Umb.Condition.Workspace.ContentHasProperties',
api: () => import('./content-has-properties.condition.js'),
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { UMB_CONTENT_WORKSPACE_CONTEXT } from '../../../../content-workspace.context-token.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type {
UmbConditionConfigBase,
UmbConditionControllerArguments,
UmbExtensionCondition,
} from '@umbraco-cms/backoffice/extension-api';
import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';

export class UmbContentHasPropertiesWorkspaceCondition
extends UmbConditionBase<UmbConditionConfigBase>
implements UmbExtensionCondition
{
constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbConditionConfigBase>) {
super(host, args);

this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (context) => {
this.observe(
context.structure.contentTypes,
(contentTypes) => {
const hasProperties = contentTypes.some((contentType) => contentType.properties.length > 0);
this.permitted = hasProperties;
},
'contentTypesObserver',
);
});
}
}

export { UmbContentHasPropertiesWorkspaceCondition as api };
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './constants.js';
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { manifest as hasPropertiesManifest } from './has-properties/content-has-properties.condition.manifest.js';

export const manifests = [hasPropertiesManifest];
1 change: 1 addition & 0 deletions src/packages/core/content/workspace/views/edit/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './conditions/has-properties/index.js';
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { manifests as conditionsManifests } from './conditions/manifests.js';
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';

export const contentEditorManifest: UmbBackofficeManifestKind = {
const contentEditorManifest: UmbBackofficeManifestKind = {
type: 'kind',
alias: 'Umb.Kind.WorkspaceView.ContentEditor',
matchKind: 'contentEditor',
Expand All @@ -17,3 +18,5 @@ export const contentEditorManifest: UmbBackofficeManifestKind = {
},
},
};

export const manifests = [contentEditorManifest, ...conditionsManifests];
16 changes: 10 additions & 6 deletions src/packages/documents/documents/workspace/manifests.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
import {
UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH,
UMB_USER_PERMISSION_DOCUMENT_UPDATE,
UMB_USER_PERMISSION_DOCUMENT_PUBLISH,
} from '../user-permissions/index.js';
import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
import type {
ManifestWorkspaces,
Expand All @@ -12,6 +6,13 @@ import type {
ManifestWorkspaceView,
ManifestTypes,
} from '@umbraco-cms/backoffice/extension-registry';
import { UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION } from '@umbraco-cms/backoffice/content';
import {
UMB_USER_PERMISSION_DOCUMENT_UNPUBLISH,
UMB_USER_PERMISSION_DOCUMENT_UPDATE,
UMB_USER_PERMISSION_DOCUMENT_PUBLISH,
} from '../user-permissions/index.js';
import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';

export const UMB_DOCUMENT_WORKSPACE_ALIAS = 'Umb.Workspace.Document';

Expand Down Expand Up @@ -63,6 +64,9 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
alias: 'Umb.Condition.WorkspaceAlias',
match: workspace.alias,
},
{
alias: UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
},
],
},
{
Expand Down
4 changes: 4 additions & 0 deletions src/packages/media/media/workspace/manifests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
ManifestTypes,
} from '@umbraco-cms/backoffice/extension-registry';
import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
import { UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION } from '@umbraco-cms/backoffice/content';

const workspace: ManifestWorkspaces = {
type: 'workspace',
Expand Down Expand Up @@ -55,6 +56,9 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
alias: 'Umb.Condition.WorkspaceAlias',
match: workspace.alias,
},
{
alias: UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
},
],
},
{
Expand Down
4 changes: 4 additions & 0 deletions src/packages/members/member/workspace/manifests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
ManifestWorkspaceView,
ManifestTypes,
} from '@umbraco-cms/backoffice/extension-registry';
import { UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION } from '@umbraco-cms/backoffice/content';

export const UMB_MEMBER_WORKSPACE_ALIAS = 'Umb.Workspace.Member';

Expand Down Expand Up @@ -58,6 +59,9 @@ export const workspaceViews: Array<ManifestWorkspaceView> = [
alias: 'Umb.Condition.WorkspaceAlias',
match: UMB_MEMBER_WORKSPACE_ALIAS,
},
{
alias: UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
},
],
},
{
Expand Down
Loading