Merge pull request #25051 from abpframework/issue-21840

feat(angular) : Add TenantUserSharingStragety.

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

@@ -1,87 +1,87 @@
-
-export interface EntityExtensionDto {
-  properties: Record<string, ExtensionPropertyDto>;
-  configuration: Record<string, object>;
-}
-
-export interface ExtensionEnumDto {
-  fields: ExtensionEnumFieldDto[];
-  localizationResource?: string;
-}
-
-export interface ExtensionEnumFieldDto {
-  name?: string;
-  value: object;
-}
-
-export interface ExtensionPropertyApiCreateDto {
-  isAvailable: boolean;
-}
-
-export interface ExtensionPropertyApiDto {
-  onGet: ExtensionPropertyApiGetDto;
-  onCreate: ExtensionPropertyApiCreateDto;
-  onUpdate: ExtensionPropertyApiUpdateDto;
-}
-
-export interface ExtensionPropertyApiGetDto {
-  isAvailable: boolean;
-}
-
-export interface ExtensionPropertyApiUpdateDto {
-  isAvailable: boolean;
-}
-
-export interface ExtensionPropertyAttributeDto {
-  typeSimple?: string;
-  config: Record<string, object>;
-}
-
-export interface ExtensionPropertyDto {
-  type?: string;
-  typeSimple?: string;
-  displayName: LocalizableStringDto;
-  api: ExtensionPropertyApiDto;
-  ui: ExtensionPropertyUiDto;
-  attributes: ExtensionPropertyAttributeDto[];
-  configuration: Record<string, object>;
-  defaultValue: object;
-}
-
-export interface ExtensionPropertyUiDto {
-  onTable: ExtensionPropertyUiTableDto;
-  onCreateForm: ExtensionPropertyUiFormDto;
-  onEditForm: ExtensionPropertyUiFormDto;
-  lookup: ExtensionPropertyUiLookupDto;
-}
-
-export interface ExtensionPropertyUiFormDto {
-  isVisible: boolean;
-}
-
-export interface ExtensionPropertyUiLookupDto {
-  url?: string;
-  resultListPropertyName?: string;
-  displayPropertyName?: string;
-  valuePropertyName?: string;
-  filterParamName?: string;
-}
-
-export interface ExtensionPropertyUiTableDto {
-  isVisible: boolean;
-}
-
-export interface LocalizableStringDto {
-  name?: string;
-  resource?: string;
-}
-
-export interface ModuleExtensionDto {
-  entities: Record<string, EntityExtensionDto>;
-  configuration: Record<string, object>;
-}
-
-export interface ObjectExtensionsDto {
-  modules: Record<string, ModuleExtensionDto>;
-  enums: Record<string, ExtensionEnumDto>;
-}
+
+export interface EntityExtensionDto {
+  properties: Record<string, ExtensionPropertyDto>;
+  configuration: Record<string, object>;
+}
+
+export interface ExtensionEnumDto {
+  fields: ExtensionEnumFieldDto[];
+  localizationResource?: string;
+}
+
+export interface ExtensionEnumFieldDto {
+  name?: string;
+  value: object;
+}
+
+export interface ExtensionPropertyApiCreateDto {
+  isAvailable: boolean;
+}
+
+export interface ExtensionPropertyApiDto {
+  onGet: ExtensionPropertyApiGetDto;
+  onCreate: ExtensionPropertyApiCreateDto;
+  onUpdate: ExtensionPropertyApiUpdateDto;
+}
+
+export interface ExtensionPropertyApiGetDto {
+  isAvailable: boolean;
+}
+
+export interface ExtensionPropertyApiUpdateDto {
+  isAvailable: boolean;
+}
+
+export interface ExtensionPropertyAttributeDto {
+  typeSimple?: string;
+  config: Record<string, object>;
+}
+
+export interface ExtensionPropertyDto {
+  type?: string;
+  typeSimple?: string;
+  displayName: LocalizableStringDto;
+  api: ExtensionPropertyApiDto;
+  ui: ExtensionPropertyUiDto;
+  attributes: ExtensionPropertyAttributeDto[];
+  configuration: Record<string, object>;
+  defaultValue: object;
+}
+
+export interface ExtensionPropertyUiDto {
+  onTable: ExtensionPropertyUiTableDto;
+  onCreateForm: ExtensionPropertyUiFormDto;
+  onEditForm: ExtensionPropertyUiFormDto;
+  lookup: ExtensionPropertyUiLookupDto;
+}
+
+export interface ExtensionPropertyUiFormDto {
+  isVisible: boolean;
+}
+
+export interface ExtensionPropertyUiLookupDto {
+  url?: string;
+  resultListPropertyName?: string;
+  displayPropertyName?: string;
+  valuePropertyName?: string;
+  filterParamName?: string;
+}
+
+export interface ExtensionPropertyUiTableDto {
+  isVisible: boolean;
+}
+
+export interface LocalizableStringDto {
+  name?: string;
+  resource?: string;
+}
+
+export interface ModuleExtensionDto {
+  entities: Record<string, EntityExtensionDto>;
+  configuration: Record<string, object>;
+}
+
+export interface ObjectExtensionsDto {
+  modules: Record<string, ModuleExtensionDto>;
+  enums: Record<string, ExtensionEnumDto>;
+}

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

@@ -1,18 +1,20 @@
-
-export interface FindTenantResultDto {
-  success: boolean;
-  tenantId?: string;
-  name?: string;
-  normalizedName?: string;
-  isActive: boolean;
-}
-
-export interface CurrentTenantDto {
-  id?: string;
-  name?: string;
-  isAvailable: boolean;
-}
-
-export interface MultiTenancyInfoDto {
-  isEnabled: boolean;
-}
+import type { TenantUserSharingStrategy } from '../../../multi-tenancy/tenant-user-sharing-strategy.enum';
+
+export interface FindTenantResultDto {
+  success: boolean;
+  tenantId?: string;
+  name?: string;
+  normalizedName?: string;
+  isActive: boolean;
+}
+
+export interface CurrentTenantDto {
+  id?: string;
+  name?: string;
+  isAvailable: boolean;
+}
+
+export interface MultiTenancyInfoDto {
+  isEnabled: boolean;
+  userSharingStrategy?: TenantUserSharingStrategy;
+}

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/http/modeling/models.ts

@@ -1,100 +1,100 @@
-
-export interface ActionApiDescriptionModel {
-  uniqueName?: string;
-  name?: string;
-  httpMethod?: string;
-  url?: string;
-  supportedVersions: string[];
-  parametersOnMethod: MethodParameterApiDescriptionModel[];
-  parameters: ParameterApiDescriptionModel[];
-  returnValue: ReturnValueApiDescriptionModel;
-  allowAnonymous?: boolean;
-  implementFrom?: string;
-}
-
-export interface ApplicationApiDescriptionModel {
-  modules: Record<string, ModuleApiDescriptionModel>;
-  types: Record<string, TypeApiDescriptionModel>;
-}
-
-export interface ApplicationApiDescriptionModelRequestDto {
-  includeTypes: boolean;
-}
-
-export interface ControllerApiDescriptionModel {
-  controllerName?: string;
-  controllerGroupName?: string;
-  isRemoteService: boolean;
-  isIntegrationService: boolean;
-  apiVersion?: string;
-  type?: string;
-  interfaces: ControllerInterfaceApiDescriptionModel[];
-  actions: Record<string, ActionApiDescriptionModel>;
-}
-
-export interface ControllerInterfaceApiDescriptionModel {
-  type?: string;
-  name?: string;
-  methods: InterfaceMethodApiDescriptionModel[];
-}
-
-export interface InterfaceMethodApiDescriptionModel {
-  name?: string;
-  parametersOnMethod: MethodParameterApiDescriptionModel[];
-  returnValue: ReturnValueApiDescriptionModel;
-}
-
-export interface MethodParameterApiDescriptionModel {
-  name?: string;
-  typeAsString?: string;
-  type?: string;
-  typeSimple?: string;
-  isOptional: boolean;
-  defaultValue: object;
-}
-
-export interface ModuleApiDescriptionModel {
-  rootPath?: string;
-  remoteServiceName?: string;
-  controllers: Record<string, ControllerApiDescriptionModel>;
-}
-
-export interface ParameterApiDescriptionModel {
-  nameOnMethod?: string;
-  name?: string;
-  jsonName?: string;
-  type?: string;
-  typeSimple?: string;
-  isOptional: boolean;
-  defaultValue: object;
-  constraintTypes: string[];
-  bindingSourceId?: string;
-  descriptorName?: string;
-}
-
-export interface PropertyApiDescriptionModel {
-  name?: string;
-  jsonName?: string;
-  type?: string;
-  typeSimple?: string;
-  isRequired: boolean;
-  minLength?: number;
-  maxLength?: number;
-  minimum?: string;
-  maximum?: string;
-  regex?: string;
-}
-
-export interface ReturnValueApiDescriptionModel {
-  type?: string;
-  typeSimple?: string;
-}
-
-export interface TypeApiDescriptionModel {
-  baseType?: string;
-  isEnum: boolean;
-  enumNames: string[];
-  enumValues: object[];
-  genericArguments: string[];
-  properties: PropertyApiDescriptionModel[];
-}
+
+export interface ActionApiDescriptionModel {
+  uniqueName?: string;
+  name?: string;
+  httpMethod?: string;
+  url?: string;
+  supportedVersions: string[];
+  parametersOnMethod: MethodParameterApiDescriptionModel[];
+  parameters: ParameterApiDescriptionModel[];
+  returnValue: ReturnValueApiDescriptionModel;
+  allowAnonymous?: boolean;
+  implementFrom?: string;
+}
+
+export interface ApplicationApiDescriptionModel {
+  modules: Record<string, ModuleApiDescriptionModel>;
+  types: Record<string, TypeApiDescriptionModel>;
+}
+
+export interface ApplicationApiDescriptionModelRequestDto {
+  includeTypes: boolean;
+}
+
+export interface ControllerApiDescriptionModel {
+  controllerName?: string;
+  controllerGroupName?: string;
+  isRemoteService: boolean;
+  isIntegrationService: boolean;
+  apiVersion?: string;
+  type?: string;
+  interfaces: ControllerInterfaceApiDescriptionModel[];
+  actions: Record<string, ActionApiDescriptionModel>;
+}
+
+export interface ControllerInterfaceApiDescriptionModel {
+  type?: string;
+  name?: string;
+  methods: InterfaceMethodApiDescriptionModel[];
+}
+
+export interface InterfaceMethodApiDescriptionModel {
+  name?: string;
+  parametersOnMethod: MethodParameterApiDescriptionModel[];
+  returnValue: ReturnValueApiDescriptionModel;
+}
+
+export interface MethodParameterApiDescriptionModel {
+  name?: string;
+  typeAsString?: string;
+  type?: string;
+  typeSimple?: string;
+  isOptional: boolean;
+  defaultValue: object;
+}
+
+export interface ModuleApiDescriptionModel {
+  rootPath?: string;
+  remoteServiceName?: string;
+  controllers: Record<string, ControllerApiDescriptionModel>;
+}
+
+export interface ParameterApiDescriptionModel {
+  nameOnMethod?: string;
+  name?: string;
+  jsonName?: string;
+  type?: string;
+  typeSimple?: string;
+  isOptional: boolean;
+  defaultValue: object;
+  constraintTypes: string[];
+  bindingSourceId?: string;
+  descriptorName?: string;
+}
+
+export interface PropertyApiDescriptionModel {
+  name?: string;
+  jsonName?: string;
+  type?: string;
+  typeSimple?: string;
+  isRequired: boolean;
+  minLength?: number;
+  maxLength?: number;
+  minimum?: string;
+  maximum?: string;
+  regex?: string;
+}
+
+export interface ReturnValueApiDescriptionModel {
+  type?: string;
+  typeSimple?: string;
+}
+
+export interface TypeApiDescriptionModel {
+  baseType?: string;
+  isEnum: boolean;
+  enumNames: string[];
+  enumValues: object[];
+  genericArguments: string[];
+  properties: PropertyApiDescriptionModel[];
+}

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/index.ts

@@ -1,5 +1,6 @@
 import * as AspNetCore from './asp-net-core';
 import * as Http from './http';
 import * as Localization from './localization';
+import * as MultiTenancy from './multi-tenancy';
 export * from './models';
-export { AspNetCore, Http, Localization };
+export { AspNetCore, Http, Localization, MultiTenancy };

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/multi-tenancy/index.ts

@@ -0,0 +1 @@
+export * from './tenant-user-sharing-strategy.enum';

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/multi-tenancy/tenant-user-sharing-strategy.enum.ts

@@ -0,0 +1,8 @@
+import { mapEnumToOptions } from '../../../../utils/form-utils';
+
+export enum TenantUserSharingStrategy {
+  Isolated = 0,
+  Shared = 1,
+}
+
+export const tenantUserSharingStrategyOptions = mapEnumToOptions(TenantUserSharingStrategy);

npm/ng-packs/packages/core/src/public-api.ts

@@ -15,6 +15,7 @@ export * from './lib/proxy/volo/abp/asp-net-core/mvc/api-exploring';
 export * from './lib/proxy/volo/abp/asp-net-core/mvc/application-configurations';
 export * from './lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/object-extending';
 export * from './lib/proxy/volo/abp/asp-net-core/mvc/multi-tenancy';
+export * from './lib/proxy/volo/abp/multi-tenancy';
 export * from './lib/proxy/volo/abp/http/modeling';
 export * from './lib/proxy/volo/abp/localization';
 export * from './lib/proxy/volo/abp/models';

npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts

@@ -4,4 +4,4 @@ export * from './ngx-datatable-messages.token';
 export * from './suppress-unsaved-changes-warning.token';
 export * from './confirmation-icons.token';
 export * from './logo.token';
-export * from './theme-change.token';
+export * from './theme-change.token';