@acorex/modules 21.0.0-next.88 → 21.0.0-next.90

package/types/acorex-modules-task-management.d.ts

@@ -4,8 +4,10 @@ import * as i1 from '@angular/common';
 import * as i3 from '@acorex/modules/calendar-management';
 import * as i4 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetColumnNode, AXPWidgetNode, AXPLayoutBaseWidgetComponent, AXPWidgetConfig } from '@acorex/platform/layout/widget-core';
+import * as i2 from '@acorex/platform/runtime';
 import { AXPEntity, AXPEntityModel } from '@acorex/platform/layout/entity-contracts';
-import { AXPMultiSourceRef, AXPUserReference, AXPExecuteCommand, AXPExecuteCommandResult, AXPDefinitionCategory } from '@acorex/platform/contracts';
+import { AXPEntityReference, AXPMultiSourceRef, AXPCategoryListItem, AXPUserReference, AXPExecuteCommand, AXPExecuteCommandResult, AXPDefinitionCategory } from '@acorex/platform/contracts';
+import { AXMMetaDataBuilderValue } from '@acorex/modules/data-management/contracts';
 import { AXPEntity as AXPEntity$1, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult, AXPSettingDefinitionProvider, AXPSettingDefinitionProviderContext, AXPSettingsService } from '@acorex/platform/common';
 import { AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
 import { AXMSecurityManagementUsersEntityModel } from '@acorex/modules/security-management';
@@ -26,12 +28,27 @@ declare class AXPTaskBoardModule {
     static ɵinj: _angular_core.ɵɵInjectorDeclaration<AXPTaskBoardModule>;
 }
 
+declare class AXMTaskFeatureModule {
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<AXMTaskFeatureModule, never>;
+    static ɵmod: _angular_core.ɵɵNgModuleDeclaration<AXMTaskFeatureModule, never, [typeof i1.CommonModule, typeof i2.AXPRuntimeModule], never>;
+    static ɵinj: _angular_core.ɵɵInjectorDeclaration<AXMTaskFeatureModule>;
+}
+
 declare class AXMTaskManagementModule {
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<AXMTaskManagementModule, never>;
-    static ɵmod: _angular_core.ɵɵNgModuleDeclaration<AXMTaskManagementModule, never, [typeof i1.CommonModule, typeof AXPTaskBoardModule, typeof i3.AXMCalendarManagementModule, typeof i4.AXPWidgetCoreModule], never>;
+    static ɵmod: _angular_core.ɵɵNgModuleDeclaration<AXMTaskManagementModule, never, [typeof i1.CommonModule, typeof AXPTaskBoardModule, typeof i3.AXMCalendarManagementModule, typeof i4.AXPWidgetCoreModule, typeof AXMTaskFeatureModule], never>;
     static ɵinj: _angular_core.ɵɵInjectorDeclaration<AXMTaskManagementModule>;
 }
 
+/** Catalog scope for task-management–scoped workflow definitions and related catalogs. */
+declare const TASK_MANAGEMENT_CATALOG_SCOPE_TASKS = "task-management.tasks";
+
+declare const AXPTaskManagementCommandKeys: {
+    readonly Task: {
+        readonly StartFlow: "TaskManagement.Task:StartFlow";
+    };
+};
+
 /** Task Management datasource registry names. */
 declare const AXMTaskManagementDataSourceKeys: {
     readonly TaskTypes: "task-types";
@@ -80,6 +97,11 @@ declare enum AXMTaskBoardSettings {
     SelectedTaskTypeNames = "taskboard.filter.selectedTaskTypeNames"
 }
 
+/** Canonical {@link AXPEntityReference.type} values for common task subjects. */
+declare const AXPTaskManagementSubjectTypes: {
+    readonly Project: "ProjectManagement.Project";
+};
+
 declare const RootConfig: {
     config: {
         readonly i18n: "task-management";
@@ -97,6 +119,12 @@ declare const RootConfig: {
             titlePlural: string;
             icon: string;
         };
+        taskTypeCategory: {
+            name: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
         taskStatus: {
             name: string;
             title: string;
@@ -169,11 +197,11 @@ interface AXMTaskManagementTaskEntityModel extends AXPEntityModel<string> {
     order: number;
     tags?: string[];
     isArchived: boolean;
-    contextType?: string;
-    contextId?: string;
+    /** Primary business subject (project, meeting, etc.). */
+    subjectRef?: AXPEntityReference;
     parentTaskId?: string;
     formTemplateId?: string;
-    dynamicFields?: Record<string, any>;
+    dynamicFields?: Record<string, unknown>;
 }
 
 declare function taskAssignmentFactory(): Promise<AXPEntity | null>;
@@ -264,21 +292,33 @@ interface AXMTaskManagementTaskTemplateEntityModel extends AXPEntityModel<string
 
 declare function taskTypeFactory(): Promise<AXPEntity | null>;
 
+/** Workflow template binding and admin-configured default inputs for task types. */
+interface AXMTaskManagementTaskTypeWorkflowConfig {
+    workflowDefinitionId: string;
+    workflowName: string;
+    defaultInput?: Record<string, unknown>;
+}
 interface AXMTaskManagementTaskTypeEntityModel extends AXPEntityModel<string> {
-    name: string;
     title: string;
     description?: string;
     icon?: string;
     color?: string;
     isActive: boolean;
-    allowedContextTypes?: string[];
-    formTemplateId?: string;
-    defaultStatusId?: string;
+    workflowConfig?: AXMTaskManagementTaskTypeWorkflowConfig | null;
+    metaDataList?: AXMMetaDataBuilderValue;
+    categoryIds?: string[];
+    categories?: AXPCategoryListItem[];
     hasChecklist: boolean;
     hasTimeTracking: boolean;
     hasAttachments: boolean;
     hasDependencies: boolean;
     hasSubtasks: boolean;
+    documentTypeIds?: string[];
+    documentTypes?: Array<{
+        id: string;
+        name?: string;
+        title?: string;
+    }>;
 }
 
 declare function timeLogFactory(): Promise<AXPEntity | null>;
@@ -470,6 +510,10 @@ interface AXPTaskFilter {
     take?: number;
     priorities?: Array<AXPTaskPriority | 'no_priority'>;
     dueStatusKeys?: AXPTaskDueStatusFilterKey[];
+    /** Filter by {@link AXPEntityReference.type} entity sources (e.g. `ProjectManagement.Project`). */
+    subjectRefTypes?: string[];
+    /** Filter by {@link AXPEntityReference.id} values. */
+    subjectRefIds?: string[];
 }
 /**
  * Represents an action performed on a task.
@@ -492,15 +536,22 @@ interface AXPResource extends AXSchedulerResource {
     title: string;
     description?: string;
 }
+/** Resolved task-board provider metadata for filters, datasources, and display. */
+interface AXPTaskBoardTaskTypeOption {
+    name: string;
+    title: string;
+    icon: string;
+}
 /**
  * An abstract class for a workflow task provider, which is responsible for
  * fetching and manipulating task data from a specific source.
  * @template T - The type of custom data associated with the tasks.
  */
 declare abstract class AXPWorkflowTaskProvider<T = Record<string, any>> {
+    /** Stable provider key used for filtering, events, and task.provider. */
     abstract get name(): string;
-    abstract get title(): string;
-    abstract get icon(): string;
+    abstract getTitle(): Promise<string>;
+    abstract getIcon(): Promise<string>;
     private readonly eventService;
     /**
      * Retrieves a list of tasks based on the provided filter options.
@@ -699,6 +750,8 @@ declare class AXPTaskBoardService {
     private readonly eventService;
     /** Cached resolved providers; set after first call to resolveProviders(). */
     private resolvedProviders;
+    /** Cached resolved provider metadata; set together with {@link resolvedProviders}. */
+    private resolvedTaskTypeOptions;
     refresh$: Subject<{
         provider?: string;
     }>;
@@ -736,10 +789,17 @@ declare class AXPTaskBoardService {
      * Resolves workflow task providers. Uses the optional workflow resolver when registered so discovery
      * can be re-run after workflow definitions become available (first app load before mock seed).
      */
-    resolveProviders(): Promise<AXPWorkflowTaskProvider[]>;
+    resolveProviders(options?: AXPWorkflowTaskProviderResolveOptions): Promise<AXPWorkflowTaskProvider[]>;
+    private resolveTaskTypeOptions;
     private getInjectedProviderEntries;
     private flattenProviderEntries;
-    getTaskTypes(): Promise<AXPWorkflowTaskProvider[]>;
+    getTaskTypes(options?: AXPWorkflowTaskProviderResolveOptions): Promise<AXPWorkflowTaskProvider[]>;
+    /**
+     * Resolved provider metadata for UI filters and datasources.
+     * Call {@link resolveProviders} or {@link getTaskTypes} first.
+     */
+    getTaskTypeOptions(): AXPTaskBoardTaskTypeOption[];
+    getTaskTypeOption(name: string | undefined): AXPTaskBoardTaskTypeOption | null;
     getTasks(options?: AXPTaskFilter): Promise<{
         items: AXPTask[];
         total: number;
@@ -901,6 +961,31 @@ declare class AXMTaskBoardTaskPopoverShellComponent {
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<AXMTaskBoardTaskPopoverShellComponent, "axm-task-board-task-popover-shell", never, { "task": { "alias": "task"; "required": true; "isSignal": true; }; "bodyComponent": { "alias": "bodyComponent"; "required": true; "isSignal": true; }; "requestClose": { "alias": "requestClose"; "required": true; "isSignal": true; }; }, {}, never, never, true, never>;
 }
 
+/**
+ * Feeds the platform task board from persisted {@link TaskManagement.Task} rows.
+ */
+declare class AXPTaskManagementEntityTaskProvider extends AXPWorkflowTaskProvider<Record<string, unknown>> {
+    getTitle(): Promise<string>;
+    getIcon(): Promise<string>;
+    private readonly entityService;
+    private readonly calendarService;
+    private readonly dueStatusProviderService;
+    get name(): string;
+    getTasks(options?: AXPTaskFilter): Promise<{
+        items: AXPTask<Record<string, unknown>>[];
+        total: number;
+    }>;
+    updateTasks(tasksToUpdate: AXPTask<Record<string, unknown>>[]): Promise<AXPTask<Record<string, unknown>>[]>;
+    getStatuses(): Promise<AXPTaskStatus[]>;
+    getExtraFields(): Promise<AXPExtraField[]>;
+    executeCommand(command: AXPExecuteCommand): Promise<AXPExecuteCommandResult>;
+    getActions(task?: AXPTask<Record<string, unknown>>): Promise<AXPActionMenuItem[]>;
+    private mapRowToTask;
+    private mapPriority;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<AXPTaskManagementEntityTaskProvider, never>;
+    static ɵprov: _angular_core.ɵɵInjectableDeclaration<AXPTaskManagementEntityTaskProvider>;
+}
+
 type TaskPriority = NonNullable<AXPTask['priority']>;
 type PriorityFilterKey = TaskPriority | 'no_priority';
 type Priority = {
@@ -1022,5 +1107,5 @@ declare const AXP_TASK_MANAGEMENT_DASHBOARD_WIDGET_CATEGORY: AXPDefinitionCatego
 declare const AXP_TASK_MANAGEMENT_DASHBOARD_SUB_SHORTCUT: AXPDefinitionCategory;
 declare const AXP_TASK_MANAGEMENT_DASHBOARD_SUB_BOARD: AXPDefinitionCategory;
 
-export { AXMDefaultDueStatusProvider, AXMPermissionsKeys, AXMSearchCommandProvider, AXMSettingProvider, AXMTaskBoardDefaultTaskPopoverComponent, AXMTaskBoardSettings, AXMTaskBoardTaskPopoverOverlayService, AXMTaskBoardTaskPopoverShellComponent, AXMTaskManagementDataSourceKeys, AXMTaskManagementEntityProvider, AXMTaskManagementMenuProvider, AXMTaskManagementModule, AXM_TASK_BOARD_UNASSIGNED_ASSIGNEE_ID, AXM_TASK_VIEW_ALL_PERMISSION, AXPDueStatusProvider, AXPDueStatusProviderService, AXPTASK_PRIORITIES, AXPTaskBoardModule, AXPTaskBoardService, AXPTaskBoardShortcut, AXPTaskBoardShortcutViewComponent, AXPTaskBoardWidget, AXPTaskBoardWidgetViewComponent, AXPTaskManagementMenuKeys, AXPTaskPopoverComponent, AXPTaskTypeDataSourceDefinition, AXPWorkflowTaskProvider, AXP_DUE_STATUS_PROVIDERS, AXP_TASK_MANAGEMENT_DASHBOARD_SUB_BOARD, AXP_TASK_MANAGEMENT_DASHBOARD_SUB_SHORTCUT, AXP_TASK_MANAGEMENT_DASHBOARD_WIDGET_CATEGORY, AXP_WORKFLOW_TASK_PROVIDER, AXP_WORKFLOW_TASK_PROVIDER_RESOLVER, RootConfig, TASK_BOARD_GRID_ROW_ACTION_COLUMN_WIDTH, TASK_BOARD_GRID_ROW_ACTION_ITEMS, TASK_BOARD_GRID_ROW_VIEW_ACTION, TASK_PRIORITY_ORDER, buildTaskAccentCssClass, buildTaskAccentSurfaceCssClass, buildTaskSurfaceCssClass, canViewAllTaskAssignees, enrichTaskBoardTasks, filterTasksOverlappingRange, formatTaskI18nParamsForTranslate, getDefaultDueStatusDefinitions, getTaskDueStatusKey, getTaskPriorityColor, getTaskPriorityFilterKey, getTaskTranslationKey, hasTaskBoardSavedAssigneePreference, isTaskBoardUnassignedAssigneeId, mapEntityStatusColorForBadge, matchesTaskBoardAssigneeFilter, matchesTaskBoardAssigneeUserIdsFilter, matchesTaskDueStatusFilter, matchesTaskPriorityFilter, normalizePriorityFilterKey, normalizePriorityFilterKeys, normalizeTaskBoardAssigneeIds, normalizeTaskPriority, resolveDefaultTaskStatusColor, resolveDueStatusFromDefinitions, resolveTaskBoardAccentColor, resolveTaskBoardCalendarPlacement, resolveTaskBoardCurrentUserAssigneeItem, resolveTaskBoardSavedAssigneeIds, resolveTaskBoardSchedulerLabels, resolveTaskBoardSchedulingRange, resolveTaskBoardStatusColor, resolveTaskPopoverComponent, taskAssignmentFactory, taskChecklistItemFactory, taskContextFactory, taskDependencyFactory, taskFactory, taskOverlapsFilterRange, taskStatusFactory, taskTemplateFactory, taskTypeFactory, timeLogFactory };
-export type { AXMOpenTaskPopoverOverlayOptions, AXMTaskManagementTaskAssignmentEntityModel, AXMTaskManagementTaskChecklistItemEntityModel, AXMTaskManagementTaskContextEntityModel, AXMTaskManagementTaskDependencyEntityModel, AXMTaskManagementTaskEntityModel, AXMTaskManagementTaskStatusEntityModel, AXMTaskManagementTaskTemplateEntityModel, AXMTaskManagementTaskTypeEntityModel, AXMTaskManagementTimeLogEntityModel, AXMTaskPopoverAnchor, AXPDueStatusDefinition, AXPDueStatusEvaluationContext, AXPDueStatusFilterKey, AXPDueStatusKey, AXPDueStatusPresentation, AXPDueStatusResolveOptions, AXPExtraField, AXPPriorityFilterKey, AXPResource, AXPTask, AXPTaskAction, AXPTaskActionMenuItem, AXPTaskBoardColorBy, AXPTaskDueStatusFilterKey, AXPTaskDueStatusPresentation, AXPTaskFilter, AXPTaskPopoverMetadata, AXPTaskPopoverMetadataField, AXPTaskPriority, AXPTaskStatus, AXPWorkflowTaskProviderResolveOptions };
+export { AXMDefaultDueStatusProvider, AXMPermissionsKeys, AXMSearchCommandProvider, AXMSettingProvider, AXMTaskBoardDefaultTaskPopoverComponent, AXMTaskBoardSettings, AXMTaskBoardTaskPopoverOverlayService, AXMTaskBoardTaskPopoverShellComponent, AXMTaskManagementDataSourceKeys, AXMTaskManagementEntityProvider, AXMTaskManagementMenuProvider, AXMTaskManagementModule, AXM_TASK_BOARD_UNASSIGNED_ASSIGNEE_ID, AXM_TASK_VIEW_ALL_PERMISSION, AXPDueStatusProvider, AXPDueStatusProviderService, AXPTASK_PRIORITIES, AXPTaskBoardModule, AXPTaskBoardService, AXPTaskBoardShortcut, AXPTaskBoardShortcutViewComponent, AXPTaskBoardWidget, AXPTaskBoardWidgetViewComponent, AXPTaskManagementCommandKeys, AXPTaskManagementEntityTaskProvider, AXPTaskManagementMenuKeys, AXPTaskManagementSubjectTypes, AXPTaskPopoverComponent, AXPTaskTypeDataSourceDefinition, AXPWorkflowTaskProvider, AXP_DUE_STATUS_PROVIDERS, AXP_TASK_MANAGEMENT_DASHBOARD_SUB_BOARD, AXP_TASK_MANAGEMENT_DASHBOARD_SUB_SHORTCUT, AXP_TASK_MANAGEMENT_DASHBOARD_WIDGET_CATEGORY, AXP_WORKFLOW_TASK_PROVIDER, AXP_WORKFLOW_TASK_PROVIDER_RESOLVER, RootConfig, TASK_BOARD_GRID_ROW_ACTION_COLUMN_WIDTH, TASK_BOARD_GRID_ROW_ACTION_ITEMS, TASK_BOARD_GRID_ROW_VIEW_ACTION, TASK_MANAGEMENT_CATALOG_SCOPE_TASKS, TASK_PRIORITY_ORDER, buildTaskAccentCssClass, buildTaskAccentSurfaceCssClass, buildTaskSurfaceCssClass, canViewAllTaskAssignees, enrichTaskBoardTasks, filterTasksOverlappingRange, formatTaskI18nParamsForTranslate, getDefaultDueStatusDefinitions, getTaskDueStatusKey, getTaskPriorityColor, getTaskPriorityFilterKey, getTaskTranslationKey, hasTaskBoardSavedAssigneePreference, isTaskBoardUnassignedAssigneeId, mapEntityStatusColorForBadge, matchesTaskBoardAssigneeFilter, matchesTaskBoardAssigneeUserIdsFilter, matchesTaskDueStatusFilter, matchesTaskPriorityFilter, normalizePriorityFilterKey, normalizePriorityFilterKeys, normalizeTaskBoardAssigneeIds, normalizeTaskPriority, resolveDefaultTaskStatusColor, resolveDueStatusFromDefinitions, resolveTaskBoardAccentColor, resolveTaskBoardCalendarPlacement, resolveTaskBoardCurrentUserAssigneeItem, resolveTaskBoardSavedAssigneeIds, resolveTaskBoardSchedulerLabels, resolveTaskBoardSchedulingRange, resolveTaskBoardStatusColor, resolveTaskPopoverComponent, taskAssignmentFactory, taskChecklistItemFactory, taskContextFactory, taskDependencyFactory, taskFactory, taskOverlapsFilterRange, taskStatusFactory, taskTemplateFactory, taskTypeFactory, timeLogFactory };
+export type { AXMOpenTaskPopoverOverlayOptions, AXMTaskManagementTaskAssignmentEntityModel, AXMTaskManagementTaskChecklistItemEntityModel, AXMTaskManagementTaskContextEntityModel, AXMTaskManagementTaskDependencyEntityModel, AXMTaskManagementTaskEntityModel, AXMTaskManagementTaskStatusEntityModel, AXMTaskManagementTaskTemplateEntityModel, AXMTaskManagementTaskTypeEntityModel, AXMTaskManagementTaskTypeWorkflowConfig, AXMTaskManagementTimeLogEntityModel, AXMTaskPopoverAnchor, AXPDueStatusDefinition, AXPDueStatusEvaluationContext, AXPDueStatusFilterKey, AXPDueStatusKey, AXPDueStatusPresentation, AXPDueStatusResolveOptions, AXPExtraField, AXPPriorityFilterKey, AXPResource, AXPTask, AXPTaskAction, AXPTaskActionMenuItem, AXPTaskBoardColorBy, AXPTaskBoardTaskTypeOption, AXPTaskDueStatusFilterKey, AXPTaskDueStatusPresentation, AXPTaskFilter, AXPTaskPopoverMetadata, AXPTaskPopoverMetadataField, AXPTaskPriority, AXPTaskStatus, AXPWorkflowTaskProviderResolveOptions };

package/types/acorex-modules-timesheet-management.d.ts

@@ -196,7 +196,7 @@ interface AXMTimesheetManagementWorkItemEntityModel extends AXPEntityModel<strin
     projectId?: string;
     project?: {
         id: string;
-        projectName?: string;
+        title?: string;
     };
 }
 
@@ -260,7 +260,7 @@ interface AXMTimesheetManagementTimeEntryEntityModel extends AXPEntityModel<stri
     projectId?: string;
     project?: {
         id: string;
-        projectName?: string;
+        title?: string;
     };
     startedAt?: string;
     endedAt?: string;

package/types/acorex-modules-workflow-management.d.ts

@@ -930,8 +930,13 @@ declare class AXPCreateEntityActivity implements AXPCommand<CreateEnityInput, Cr
 interface AXPGenericWorkflowTaskProviderConfig {
     /** Unique provider name (e.g. 'leave-request-workflow-tasks', 'document-review-workflow-tasks'). */
     name: string;
-    /** Display title in task board type selector. */
-    title: string;
+    /**
+     * Original translatable title source (i18n key or MLS).
+     * When set, {@link AXPGenericWorkflowTaskProvider.getTitle} resolves from this on each read.
+     */
+    titleSource?: AXPMultiLanguageString;
+    /** Display title in task board type selector (i18n key, MLS, or plain string). */
+    title: AXPMultiLanguageString;
     /** Optional icon (default: 'fa-light fa-diagram-project'). */
     icon?: string;
     /**
@@ -990,8 +995,8 @@ declare class AXPGenericWorkflowTaskProvider extends AXPWorkflowTaskProvider<Rec
     private readonly entityStatusIdCache;
     constructor(config: AXPGenericWorkflowTaskProviderConfig);
     get name(): string;
-    get title(): string;
-    get icon(): string;
+    getTitle(): Promise<string>;
+    getIcon(): Promise<string>;
     /** Bookmark types shown on the workflow task board. */
     private isTaskBoardBookmarkPayload;
     /** Pooled task: must be claimed before submit/cancel (cartable, or human-task with candidates only). */

package/types/acorex-modules-workplacesafety-management.d.ts

@@ -1,13 +1,14 @@
 import * as i0 from '@angular/core';
+import * as i1 from '@acorex/platform/layout/widget-core';
 import { AXPEntity, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult } from '@acorex/platform/common';
 import { AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
 import { AXPEntity as AXPEntity$1, AXPEntityModel } from '@acorex/platform/layout/entity-contracts';
-import { AXPMultiLanguageString, AXPSystemStatusType, AXPCategoryListItem } from '@acorex/platform/contracts';
+import { AXPMultiLanguageString, AXPCategoryListItem, AXPSystemStatusType } from '@acorex/platform/contracts';
 import { AXMMetaDataBuilderValue } from '@acorex/modules/data-management/contracts';
 
 declare class AXMWorkplaceSafetyManagementModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMWorkplaceSafetyManagementModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMWorkplaceSafetyManagementModule, never, never, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMWorkplaceSafetyManagementModule, never, [typeof i1.AXPWidgetCoreModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AXMWorkplaceSafetyManagementModule>;
 }
 
@@ -64,6 +65,13 @@ declare const RootConfig: {
             titlePlural: string;
             icon: string;
         };
+        hazardRiskPpeRule: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
         controlHierarchyLevels: {
             name: string;
             source: string;
@@ -109,6 +117,10 @@ interface AXMWorkplaceSafetyManagementControlHierarchyLevelsEntityModel extends
     description?: AXPMultiLanguageString;
     /** Relative control effectiveness (higher is more effective). */
     effectivenessLevel: number;
+    /** Display color for hierarchy diagram visualizations. */
+    color?: string;
+    categoryIds?: string[];
+    categories?: AXPCategoryListItem[];
     status?: string;
 }
 
@@ -207,36 +219,10 @@ interface AXMWorkplaceSafetyManagementHazardRiskEntityModel extends AXPEntityMod
         title?: string;
         code?: string;
     };
-    responsibleRoleText?: string;
-    legislationText?: string;
-    conditionNote?: string;
-    assessmentInstruction?: string;
-    sortOrder?: number;
     status?: AXPSystemStatusType.Active | AXPSystemStatusType.Inactive;
 }
 
-declare function ppeItemEntityFactory(): Promise<AXPEntity$1 | null>;
-
-interface AXMWorkplaceSafetyManagementPpeItemEntityModel extends AXPEntityModel<string> {
-    code: string;
-    title: AXPMultiLanguageString;
-    description?: AXPMultiLanguageString;
-    categoryIds?: string[];
-    categories?: AXPCategoryListItem[];
-    standardCode?: string;
-    usageNote?: string;
-    icon?: string;
-    status?: string;
-}
-
-declare function riskRatingEntityFactory(): Promise<AXPEntity$1 | null>;
-
-interface AXMWorkplaceSafetyManagementRiskRatingEntityModel extends AXPEntityModel<string> {
-    code: string;
-    title: AXPMultiLanguageString;
-    levelNumber: number;
-    description?: AXPMultiLanguageString;
-}
+declare function hazardRiskPpeRuleEntityFactory(): Promise<AXPEntity$1 | null>;
 
 declare enum AXMHazardPpeRuleRequirementType {
     Required = "required",
@@ -258,18 +244,53 @@ interface AXMWorkplaceSafetyManagementHazardPpeRuleEntityModel extends AXPEntity
         code?: string;
     };
     requirementType: AXMHazardPpeRuleRequirementType;
-    riskRatingIdWithPpe?: string;
-    riskRatingWithPpe?: {
+    conditionNote?: string;
+    usageInstruction?: string;
+    sortOrder?: number;
+    status?: AXPSystemStatusType.Active | AXPSystemStatusType.Inactive;
+}
+
+interface AXMWorkplaceSafetyManagementHazardRiskPpeRuleEntityModel extends AXPEntityModel<string> {
+    hazardRiskId: string;
+    hazardRisk?: {
+        id: string;
+        title?: string;
+        code?: string;
+    };
+    ppeItemId: string;
+    ppeItem?: {
         id: string;
         title?: string;
         code?: string;
     };
+    requirementType: AXMHazardPpeRuleRequirementType;
     conditionNote?: string;
     usageInstruction?: string;
-    sortOrder?: number;
     status?: AXPSystemStatusType.Active | AXPSystemStatusType.Inactive;
 }
 
+declare function ppeItemEntityFactory(): Promise<AXPEntity$1 | null>;
+
+interface AXMWorkplaceSafetyManagementPpeItemEntityModel extends AXPEntityModel<string> {
+    code: string;
+    title: AXPMultiLanguageString;
+    description?: AXPMultiLanguageString;
+    categoryIds?: string[];
+    categories?: AXPCategoryListItem[];
+    serialNumber?: string;
+    icon?: string;
+    status?: string;
+}
+
+declare function riskRatingEntityFactory(): Promise<AXPEntity$1 | null>;
+
+interface AXMWorkplaceSafetyManagementRiskRatingEntityModel extends AXPEntityModel<string> {
+    code: string;
+    title: AXPMultiLanguageString;
+    levelNumber: number;
+    description?: AXPMultiLanguageString;
+}
+
 declare const WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS: readonly [{
     readonly id: "GHS01";
     readonly title: "GHS01 — Exploding bomb";
@@ -359,6 +380,13 @@ declare const AXMWorkplaceSafetyManagementPermissionKeys: {
             readonly Update: "WorkplaceSafetyManagement:Permission:HazardRisk.Update";
             readonly Delete: "WorkplaceSafetyManagement:Permission:HazardRisk.Delete";
         };
+        readonly HazardRiskPpeRule: {
+            readonly Management: "WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Management";
+            readonly View: "WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.View";
+            readonly Create: "WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Create";
+            readonly Update: "WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Update";
+            readonly Delete: "WorkplaceSafetyManagement:Permission:HazardRiskPpeRule.Delete";
+        };
         readonly ControlHierarchyLevels: {
             readonly Management: "WorkplaceSafetyManagement:Permission:ControlHierarchyLevels.Management";
         };
@@ -388,5 +416,5 @@ declare const RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY = "RiskManagement.RiskMatr
 /** Hazard catalog scope for risk matrix lookup filtering. */
 declare const RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE = "risk-management.hazard";
 
-export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementEntityProvider, AXMWorkplaceSafetyManagementMenuProvider, AXMWorkplaceSafetyManagementModule, AXMWorkplaceSafetyManagementPermissionKeys, AXMWorkplaceSafetyManagementSearchCommandProvider, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RootConfig, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, controlHierarchyLevelsEntityFactory, controlMeasureEntityFactory, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, hazardRiskEntityFactory, ppeItemEntityFactory, riskRatingEntityFactory };
-export type { AXMHazardStatus, AXMWorkplaceSafetyManagementControlHierarchyLevelsEntityModel, AXMWorkplaceSafetyManagementControlMeasureEntityModel, AXMWorkplaceSafetyManagementHazardEntityModel, AXMWorkplaceSafetyManagementHazardPpeRuleEntityModel, AXMWorkplaceSafetyManagementHazardRegisterEntityModel, AXMWorkplaceSafetyManagementHazardRiskEntityModel, AXMWorkplaceSafetyManagementPpeItemEntityModel, AXMWorkplaceSafetyManagementRiskRatingEntityModel, WorkplaceSafetyGhsSymbolId };
+export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementEntityProvider, AXMWorkplaceSafetyManagementMenuProvider, AXMWorkplaceSafetyManagementModule, AXMWorkplaceSafetyManagementPermissionKeys, AXMWorkplaceSafetyManagementSearchCommandProvider, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RootConfig, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, controlHierarchyLevelsEntityFactory, controlMeasureEntityFactory, hazardEntityFactory, hazardPpeRuleEntityFactory, hazardRegisterEntityFactory, hazardRiskEntityFactory, hazardRiskPpeRuleEntityFactory, ppeItemEntityFactory, riskRatingEntityFactory };
+export type { AXMHazardStatus, AXMWorkplaceSafetyManagementControlHierarchyLevelsEntityModel, AXMWorkplaceSafetyManagementControlMeasureEntityModel, AXMWorkplaceSafetyManagementHazardEntityModel, AXMWorkplaceSafetyManagementHazardPpeRuleEntityModel, AXMWorkplaceSafetyManagementHazardRegisterEntityModel, AXMWorkplaceSafetyManagementHazardRiskEntityModel, AXMWorkplaceSafetyManagementHazardRiskPpeRuleEntityModel, AXMWorkplaceSafetyManagementPpeItemEntityModel, AXMWorkplaceSafetyManagementRiskRatingEntityModel, WorkplaceSafetyGhsSymbolId };