{
map(([value, options]) => searchOptions(options, value)),
shareReplay({ refCount: true, bufferSize: 1 }),
);
+
+ override ngOnInit(): void {
+ super.ngOnInit();
+ getValueChanges(this.control)
+ .pipe(takeUntilDestroyed(this.dr))
+ .subscribe((value) => {
+ this.searchChange.emit(String(value));
+ });
+ }
+
+ protected override innerToOuterValue(inner: T): T {
+ if (this.type === 'text') return inner;
+ const res = Number(inner);
+ if (isNaN(res)) return undefined;
+ return res as T;
+ }
}
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.html b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.html
index 3fdcfd087..60f15aec6 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.html
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.html
@@ -37,29 +37,17 @@
} @else {
@let extensionResult = extensionResult$ | async;
-
- @if (extensionResult?.search) {
-
- } @else {
-
- }
+
@if (generate$ | async) {
}
- @if (options?.length) {
+ @if (options()?.length) {
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
index f02a6f22f..b5e55a6db 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
@@ -26,6 +26,7 @@ import {
Option,
SelectFieldModule,
createControlProviders,
+ getPossiblyAsyncValue,
getValueChanges,
} from '@vality/matez';
import { ThriftType } from '@vality/thrift-ts';
@@ -91,23 +92,25 @@ export class PrimitiveFieldComponent extends FormControlSuperclass impleme
label: o.label || `#${o.value}`,
value: o.value as never,
description: String(o.value),
+ details: o.details,
}),
),
);
}),
shareReplay({ refCount: true, bufferSize: 1 }),
);
- selectedExtensionOption$ = combineLatest([
- this.extensionResult$,
- getValueChanges(this.control),
- ]).pipe(
- map(([result]) => result?.options?.find?.((o) => o.value === this.control.value)),
+ selectedExtensionOption$ = combineLatest([this.options$, getValueChanges(this.control)]).pipe(
+ map(([options, selected]) => options?.find?.((o) => o.value === selected)),
shareReplay({ refCount: true, bufferSize: 1 }),
);
selectedOption$ = combineLatest([this.options$, getValueChanges(this.control)]).pipe(
map(([options]) => options.find((o) => o.value === this.control.value)),
shareReplay({ refCount: true, bufferSize: 1 }),
);
+ selectedOptionDetails$ = this.selectedOption$.pipe(
+ switchMap((option) => getPossiblyAsyncValue(option.details)),
+ shareReplay({ refCount: true, bufferSize: 1 }),
+ );
selectedHint$ = combineLatest([this.selectedOption$, toObservable(this.data)]).pipe(
map(([selectedOption, data]) => {
if (!selectedOption) {
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts b/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
index 4f1896eeb..09e3ee9cf 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
@@ -5,7 +5,7 @@ import { TemplateRef } from '@angular/core';
import { ValidatorFn } from '@angular/forms';
import { ThemePalette } from '@angular/material/core';
-import { Option } from '@vality/matez';
+import { Option, PossiblyAsync } from '@vality/matez';
import { ThriftData } from '../../../models';
@@ -36,7 +36,7 @@ export interface ThriftFormExtensionResult {
export interface ThriftFormExtensionOption {
value: unknown;
label?: string;
- details?: string | object;
+ details?: PossiblyAsync;
color?: ThemePalette;
}
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
index 8bcd320b0..36ded4598 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
@@ -192,6 +192,9 @@ export class DomainMetadataFormExtensionsService {
value: getReferenceId(obj.ref),
label: obj.name,
description: obj.description,
+ details: this.domainService
+ .get(obj.ref, obj.info.version)
+ .pipe(map((o) => o.object)),
})),
})),
),
From 422c44e9e99e8a44fe0889ea018d7425d9dabb0c Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Wed, 22 Jul 2026 23:05:41 +0800
Subject: [PATCH 12/14] refactor: replace custom thrift option types with
unified Matez Option interface and enhance domain object details and
retrieval logic
---
.../select-autocomplete/types/option.ts | 8 ++--
.../observable-resource.ts | 6 +++
.../primitive-field.component.ts | 8 +++-
.../src/lib/components/thrift-editor/index.ts | 1 -
.../types/thrift-form-extension.ts | 12 +----
...domain-metadata-form-extensions.service.ts | 43 +++++++++++++-----
.../utils/create-domain-object-extension.ts | 10 ++---
.../utils/get-domain-object-option.ts | 44 ++++++++++++++-----
.../domain/utils/get-domain-object-details.ts | 12 ++++-
9 files changed, 99 insertions(+), 45 deletions(-)
diff --git a/projects/matez/src/lib/components/select-autocomplete/types/option.ts b/projects/matez/src/lib/components/select-autocomplete/types/option.ts
index fde540b24..55366f539 100644
--- a/projects/matez/src/lib/components/select-autocomplete/types/option.ts
+++ b/projects/matez/src/lib/components/select-autocomplete/types/option.ts
@@ -1,9 +1,11 @@
-import { PossiblyAsync } from '@vality/matez';
+import { ThemePalette } from '../../../styles';
+import { PossiblyAsync } from '../../../utils';
-export interface Option {
+export interface Option {
value: T;
- label: string;
+ label?: string;
description?: string;
type?: unknown;
details?: PossiblyAsync;
+ color?: ThemePalette;
}
diff --git a/projects/matez/src/lib/utils/observable-resource/observable-resource.ts b/projects/matez/src/lib/utils/observable-resource/observable-resource.ts
index 4c9b1de4f..439dc13ee 100644
--- a/projects/matez/src/lib/utils/observable-resource/observable-resource.ts
+++ b/projects/matez/src/lib/utils/observable-resource/observable-resource.ts
@@ -159,6 +159,12 @@ export class ObservableResource<
value: toSignal(value$, { injector: this.injector }),
map: (fn: (value: TResult) => PossiblyAsync) =>
this.map(fn, value$ as never),
+ getFirstValue: () =>
+ combineLatest([value$, this.isLoading$]).pipe(
+ skipWhile(([_, isLoading]) => isLoading),
+ map(([value]) => value),
+ take(1),
+ ),
}) as never;
}
}
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
index b5e55a6db..e72d1a231 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
@@ -6,11 +6,13 @@ import {
ChangeDetectionStrategy,
Component,
DestroyRef,
+ Injector,
OnInit,
computed,
inject,
input,
model,
+ runInInjectionContext,
signal,
} from '@angular/core';
import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
@@ -62,6 +64,8 @@ import {
})
export class PrimitiveFieldComponent extends FormControlSuperclass implements OnInit {
private destroyRef = inject(DestroyRef);
+ private injector = inject(Injector);
+
data = input.required>();
extensions = input();
@@ -153,7 +157,9 @@ export class PrimitiveFieldComponent extends FormControlSuperclass impleme
generate(event: MouseEvent) {
this.generate$
.pipe(
- switchMap((generate) => generate(this.control.value)),
+ switchMap((generate) =>
+ runInInjectionContext(this.injector, () => generate(this.control.value)),
+ ),
takeUntilDestroyed(this.destroyRef),
)
.subscribe((value) => this.control.setValue(value as T));
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/index.ts b/projects/ng-thrift/src/lib/components/thrift-editor/index.ts
index ce3cddca4..7f9ec4a6f 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/index.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/index.ts
@@ -3,4 +3,3 @@ export * from './thrift-editor.module';
export * from './thrift-editor.component';
export { type ThriftFormExtension } from './types/thrift-form-extension';
export { type ThriftFormExtensionResult } from './types/thrift-form-extension';
-export { type ThriftFormExtensionOption } from './types/thrift-form-extension';
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts b/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
index 09e3ee9cf..9cb97d701 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/types/thrift-form-extension.ts
@@ -3,9 +3,8 @@ import { map } from 'rxjs/operators';
import { TemplateRef } from '@angular/core';
import { ValidatorFn } from '@angular/forms';
-import { ThemePalette } from '@angular/material/core';
-import { Option, PossiblyAsync } from '@vality/matez';
+import { Option } from '@vality/matez';
import { ThriftData } from '../../../models';
@@ -21,7 +20,7 @@ export interface Converter {
export interface ThriftFormExtensionResult {
/** @deprecated use search instead */
- options?: ThriftFormExtensionOption[];
+ options?: Option[];
search?: (searchStr: string) => Observable<{ result: Option[] }>;
generate?: (value: T) => Observable;
isIdentifier?: boolean;
@@ -33,13 +32,6 @@ export interface ThriftFormExtensionResult {
template?: TemplateRef;
}
-export interface ThriftFormExtensionOption {
- value: unknown;
- label?: string;
- details?: PossiblyAsync;
- color?: ThemePalette;
-}
-
export function getExtensionsResult(
sourceExtensions: ThriftFormExtension[] = [],
data: ThriftData,
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
index 36ded4598..5ecbf5d48 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
@@ -3,7 +3,7 @@ import { map, shareReplay } from 'rxjs/operators';
import { generate } from 'short-uuid';
import { v4 } from 'uuid';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, Injector, inject, runInInjectionContext } from '@angular/core';
import { Validators } from '@angular/forms';
import { ThriftAstMetadata, metadata$ } from '@vality/domain-proto';
@@ -15,6 +15,7 @@ import { ThriftData, ThriftFormExtension, isTypeWithAliases } from '@vality/ng-t
import { DomainObjectsStoreService, DomainService } from '~/api/domain-config';
import { AuthorStoreService } from '~/api/domain-config/stores/author-store.service';
import { ThriftRepositoryService } from '~/api/services';
+import { createNextId } from '~/utils';
import { getReferenceId } from '../../utils';
@@ -22,7 +23,7 @@ import {
createDomainObjectExtensions,
isDomainObject,
} from './utils/create-domain-object-extension';
-import { getFullDomainObjectOption } from './utils/get-domain-object-option';
+import { getDomainObjectOption, getFullDomainObjectOption } from './utils/get-domain-object-option';
@Injectable({
providedIn: 'root',
@@ -32,6 +33,7 @@ export class DomainMetadataFormExtensionsService {
private domainService = inject(DomainService);
private authorStoreService = inject(AuthorStoreService);
private repositoryService = inject(ThriftRepositoryService);
+ private injector = inject(Injector);
extensions$: Observable = metadata$.pipe(
map((metadata): ThriftFormExtension[] => [
@@ -177,7 +179,7 @@ export class DomainMetadataFormExtensionsService {
return [
{
determinant: (data) => of(isDomainObject(data, refType)),
- extension: () =>
+ extension: (data) =>
of({
search: (searchStr) =>
this.repositoryService
@@ -188,16 +190,35 @@ export class DomainMetadataFormExtensionsService {
})
.pipe(
map(({ result }) => ({
- result: result.map((obj) => ({
- value: getReferenceId(obj.ref),
- label: obj.name,
- description: obj.description,
- details: this.domainService
- .get(obj.ref, obj.info.version)
- .pipe(map((o) => o.object)),
- })),
+ result: result.map((obj) =>
+ runInInjectionContext(this.injector, () =>
+ getDomainObjectOption(obj),
+ ),
+ ),
})),
),
+ isIdentifier: true,
+ generate: isTypeWithAliases(data, 'ObjectID', 'domain')
+ ? () =>
+ this.domainStoreService
+ .getLimitedObjects(objectKey)
+ .getFirstValue()
+ .pipe(
+ map((objects) =>
+ objects?.length &&
+ typeof getReferenceId(objects[0].ref) === 'number'
+ ? createNextId(
+ objects.map((o) =>
+ typeof getReferenceId(o.ref) ===
+ 'number'
+ ? (getReferenceId(o.ref) as number)
+ : 0,
+ ),
+ )
+ : v4(),
+ ),
+ )
+ : () => of(v4()),
}),
},
];
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/create-domain-object-extension.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/create-domain-object-extension.ts
index 089ab4069..1d63d77ab 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/create-domain-object-extension.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/create-domain-object-extension.ts
@@ -1,12 +1,8 @@
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
-import {
- ThriftData,
- ThriftFormExtension,
- ThriftFormExtensionOption,
- isTypeWithAliases,
-} from '@vality/ng-thrift';
+import { Option } from '@vality/matez';
+import { ThriftData, ThriftFormExtension, isTypeWithAliases } from '@vality/ng-thrift';
import { createNextId } from '~/utils';
@@ -21,7 +17,7 @@ export function isDomainObject(data: ThriftData, refType: string) {
export function createDomainObjectExtensions(
refType: string,
- options: () => Observable,
+ options: () => Observable,
determinant?: ThriftFormExtension['determinant'],
): ThriftFormExtension[] {
return [
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
index 18ba7f11f..7ffee3421 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
@@ -1,22 +1,44 @@
+import { map } from 'rxjs';
+
+import { inject } from '@angular/core';
+
import { LimitedVersionedObject, VersionedObject } from '@vality/domain-proto/domain_config_v2';
-import { ThriftFormExtensionOption, getUnionValue } from '@vality/ng-thrift';
+import { Option } from '@vality/matez';
+import { getUnionValue } from '@vality/ng-thrift';
-import { getDomainObjectReference } from '~/api/domain-config';
+import { DomainService, getDomainObjectReference } from '~/api/domain-config';
-import { getDomainObjectDetails, getReferenceId } from '../../../utils';
+import {
+ getDomainObjectDetails,
+ getLimitedDomainObjectDetails,
+ getReferenceId,
+} from '../../../utils';
-export function getDomainObjectOption(o: LimitedVersionedObject): ThriftFormExtensionOption {
+export function getDomainObjectOption(obj: LimitedVersionedObject): Option {
+ const details = getLimitedDomainObjectDetails(obj);
+ let detailsObj: Option['details'];
+ try {
+ detailsObj = inject(DomainService)
+ .get(obj.ref, obj.info.version)
+ .pipe(map((o) => o.object));
+ } catch (err) {
+ console.warn(err);
+ detailsObj = obj.ref;
+ }
return {
- value: getReferenceId(o.ref),
- label: o.name,
- details: o,
+ value: getReferenceId(obj.ref),
+ label: details.label,
+ description: details.description,
+ details: detailsObj,
};
}
-export function getFullDomainObjectOption(o: VersionedObject): ThriftFormExtensionOption {
+export function getFullDomainObjectOption(obj: VersionedObject): Option {
+ const details = getDomainObjectDetails(obj.object);
return {
- value: getReferenceId(getDomainObjectReference(o.object)),
- label: getDomainObjectDetails(o.object).label,
- details: getUnionValue(o.object).data,
+ value: getReferenceId(getDomainObjectReference(obj.object)),
+ label: details.label,
+ description: details.description,
+ details: getUnionValue(obj.object).data,
};
}
diff --git a/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts b/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
index 8ccbbb8bc..bfab52677 100644
--- a/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
+++ b/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
@@ -13,6 +13,7 @@ export interface DomainObjectDetails {
id: number | string;
label: string;
description?: string;
+ idDescription?: string;
type: string;
}
@@ -120,6 +121,9 @@ export function getDomainObjectDetails(o: DomainObject): DomainObjectDetails {
result.description ||
`${startCase(getUnionKey(o))}${isNil(result.id) ? '' : ' ' + result.id}`,
description: result.label ? result.description : '',
+ idDescription:
+ String(result.id) +
+ (result.label ? (result.description ? ` (${result.description})` : '') : ''),
type: startCase(getUnionKey(o)),
};
}
@@ -130,5 +134,11 @@ export function getLimitedDomainObjectDetails(o: LimitedVersionedObject): Domain
const label = o.name || `#${id}`;
const description = o.description;
- return { id, label, description, type };
+ return {
+ id,
+ label,
+ description,
+ type,
+ idDescription: String(id) + (description ? ` (${description})` : ''),
+ };
}
From 0fe1f3e50c60ccb62ec57ddb0329903f7b398fab Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Wed, 22 Jul 2026 23:20:15 +0800
Subject: [PATCH 13/14] refactor: update domain object ID generation and refine
metadata description logic
---
.../primitive-field.component.ts | 2 +-
...domain-metadata-form-extensions.service.ts | 22 ++++-----
.../utils/get-domain-object-option.ts | 4 +-
.../domain/utils/get-domain-object-details.ts | 48 +++++++++++--------
4 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
index e72d1a231..d2e720c8f 100644
--- a/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
+++ b/projects/ng-thrift/src/lib/components/thrift-editor/components/primitive-field/primitive-field.component.ts
@@ -112,7 +112,7 @@ export class PrimitiveFieldComponent extends FormControlSuperclass impleme
shareReplay({ refCount: true, bufferSize: 1 }),
);
selectedOptionDetails$ = this.selectedOption$.pipe(
- switchMap((option) => getPossiblyAsyncValue(option.details)),
+ switchMap((option) => getPossiblyAsyncValue(option?.details)),
shareReplay({ refCount: true, bufferSize: 1 }),
);
selectedHint$ = combineLatest([this.selectedOption$, toObservable(this.data)]).pipe(
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
index 5ecbf5d48..897cda031 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/domain-metadata-form-extensions.service.ts
@@ -7,7 +7,7 @@ import { Injectable, Injector, inject, runInInjectionContext } from '@angular/co
import { Validators } from '@angular/forms';
import { ThriftAstMetadata, metadata$ } from '@vality/domain-proto';
-import { DomainObject, DomainObjectType } from '@vality/domain-proto/domain';
+import { DomainObject, DomainObjectType, ObjectID } from '@vality/domain-proto/domain';
import { VersionedObject } from '@vality/domain-proto/domain_config_v2';
import { PossiblyAsync, getNoTimeZoneIsoString, getPossiblyAsyncObservable } from '@vality/matez';
import { ThriftData, ThriftFormExtension, isTypeWithAliases } from '@vality/ng-thrift';
@@ -204,18 +204,14 @@ export class DomainMetadataFormExtensionsService {
.getLimitedObjects(objectKey)
.getFirstValue()
.pipe(
- map((objects) =>
- objects?.length &&
- typeof getReferenceId(objects[0].ref) === 'number'
- ? createNextId(
- objects.map((o) =>
- typeof getReferenceId(o.ref) ===
- 'number'
- ? (getReferenceId(o.ref) as number)
- : 0,
- ),
- )
- : v4(),
+ map(
+ (objects) =>
+ objects?.length &&
+ createNextId(
+ objects.map(
+ (o) => getReferenceId(o.ref) as ObjectID,
+ ),
+ ),
),
)
: () => of(v4()),
diff --git a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
index 7ffee3421..2a6b567c9 100644
--- a/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
+++ b/src/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option.ts
@@ -28,7 +28,7 @@ export function getDomainObjectOption(obj: LimitedVersionedObject): Option {
return {
value: getReferenceId(obj.ref),
label: details.label,
- description: details.description,
+ description: details.idDescription,
details: detailsObj,
};
}
@@ -38,7 +38,7 @@ export function getFullDomainObjectOption(obj: VersionedObject): Option {
return {
value: getReferenceId(getDomainObjectReference(obj.object)),
label: details.label,
- description: details.description,
+ description: details.idDescription,
details: getUnionValue(obj.object).data,
};
}
diff --git a/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts b/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
index bfab52677..b5901e7ee 100644
--- a/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
+++ b/src/components/thrift-api-crud/domain/utils/get-domain-object-details.ts
@@ -1,6 +1,6 @@
import isNil from 'lodash-es/isNil';
import startCase from 'lodash-es/startCase';
-import { PickByValue, ValuesType } from 'utility-types';
+import { Overwrite, PickByValue, ValuesType } from 'utility-types';
import { DomainObject } from '@vality/domain-proto/domain';
import { LimitedVersionedObject } from '@vality/domain-proto/domain_config_v2';
@@ -109,36 +109,44 @@ export function getDomainObjectValueDetailsFn(key: keyof DomainObject): GetDomai
return GET_DOMAIN_OBJECTS_DETAILS[key] ?? defaultGetDomainObjectDetails;
}
-export function getDomainObjectDetails(o: DomainObject): DomainObjectDetails {
- if (!o || !getUnionValue(o)?.ref || !getUnionValue(o)?.data) {
- return { id: null, label: '', description: '', type: '' };
- }
- const result = getDomainObjectValueDetailsFn(getUnionKey(o))(getUnionValue(o));
+function getBasicDomainObjectDetails(
+ result: Overwrite<
+ Omit,
+ Pick, 'id' | 'label'>
+ >,
+ type: string,
+): DomainObjectDetails {
return {
id: result.id,
label:
result.label ||
result.description ||
- `${startCase(getUnionKey(o))}${isNil(result.id) ? '' : ' ' + result.id}`,
+ `${startCase(type)}${isNil(result.id) ? '' : ' ' + result.id}`,
description: result.label ? result.description : '',
idDescription:
String(result.id) +
(result.label ? (result.description ? ` (${result.description})` : '') : ''),
- type: startCase(getUnionKey(o)),
+ type: startCase(type),
};
}
-export function getLimitedDomainObjectDetails(o: LimitedVersionedObject): DomainObjectDetails {
- const id = getReferenceId(o.ref);
- const type = startCase(getUnionKey(o.ref));
- const label = o.name || `#${id}`;
- const description = o.description;
+export function getDomainObjectDetails(o: DomainObject): DomainObjectDetails {
+ if (!o || !getUnionValue(o)?.ref || !getUnionValue(o)?.data) {
+ return { id: null, label: '', description: '', type: '' };
+ }
+ return getBasicDomainObjectDetails(
+ getDomainObjectValueDetailsFn(getUnionKey(o))(getUnionValue(o)),
+ getUnionKey(o),
+ );
+}
- return {
- id,
- label,
- description,
- type,
- idDescription: String(id) + (description ? ` (${description})` : ''),
- };
+export function getLimitedDomainObjectDetails(o: LimitedVersionedObject): DomainObjectDetails {
+ return getBasicDomainObjectDetails(
+ {
+ id: getReferenceId(o.ref),
+ label: o.name,
+ description: o.description,
+ },
+ getUnionKey(o.ref),
+ );
}
From 70100d0494cdfaf10c2ca3a1a2fdc6316d604f52 Mon Sep 17 00:00:00 2001
From: Ray <11846445+A77AY@users.noreply.github.com>
Date: Thu, 23 Jul 2026 09:17:27 +0800
Subject: [PATCH 14/14] chore: remove redundant force flag from setup-install
actions in CI workflows
---
.github/workflows/main.yaml | 1 -
.github/workflows/pr.yaml | 2 --
2 files changed, 3 deletions(-)
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c833307c6..37f92be72 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -17,7 +17,6 @@ jobs:
- uses: valitydev/action-frontend/setup-install@v3
with:
release: true
- force: true
- name: Build
run: npm run build
- name: Deploy image
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 291ba192c..6f72f7252 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -9,8 +9,6 @@ jobs:
steps:
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v3
- with:
- force: true
- name: Install Playwright
run: npx playwright install chromium --with-deps
- name: Check