app.module.ts (dspace-angular-dspace-7.0) | : | app.module.ts (dspace-angular-dspace-7.1) | ||
---|---|---|---|---|
import { APP_BASE_HREF, CommonModule } from '@angular/common'; | import { APP_BASE_HREF, CommonModule } from '@angular/common'; | |||
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; | import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; | |||
import { APP_INITIALIZER, NgModule } from '@angular/core'; | import { APP_INITIALIZER, NgModule } from '@angular/core'; | |||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; | import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; | |||
import { EffectsModule } from '@ngrx/effects'; | import { EffectsModule } from '@ngrx/effects'; | |||
import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router -store'; | import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router -store'; | |||
import { MetaReducer, Store, StoreModule, USER_PROVIDED_META_REDUCERS } from '@n grx/store'; | import { MetaReducer, Store, StoreModule, USER_PROVIDED_META_REDUCERS } from '@n grx/store'; | |||
import { StoreDevtoolsModule } from '@ngrx/store-devtools'; | import { StoreDevtoolsModule } from '@ngrx/store-devtools'; | |||
import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; | import { | |||
DYNAMIC_ERROR_MESSAGES_MATCHER, | ||||
DYNAMIC_MATCHER_PROVIDERS, | ||||
DynamicErrorMessagesMatcher | ||||
} from '@ng-dynamic-forms/core'; | ||||
import { TranslateModule } from '@ngx-translate/core'; | import { TranslateModule } from '@ngx-translate/core'; | |||
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; | import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; | |||
import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sideba r-section/admin-sidebar-section.component'; | import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sideba r-section/admin-sidebar-section.component'; | |||
import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.compo nent'; | import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.compo nent'; | |||
import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/ex pandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; | import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/ex pandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; | |||
import { AppRoutingModule } from './app-routing.module'; | import { AppRoutingModule } from './app-routing.module'; | |||
import { AppComponent } from './app.component'; | import { AppComponent } from './app.component'; | |||
import { appEffects } from './app.effects'; | import { appEffects } from './app.effects'; | |||
import { appMetaReducers, debugMetaReducers } from './app.metareducers'; | import { appMetaReducers, debugMetaReducers } from './app.metareducers'; | |||
skipping to change at line 55 | skipping to change at line 59 | |||
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound. component'; | import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound. component'; | |||
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component '; | import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component '; | |||
import { ThemedHeaderComponent } from './header/themed-header.component'; | import { ThemedHeaderComponent } from './header/themed-header.component'; | |||
import { ThemedFooterComponent } from './footer/themed-footer.component'; | import { ThemedFooterComponent } from './footer/themed-footer.component'; | |||
import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.com ponent'; | import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.com ponent'; | |||
import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed- header-navbar-wrapper.component'; | import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed- header-navbar-wrapper.component'; | |||
import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; | import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; | |||
import { UUIDService } from './core/shared/uuid.service'; | import { UUIDService } from './core/shared/uuid.service'; | |||
import { CookieService } from './core/services/cookie.service'; | import { CookieService } from './core/services/cookie.service'; | |||
import { AbstractControl } from '@angular/forms'; | ||||
export function getBase() { | export function getBase() { | |||
return environment.ui.nameSpace; | return environment.ui.nameSpace; | |||
} | } | |||
export function getMetaReducers(): MetaReducer<AppState>[] { | export function getMetaReducers(): MetaReducer<AppState>[] { | |||
return environment.debug ? [...appMetaReducers, ...debugMetaReducers] : appMet aReducers; | return environment.debug ? [...appMetaReducers, ...debugMetaReducers] : appMet aReducers; | |||
} | } | |||
/** | ||||
* Condition for displaying error messages on email form field | ||||
*/ | ||||
export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher = | ||||
(control: AbstractControl, model: any, hasFocus: boolean) => { | ||||
return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasF | ||||
ocus); | ||||
}; | ||||
const IMPORTS = [ | const IMPORTS = [ | |||
CommonModule, | CommonModule, | |||
SharedModule, | SharedModule, | |||
NavbarModule, | NavbarModule, | |||
HttpClientModule, | HttpClientModule, | |||
AppRoutingModule, | AppRoutingModule, | |||
CoreModule.forRoot(), | CoreModule.forRoot(), | |||
ScrollToModule.forRoot(), | ScrollToModule.forRoot(), | |||
NgbModule, | NgbModule, | |||
TranslateModule.forRoot(), | TranslateModule.forRoot(), | |||
skipping to change at line 149 | skipping to change at line 162 | |||
// Check if cookie exists, if don't, set it with unique id | // Check if cookie exists, if don't, set it with unique id | |||
if (!correlationId) { | if (!correlationId) { | |||
cookieService.set('CORRELATION-ID', uuidService.generate()); | cookieService.set('CORRELATION-ID', uuidService.generate()); | |||
} | } | |||
return () => true; | return () => true; | |||
}, | }, | |||
multi: true, | multi: true, | |||
deps: [ CookieService, UUIDService ] | deps: [ CookieService, UUIDService ] | |||
}, | }, | |||
{ | ||||
provide: DYNAMIC_ERROR_MESSAGES_MATCHER, | ||||
useValue: ValidateEmailErrorStateMatcher | ||||
}, | ||||
...DYNAMIC_MATCHER_PROVIDERS, | ...DYNAMIC_MATCHER_PROVIDERS, | |||
]; | ]; | |||
const DECLARATIONS = [ | const DECLARATIONS = [ | |||
AppComponent, | AppComponent, | |||
RootComponent, | RootComponent, | |||
ThemedRootComponent, | ThemedRootComponent, | |||
HeaderComponent, | HeaderComponent, | |||
ThemedHeaderComponent, | ThemedHeaderComponent, | |||
HeaderNavbarWrapperComponent, | HeaderNavbarWrapperComponent, | |||
End of changes. 4 change blocks. | ||||
1 lines changed or deleted | 19 lines changed or added |