Skip to content

Commit 046b805

Browse files
nielslyngsoenielslyngsoe
committed
Merge branch 'v15/dev' into v15/feature/emm-section-conditions
# Conflicts: # src/packages/core/extension-registry/conditions/types.ts # src/packages/core/section/conditions/section-user-permission.condition.ts # src/packages/core/section/conditions/types.ts # src/packages/core/section/index.ts # src/packages/core/section/manifests.ts # src/packages/core/section/types.ts
2 parents 07e45ef + 9beeaa4 commit 046b805

File tree

17 files changed

+42
-58
lines changed

17 files changed

+42
-58
lines changed

‎src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { UMB_BLOCK_ENTRY_CONTEXT } from '../context/block-entry.context-token.js';
2-
import type { BlockEntryShowContentEditConditionConfig } from '@umbraco-cms/backoffice/extension-registry';
2+
import type { BlockEntryShowContentEditConditionConfig } from './types.js';
33
import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
44
import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
55
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';

‎src/packages/block/block/conditions/block-workspace-has-settings.condition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js';
2+
import type { BlockWorkspaceHasSettingsConditionConfig } from './types.js';
23
import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
3-
import type { BlockWorkspaceHasSettingsConditionConfig } from '@umbraco-cms/backoffice/extension-registry';
44
import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
55
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
66

‎src/packages/core/extension-registry/conditions/index.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
export { UmbSwitchCondition } from './switch.condition.js';
22
export { UmbConditionBase } from './condition-base.controller.js';
33

4-
export type {
5-
BlockEntryShowContentEditConditionConfig,
6-
BlockWorkspaceHasSettingsConditionConfig,
7-
ConditionTypes,
8-
} from './types.js';
4+
export type { ConditionTypes } from './types.js';

‎src/packages/core/extension-registry/conditions/types.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
import type { CollectionAliasConditionConfig } from '../../collection/collection-alias.manifest.js';
22
import type { CollectionBulkActionPermissionConditionConfig } from '../../collection/collection-bulk-action-permission.manifest.js';
3-
import type { UmbSectionUserPermissionConditionConfig } from '../../section/conditions/index.js';
43
import type { SwitchConditionConfig } from './switch.condition.js';
54
import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-languages.condition.js';
65
import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
7-
import type { UmbDocumentUserPermissionConditionConfig } from '@umbraco-cms/backoffice/document';
8-
9-
// temp location to avoid circular dependencies
10-
export type BlockWorkspaceHasSettingsConditionConfig =
11-
UmbConditionConfigBase<'Umb.Condition.BlockWorkspaceHasSettings'>;
12-
13-
export type BlockEntryShowContentEditConditionConfig =
14-
UmbConditionConfigBase<'Umb.Condition.BlockEntryShowContentEdit'>;
156

167
export type ConditionTypes =
17-
| BlockEntryShowContentEditConditionConfig
18-
| BlockWorkspaceHasSettingsConditionConfig
198
| CollectionAliasConditionConfig
209
| CollectionBulkActionPermissionConditionConfig
2110
| SwitchConditionConfig
22-
| UmbConditionConfigBase
23-
| UmbDocumentUserPermissionConditionConfig
2411
| UmbMultipleAppLanguageConditionConfig
25-
| UmbSectionUserPermissionConditionConfig;
12+
| UmbConditionConfigBase;
2613

2714
type UnionOfProperties<T> = T extends object ? T[keyof T] : never;
2815

‎src/packages/core/section/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ export * from './section-sidebar-menu-with-entity-actions/index.js';
88
export * from './section-sidebar-menu/index.js';
99
export * from './section-sidebar/index.js';
1010
export * from './section.context.js';
11-
export * from './types.js';
11+
export type * from './types.js';

‎src/packages/core/section/manifests.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { manifests as sectionUserPermissionConditionManifests } from './conditions/manifests.js';
22
import { manifests as repositoryManifests } from './repository/manifests.js';
3-
import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
43

5-
export const manifests: Array<ManifestTypes> = [
4+
export const manifests: Array<UmbExtensionManifest> = [
65
{
76
type: 'modal',
87
alias: 'Umb.Modal.SectionPicker',

‎src/packages/core/section/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from './conditions/types.js';
1+
export type * from './conditions/types.js';

‎src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
88
import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
99
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
1010
import { UMB_SECTION_CONTEXT, UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section';
11-
import type { UmbSectionContext, UmbSectionSidebarContext } from '@umbraco-cms/backoffice/section';
1211
import type { ManifestTreeItem } from '@umbraco-cms/backoffice/extension-registry';
1312
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
14-
import { UMB_ACTION_EVENT_CONTEXT, type UmbActionEventContext } from '@umbraco-cms/backoffice/action';
13+
import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
1514
import {
1615
UmbRequestReloadChildrenOfEntityEvent,
1716
UmbRequestReloadStructureForEntityEvent,
@@ -69,9 +68,9 @@ export abstract class UmbTreeItemContextBase<
6968
readonly foldersOnly = this.#foldersOnly.asObservable();
7069

7170
treeContext?: UmbDefaultTreeContext<TreeItemType, TreeRootType>;
72-
#sectionContext?: UmbSectionContext;
73-
#sectionSidebarContext?: UmbSectionSidebarContext;
74-
#actionEventContext?: UmbActionEventContext;
71+
#sectionContext?: typeof UMB_SECTION_CONTEXT.TYPE;
72+
#sectionSidebarContext?: typeof UMB_SECTION_SIDEBAR_CONTEXT.TYPE;
73+
#actionEventContext?: typeof UMB_ACTION_EVENT_CONTEXT.TYPE;
7574

7675
// TODO: get this from the tree context
7776
#paging = {

‎src/packages/documents/documents/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { UmbVariantModel, UmbVariantOptionModel, UmbVariantPublishModel } f
33
import type { UmbReferenceByUnique } from '@umbraco-cms/backoffice/models';
44
import { DocumentVariantStateModel as UmbDocumentVariantState } from '@umbraco-cms/backoffice/external/backend-api';
55
export { UmbDocumentVariantState };
6-
export type { UmbDocumentUserPermissionConditionConfig } from './user-permissions/condition/document-user-permission.condition.js';
76

87
export interface UmbDocumentDetailModel {
98
documentType: {

‎src/packages/documents/documents/user-permissions/condition/document-user-permission.condition.ts renamed to ‎src/packages/documents/documents/user-permissions/conditions/document-user-permission.condition.ts

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { isDocumentUserPermission } from '../utils.js';
2+
import type { UmbDocumentUserPermissionConditionConfig } from './types.js';
23
import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
34
import { UMB_ENTITY_CONTEXT } from '@umbraco-cms/backoffice/entity';
45
import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
56
import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
6-
import type {
7-
UmbConditionConfigBase,
8-
UmbConditionControllerArguments,
9-
UmbExtensionCondition,
10-
} from '@umbraco-cms/backoffice/extension-api';
7+
import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
118
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
129
import type { DocumentPermissionPresentationModel } from '@umbraco-cms/backoffice/external/backend-api';
1310

@@ -109,21 +106,4 @@ export class UmbDocumentUserPermissionCondition
109106
}
110107
}
111108

112-
export type UmbDocumentUserPermissionConditionConfig =
113-
UmbConditionConfigBase<'Umb.Condition.UserPermission.Document'> & {
114-
/**
115-
* The user must have all of the permissions in this array for the condition to be met.
116-
* @example
117-
* ["Umb.Document.Save", "Umb.Document.Publish"]
118-
*/
119-
allOf?: Array<string>;
120-
121-
/**
122-
* The user must have at least one of the permissions in this array for the condition to be met.
123-
* @example
124-
* ["Umb.Document.Save", "Umb.Document.Publish"]
125-
*/
126-
oneOf?: Array<string>;
127-
};
128-
129109
export { UmbDocumentUserPermissionCondition as api };

0 commit comments

Comments
 (0)