feat: add components enum to all modules

#3425
pull/3540/head
mehmet-erim 6 years ago
parent 31624376c4
commit 29c567bede

@ -18,7 +18,9 @@
"titleBar.inactiveForeground": "#e7e7e799",
"statusBar.background": "#1d70a2",
"statusBarItem.hoverBackground": "#258ecd",
"statusBar.foreground": "#e7e7e7"
"statusBar.foreground": "#e7e7e7",
"statusBar.border": "#1d70a2",
"titleBar.border": "#1d70a2"
},
"peacock.color": "#1D70A2"
}

@ -9,6 +9,7 @@ import { RouterModule, Routes } from '@angular/router';
import { LoginComponent } from './components/login/login.component';
import { ManageProfileComponent } from './components/manage-profile/manage-profile.component';
import { RegisterComponent } from './components/register/register.component';
import { eAccountComponents } from './enums/components';
const routes: Routes = [
{ path: '', pathMatch: 'full', redirectTo: 'login' },
@ -21,7 +22,7 @@ const routes: Routes = [
component: ReplaceableRouteContainerComponent,
data: {
replaceableComponent: {
key: 'Account.LoginComponent',
key: eAccountComponents.Login,
defaultComponent: LoginComponent,
} as ReplaceableComponents.RouteData<LoginComponent>,
},
@ -31,7 +32,7 @@ const routes: Routes = [
component: ReplaceableRouteContainerComponent,
data: {
replaceableComponent: {
key: 'Account.RegisterComponent',
key: eAccountComponents.Register,
defaultComponent: RegisterComponent,
} as ReplaceableComponents.RouteData<RegisterComponent>,
},
@ -42,7 +43,7 @@ const routes: Routes = [
canActivate: [AuthGuard],
data: {
replaceableComponent: {
key: 'Account.ManageProfileComponent',
key: eAccountComponents.ManageProfile,
defaultComponent: ManageProfileComponent,
} as ReplaceableComponents.RouteData<ManageProfileComponent>,
},

@ -1,9 +1,7 @@
<div class="row">
<div class="mx-auto col col-md-5">
<ng-container *ngIf="isMultiTenancyEnabled$ | async">
<abp-tenant-box
*abpReplaceableTemplate="{ componentKey: 'Account.TenantBoxComponent' }"
></abp-tenant-box>
<abp-tenant-box *abpReplaceableTemplate="{ componentKey: tenantBoxKey }"></abp-tenant-box>
</ng-container>
<div class="abp-account-container">

@ -3,6 +3,7 @@ import { Component, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core'
import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs';
import { Account } from '../../models/account';
import { eAccountComponents } from '../../enums/components';
@Component({
selector: 'abp-auth-wrapper',
@ -26,6 +27,8 @@ export class AuthWrapperComponent
enableLocalLogin = true;
tenantBoxKey = eAccountComponents.TenantBox;
constructor(private store: Store) {}
ngOnInit() {

@ -1,6 +1,6 @@
<abp-auth-wrapper
*abpReplaceableTemplate="{
componentKey: 'Account.AuthWrapperComponent',
componentKey: authWrapperKey,
inputs: {
mainContentRef: { value: mainContentRef },
cancelContentRef: { value: cancelContentRef }

@ -7,6 +7,7 @@ import { OAuthService } from 'angular-oauth2-oidc';
import { throwError } from 'rxjs';
import { catchError, finalize } from 'rxjs/operators';
import snq from 'snq';
import { eAccountComponents } from '../../enums/components';
const { maxLength, minLength, required } = Validators;
@ -21,6 +22,8 @@ export class LoginComponent implements OnInit {
isSelfRegistrationEnabled = true;
authWrapperKey = eAccountComponents.AuthWrapper;
constructor(
private fb: FormBuilder,
private oauthService: OAuthService,

@ -33,7 +33,7 @@
<hr />
</h4>
<abp-change-password-form
*abpReplaceableTemplate="{ componentKey: 'Account.ChangePasswordComponent' }"
*abpReplaceableTemplate="{ componentKey: changePasswordKey }"
></abp-change-password-form>
</div>
</div>
@ -44,7 +44,7 @@
<hr />
</h4>
<abp-personal-settings-form
*abpReplaceableTemplate="{ componentKey: 'Account.PersonalSettingsComponent' }"
*abpReplaceableTemplate="{ componentKey: personalSettingsKey }"
></abp-personal-settings-form>
</div>
</div>

@ -1,6 +1,7 @@
import { fadeIn } from '@abp/ng.theme.shared';
import { transition, trigger, useAnimation } from '@angular/animations';
import { Component } from '@angular/core';
import { eAccountComponents } from '../../enums/components';
@Component({
selector: 'abp-manage-profile',
@ -9,4 +10,8 @@ import { Component } from '@angular/core';
})
export class ManageProfileComponent {
selectedTab = 0;
changePasswordKey = eAccountComponents.ChangePassword;
personalSettingsKey = eAccountComponents.PersonalSettings;
}

@ -1,6 +1,6 @@
<abp-auth-wrapper
*abpReplaceableTemplate="{
componentKey: 'Account.AuthWrapperComponent',
componentKey: authWrapperKey,
inputs: {
mainContentRef: { value: mainContentRef }
}

@ -9,6 +9,7 @@ import { catchError, finalize, switchMap } from 'rxjs/operators';
import snq from 'snq';
import { RegisterRequest } from '../../models';
import { AccountService } from '../../services/account.service';
import { eAccountComponents } from '../../enums/components';
const { maxLength, required, email } = Validators;
@Component({
@ -22,6 +23,8 @@ export class RegisterComponent implements OnInit {
isSelfRegistrationEnabled = true;
authWrapperKey = eAccountComponents.AuthWrapper;
constructor(
private fb: FormBuilder,
private accountService: AccountService,

@ -0,0 +1,9 @@
export const enum eAccountComponents {
Login = 'Account.LoginComponent',
Register = 'Account.RegisterComponent',
ManageProfile = 'Account.ManageProfileComponent',
TenantBox = 'Account.TenantBoxComponent',
AuthWrapper = 'Account.AuthWrapperComponent',
ChangePassword = 'Account.ChangePasswordComponent',
PersonalSettings = 'Account.PersonalSettingsComponent',
}

@ -1,5 +1,6 @@
export * from './lib/account.module';
export * from './lib/components';
export * from './lib/enums/components';
export * from './lib/tokens';
export * from './lib/models';
export * from './lib/services';

@ -7,7 +7,7 @@
"url": "https://github.com/abpframework/abp.git"
},
"dependencies": {
"@abp/ng.theme.shared": "^2.5.0"
"@abp/ng.theme.shared": "~2.5.0"
},
"publishConfig": {
"access": "public"

@ -0,0 +1,3 @@
export const enum eFeatureManagementComponents {
FeatureManagement = 'FeatureManagement.FeatureManagementComponent',
}

@ -1,2 +1,3 @@
export * from './lib/feature-management.module';
export * from './lib/components';
export * from './lib/enums/components';

@ -166,7 +166,7 @@
hideBadges: { value: true }
},
outputs: { visibleChange: onVisiblePermissionChange },
componentKey: 'PermissionManagement.PermissionManagementComponent'
componentKey: permissionManagementKey
};
let init = initTemplate
"

@ -14,6 +14,7 @@ import {
} from '../../actions/identity.actions';
import { Identity } from '../../models/identity';
import { IdentityState } from '../../states/identity.state';
import { ePermissionManagementComponents } from '@abp/ng.permission-management';
@Component({
selector: 'abp-roles',
@ -46,6 +47,8 @@ export class RolesComponent implements OnInit {
sortKey = '';
permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
@ViewChild('formRef', { static: false, read: ElementRef })
formRef: ElementRef<HTMLFormElement>;

@ -262,7 +262,7 @@
visible: { value: visiblePermissions, twoWay: true }
},
outputs: { visibleChange: onVisiblePermissionChange },
componentKey: 'PermissionManagement.PermissionManagementComponent'
componentKey: permissionManagementKey
};
let init = initTemplate
"

@ -24,6 +24,7 @@ import {
import { Identity } from '../../models/identity';
import { IdentityService } from '../../services/identity.service';
import { IdentityState } from '../../states/identity.state';
import { ePermissionManagementComponents } from '@abp/ng.permission-management';
@Component({
selector: 'abp-users',
templateUrl: './users.component.html',
@ -62,6 +63,8 @@ export class UsersComponent implements OnInit {
sortKey = '';
permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;
onVisiblePermissionChange = event => {

@ -0,0 +1,4 @@
export const enum eIdentityComponents {
Roles = 'Identity.RolesComponent',
Users = 'Identity.UsersComponent',
}

@ -10,6 +10,7 @@ import { NgModule, Type } from '@angular/core';
import { RouterModule, Routes, Router, ActivatedRoute } from '@angular/router';
import { RolesComponent } from './components/roles/roles.component';
import { UsersComponent } from './components/users/users.component';
import { eIdentityComponents } from './enums/components';
const routes: Routes = [
{ path: '', redirectTo: 'roles', pathMatch: 'full' },
@ -24,7 +25,7 @@ const routes: Routes = [
data: {
requiredPolicy: 'AbpIdentity.Roles',
replaceableComponent: {
key: 'Identity.RolesComponent',
key: eIdentityComponents.Roles,
defaultComponent: RolesComponent,
} as ReplaceableComponents.RouteData<RolesComponent>,
},
@ -35,7 +36,7 @@ const routes: Routes = [
data: {
requiredPolicy: 'AbpIdentity.Users',
replaceableComponent: {
key: 'Identity.UsersComponent',
key: eIdentityComponents.Users,
defaultComponent: UsersComponent,
} as ReplaceableComponents.RouteData<UsersComponent>,
},

@ -4,6 +4,7 @@
export * from './lib/identity.module';
export * from './lib/actions/identity.actions';
export * from './lib/enums/components';
export * from './lib/components';
export * from './lib/models/identity';
export * from './lib/services';

@ -0,0 +1,3 @@
export const enum ePermissionManagementComponents {
PermissionManagement = 'PermissionManagement.PermissionManagementComponent',
}

@ -5,6 +5,7 @@
export * from './lib/permission-management.module';
export * from './lib/actions';
export * from './lib/components';
export * from './lib/enums/components';
export * from './lib/models';
export * from './lib/services';
export * from './lib/states';

@ -0,0 +1,3 @@
export const enum eSettingManagementComponents {
SettingManagement = 'SettingManagement.SettingManagementComponent',
}

@ -6,6 +6,7 @@ import {
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { SettingManagementComponent } from './components/setting-management.component';
import { eSettingManagementComponents } from './enums/components';
const routes: Routes = [
{
@ -18,7 +19,7 @@ const routes: Routes = [
data: {
requiredPolicy: 'AbpAccount.SettingManagement',
replaceableComponent: {
key: 'SettingManagement.SettingManagementComponent',
key: eSettingManagementComponents.SettingManagement,
defaultComponent: SettingManagementComponent,
} as ReplaceableComponents.RouteData,
},

@ -1,2 +1,3 @@
export * from './lib/setting-management.module';
export * from './lib/components/setting-management.component';
export * from './lib/enums/components';

@ -141,7 +141,9 @@
<input type="text" id="name" class="form-control" formControlName="name" autofocus />
</div>
<div class="form-group" *ngIf="tenantForm.controls.adminEmailAddress">
<label for="name">{{ 'AbpTenantManagement::DisplayName:AdminEmailAddress' | abpLocalization }}</label>
<label for="name">{{
'AbpTenantManagement::DisplayName:AdminEmailAddress' | abpLocalization
}}</label>
<input
autocomplete="email"
type="email"
@ -151,7 +153,9 @@
/>
</div>
<div class="form-group" *ngIf="tenantForm.controls.adminPassword">
<label for="name">{{ 'AbpTenantManagement::DisplayName:AdminPassword' | abpLocalization }}</label>
<label for="name">{{
'AbpTenantManagement::DisplayName:AdminPassword' | abpLocalization
}}</label>
<input
autocomplete="new-password"
type="password"
@ -203,7 +207,7 @@
visible: { value: visibleFeatures, twoWay: true }
},
outputs: { visibleChange: onVisibleFeaturesChange },
componentKey: 'FeatureManagement.FeatureManagementComponent'
componentKey: featureManagementKey
}"
[(visible)]="visibleFeatures"
providerName="T"

@ -14,6 +14,7 @@ import {
} from '../../actions/tenant-management.actions';
import { TenantManagementService } from '../../services/tenant-management.service';
import { TenantManagementState } from '../../states/tenant-management.state';
import { eFeatureManagementComponents } from '@abp/ng.feature-management';
interface SelectedModalContent {
type: 'saveConnStr' | 'saveTenant';
@ -60,6 +61,8 @@ export class TenantsComponent implements OnInit {
sortKey = '';
featureManagementKey = eFeatureManagementComponents.FeatureManagement;
get hasSelectedTenant(): boolean {
return Boolean(this.selected.id);
}

@ -0,0 +1,3 @@
export const enum eTenantManagementComponents {
Tenants = 'TenantManagement.TenantsComponent',
}

@ -8,6 +8,7 @@ import {
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { TenantsComponent } from './components/tenants/tenants.component';
import { eTenantManagementComponents } from './enums/components';
const routes: Routes = [
{ path: '', redirectTo: 'tenants', pathMatch: 'full' },
@ -22,7 +23,7 @@ const routes: Routes = [
data: {
requiredPolicy: 'AbpTenantManagement.Tenants',
replaceableComponent: {
key: 'TenantManagement.TenantsComponent',
key: eTenantManagementComponents.Tenants,
defaultComponent: TenantsComponent,
} as ReplaceableComponents.RouteData<TenantsComponent>,
},

@ -1,6 +1,7 @@
export * from './lib/tenant-management.module';
export * from './lib/actions';
export * from './lib/components';
export * from './lib/enums/components';
export * from './lib/models';
export * from './lib/services';
export * from './lib/states';

@ -0,0 +1,5 @@
export const enum eThemeBasicComponents {
ApplicationLayout = 'Theme.ApplicationLayoutComponent',
AccountLayout = 'Theme.AccountLayoutComponent',
EmptyLayout = 'Theme.EmptyLayoutComponent',
}

@ -5,6 +5,7 @@ import styles from '../constants/styles';
import { ApplicationLayoutComponent } from '../components/application-layout/application-layout.component';
import { AccountLayoutComponent } from '../components/account-layout/account-layout.component';
import { EmptyLayoutComponent } from '../components/empty-layout/empty-layout.component';
import { eThemeBasicComponents } from '../enums/components';
@Injectable({ providedIn: 'root' })
export class InitialService {
@ -13,15 +14,15 @@ export class InitialService {
this.store.dispatch([
new AddReplaceableComponent({
key: 'Theme.ApplicationLayoutComponent',
key: eThemeBasicComponents.ApplicationLayout,
component: ApplicationLayoutComponent,
}),
new AddReplaceableComponent({
key: 'Theme.AccountLayoutComponent',
key: eThemeBasicComponents.AccountLayout,
component: AccountLayoutComponent,
}),
new AddReplaceableComponent({
key: 'Theme.EmptyLayoutComponent',
key: eThemeBasicComponents.EmptyLayout,
component: EmptyLayoutComponent,
}),
]);

@ -5,5 +5,6 @@
export * from './lib/theme-basic.module';
export * from './lib/actions';
export * from './lib/components';
export * from './lib/enums/components';
export * from './lib/models';
export * from './lib/states';

Loading…
Cancel
Save