diff --git a/npm/ng-packs/.eslintrc.json b/npm/ng-packs/.eslintrc.json index 3a15786c57..8649f90b2d 100644 --- a/npm/ng-packs/.eslintrc.json +++ b/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"] + } }, { diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts index 304cc31242..58df433232 100644 --- a/npm/ng-packs/packages/account/src/lib/account.module.ts +++ b/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], }) diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts index d7920984ce..2515983e48 100644 --- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts +++ b/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({ diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts index f41058d06c..a40041551a 100644 --- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts +++ b/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({ diff --git a/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts b/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts index 59c196f2bd..b9463ae336 100644 --- a/npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts +++ b/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'; diff --git a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts index 43345bffc3..ebeae81a67 100644 --- a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts +++ b/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, diff --git a/npm/ng-packs/packages/account/src/lib/models/config-options.ts b/npm/ng-packs/packages/account/src/lib/models/config-options.ts index c45389492f..11964f8da8 100644 --- a/npm/ng-packs/packages/account/src/lib/models/config-options.ts +++ b/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[]; -}>; \ No newline at end of file +}>; diff --git a/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts index 19e29b1e54..b3aec858b8 100644 --- a/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts +++ b/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'; diff --git a/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts index 78acb7feaa..d8baf6f623 100644 --- a/npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts +++ b/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 = { diff --git a/npm/ng-packs/packages/components/extensible/README.md b/npm/ng-packs/packages/components/extensible/README.md new file mode 100644 index 0000000000..7a14a85f7c --- /dev/null +++ b/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`. diff --git a/npm/ng-packs/packages/components/extensible/ng-package.json b/npm/ng-packs/packages/components/extensible/ng-package.json new file mode 100644 index 0000000000..fbafcc4448 --- /dev/null +++ b/npm/ng-packs/packages/components/extensible/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "src/public-api.ts" + } +} diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/abstract-actions/abstract-actions.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/abstract-actions/abstract-actions.component.ts similarity index 95% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/abstract-actions/abstract-actions.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/abstract-actions/abstract-actions.component.ts index a7710d16a0..394e125798 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/abstract-actions/abstract-actions.component.ts +++ b/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['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); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/date-time-picker/extensible-date-time-picker.component.ts similarity index 82% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/date-time-picker/extensible-date-time-picker.component.ts index 60a2d16f34..55b73581c9 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts +++ b/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', - selector: 'abp-date-time-picker', + exportAs: 'abpExtensibleDateTimePicker', + selector: 'abp-extensible-date-time-picker', template: ` - + diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts similarity index 97% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts index 679afe3b04..2689e09a33 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/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 { TimeAdapter } from '../../adapters/time.adapter'; +import { DateAdapter, TimeAdapter } from '@abp/ng.theme.shared'; 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', diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.html rename to npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html rename to npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts similarity index 95% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts index aa264385be..af146e2367 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts +++ b/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 implements OnChanges { @Output() tableActivate = new EventEmitter(); - getInjected: (token: Type | InjectionToken, notFoundValue?: T, flags?: InjectFlags) => T; + getInjected: typeof this.injector.get hasAtLeastOnePermittedAction: boolean; @@ -150,7 +147,7 @@ export class ExtensibleTableComponent 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 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 implements OnChanges { ], parent: this.injector, }); - record[propKey].injector = injector; record[propKey].component = prop.value.component; } }); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/grid-actions/grid-actions.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/grid-actions/grid-actions.component.html rename to npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/grid-actions/grid-actions.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/grid-actions/grid-actions.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/index.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/index.ts new file mode 100644 index 0000000000..17f1c380d1 --- /dev/null +++ b/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'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html rename to npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.html diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.ts rename to npm/ng-packs/packages/components/extensible/src/lib/components/page-toolbar/page-toolbar.component.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/constants/extra-properties.ts b/npm/ng-packs/packages/components/extensible/src/lib/constants/extra-properties.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/constants/extra-properties.ts rename to npm/ng-packs/packages/components/extensible/src/lib/constants/extra-properties.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/directives/prop-data.directive.ts b/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/directives/prop-data.directive.ts rename to npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/components.ts b/npm/ng-packs/packages/components/extensible/src/lib/enums/components.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/components.ts rename to npm/ng-packs/packages/components/extensible/src/lib/enums/components.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts b/npm/ng-packs/packages/components/extensible/src/lib/enums/props.enum.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts rename to npm/ng-packs/packages/components/extensible/src/lib/enums/props.enum.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/ui-extensions.module.ts b/npm/ng-packs/packages/components/extensible/src/lib/extensible.module.ts similarity index 54% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/ui-extensions.module.ts rename to npm/ng-packs/packages/components/extensible/src/lib/extensible.module.ts index 33882fbd43..334909a7e2 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/ui-extensions.module.ts +++ b/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 { DateTimePickerComponent } from './components/date-time-picker/date-time-picker.component'; -import { ExtensibleFormPropComponent } from './components/extensible-form/extensible-form-prop.component'; -import { ExtensibleFormComponent } from './components/extensible-form/extensible-form.component'; -import { ExtensibleTableComponent } from './components/extensible-table/extensible-table.component'; -import { GridActionsComponent } from './components/grid-actions/grid-actions.component'; -import { PageToolbarComponent } from './components/page-toolbar/page-toolbar.component'; -import { DisabledDirective } from './directives/disabled.directive'; +import { + ExtensibleFormComponent, + ExtensibleFormPropComponent, + ExtensibleTableComponent, + GridActionsComponent, + PageToolbarComponent, + ExtensibleDateTimePickerComponent +} 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 {} - -@NgModule({ - exports: [BaseUiExtensionsModule], - imports: [BaseUiExtensionsModule], -}) -export class UiExtensionsModule {} +export class ExtensibleModule {} diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/actions.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/entity-actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/entity-actions.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/entity-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/entity-props.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/internal/object-extensions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/internal/object-extensions.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/internal/object-extensions.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/internal/object-extensions.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/object-extensions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/object-extensions.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/object-extensions.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/object-extensions.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/props.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts rename to npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/pipes/create-injector.pipe.ts b/npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/pipes/create-injector.pipe.ts rename to npm/ng-packs/packages/components/extensible/src/lib/pipes/create-injector.pipe.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/services/extensions.service.ts b/npm/ng-packs/packages/components/extensible/src/lib/services/extensions.service.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/services/extensions.service.ts rename to npm/ng-packs/packages/components/extensible/src/lib/services/extensions.service.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts b/npm/ng-packs/packages/components/extensible/src/lib/tokens/extensible-form-view-provider.token.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensible-form-view-provider.token.ts rename to npm/ng-packs/packages/components/extensible/src/lib/tokens/extensible-form-view-provider.token.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/components/extensible/src/lib/tokens/extensions.token.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/tokens/extensions.token.ts rename to npm/ng-packs/packages/components/extensible/src/lib/tokens/extensions.token.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/actions.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/actions.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/actions.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/actions.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/enum.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/enum.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/enum.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/enum.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/factory.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/factory.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/factory.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/factory.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts similarity index 87% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts index c1295f21fa..ab7c669d47 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts +++ b/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 { DateAdapter } from '../adapters/date.adapter'; -import { TimeAdapter } from '../adapters/time.adapter'; +import { DateTimeAdapter,DateAdapter,TimeAdapter } from '@abp/ng.theme.shared'; + import { EXTRA_PROPERTIES_KEY } from '../constants/extra-properties'; import { ePropType } from '../enums/props.enum'; -import { FormProp, FormPropList } from "../models/form-props"; -import { InferredProp, PropData } from "../models/props"; +import { FormPropList } from "../models/form-props"; +import { PropData } from "../models/props"; import { ExtensionsService } from '../services/extensions.service'; import { EXTENSIONS_IDENTIFIER } from '../tokens/extensions.token'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/localization.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/localization.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/localization.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/localization.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/props.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/props.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/state.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/state.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/state.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/state.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/typeahead.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/typeahead.util.ts similarity index 93% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/typeahead.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/typeahead.util.ts index b8038b7a69..eec592ad0c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/typeahead.util.ts +++ b/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) - ? ePropType.Typeahead - : name.endsWith(TYPEAHEAD_TEXT_SUFFIX) - ? ePropType.Hidden - : undefined; + if (!!lookup.url) { + return ePropType.Typeahead; + } else { + return name.endsWith(TYPEAHEAD_TEXT_SUFFIX) ? ePropType.Hidden : undefined; + } } export function createTypeaheadDisplayNameGenerator( diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/validation.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/validation.util.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/validation.util.ts rename to npm/ng-packs/packages/components/extensible/src/lib/utils/validation.util.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts b/npm/ng-packs/packages/components/extensible/src/public-api.ts similarity index 84% rename from npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts rename to npm/ng-packs/packages/components/extensible/src/public-api.ts index 7268be4395..abcc3a1a0c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts +++ b/npm/ng-packs/packages/components/extensible/src/public-api.ts @@ -1,14 +1,10 @@ -export * from './lib/adapters/date-time.adapter'; -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/date-time-picker/extensible-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'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/actions.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/actions.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/actions.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/actions.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/actions.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/actions.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/actions.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/actions.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/date-time.adapter.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/date-time.adapter.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/date-time.adapter.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/date-time.adapter.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/date.adapter.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/date.adapter.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/date.adapter.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/date.adapter.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/entity-actions.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/entity-actions.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/entity-props.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/entity-props.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/enum.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/enum.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/extensions.service.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/extensions.service.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/extensions.service.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/extensions.service.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/factory.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/factory.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/factory.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/factory.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/form-props.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/form-props.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/form-props.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/form-props.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/localization.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/localization.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/props.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/props.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/props.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/props.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/props.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/props.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/props.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/props.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/state.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/state.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/time.adapter.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/time.adapter.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/time.adapter.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/time.adapter.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/toolbar-actions.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/toolbar-actions.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/toolbar-actions.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/toolbar-actions.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/typeahead.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/typeahead.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/typeahead.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/typeahead.util.spec.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/validation.util.spec.ts b/npm/ng-packs/packages/components/extensible/src/tests/validation.util.spec.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/tests/validation.util.spec.ts rename to npm/ng-packs/packages/components/extensible/src/tests/validation.util.spec.ts diff --git a/npm/ng-packs/packages/components/page/src/page.module.ts b/npm/ng-packs/packages/components/page/src/page.module.ts index d9d237cbdb..5bb27fbc66 100644 --- a/npm/ng-packs/packages/components/page/src/page.module.ts +++ b/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], - exports: [...exportedDeclarations, UiExtensionsModule], + imports: [CommonModule, CoreModule, ThemeSharedModule, ExtensibleModule], + exports: [...exportedDeclarations], }) export class PageModule {} diff --git a/npm/ng-packs/packages/components/project.json b/npm/ng-packs/packages/components/project.json index 12a03b4ad1..fc73649c65 100644 --- a/npm/ng-packs/packages/components/project.json +++ b/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}"] } diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts index 5e2a0e866a..fd8b3670f8 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts +++ b/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'; diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 6dd1ab9f17..f8802de304 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/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 = (index, item) => Object.keys(item)[0] || index; diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-actions.ts index fe6e0661d5..11a1b967e0 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-actions.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts index c26124c531..6c3e473ae9 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-form-props.ts index 129a095a02..d09b8755f2 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-form-props.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-toolbar-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-toolbar-actions.ts index e31e444669..e938342d8f 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-roles-toolbar-actions.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts index ca0a2edcad..bc7c2dd8e6 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts +++ b/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'; diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts index da277acd6c..a90a0d7458 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index 3c1a3e4c82..9f802c8283 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-toolbar-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-toolbar-actions.ts index 72092cbb1a..75053fcaa9 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-toolbar-actions.ts +++ b/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([ diff --git a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts index 74dab0745a..c78e03b6af 100644 --- a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts +++ b/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 { diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts index e6c11d195e..ea07602f7c 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts +++ b/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, diff --git a/npm/ng-packs/packages/identity/src/lib/models/config-options.ts b/npm/ng-packs/packages/identity/src/lib/models/config-options.ts index b244a1a51a..56abbd11e6 100644 --- a/npm/ng-packs/packages/identity/src/lib/models/config-options.ts +++ b/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<{ diff --git a/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts index 1a303e50c4..45856046d8 100644 --- a/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts +++ b/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, diff --git a/npm/ng-packs/packages/identity/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/identity/src/lib/tokens/extensions.token.ts index 3a91d38c27..ec3af0649d 100644 --- a/npm/ng-packs/packages/identity/src/lib/tokens/extensions.token.ts +++ b/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'; diff --git a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts b/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts index a222b6327b..3ee3741d04 100644 --- a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts +++ b/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, diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts index 51c98a53e2..b759947b32 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts +++ b/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'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-actions.ts b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-actions.ts index 6cb5fe7d26..23848b8582 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-actions.ts +++ b/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([ diff --git a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-props.ts b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-props.ts index 8eacec5623..a893453e71 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-entity-props.ts +++ b/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([ { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts index a3956e87d5..2c6482f78f 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts +++ b/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< diff --git a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-toolbar-actions.ts b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-toolbar-actions.ts index 5621a81aac..f1b3bce9d5 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-toolbar-actions.ts +++ b/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([ diff --git a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts index 42e0b50d75..d37d735453 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts +++ b/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 { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/models/config-options.ts b/npm/ng-packs/packages/tenant-management/src/lib/models/config-options.ts index 684d7c49ea..c9f4d62e44 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/models/config-options.ts +++ b/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<{ diff --git a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts index 609f048465..d3c224aba2 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts +++ b/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, diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts index 535ee38aaa..4b44814bce 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts +++ b/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, ], }) diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tokens/extensions.token.ts b/npm/ng-packs/packages/tenant-management/src/lib/tokens/extensions.token.ts index 666183fbaa..8215a0cc8f 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tokens/extensions.token.ts +++ b/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'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/ng-package.json b/npm/ng-packs/packages/theme-shared/extensions/ng-package.json deleted file mode 100644 index 3244b2e39b..0000000000 --- a/npm/ng-packs/packages/theme-shared/extensions/ng-package.json +++ /dev/null @@ -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" - } -} diff --git a/npm/ng-packs/packages/theme-shared/extensions/testing/src/lib/ui-extensions-testing.module.ts b/npm/ng-packs/packages/theme-shared/extensions/testing/src/lib/ui-extensions-testing.module.ts deleted file mode 100644 index 593cce3733..0000000000 --- a/npm/ng-packs/packages/theme-shared/extensions/testing/src/lib/ui-extensions-testing.module.ts +++ /dev/null @@ -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 {} diff --git a/npm/ng-packs/packages/theme-shared/extensions/testing/src/public-api.ts b/npm/ng-packs/packages/theme-shared/extensions/testing/src/public-api.ts deleted file mode 100644 index d524c9cd0c..0000000000 --- a/npm/ng-packs/packages/theme-shared/extensions/testing/src/public-api.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './lib/ui-extensions-testing.module'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/testing/ssng-package.json b/npm/ng-packs/packages/theme-shared/extensions/testing/ssng-package.json deleted file mode 100644 index 10757e7f04..0000000000 --- a/npm/ng-packs/packages/theme-shared/extensions/testing/ssng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/theme-shared/extensions/testing", - "lib": { - "entryFile": "src/public-api.ts" - } -} diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/date-time.adapter.ts b/npm/ng-packs/packages/theme-shared/src/lib/adapters/date-time.adapter.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/date-time.adapter.ts rename to npm/ng-packs/packages/theme-shared/src/lib/adapters/date-time.adapter.ts diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/date.adapter.ts b/npm/ng-packs/packages/theme-shared/src/lib/adapters/date.adapter.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/date.adapter.ts rename to npm/ng-packs/packages/theme-shared/src/lib/adapters/date.adapter.ts diff --git a/npm/ng-packs/packages/theme-shared/src/lib/adapters/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/adapters/index.ts new file mode 100644 index 0000000000..a8e37ee1d3 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/adapters/index.ts @@ -0,0 +1,3 @@ +export * from './date-time.adapter'; +export * from './date.adapter'; +export * from './time.adapter'; diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/time.adapter.ts b/npm/ng-packs/packages/theme-shared/src/lib/adapters/time.adapter.ts similarity index 92% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/time.adapter.ts rename to npm/ng-packs/packages/theme-shared/src/lib/adapters/time.adapter.ts index c51650b8dd..de2c47b349 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/adapters/time.adapter.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/adapters/time.adapter.ts @@ -31,5 +31,5 @@ export class TimeAdapter extends NgbTimeAdapter { } function isTimeStr(value: string | Date): value is string { - return /^((2[123])|[01][0-9])(\:[0-5][0-9]){1,2}$/.test(String(value)); + return /^((2[123])|[01][0-9])(:[0-5][0-9]){1,2}$/.test(String(value)); } diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/directives/disabled.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts similarity index 96% rename from npm/ng-packs/packages/theme-shared/extensions/src/lib/directives/disabled.directive.ts rename to npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts index c0a1a74995..8832280dee 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/directives/disabled.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts @@ -3,6 +3,7 @@ import { NgControl } from '@angular/forms'; @Directive({ selector: '[abpDisabled]', + standalone:true, }) export class DisabledDirective implements OnChanges { @Input() diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts index 3f22a36f1b..1047bc67e6 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts @@ -3,3 +3,4 @@ export * from './loading.directive'; export * from './ngx-datatable-default.directive'; export * from './ngx-datatable-list.directive'; export * from './visible.directive'; +export * from './disabled.directive'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/nav-item.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/nav-item.ts index 3afce94a0c..dc98726624 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/models/nav-item.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/nav-item.ts @@ -1,5 +1,5 @@ import { Injector, Type } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { Observable } from 'rxjs'; export interface Badge { count?: number | Observable; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/page-alert.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/page-alert.service.ts index c66d02c004..22346ab78c 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/page-alert.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/page-alert.service.ts @@ -16,8 +16,6 @@ export class PageAlertService { alerts$ = this.alerts.sliceState(state => state); - constructor() {} - show(alert: PageAlert) { const newAlert: PageAlert = { ...alert, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/form-input.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/form-input.component.spec.ts index 660cb72165..cf4eb4aac3 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/form-input.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/form-input.component.spec.ts @@ -1,4 +1,3 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest'; import { FormInputComponent } from '../components/form-input/form-input.component'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts index 60b9130ece..db468c4a6d 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts @@ -7,7 +7,6 @@ import { LoaderBarComponent } from '../components/loader-bar/loader-bar.componen describe('LoaderBarComponent', () => { let spectator: Spectator; - let router: SpyObject; const events$ = new Subject(); const createComponent = createComponentFactory({ diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index ce1d5b40fe..71c081c9b2 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -37,7 +37,7 @@ import { DateParserFormatter } from './utils/date-parser-formatter'; import { CONFIRMATION_ICONS, DEFAULT_CONFIRMATION_ICONS } from './tokens/confirmation-icons.token'; import { PasswordComponent } from './components/password/password.component'; import { CardModule } from './components/card/card.module'; -import { AbpVisibleDirective } from './directives'; +import { AbpVisibleDirective, DisabledDirective } from './directives'; import { FormInputComponent } from './components/form-input/form-input.component'; import { FormCheckboxComponent } from './components/checkbox/checkbox.component'; import { tenantNotFoundProvider } from './providers/tenant-not-found.provider'; @@ -70,6 +70,7 @@ const declarationsWithExports = [ NgbPaginationModule, EllipsisModule, CardModule, + DisabledDirective ], declarations: [...declarationsWithExports, HttpErrorWrapperComponent], exports: [ @@ -77,6 +78,9 @@ const declarationsWithExports = [ EllipsisModule, NgxValidateCoreModule, CardModule, + DisabledDirective, + NgxDatatableListDirective, + NgxDatatableDefaultDirective, ...declarationsWithExports, ], providers: [DatePipe], diff --git a/npm/ng-packs/packages/theme-shared/src/public-api.ts b/npm/ng-packs/packages/theme-shared/src/public-api.ts index 22661e3855..659e59e490 100644 --- a/npm/ng-packs/packages/theme-shared/src/public-api.ts +++ b/npm/ng-packs/packages/theme-shared/src/public-api.ts @@ -2,6 +2,7 @@ * Public API Surface of theme-shared */ +export * from './lib/adapters' export * from './lib/animations'; export * from './lib/components'; export * from './lib/constants/validation'; diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 3b4de4eb67..d24de94706 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -20,6 +20,7 @@ "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"], "@abp/ng.components": ["packages/components/src/public-api.ts"], "@abp/ng.components/chart.js": ["packages/components/chart.js/src/public-api.ts"], + "@abp/ng.components/extensible": ["packages/components/extensible/src/public-api.ts"], "@abp/ng.components/page": ["packages/components/page/src/public-api.ts"], "@abp/ng.components/tree": ["packages/components/tree/src/public-api.ts"], "@abp/ng.core": ["packages/core/src/public-api.ts"], @@ -44,7 +45,6 @@ "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"], "@abp/ng.theme.basic/testing": ["packages/theme-basic/testing/src/public-api.ts"], "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], - "@abp/ng.theme.shared/extensions": ["packages/theme-shared/extensions/src/public-api.ts"], "@abp/ng.theme.shared/testing": ["packages/theme-shared/testing/src/public-api.ts"], "@abp/nx.generators": ["packages/generators/src/index.ts"] }