Merge pull request #18075 from abpframework/issue/18074

Move codes from `theme-shared/extensions` lib to `components` lib

npm/ng-packs/.eslintrc.json

@@ -2,6 +2,9 @@
   "root": true,
   "ignorePatterns": ["**/*"],
   "plugins": ["@nx"],
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off"
+  },
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -25,9 +28,11 @@
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
       "rules": {
+        "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/no-empty-function": ["warn"],
         "@typescript-eslint/no-empty-interface": ["warn"]
+        
       }
     },
     {

npm/ng-packs/packages/account/src/lib/account.module.ts

@@ -16,10 +16,11 @@ import { AuthenticationFlowGuard } from './guards/authentication-flow.guard';
 import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
 import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
 import { RE_LOGIN_CONFIRMATION_TOKEN } from './tokens';
-import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
+
 import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS } from './tokens/extensions.token';
 import { AccountExtensionsGuard } from './guards/extensions.guard';
 import { PersonalSettingsHalfRowComponent } from './components/personal-settings/personal-settings-half-row.component';
+import { ExtensibleModule } from "@abp/ng.components/extensible";
 
 const declarations = [
   LoginComponent,
@@ -40,7 +41,7 @@ const declarations = [
     ThemeSharedModule,
     NgbDropdownModule,
     NgxValidateCoreModule,
-    UiExtensionsModule,
+    ExtensibleModule,
   ],
   exports: [...declarations],
 })

npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts

@@ -3,7 +3,7 @@ import {
   EXTENSIONS_FORM_PROP,
   FormProp,
   EXTENSIBLE_FORM_VIEW_PROVIDER,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { UntypedFormGroup } from '@angular/forms';
 
 @Component({

npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts

@@ -11,7 +11,7 @@ import {
   EXTENSIONS_IDENTIFIER,
   FormPropData,
   generateFormFromProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eAccountComponents } from '../../enums';
 
 @Component({

npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts

@@ -1,4 +1,4 @@
-import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
+import { ePropType, FormProp } from '@abp/ng.components/extensible';
 import { UpdateProfileDto } from '@abp/ng.account.core/proxy';
 import { Validators } from '@angular/forms';
 import { PersonalSettingsHalfRowComponent } from '../components/personal-settings/personal-settings-half-row.component';

npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts

@@ -9,7 +9,7 @@ import {
   getObjectExtensionEntitiesFromStore,
   mapEntitiesToContributors,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 
 import {
   ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS,

npm/ng-packs/packages/account/src/lib/models/config-options.ts

@@ -1,5 +1,5 @@
 import { eAccountComponents } from '../enums';
-import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions';
+import { EditFormPropContributorCallback } from '@abp/ng.components/extensible';
 import { UpdateProfileDto } from '@abp/ng.account.core/proxy';
 
 export interface AccountConfigOptions {
@@ -9,4 +9,4 @@ export interface AccountConfigOptions {
 }
 export type AccountEditFormPropContributors = Partial<{
   [eAccountComponents.PersonalSettings]: EditFormPropContributorCallback<UpdateProfileDto>[];
-}>;
+}>;

npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts

@@ -6,7 +6,7 @@ import {
   getObjectExtensionEntitiesFromStore,
   mapEntitiesToContributors,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eAccountComponents } from '../enums';
 import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, DEFAULT_ACCOUNT_FORM_PROPS } from '../tokens';
 import { ResolveFn } from '@angular/router';

npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts

@@ -1,7 +1,7 @@
 import { eAccountComponents } from '../enums';
 import { DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS } from '../defaults/default-personal-settings-form-props';
 import { InjectionToken } from '@angular/core';
-import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions';
+import { EditFormPropContributorCallback } from '@abp/ng.components/extensible';
 import { UpdateProfileDto } from '@abp/ng.account.core/proxy';
 
 export const DEFAULT_ACCOUNT_FORM_PROPS = {

npm/ng-packs/packages/components/extensible/README.md

@@ -0,0 +1,3 @@
+# @abp/ng.components/extensible
+
+Secondary entry point of `@abp/ng.components`. It can be used by importing from `@abp/ng.components/extensible`.

npm/ng-packs/packages/components/extensible/ng-package.json

@@ -0,0 +1,5 @@
+{
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/abstract-actions/abstract-actions.component.ts → npm/ng-packs/packages/components/extensible/src/lib/components/abstract-actions/abstract-actions.component.ts

@@ -16,9 +16,8 @@ export abstract class AbstractActionsComponent<
 
   @Input() record!: InferredData<L>['record'];
 
-  constructor(injector: Injector) {
+  protected constructor(injector: Injector) {
     super();
-
     this.getInjected = injector.get.bind(injector);
     const extensions = injector.get(ExtensionsService);
     const name = injector.get(EXTENSIONS_IDENTIFIER);

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts → npm/ng-packs/packages/components/extensible/src/lib/components/date-time-picker/extensible-date-time-picker.component.ts

@@ -14,13 +14,13 @@ import {
   NgbTimeAdapter,
   NgbTimepicker,
 } from '@ng-bootstrap/ng-bootstrap';
-import { DateTimeAdapter } from '../../adapters/date-time.adapter';
 import { FormProp } from '../../models/form-props';
 import { selfFactory } from '../../utils/factory.util';
+import { DateTimeAdapter } from '@abp/ng.theme.shared';
 
 @Component({
-  exportAs: 'abpDateTimePicker',
+  exportAs: 'abpExtensibleDateTimePicker',
-  selector: 'abp-date-time-picker',
+  selector: 'abp-extensible-date-time-picker',
   template: `
     <input
       [id]="prop.id"
@@ -57,7 +57,7 @@ import { selfFactory } from '../../utils/factory.util';
     },
   ],
 })
-export class DateTimePickerComponent {
+export class ExtensibleDateTimePickerComponent {
   @Input() prop!: FormProp;
   @Input() meridian = false;
 
@@ -66,11 +66,11 @@ export class DateTimePickerComponent {
 
   constructor(public readonly cdRef: ChangeDetectorRef) {}
 
-  setDate(datestr: string) {
+  setDate(dateStr: string) {
-    this.date.writeValue(datestr);
+    this.date.writeValue(dateStr);
   }
 
-  setTime(datestr: string) {
+  setTime(dateStr: string) {
-    this.time.writeValue(datestr);
+    this.time.writeValue(dateStr);
   }
 }

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html → npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html

@@ -124,7 +124,7 @@
 
     <ng-template ngSwitchCase="dateTime">
       <ng-template [ngTemplateOutlet]="label"></ng-template>
-      <abp-date-time-picker [prop]="prop" [meridian]="meridian"></abp-date-time-picker>
+      <abp-extensible-date-time-picker [prop]="prop" [meridian]="meridian" />
     </ng-template>
 
     <ng-template ngSwitchCase="textarea">

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts → npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts

@@ -24,15 +24,14 @@ import {
 import { NgbDateAdapter, NgbTimeAdapter } from '@ng-bootstrap/ng-bootstrap';
 import { Observable, of } from 'rxjs';
 import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
-import { DateAdapter } from '../../adapters/date.adapter';
+import { DateAdapter, TimeAdapter } from '@abp/ng.theme.shared';
-import { TimeAdapter } from '../../adapters/time.adapter';
 import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties';
 import { ePropType } from '../../enums/props.enum';
 import { FormProp } from '../../models/form-props';
 import { PropData } from '../../models/props';
 import { selfFactory } from '../../utils/factory.util';
 import { addTypeaheadTextSuffix } from '../../utils/typeahead.util';
-import { eThemeSharedComponents } from '../../enums/components';
+import { eThemeSharedComponents } from "../../enums/components";
 
 @Component({
   selector: 'abp-extensible-form-prop',

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts → npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

@@ -13,8 +13,6 @@ import {
   Component,
   EventEmitter,
   Inject,
-  InjectFlags,
-  InjectionToken,
   Injector,
   Input,
   LOCALE_ID,
@@ -23,7 +21,6 @@ import {
   SimpleChanges,
   TemplateRef,
   TrackByFunction,
-  Type,
 } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -41,7 +38,7 @@ import {
 
 const DEFAULT_ACTIONS_COLUMN_WIDTH = 150;
 
-@Component({
+ @Component({
   exportAs: 'abpExtensibleTable',
   selector: 'abp-extensible-table',
   templateUrl: './extensible-table.component.html',
@@ -67,7 +64,7 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
 
   @Output() tableActivate = new EventEmitter();
 
-  getInjected: <T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags) => T;
+  getInjected: typeof this.injector.get
 
   hasAtLeastOnePermittedAction: boolean;
 
@@ -150,7 +147,7 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
 
   ngOnChanges({ data }: SimpleChanges) {
     if (!data?.currentValue) return;
-    
+
     if (data.currentValue.length < 1) {
       this.list.totalCount = this.recordsTotal
     }
@@ -166,7 +163,7 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
           value,
         };
         if (prop.value.component) {
-          const injector = Injector.create({
+          record[propKey].injector = Injector.create({
             providers: [
               {
                 provide: PROP_DATA_STREAM,
@@ -175,7 +172,6 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
             ],
             parent: this.injector,
           });
-          record[propKey].injector = injector;
           record[propKey].component = prop.value.component;
         }
       });

npm/ng-packs/packages/components/extensible/src/lib/components/index.ts

@@ -0,0 +1,7 @@
+export * from './abstract-actions/abstract-actions.component';
+export * from './extensible-form/extensible-form.component';
+export * from './extensible-form/extensible-form-prop.component';
+export * from './extensible-table/extensible-table.component';
+export * from './date-time-picker/extensible-date-time-picker.component';
+export * from './grid-actions/grid-actions.component';
+export * from './page-toolbar/page-toolbar.component';

npm/ng-packs/packages/theme-shared/extensions/src/lib/ui-extensions.module.ts → npm/ng-packs/packages/components/extensible/src/lib/extensible.module.ts

@@ -1,6 +1,7 @@
+import { NgModule } from '@angular/core';
 import { CoreModule } from '@abp/ng.core';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { NgModule } from '@angular/core';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
 import {
   NgbDatepickerModule,
   NgbDropdownModule,
@@ -8,37 +9,27 @@ import {
   NgbTooltipModule,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
+import {
-import { DateTimePickerComponent } from './components/date-time-picker/date-time-picker.component';
+  ExtensibleFormComponent,
-import { ExtensibleFormPropComponent } from './components/extensible-form/extensible-form-prop.component';
+  ExtensibleFormPropComponent,
-import { ExtensibleFormComponent } from './components/extensible-form/extensible-form.component';
+  ExtensibleTableComponent,
-import { ExtensibleTableComponent } from './components/extensible-table/extensible-table.component';
+  GridActionsComponent,
-import { GridActionsComponent } from './components/grid-actions/grid-actions.component';
+  PageToolbarComponent,
-import { PageToolbarComponent } from './components/page-toolbar/page-toolbar.component';
+  ExtensibleDateTimePickerComponent
-import { DisabledDirective } from './directives/disabled.directive';
+} from './components';
 import { PropDataDirective } from './directives/prop-data.directive';
 import { CreateInjectorPipe } from './pipes/create-injector.pipe';
+import { DisabledDirective } from '@abp/ng.theme.shared';
 
 @NgModule({
-  exports: [
-    DateTimePickerComponent,
-    PageToolbarComponent,
-    GridActionsComponent,
-    ExtensibleFormComponent,
-    ExtensibleTableComponent,
-    PropDataDirective,
-    DisabledDirective,
-    CreateInjectorPipe,
-  ],
   declarations: [
-    DateTimePickerComponent,
+    ExtensibleDateTimePickerComponent,
     PageToolbarComponent,
     GridActionsComponent,
     ExtensibleFormPropComponent,
     ExtensibleFormComponent,
     ExtensibleTableComponent,
     PropDataDirective,
-    DisabledDirective,
     CreateInjectorPipe,
   ],
   imports: [
@@ -49,13 +40,16 @@ import { CreateInjectorPipe } from './pipes/create-injector.pipe';
     NgbDropdownModule,
     NgbTimepickerModule,
     NgbTypeaheadModule,
-    NgbTooltipModule
+    NgbTooltipModule,
+    DisabledDirective,
+  ],
+  exports: [
+    PageToolbarComponent,
+    GridActionsComponent,
+    ExtensibleFormComponent,
+    ExtensibleTableComponent,
+    PropDataDirective,
+    CreateInjectorPipe,
   ],
 })
-export class BaseUiExtensionsModule {}
+export class ExtensibleModule {}
-
-@NgModule({
-  exports: [BaseUiExtensionsModule],
-  imports: [BaseUiExtensionsModule],
-})
-export class UiExtensionsModule {}

npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts → npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts

@@ -1,11 +1,10 @@
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { DateTimeAdapter } from '../adapters/date-time.adapter';
+import { DateTimeAdapter,DateAdapter,TimeAdapter } from '@abp/ng.theme.shared';
-import { DateAdapter } from '../adapters/date.adapter';
+
-import { TimeAdapter } from '../adapters/time.adapter';
 import { EXTRA_PROPERTIES_KEY } from '../constants/extra-properties';
 import { ePropType } from '../enums/props.enum';
-import { FormProp, FormPropList } from "../models/form-props";
+import { FormPropList } from "../models/form-props";
-import { InferredProp, PropData } from "../models/props";
+import { PropData } from "../models/props";
 import { ExtensionsService } from '../services/extensions.service';
 import { EXTENSIONS_IDENTIFIER } from '../tokens/extensions.token';
 

npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/typeahead.util.ts → npm/ng-packs/packages/components/extensible/src/lib/utils/typeahead.util.ts

@@ -39,11 +39,11 @@ export function createTypeaheadOptions(
 }
 
 export function getTypeaheadType(lookup: ExtensionPropertyUiLookupDto, name: string) {
-  return Boolean(lookup.url)
+  if (!!lookup.url) {
-    ? ePropType.Typeahead
+    return ePropType.Typeahead;
-    : name.endsWith(TYPEAHEAD_TEXT_SUFFIX)
+  } else {
-    ? ePropType.Hidden
+    return name.endsWith(TYPEAHEAD_TEXT_SUFFIX) ? ePropType.Hidden : undefined;
-    : undefined;
+  }
 }
 
 export function createTypeaheadDisplayNameGenerator(

npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts → npm/ng-packs/packages/components/extensible/src/public-api.ts

@@ -1,14 +1,10 @@
-export * from './lib/adapters/date-time.adapter';
+export * from './lib/components/date-time-picker/extensible-date-time-picker.component';
-export * from './lib/adapters/date.adapter';
-export * from './lib/adapters/time.adapter';
-export * from './lib/components/date-time-picker/date-time-picker.component';
 export * from './lib/components/extensible-form/extensible-form-prop.component';
 export * from './lib/components/extensible-form/extensible-form.component';
 export * from './lib/components/extensible-table/extensible-table.component';
 export * from './lib/components/grid-actions/grid-actions.component';
 export * from './lib/components/page-toolbar/page-toolbar.component';
 export * from './lib/constants/extra-properties';
-export * from './lib/directives/disabled.directive';
 export * from './lib/directives/prop-data.directive';
 export * from './lib/enums/props.enum';
 export * from './lib/enums/components';
@@ -66,8 +62,8 @@ export * from './lib/pipes/create-injector.pipe';
 export * from './lib/services/extensions.service';
 export * from './lib/tokens/extensions.token';
 export * from './lib/tokens/extensible-form-view-provider.token';
-export * from './lib/ui-extensions.module';
+ export * from './lib/utils/actions.util';
-export * from './lib/utils/actions.util';
 export * from './lib/utils/form-props.util';
 export * from './lib/utils/props.util';
 export * from './lib/utils/state.util';
+export * from './lib/extensible.module';

npm/ng-packs/packages/components/page/src/page.module.ts

@@ -1,7 +1,6 @@
 import { CoreModule } from '@abp/ng.core';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
+ import { CommonModule } from '@angular/common';
-import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { PagePartDirective } from './page-part.directive';
 import {
@@ -10,6 +9,7 @@ import {
   PageToolbarContainerComponent,
 } from './page-parts.component';
 import { PageComponent } from './page.component';
+import {ExtensibleModule} from "@abp/ng.components/extensible";
 
 const exportedDeclarations = [
   PageComponent,
@@ -21,7 +21,7 @@ const exportedDeclarations = [
 
 @NgModule({
   declarations: [...exportedDeclarations],
-  imports: [CommonModule, UiExtensionsModule, CoreModule, ThemeSharedModule],
+    imports: [CommonModule, CoreModule, ThemeSharedModule, ExtensibleModule],
-  exports: [...exportedDeclarations, UiExtensionsModule],
+  exports: [...exportedDeclarations],
 })
 export class PageModule {}

npm/ng-packs/packages/components/project.json

@@ -32,7 +32,12 @@
     "lint": {
       "executor": "@nx/linter:eslint",
       "options": {
-        "lintFilePatterns": ["packages/components/src/**/*.ts", "packages/components/src/**/*.html"]
+        "lintFilePatterns": [
+          "packages/components/src/**/*.ts",
+          "packages/components/src/**/*.html",
+          "packages/components/extensible/**/*.ts",
+          "packages/components/extensible/**/*.html"
+        ]
       },
       "outputs": ["{options.outputFile}"]
     }

npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts

@@ -6,7 +6,7 @@ import {
   EXTENSIONS_IDENTIFIER,
   FormPropData,
   generateFormFromProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { Component, Injector, OnInit } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { finalize } from 'rxjs/operators';

npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@@ -11,7 +11,7 @@ import {
   EXTENSIONS_IDENTIFIER,
   FormPropData,
   generateFormFromProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import {
   Component,
   Injector,
@@ -60,7 +60,7 @@ export class UsersComponent implements OnInit {
   permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
 
   entityDisplayName: string;
-  
+
   inputKey=eFormComponets.FormCheckboxComponent
 
   trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-actions.ts

@@ -1,5 +1,5 @@
 import { IdentityRoleDto } from '@abp/ng.identity/proxy';
-import { EntityAction } from '@abp/ng.theme.shared/extensions';
+import { EntityAction } from '@abp/ng.components/extensible';
 import { RolesComponent } from '../components/roles/roles.component';
 
 export const DEFAULT_ROLES_ENTITY_ACTIONS = EntityAction.createMany<IdentityRoleDto>([

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts

@@ -1,6 +1,6 @@
 import { escapeHtmlChars, LocalizationService } from '@abp/ng.core';
 import { IdentityRoleDto } from '@abp/ng.identity/proxy';
-import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
+import { EntityProp, ePropType } from '@abp/ng.components/extensible';
 import { of } from 'rxjs';
 
 export const DEFAULT_ROLES_ENTITY_PROPS = EntityProp.createMany<IdentityRoleDto>([

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-form-props.ts

@@ -1,5 +1,5 @@
 import { IdentityRoleDto } from '@abp/ng.identity/proxy';
-import { ePropType, FormProp, PropData, PropPredicate } from "@abp/ng.theme.shared/extensions";
+import { ePropType, FormProp, PropData, PropPredicate } from "@abp/ng.components/extensible";
 import { Validators } from '@angular/forms';
 
 export const DEFAULT_ROLES_CREATE_FORM_PROPS = FormProp.createMany<IdentityRoleDto>([

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-toolbar-actions.ts

@@ -1,5 +1,5 @@
 import { IdentityRoleDto } from '@abp/ng.identity/proxy';
-import { ToolbarAction } from '@abp/ng.theme.shared/extensions';
+import { ToolbarAction } from '@abp/ng.components/extensible';
 import { RolesComponent } from '../components/roles/roles.component';
 
 export const DEFAULT_ROLES_TOOLBAR_ACTIONS = ToolbarAction.createMany<IdentityRoleDto[]>([

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts

@@ -1,5 +1,5 @@
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
-import { EntityAction } from '@abp/ng.theme.shared/extensions';
+import { EntityAction } from '@abp/ng.components/extensible';
 import { UsersComponent } from '../components/users/users.component';
 import { ConfigStateService, CurrentUserDto } from '@abp/ng.core';
 

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts

@@ -1,6 +1,6 @@
 import { escapeHtmlChars, LocalizationService } from '@abp/ng.core';
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
-import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
+import { EntityProp, ePropType } from '@abp/ng.components/extensible';
 import { of } from 'rxjs';
 
 export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>([

npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

@@ -1,7 +1,7 @@
 import { Validators } from '@angular/forms';
 import { ConfigStateService, CurrentUserDto } from '@abp/ng.core';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
-import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
+import { ePropType, FormProp } from '@abp/ng.components/extensible';
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
 
 export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserDto>([

npm/ng-packs/packages/identity/src/lib/defaults/default-users-toolbar-actions.ts

@@ -1,5 +1,5 @@
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
-import { ToolbarAction } from '@abp/ng.theme.shared/extensions';
+import { ToolbarAction } from '@abp/ng.components/extensible';
 import { UsersComponent } from '../components/users/users.component';
 
 export const DEFAULT_USERS_TOOLBAR_ACTIONS = ToolbarAction.createMany<IdentityUserDto[]>([

npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts

@@ -10,7 +10,7 @@ import {
   mapEntitiesToContributors,
   mergeWithDefaultActions,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 
 import { eIdentityComponents } from '../enums/components';
 import {

npm/ng-packs/packages/identity/src/lib/identity.module.ts

@@ -1,7 +1,7 @@
 import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
 import { PermissionManagementModule } from '@abp/ng.permission-management';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
+import { ExtensibleModule } from '@abp/ng.components/extensible';
 import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
 import { NgbDropdownModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
@@ -27,7 +27,7 @@ import { PageModule } from '@abp/ng.components/page';
     IdentityRoutingModule,
     NgbNavModule,
     ThemeSharedModule,
-    UiExtensionsModule,
+    ExtensibleModule,
     NgbDropdownModule,
     PermissionManagementModule,
     NgxValidateCoreModule,

npm/ng-packs/packages/identity/src/lib/models/config-options.ts

@@ -5,7 +5,7 @@ import {
   EntityActionContributorCallback,
   EntityPropContributorCallback,
   ToolbarActionContributorCallback,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eIdentityComponents } from '../enums/components';
 
 export type IdentityEntityActionContributors = Partial<{

npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts

@@ -7,7 +7,7 @@ import {
   mapEntitiesToContributors,
   mergeWithDefaultActions,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eIdentityComponents } from '../enums';
 import {
   IDENTITY_ENTITY_ACTION_CONTRIBUTORS,

npm/ng-packs/packages/identity/src/lib/tokens/extensions.token.ts

@@ -5,7 +5,7 @@ import {
   EntityActionContributorCallback,
   EntityPropContributorCallback,
   ToolbarActionContributorCallback,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { InjectionToken } from '@angular/core';
 import { DEFAULT_ROLES_ENTITY_ACTIONS } from '../defaults/default-roles-entity-actions';
 import { DEFAULT_ROLES_ENTITY_PROPS } from '../defaults/default-roles-entity-props';

npm/ng-packs/packages/oauth/src/lib/oauth.module.ts

@@ -4,6 +4,7 @@ import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
 import {
   AbpLocalStorageService,
   ApiInterceptor,
+  AuthGuard,
   authGuard,
   AuthService,
   CHECK_AUTHENTICATION_STATE_FN_KEY,
@@ -14,7 +15,7 @@ import { AbpOAuthService } from './services';
 import { OAuthConfigurationHandler } from './handlers/oauth-configuration.handler';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { OAuthApiInterceptor } from './interceptors/api.interceptor';
-import { abpOAuthGuard } from './guards/oauth.guard';
+import { AbpOAuthGuard, abpOAuthGuard } from './guards/oauth.guard';
 import { NavigateToManageProfileProvider } from './providers';
 import { checkAccessToken, pipeToLogin } from './utils';
 
@@ -30,6 +31,10 @@ export class AbpOAuthModule {
           provide: AuthService,
           useClass: AbpOAuthService,
         },
+        {
+          provide: AuthGuard,
+          useClass: AbpOAuthGuard,
+        },
         {
           provide: authGuard,
           useValue: abpOAuthGuard,

npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts

@@ -6,7 +6,7 @@ import {
   EXTENSIONS_IDENTIFIER,
   FormPropData,
   generateFormFromProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { Component, Injector, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { finalize } from 'rxjs/operators';

npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-actions.ts

@@ -1,5 +1,5 @@
 import { TenantDto } from '@abp/ng.tenant-management/proxy';
-import { EntityAction } from '@abp/ng.theme.shared/extensions';
+import { EntityAction } from '@abp/ng.components/extensible';
 import { TenantsComponent } from '../components/tenants/tenants.component';
 
 export const DEFAULT_TENANTS_ENTITY_ACTIONS = EntityAction.createMany<TenantDto>([

npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-props.ts

@@ -1,5 +1,5 @@
 import { TenantDto } from '@abp/ng.tenant-management/proxy';
-import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
+import { EntityProp, ePropType } from '@abp/ng.components/extensible';
 
 export const DEFAULT_TENANTS_ENTITY_PROPS = EntityProp.createMany<TenantDto>([
   {

npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts

@@ -1,6 +1,6 @@
 import { TenantCreateDto, TenantUpdateDto } from '@abp/ng.tenant-management/proxy';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
-import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
+import { ePropType, FormProp } from '@abp/ng.components/extensible';
 import { Validators } from '@angular/forms';
 
 export const DEFAULT_TENANTS_CREATE_FORM_PROPS = FormProp.createMany<

npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-toolbar-actions.ts

@@ -1,5 +1,5 @@
 import { TenantDto } from '@abp/ng.tenant-management/proxy';
-import { ToolbarAction } from '@abp/ng.theme.shared/extensions';
+import { ToolbarAction } from '@abp/ng.components/extensible';
 import { TenantsComponent } from '../components/tenants/tenants.component';
 
 export const DEFAULT_TENANTS_TOOLBAR_ACTIONS = ToolbarAction.createMany<TenantDto[]>([

npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts

@@ -10,7 +10,7 @@ import {
   mapEntitiesToContributors,
   mergeWithDefaultActions,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 
 import { eTenantManagementComponents } from '../enums/components';
 import {

npm/ng-packs/packages/tenant-management/src/lib/models/config-options.ts

@@ -5,7 +5,7 @@ import {
   EntityActionContributorCallback,
   EntityPropContributorCallback,
   ToolbarActionContributorCallback,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eTenantManagementComponents } from '../enums/components';
 
 export type TenantManagementEntityActionContributors = Partial<{

npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts

@@ -7,7 +7,7 @@ import {
   mapEntitiesToContributors,
   mergeWithDefaultActions,
   mergeWithDefaultProps,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { eTenantManagementComponents } from '../enums';
 import {
   TENANT_MANAGEMENT_ENTITY_ACTION_CONTRIBUTORS,

npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts

@@ -1,7 +1,7 @@
 import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
 import { FeatureManagementModule } from '@abp/ng.feature-management';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
+import { ExtensibleModule } from '@abp/ng.components/extensible';
 import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
@@ -28,7 +28,7 @@ import { PageModule } from '@abp/ng.components/page';
     ThemeSharedModule,
     NgbDropdownModule,
     FeatureManagementModule,
-    UiExtensionsModule,
+    ExtensibleModule,
     PageModule,
   ],
 })

npm/ng-packs/packages/tenant-management/src/lib/tokens/extensions.token.ts

@@ -5,7 +5,7 @@ import {
   EntityActionContributorCallback,
   EntityPropContributorCallback,
   ToolbarActionContributorCallback,
-} from '@abp/ng.theme.shared/extensions';
+} from '@abp/ng.components/extensible';
 import { InjectionToken } from '@angular/core';
 import { DEFAULT_TENANTS_ENTITY_ACTIONS } from '../defaults/default-tenants-entity-actions';
 import { DEFAULT_TENANTS_ENTITY_PROPS } from '../defaults/default-tenants-entity-props';

npm/ng-packs/packages/theme-shared/extensions/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../dist/packages/theme-shared/extensions",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  }
-}

npm/ng-packs/packages/theme-shared/extensions/testing/src/lib/ui-extensions-testing.module.ts

@@ -1,8 +0,0 @@
-import { BaseUiExtensionsModule } from '@abp/ng.theme.shared/extensions';
-import { NgModule } from '@angular/core';
-
-@NgModule({
-  exports: [BaseUiExtensionsModule],
-  imports: [BaseUiExtensionsModule],
-})
-export class UiExtensionsTestingModule {}