tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Format changes code with prettier

pull/13700/head
Mahmut Gundogdu 4 years ago
parent
a582807e07
commit
9cd2027cb0
7 changed files with 86 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      npm/ng-packs/packages/account/src/lib/account.module.ts
  2. 42
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
  3. 36
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts
  4. 22
      npm/ng-packs/packages/account/src/lib/defaults/default-personal-settings-form-props.ts
  5. 8
      npm/ng-packs/packages/account/src/lib/models/config-options.ts
  6. 10
      npm/ng-packs/packages/account/src/lib/tokens/extensions.token.ts
  7. 1
      npm/ng-packs/packages/core/src/lib/validators/required.validator.ts

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

@ -1,24 +1,24 @@
import {CoreModule, LazyModuleFactory} from '@abp/ng.core'; import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
import {ThemeSharedModule} from '@abp/ng.theme.shared'; import { ThemeSharedModule } from '@abp/ng.theme.shared';
import {ModuleWithProviders, NgModule, NgModuleFactory} from '@angular/core'; import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
import {NgbDropdownModule} from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import {NgxValidateCoreModule} from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import {AccountRoutingModule} from './account-routing.module'; import { AccountRoutingModule } from './account-routing.module';
import {ChangePasswordComponent} from './components/change-password/change-password.component'; import { ChangePasswordComponent } from './components/change-password/change-password.component';
import {LoginComponent} from './components/login/login.component'; import { LoginComponent } from './components/login/login.component';
import {ManageProfileComponent} from './components/manage-profile/manage-profile.component'; import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
import {PersonalSettingsComponent} from './components/personal-settings/personal-settings.component'; import { PersonalSettingsComponent } from './components/personal-settings/personal-settings.component';
import {RegisterComponent} from './components/register/register.component'; import { RegisterComponent } from './components/register/register.component';
import {AccountConfigOptions} from './models/config-options'; import { AccountConfigOptions } from './models/config-options';
import {ACCOUNT_CONFIG_OPTIONS} from './tokens/config-options.token'; import { ACCOUNT_CONFIG_OPTIONS } from './tokens/config-options.token';
import {accountConfigOptionsFactory} from './utils/factory-utils'; import { accountConfigOptionsFactory } from './utils/factory-utils';
import {AuthenticationFlowGuard} from './guards/authentication-flow.guard'; import { AuthenticationFlowGuard } from './guards/authentication-flow.guard';
import {ForgotPasswordComponent} from './components/forgot-password/forgot-password.component'; import { ForgotPasswordComponent } from './components/forgot-password/forgot-password.component';
import {ResetPasswordComponent} from './components/reset-password/reset-password.component'; import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
import {UiExtensionsModule} from '@abp/ng.theme.shared/extensions'; import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions';
import {ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS} from './tokens/extensions.token'; import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS } from './tokens/extensions.token';
import {AccountExtensionsGuard} from './guards/extensions.guard'; import { AccountExtensionsGuard } from './guards/extensions.guard';
import {PersonalSettingsHalfRowComponent} from './components/personal-settings/personal-settings-half-row.component'; import { PersonalSettingsHalfRowComponent } from './components/personal-settings/personal-settings-half-row.component';
const declarations = [ const declarations = [
LoginComponent, LoginComponent,
@ -49,7 +49,7 @@ export class AccountModule {
ngModule: AccountModule, ngModule: AccountModule,
providers: [ providers: [
AuthenticationFlowGuard, AuthenticationFlowGuard,
{provide: ACCOUNT_CONFIG_OPTIONS, useValue: options}, { provide: ACCOUNT_CONFIG_OPTIONS, useValue: options },
{ {
provide: 'ACCOUNT_OPTIONS', provide: 'ACCOUNT_OPTIONS',
useFactory: accountConfigOptionsFactory, useFactory: accountConfigOptionsFactory,

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

@ -1,31 +1,37 @@
import {Component, Inject} from '@angular/core'; import { Component, Inject } from '@angular/core';
import {EXTENSIONS_FORM_PROP, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions"; import {
import {FormGroup} from "@angular/forms"; EXTENSIONS_FORM_PROP,
FormProp,
EXTENSIBLE_FORM_VIEW_PROVIDER,
} from '@abp/ng.theme.shared/extensions';
import { FormGroup } from '@angular/forms';
@Component({ @Component({
selector: 'abp-personal-settings-half-row', selector: 'abp-personal-settings-half-row',
template: ` template: ` <div class="w-50 d-inline">
<div class="w-50 d-inline"> <div class="mb-3 form-group">
<div class="mb-3 form-group" > <label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
<label [attr.for]="name" class="form-label">{{ <input
displayName | abpLocalization type="text"
}} [attr.id]="id"
</label> class="form-control"
<input type="text" [attr.id]="id" class="form-control" [attr.name]="name" [formControlName]="name"/> [attr.name]="name"
</div> [formControlName]="name"
</div>`, />
</div>
</div>`,
styles: [], styles: [],
viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER] viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER],
}) })
export class PersonalSettingsHalfRowComponent { export class PersonalSettingsHalfRowComponent {
public displayName: string; public displayName: string;
public name: string; public name: string;
public id: string; public id: string;
public formGroup: FormGroup public formGroup: FormGroup;
constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) { constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) {
this.displayName = propData.displayName this.displayName = propData.displayName;
this.name = propData.name this.name = propData.name;
this.id = propData.id this.id = propData.id;
} }
} }

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

@ -1,24 +1,27 @@
import {ProfileDto, ProfileService} from '@abp/ng.account.core/proxy'; import { ProfileDto, ProfileService } from '@abp/ng.account.core/proxy';
import {ToasterService} from '@abp/ng.theme.shared'; import { ToasterService } from '@abp/ng.theme.shared';
import {Component, Injector, OnInit, ViewEncapsulation} from '@angular/core'; import { Component, Injector, OnInit, ViewEncapsulation } from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms'; import { FormBuilder, FormGroup } from '@angular/forms';
import {finalize} from 'rxjs/operators'; import { finalize } from 'rxjs/operators';
import {Account} from '../../models/account'; import { Account } from '../../models/account';
import {ManageProfileStateService} from '../../services/manage-profile.state.service'; import { ManageProfileStateService } from '../../services/manage-profile.state.service';
import {EXTENSIONS_IDENTIFIER, FormPropData, generateFormFromProps} from "@abp/ng.theme.shared/extensions"; import {
import {eAccountComponents} from "../../enums"; EXTENSIONS_IDENTIFIER,
FormPropData,
generateFormFromProps,
} from '@abp/ng.theme.shared/extensions';
import { eAccountComponents } from '../../enums';
@Component({ @Component({
selector: 'abp-personal-settings-form', selector: 'abp-personal-settings-form',
templateUrl: './personal-settings.component.html', templateUrl: './personal-settings.component.html',
exportAs: 'abpPersonalSettingsForm', exportAs: 'abpPersonalSettingsForm',
providers:[ providers: [
{ {
provide: EXTENSIONS_IDENTIFIER, provide: EXTENSIONS_IDENTIFIER,
useValue: eAccountComponents.PersonalSettings, useValue: eAccountComponents.PersonalSettings,
}, },
] ],
}) })
export class PersonalSettingsComponent export class PersonalSettingsComponent
implements implements
@ -26,7 +29,7 @@ export class PersonalSettingsComponent
Account.PersonalSettingsComponentInputs, Account.PersonalSettingsComponentInputs,
Account.PersonalSettingsComponentOutputs Account.PersonalSettingsComponentOutputs
{ {
selected:ProfileDto selected: ProfileDto;
form: FormGroup; form: FormGroup;
@ -40,18 +43,17 @@ export class PersonalSettingsComponent
protected injector: Injector, protected injector: Injector,
) {} ) {}
buildForm() { buildForm() {
this.selected = this.manageProfileState.getProfile(); this.selected = this.manageProfileState.getProfile();
if(!this.selected){ if (!this.selected) {
return return;
} }
const data = new FormPropData(this.injector, this.selected); const data = new FormPropData(this.injector, this.selected);
this.form = generateFormFromProps(data); this.form = generateFormFromProps(data);
} }
ngOnInit(): void { ngOnInit(): void {
this.buildForm() this.buildForm();
} }
submit() { submit() {

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

@ -1,7 +1,7 @@
import {ePropType, FormProp} from "@abp/ng.theme.shared/extensions"; import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
import {UpdateProfileDto} from "@abp/ng.account.core/proxy"; import { UpdateProfileDto } from '@abp/ng.account.core/proxy';
import {Validators} from "@angular/forms"; import { Validators } from '@angular/forms';
import {PersonalSettingsHalfRowComponent} from "../components/personal-settings/personal-settings-half-row.component"; import { PersonalSettingsHalfRowComponent } from '../components/personal-settings/personal-settings-half-row.component';
const { maxLength, required, email } = Validators; const { maxLength, required, email } = Validators;
export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<UpdateProfileDto>([ export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<UpdateProfileDto>([
@ -10,7 +10,7 @@ export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<U
name: 'userName', name: 'userName',
displayName: 'AbpIdentity::DisplayName:UserName', displayName: 'AbpIdentity::DisplayName:UserName',
id: 'username', id: 'username',
validators: () => [required,maxLength(256)], validators: () => [required, maxLength(256)],
}, },
{ {
type: ePropType.String, type: ePropType.String,
@ -18,8 +18,8 @@ export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<U
displayName: 'AbpIdentity::DisplayName:Name', displayName: 'AbpIdentity::DisplayName:Name',
id: 'name', id: 'name',
validators: () => [maxLength(64)], validators: () => [maxLength(64)],
template:PersonalSettingsHalfRowComponent, template: PersonalSettingsHalfRowComponent,
className:"d-inline-block w-50" className: 'd-inline-block w-50',
}, },
{ {
type: ePropType.String, type: ePropType.String,
@ -27,15 +27,15 @@ export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<U
displayName: 'AbpIdentity::DisplayName:Surname', displayName: 'AbpIdentity::DisplayName:Surname',
id: 'surname', id: 'surname',
validators: () => [maxLength(64)], validators: () => [maxLength(64)],
className:"d-inline-block w-50 ps-4", className: 'd-inline-block w-50 ps-4',
template:PersonalSettingsHalfRowComponent template: PersonalSettingsHalfRowComponent,
}, },
{ {
type: ePropType.String, type: ePropType.String,
name: 'email', name: 'email',
displayName: 'AbpIdentity::DisplayName:Email', displayName: 'AbpIdentity::DisplayName:Email',
id: 'email-address', id: 'email-address',
validators: () => [required, email, maxLength(256)], validators: () => [required, email, maxLength(256)],
}, },
{ {
type: ePropType.String, type: ePropType.String,
@ -44,4 +44,4 @@ export const DEFAULT_PERSONAL_SETTINGS_UPDATE_FORM_PROPS = FormProp.createMany<U
id: 'phone-number', id: 'phone-number',
validators: () => [maxLength(16)], validators: () => [maxLength(16)],
}, },
]) ]);

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

@ -1,11 +1,11 @@
import {eAccountComponents} from "../enums"; import { eAccountComponents } from '../enums';
import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions'; import { EditFormPropContributorCallback } from '@abp/ng.theme.shared/extensions';
import {UpdateProfileDto} from "@abp/ng.account.core/proxy"; import { UpdateProfileDto } from '@abp/ng.account.core/proxy';
export interface AccountConfigOptions { export interface AccountConfigOptions {
redirectUrl?: string; redirectUrl?: string;
editFormPropContributors?: AccountEditFormPropContributors; editFormPropContributors?: AccountEditFormPropContributors;
} }
export type AccountEditFormPropContributors = Partial<{ export type AccountEditFormPropContributors = Partial<{
[eAccountComponents.PersonalSettings]: EditFormPropContributorCallback<UpdateProfileDto>[]; [eAccountComponents.PersonalSettings]: EditFormPropContributorCallback<UpdateProfileDto>[];
}>; }>;

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

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

1
npm/ng-packs/packages/core/src/lib/validators/required.validator.ts
View File

@ -9,6 +9,7 @@ export interface RequiredOptions {
} }
export function validateRequired({ allowEmptyStrings }: RequiredOptions = {}): ValidatorFn { export function validateRequired({ allowEmptyStrings }: RequiredOptions = {}): ValidatorFn {
// note: please do not remove name of the function, it is used in function compare with type 'RequiredError'
const required = (control: AbstractControl): RequiredError | null => { const required = (control: AbstractControl): RequiredError | null => {
return isValidRequired(control.value, allowEmptyStrings) ? null : { required: true }; return isValidRequired(control.value, allowEmptyStrings) ? null : { required: true };
}; };

Write Preview
Loading…
Cancel
Save