Uses sartography forms library

This commit is contained in:
Aaron Louie 2020-03-19 16:01:57 -04:00
parent 05cf7ad0db
commit ced9a852e8

View File

@ -18,8 +18,13 @@ import {MatTooltipModule} from '@angular/material/tooltip';
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {FormlyModule} from '@ngx-formly/core'; import {FormlyModule} from '@ngx-formly/core';
import {FormlyMaterialModule} from '@ngx-formly/material'; import {
import {AppEnvironment, AuthInterceptor, SartographyWorkflowLibModule} from 'sartography-workflow-lib'; AppEnvironment,
AuthInterceptor,
SartographyFormsModule,
SartographyPipesModule,
SartographyWorkflowLibModule
} from 'sartography-workflow-lib';
import {environment} from '../environments/environment'; import {environment} from '../environments/environment';
import {DeleteFileDialogComponent} from './_dialogs/delete-file-dialog/delete-file-dialog.component'; import {DeleteFileDialogComponent} from './_dialogs/delete-file-dialog/delete-file-dialog.component';
import {DeleteWorkflowSpecCategoryDialogComponent} from './_dialogs/delete-workflow-spec-category-dialog/delete-workflow-spec-category-dialog.component'; import {DeleteWorkflowSpecCategoryDialogComponent} from './_dialogs/delete-workflow-spec-category-dialog/delete-workflow-spec-category-dialog.component';
@ -29,7 +34,6 @@ import {NewFileDialogComponent} from './_dialogs/new-file-dialog/new-file-dialog
import {OpenFileDialogComponent} from './_dialogs/open-file-dialog/open-file-dialog.component'; import {OpenFileDialogComponent} from './_dialogs/open-file-dialog/open-file-dialog.component';
import {WorkflowSpecCategoryDialogComponent} from './_dialogs/workflow-spec-category-dialog/workflow-spec-category-dialog.component'; import {WorkflowSpecCategoryDialogComponent} from './_dialogs/workflow-spec-category-dialog/workflow-spec-category-dialog.component';
import {WorkflowSpecDialogComponent} from './_dialogs/workflow-spec-dialog/workflow-spec-dialog.component'; import {WorkflowSpecDialogComponent} from './_dialogs/workflow-spec-dialog/workflow-spec-dialog.component';
import {EmailValidator, EmailValidatorMessage, ShowError} from './_forms/validators/formly.validator';
import {GetIconCodePipe} from './_pipes/get-icon-code.pipe'; import {GetIconCodePipe} from './_pipes/get-icon-code.pipe';
import {AppRoutingModule} from './app-routing.module'; import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component'; import {AppComponent} from './app.component';
@ -41,8 +45,8 @@ import {ModelerComponent} from './modeler/modeler.component';
import {NavbarComponent} from './navbar/navbar.component'; import {NavbarComponent} from './navbar/navbar.component';
import {SignInComponent} from './sign-in/sign-in.component'; import {SignInComponent} from './sign-in/sign-in.component';
import {SignOutComponent} from './sign-out/sign-out.component'; import {SignOutComponent} from './sign-out/sign-out.component';
import {WorkflowSpecCardComponent} from './workflow-spec-card/workflow-spec-card.component';
import {WorkflowSpecListComponent} from './workflow-spec-list/workflow-spec-list.component'; import {WorkflowSpecListComponent} from './workflow-spec-list/workflow-spec-list.component';
import { WorkflowSpecCardComponent } from './workflow-spec-card/workflow-spec-card.component';
@Injectable() @Injectable()
export class ThisEnvironment implements AppEnvironment { export class ThisEnvironment implements AppEnvironment {
@ -52,22 +56,6 @@ export class ThisEnvironment implements AppEnvironment {
irbUrl = environment.irbUrl; irbUrl = environment.irbUrl;
} }
@Injectable()
export class AppFormlyConfig {
public static config = {
extras: {
showError: ShowError,
},
validators: [
{name: 'email', validation: EmailValidator},
],
validationMessages: [
{name: 'email', message: EmailValidatorMessage},
{name: 'required', message: 'This field is required.'},
],
};
}
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
@ -95,8 +83,7 @@ export class AppFormlyConfig {
BrowserAnimationsModule, BrowserAnimationsModule,
BrowserModule, BrowserModule,
FlexLayoutModule, FlexLayoutModule,
FormlyMaterialModule, FormlyModule,
FormlyModule.forRoot(AppFormlyConfig.config),
FormsModule, FormsModule,
HttpClientModule, HttpClientModule,
MatButtonModule, MatButtonModule,
@ -112,6 +99,8 @@ export class AppFormlyConfig {
MatToolbarModule, MatToolbarModule,
MatTooltipModule, MatTooltipModule,
ReactiveFormsModule, ReactiveFormsModule,
SartographyFormsModule,
SartographyPipesModule,
SartographyWorkflowLibModule, SartographyWorkflowLibModule,
AppRoutingModule, // <-- This line MUST be last (https://angular.io/guide/router#module-import-order-matters) AppRoutingModule, // <-- This line MUST be last (https://angular.io/guide/router#module-import-order-matters)
], ],