Skip to content

Commit 82eced3

Browse files
committed
Revert "Regenerate ABP account proxy definitions"
This reverts commit c2ed89e.
1 parent c2ed89e commit 82eced3

File tree

14 files changed

+3945
-48502
lines changed

14 files changed

+3945
-48502
lines changed

npm/ng-packs/packages/core/src/lib/proxy/generate-proxy.json

Lines changed: 3776 additions & 48306 deletions
Large diffs are not rendered by default.

npm/ng-packs/packages/core/src/lib/proxy/pages/abp/multi-tenancy/abp-tenant.service.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import { RestService, Rest } from '@abp/ng.core';
1+
import { RestService } from '../../../../services';
2+
import { Rest } from '../../../../models';
23
import { Injectable, inject } from '@angular/core';
34
import type { FindTenantResultDto } from '../../../volo/abp/asp-net-core/mvc/multi-tenancy/models';
45

56
@Injectable({
67
providedIn: 'root',
78
})
8-
export class AbpTenantService {
9-
private restService = inject(RestService);
9+
export class AbpTenantService {
10+
private restService = inject(RestService);
11+
1012
apiName = 'abp';
1113

1214

@@ -24,4 +26,4 @@ export class AbpTenantService {
2426
url: `/api/abp/multi-tenancy/tenants/by-name/${name}`,
2527
},
2628
{ apiName: this.apiName,...config });
27-
}
29+
}
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import { RestService, Rest } from '@abp/ng.core';
1+
import { RestService } from '../../../../../../services';
2+
import { Rest } from '../../../../../../models';
23
import { Injectable, inject } from '@angular/core';
34
import type { ApplicationApiDescriptionModel, ApplicationApiDescriptionModelRequestDto } from '../../../http/modeling/models';
45

56
@Injectable({
67
providedIn: 'root',
78
})
8-
export class AbpApiDefinitionService {
9-
private restService = inject(RestService);
9+
export class AbpApiDefinitionService {
10+
private restService = inject(RestService);
11+
1012
apiName = 'abp';
1113

1214

@@ -17,4 +19,4 @@ export class AbpApiDefinitionService {
1719
params: { includeTypes: model.includeTypes },
1820
},
1921
{ apiName: this.apiName,...config });
20-
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
import type { ApplicationConfigurationDto, ApplicationConfigurationRequestOptions } from './models';
2-
import { RestService, Rest } from '@abp/ng.core';
2+
import { RestService } from '../../../../../../services';
3+
import { Rest } from '../../../../../../models';
34
import { Injectable, inject } from '@angular/core';
45

56
@Injectable({
67
providedIn: 'root',
78
})
89
export class AbpApplicationConfigurationService {
910
private restService = inject(RestService);
11+
1012
apiName = 'abp';
11-
13+
1214

1315
get = (options: ApplicationConfigurationRequestOptions, config?: Partial<Rest.Config>) =>
1416
this.restService.request<any, ApplicationConfigurationDto>({
1517
method: 'GET',
1618
url: '/api/abp/application-configuration',
1719
params: { includeLocalizationResources: options.includeLocalizationResources },
1820
},
19-
{ apiName: this.apiName,...config });
20-
}
21+
{ apiName: this.apiName, ...config });
22+
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import type { ApplicationLocalizationDto, ApplicationLocalizationRequestDto } from './models';
2-
import { RestService, Rest } from '@abp/ng.core';
2+
import { RestService } from '../../../../../../services';
3+
import { Rest } from '../../../../../../models';
34
import { Injectable, inject } from '@angular/core';
45

56
@Injectable({
67
providedIn: 'root',
78
})
8-
export class AbpApplicationLocalizationService {
9-
private restService = inject(RestService);
9+
export class AbpApplicationLocalizationService {
10+
private restService = inject(RestService);
11+
1012
apiName = 'abp';
1113

1214

@@ -17,4 +19,4 @@ export class AbpApplicationLocalizationService {
1719
params: { cultureName: input.cultureName, onlyDynamics: input.onlyDynamics },
1820
},
1921
{ apiName: this.apiName,...config });
20-
}
22+
}

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/models.ts

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,63 @@ import type { LanguageInfo } from '../../../localization/models';
44
import type { NameValue } from '../../../models';
55

66
export interface ApplicationAuthConfigurationDto {
7-
grantedPolicies?: Record<string, boolean>;
7+
grantedPolicies: Record<string, boolean>;
88
}
99

1010
export interface ApplicationConfigurationDto {
11-
localization?: ApplicationLocalizationConfigurationDto;
12-
auth?: ApplicationAuthConfigurationDto;
13-
setting?: ApplicationSettingConfigurationDto;
14-
currentUser?: CurrentUserDto;
15-
features?: ApplicationFeatureConfigurationDto;
16-
globalFeatures?: ApplicationGlobalFeatureConfigurationDto;
17-
multiTenancy?: MultiTenancyInfoDto;
18-
currentTenant?: CurrentTenantDto;
19-
timing?: TimingDto;
20-
clock?: ClockDto;
21-
objectExtensions?: ObjectExtensionsDto;
22-
extraProperties?: Record<string, object>;
11+
localization: ApplicationLocalizationConfigurationDto;
12+
auth: ApplicationAuthConfigurationDto;
13+
setting: ApplicationSettingConfigurationDto;
14+
currentUser: CurrentUserDto;
15+
features: ApplicationFeatureConfigurationDto;
16+
globalFeatures: ApplicationGlobalFeatureConfigurationDto;
17+
multiTenancy: MultiTenancyInfoDto;
18+
currentTenant: CurrentTenantDto;
19+
timing: TimingDto;
20+
clock: ClockDto;
21+
objectExtensions: ObjectExtensionsDto;
22+
extraProperties: Record<string, object>;
2323
}
2424

2525
export interface ApplicationConfigurationRequestOptions {
26-
includeLocalizationResources?: boolean;
26+
includeLocalizationResources: boolean;
2727
}
2828

2929
export interface ApplicationFeatureConfigurationDto {
30-
values?: Record<string, string>;
30+
values: Record<string, string>;
3131
}
3232

3333
export interface ApplicationGlobalFeatureConfigurationDto {
34-
enabledFeatures?: string[];
34+
enabledFeatures: string[];
3535
}
3636

3737
export interface ApplicationLocalizationConfigurationDto {
38-
values?: Record<string, Record<string, string>>;
39-
resources?: Record<string, ApplicationLocalizationResourceDto>;
40-
languages?: LanguageInfo[];
41-
currentCulture?: CurrentCultureDto;
42-
defaultResourceName?: string | null;
43-
languagesMap?: Record<string, NameValue[]>;
44-
languageFilesMap?: Record<string, NameValue[]>;
38+
values: Record<string, Record<string, string>>;
39+
resources: Record<string, ApplicationLocalizationResourceDto>;
40+
languages: LanguageInfo[];
41+
currentCulture: CurrentCultureDto;
42+
defaultResourceName?: string;
43+
languagesMap: Record<string, NameValue[]>;
44+
languageFilesMap: Record<string, NameValue[]>;
4545
}
4646

4747
export interface ApplicationLocalizationDto {
48-
resources?: Record<string, ApplicationLocalizationResourceDto>;
49-
currentCulture?: CurrentCultureDto;
48+
resources: Record<string, ApplicationLocalizationResourceDto>;
49+
currentCulture: CurrentCultureDto;
5050
}
5151

5252
export interface ApplicationLocalizationRequestDto {
5353
cultureName: string;
54-
onlyDynamics?: boolean;
54+
onlyDynamics: boolean;
5555
}
5656

5757
export interface ApplicationLocalizationResourceDto {
58-
texts?: Record<string, string>;
59-
baseResources?: string[];
58+
texts: Record<string, string>;
59+
baseResources: string[];
6060
}
6161

6262
export interface ApplicationSettingConfigurationDto {
63-
values?: Record<string, string>;
63+
values: Record<string, string>;
6464
}
6565

6666
export interface ClockDto {
@@ -72,30 +72,29 @@ export interface CurrentCultureDto {
7272
englishName?: string;
7373
threeLetterIsoLanguageName?: string;
7474
twoLetterIsoLanguageName?: string;
75-
isRightToLeft?: boolean;
75+
isRightToLeft: boolean;
7676
cultureName?: string;
7777
name?: string;
7878
nativeName?: string;
79-
dateTimeFormat?: DateTimeFormatDto;
79+
dateTimeFormat: DateTimeFormatDto;
8080
}
8181

8282
export interface CurrentUserDto {
83-
isAuthenticated?: boolean;
84-
id?: string | null;
85-
tenantId?: string | null;
86-
impersonatorUserId?: string | null;
87-
impersonatorTenantId?: string | null;
88-
impersonatorUserName?: string | null;
89-
impersonatorTenantName?: string | null;
90-
userName?: string | null;
91-
name?: string | null;
92-
surName?: string | null;
93-
email?: string | null;
94-
emailVerified?: boolean;
95-
phoneNumber?: string | null;
96-
phoneNumberVerified?: boolean;
97-
roles?: string[];
98-
sessionId?: string | null;
83+
isAuthenticated: boolean;
84+
id?: string;
85+
tenantId?: string;
86+
impersonatorUserId?: string;
87+
impersonatorTenantId?: string;
88+
impersonatorUserName?: string;
89+
impersonatorTenantName?: string;
90+
userName?: string;
91+
name?: string;
92+
surName?: string;
93+
email?: string;
94+
emailVerified: boolean;
95+
phoneNumber?: string;
96+
phoneNumberVerified: boolean;
97+
roles: string[];
9998
}
10099

101100
export interface DateTimeFormatDto {
@@ -109,18 +108,18 @@ export interface DateTimeFormatDto {
109108
}
110109

111110
export interface IanaTimeZone {
112-
timeZoneName?: string | null;
111+
timeZoneName?: string;
113112
}
114113

115114
export interface TimeZone {
116-
iana?: IanaTimeZone;
117-
windows?: WindowsTimeZone;
115+
iana: IanaTimeZone;
116+
windows: WindowsTimeZone;
118117
}
119118

120119
export interface TimingDto {
121-
timeZone?: TimeZone;
120+
timeZone: TimeZone;
122121
}
123122

124123
export interface WindowsTimeZone {
125-
timeZoneId?: string | null;
124+
timeZoneId?: string;
126125
}

0 commit comments

Comments
 (0)