Browse Source

refactor(identity): change form build method name

pull/2412/head
TheDiaval 7 years ago
parent
commit
8ed4b5f9dc
  1. 8
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
  2. 51
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  3. 8
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

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

@ -1,7 +1,7 @@
import { ABP } from '@abp/ng.core'; import { ABP } from '@abp/ng.core';
import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
import { Component, TemplateRef, ViewChild, OnInit, ContentChild, ElementRef } from '@angular/core'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { Select, Store } from '@ngxs/store'; import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { finalize, pluck } from 'rxjs/operators'; import { finalize, pluck } from 'rxjs/operators';
@ -59,7 +59,7 @@ export class RolesComponent implements OnInit {
this.get(); this.get();
} }
createForm() { buildForm() {
this.form = this.fb.group({ this.form = this.fb.group({
name: new FormControl({ value: this.selected.name || '', disabled: this.selected.isStatic }, [ name: new FormControl({ value: this.selected.name || '', disabled: this.selected.isStatic }, [
Validators.required, Validators.required,
@ -71,7 +71,7 @@ export class RolesComponent implements OnInit {
} }
openModal() { openModal() {
this.createForm(); this.buildForm();
this.isModalVisible = true; this.isModalVisible = true;
} }

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

@ -12,7 +12,8 @@
type="button" type="button"
(click)="add()" (click)="add()"
> >
<i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewUser' | abpLocalization }}</span> <i class="fa fa-plus mr-1"></i>
<span>{{ 'AbpIdentity::NewUser' | abpLocalization }}</span>
</button> </button>
</div> </div>
</div> </div>
@ -59,12 +60,21 @@
<th>{{ 'AbpIdentity::Actions' | abpLocalization }}</th> <th>{{ 'AbpIdentity::Actions' | abpLocalization }}</th>
<th pResizableColumn (click)="sortOrderIcon.sort('userName')"> <th pResizableColumn (click)="sortOrderIcon.sort('userName')">
{{ 'AbpIdentity::UserName' | abpLocalization }} {{ 'AbpIdentity::UserName' | abpLocalization }}
<abp-sort-order-icon #sortOrderIcon key="userName" [(selectedKey)]="sortKey" [(order)]="sortOrder"> <abp-sort-order-icon
#sortOrderIcon
key="userName"
[(selectedKey)]="sortKey"
[(order)]="sortOrder"
>
</abp-sort-order-icon> </abp-sort-order-icon>
</th> </th>
<th pResizableColumn (click)="sortOrderIcon.sort('email')"> <th pResizableColumn (click)="sortOrderIcon.sort('email')">
{{ 'AbpIdentity::EmailAddress' | abpLocalization }} {{ 'AbpIdentity::EmailAddress' | abpLocalization }}
<abp-sort-order-icon key="email" [(selectedKey)]="sortKey" [(order)]="sortOrder"></abp-sort-order-icon> <abp-sort-order-icon
key="email"
[(selectedKey)]="sortKey"
[(order)]="sortOrder"
></abp-sort-order-icon>
</th> </th>
<th pResizableColumn (click)="sortOrderIcon.sort('phoneNumber')"> <th pResizableColumn (click)="sortOrderIcon.sort('phoneNumber')">
{{ 'AbpIdentity::PhoneNumber' | abpLocalization }} {{ 'AbpIdentity::PhoneNumber' | abpLocalization }}
@ -86,7 +96,11 @@
<i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }} <i class="fa fa-cog mr-1"></i>{{ 'AbpIdentity::Actions' | abpLocalization }}
</button> </button>
<div ngbDropdownMenu> <div ngbDropdownMenu>
<button *abpPermission="'AbpIdentity.Users.Update'" ngbDropdownItem (click)="edit(data.id)"> <button
*abpPermission="'AbpIdentity.Users.Update'"
ngbDropdownItem
(click)="edit(data.id)"
>
{{ 'AbpIdentity::Edit' | abpLocalization }} {{ 'AbpIdentity::Edit' | abpLocalization }}
</button> </button>
<button <button
@ -133,7 +147,13 @@
<div class="form-group"> <div class="form-group">
<label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
><span> * </span> ><span> * </span>
<input type="text" id="user-name" class="form-control" formControlName="userName" autofocus /> <input
type="text"
id="user-name"
class="form-control"
formControlName="userName"
autofocus
/>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -142,7 +162,9 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="surname">{{ 'AbpIdentity::DisplayName:Surname' | abpLocalization }}</label> <label for="surname">{{
'AbpIdentity::DisplayName:Surname' | abpLocalization
}}</label>
<input type="text" id="surname" class="form-control" formControlName="surname" /> <input type="text" id="surname" class="form-control" formControlName="surname" />
</div> </div>
@ -166,7 +188,12 @@
<div class="form-group"> <div class="form-group">
<label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label> <label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label>
<input type="text" id="phone-number" class="form-control" formControlName="phoneNumber" /> <input
type="text"
id="phone-number"
class="form-control"
formControlName="phoneNumber"
/>
</div> </div>
<div class="custom-checkbox custom-control mb-2"> <div class="custom-checkbox custom-control mb-2">
@ -210,7 +237,9 @@
[attr.id]="'roles-' + i" [attr.id]="'roles-' + i"
[formControl]="roleGroup.controls[roles[i].name]" [formControl]="roleGroup.controls[roles[i].name]"
/> />
<label class="custom-control-label" [attr.for]="'roles-' + i">{{ roles[i].name }}</label> <label class="custom-control-label" [attr.for]="'roles-' + i">{{
roles[i].name
}}</label>
</div> </div>
</div> </div>
</ng-template> </ng-template>
@ -229,5 +258,9 @@
</ng-template> </ng-template>
</abp-modal> </abp-modal>
<abp-permission-management [(visible)]="visiblePermissions" providerName="U" [providerKey]="providerKey"> <abp-permission-management
[(visible)]="visiblePermissions"
providerName="U"
[providerKey]="providerKey"
>
</abp-permission-management> </abp-permission-management>

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

@ -1,14 +1,15 @@
import { ABP, ConfigState } from '@abp/ng.core'; import { ABP, ConfigState } from '@abp/ng.core';
import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
import { Component, TemplateRef, TrackByFunction, ViewChild, OnInit } from '@angular/core'; import { Component, OnInit, TemplateRef, TrackByFunction, ViewChild } from '@angular/core';
import { import {
AbstractControl, AbstractControl,
FormArray, FormArray,
FormBuilder, FormBuilder,
FormControl,
FormGroup, FormGroup,
Validators, Validators,
FormControl,
} from '@angular/forms'; } from '@angular/forms';
import { PasswordRules, validatePassword } from '@ngx-validate/core';
import { Select, Store } from '@ngxs/store'; import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { finalize, pluck, switchMap, take } from 'rxjs/operators'; import { finalize, pluck, switchMap, take } from 'rxjs/operators';
@ -16,15 +17,14 @@ import snq from 'snq';
import { import {
CreateUser, CreateUser,
DeleteUser, DeleteUser,
GetRoles,
GetUserById, GetUserById,
GetUserRoles, GetUserRoles,
GetUsers, GetUsers,
UpdateUser, UpdateUser,
GetRoles,
} from '../../actions/identity.actions'; } from '../../actions/identity.actions';
import { Identity } from '../../models/identity'; import { Identity } from '../../models/identity';
import { IdentityState } from '../../states/identity.state'; import { IdentityState } from '../../states/identity.state';
import { PasswordRules, validatePassword } from '@ngx-validate/core';
@Component({ @Component({
selector: 'abp-users', selector: 'abp-users',
templateUrl: './users.component.html', templateUrl: './users.component.html',

Loading…
Cancel
Save