From 2e949642a4c2bdf396324c0a97c152ea37ab8c5e Mon Sep 17 00:00:00 2001 From: sumeyye Date: Mon, 15 Jun 2026 16:35:12 +0300 Subject: [PATCH] update: feature-management package for the latest upgrade (state management and html properties) --- .../packages/feature-management/project.json | 2 +- .../feature-management.component.html | 224 +++++++++++------- .../feature-management.component.ts | 30 ++- .../directives/free-text-input.directive.ts | 10 +- 4 files changed, 167 insertions(+), 99 deletions(-) diff --git a/npm/ng-packs/packages/feature-management/project.json b/npm/ng-packs/packages/feature-management/project.json index e34c0d6b16..9c40489b41 100644 --- a/npm/ng-packs/packages/feature-management/project.json +++ b/npm/ng-packs/packages/feature-management/project.json @@ -31,7 +31,7 @@ "executor": "@nx/vitest:test", "outputs": ["{options.reportsDirectory}"], "options": { - "reportsDirectory": "../../coverage/packages/feature-management" + "reportsDirectory": "{projectRoot}/../../coverage/packages/feature-management" } } } diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index bd08cbb7b7..4becc1f016 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -1,22 +1,35 @@ @if (visible) { - - -

- {{ 'AbpFeatureManagement::Features' | abpLocalization }} - @if (providerTitle()) { - - {{ providerTitle() }} - } -

- + + +

+ {{ 'AbpFeatureManagement::Features' | abpLocalization }} + @if (providerTitle()) { + - {{ providerTitle() }} + } +

+
@if (groups.length) {
-
+
@for (group of groups; track group.name) { - } @@ -35,76 +48,100 @@

{{ selectedGroupDisplayName }}

- @for (feature of features[group.name]; track feature.id || i; let i = $index) { - @let provider = feature.provider.name; - @let isFeatureDisabled = !feature.parentName ? isParentDisabled(feature.name, group.name, provider) : - (provider !== providerName() && provider !== defaultProviderName); + @for ( + feature of features[group.name]; + track feature.name ?? i; + let i = $index + ) { + @let provider = feature.provider.name; + @let isFeatureDisabled = + !feature.parentName + ? isParentDisabled(feature.name, group.name, provider) + : provider !== providerName() && provider !== defaultProviderName; -
- @switch (feature.valueType?.name) { - @case (valueTypes.ToggleStringValueType) { -
- +
+ @switch (feature.valueType?.name) { + @case (valueTypes.ToggleStringValueType) { +
+ - - + {{ feature.displayName }} + @if (isFeatureDisabled) { + ({{ provider }}) + } + + -
- } - @case (valueTypes.FreeTextStringValueType) { -
- - + " + /> +
+ } + @case (valueTypes.FreeTextStringValueType) { +
+ + - -
- } - @case (valueTypes.SelectionStringValueType) { - @if (feature.valueType.itemSource?.items?.length) { -
- - - +
+ } + @case (valueTypes.SelectionStringValueType) { + @if (getSelectionItems(feature).length) { +
+ + + + />
} } @@ -129,23 +166,32 @@
- - + + - @if (groups.length) { - - } + @if (groups.length) { + + } - @if (groups.length) { - - } - - -} \ No newline at end of file + @if (groups.length) { + + } + + +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts index 0ba6880036..2c15f227d9 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts @@ -29,6 +29,26 @@ enum ValueTypes { const DEFAULT_PROVIDER_NAME = 'D'; +/** + * FeatureDto.ValueType is typed as IStringValueType in Application.Contracts, but the API + * serializes concrete value types at runtime (e.g. SelectionStringValueType includes itemSource). + * generate-proxy only reflects the interface contract, so keep runtime-only shapes here — not in proxy/. + * See: modules/feature-management (FeatureDto, StringValueTypeJsonConverter) and Blazor/MVC cast pattern. + */ +type FeatureWithStyle = FeatureDto & { + style?: Record; + initialValue: unknown; +}; + +type SelectionStringValueType = FeatureDto['valueType'] & { + itemSource?: { + items?: Array<{ + value?: string; + displayText?: { resourceName?: string; name?: string }; + }>; + }; +}; + @Component({ selector: 'abp-feature-management', templateUrl: './feature-management.component.html', @@ -73,7 +93,7 @@ export class FeatureManagementComponent { groups: Pick[] = []; features: { - [group: string]: Array; + [group: string]: FeatureWithStyle[]; }; valueTypes = ValueTypes; @@ -194,6 +214,14 @@ export class FeatureManagementComponent { } } + getSelectionItems(feature: FeatureWithStyle) { + if (feature.valueType?.name !== ValueTypes.SelectionStringValueType) { + return []; + } + + return (feature.valueType as SelectionStringValueType).itemSource?.items ?? []; + } + isParentDisabled(parentName: string, groupName: string, provider: string): boolean { const children = this.features[groupName]?.filter(f => f.parentName === parentName); const providerNameValue = this.providerName(); diff --git a/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts b/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts index b341879995..0b1bb7e8c9 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts @@ -1,13 +1,7 @@ import { Directive, effect, inject, input, ElementRef, Renderer2 } from '@angular/core'; +import type { FeatureDto } from '@abp/ng.feature-management/proxy'; -// TODO: improve this type -export interface FreeTextType { - valueType: { - validator: { - name: string; - }; - }; -} +export type FreeTextType = Pick; export const INPUT_TYPES: Record = { numeric: 'number',