FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AW-835 Added CodeListItem. Some cleanup.
Some checks failed
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Peter Bastiani 2020-01-22 09:52:40 +01:00
parent 587e484cf8
commit a12b45f8f9
2 changed files with 35 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
projects/common/src/fm/common-service.module.ts
View File

@ -1,23 +1,16 @@
// angular modules // angular modules
import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core'; import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { FormsModule } from '@angular/forms';
// external modules // external modules
import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
// routing module
import { AppCommonRoutingModule } from './common-routing.module';
import { MODULE_NAME } from './module-name';
//components //components
import { ItemTypeService } from './services/itemtype.service'; import { ItemTypeService } from './services/itemtype.service';
import { FolderService } from './services/folder.service'; import { FolderService } from './services/folder.service';
import { TimespanService} from './services/timespan.service'; import { TimespanService } from './services/timespan.service';
import { ItemService} from './services/item.service'; import { ItemService } from './services/item.service';
import { EventService } from './services/event.service'; import { EventService } from './services/event.service';
import { TypeaheadService } from './services/typeahead.service'; import { TypeaheadService } from './services/typeahead.service';
import { UserService } from './services/user.service'; import { UserService } from './services/user.service';
@ -27,40 +20,21 @@ import { appConfigFactory } from "./shared/app.config.factory";
import { AuthGuard } from './services/auth-guard.service'; import { AuthGuard } from './services/auth-guard.service';
import { NavBarGuard } from './services/nav-bar-guard.service'; import { NavBarGuard } from './services/nav-bar-guard.service';
import { FullScreenGuard } from './services/full-screen-guard.service'; import { FullScreenGuard } from './services/full-screen-guard.service';
import { SafePipe } from './shared/safe.pipe';
import { AppComponent} from './components/app/app.component';
import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard'; import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard';
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service'; import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service';
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component'; import { NgbDateNativeAdapter } from './services/date-adapter.service'
import { NotFoundComponent } from './components/not-found/not-found.component'; import { AuthConfigFactory } from './shared/authconfigFactory';
import { NotImplementedComponent } from './components/not-implemented/not-implemented.component'; import { CodeListItemService } from './services/codelistitem.service';
import { SidePanelComponent } from './components/side-panel/side-panel.component';
import { TimespanComponent } from './components/timespan/timespan.component';
import { TagInputComponent } from './components/tag-input/tag-input.component';
import {IEventMessage } from './models/event.message';
import { IItem, Item } from './models/item';
import {IItemType} from './models/item.type';
import {IItemTypes} from './models/item.types';
import {IItemTask,ItemTask} from './models/itemTask';
import {IListItem} from './models/list.item';
import {ITypeaheadItem} from './models/typeahead.item';
import {IUser} from './models/user';
import * as commonActions from './actions/app-common.actions';
import * as commonReducers from './reducers/app-common.reducer';
import * as commonEffects from './effects/app-common.effects';
import {NgbDateNativeAdapter} from './services/date-adapter.service'
import { from } from 'rxjs';
import {AuthConfigFactory} from './shared/authconfigFactory';
export {FolderService, export {
FolderService,
ItemTypeService, ItemTypeService,
TimespanService, TimespanService,
ItemService, ItemService,
EventService, EventService,
TypeaheadService, TypeaheadService,
UserService, UserService,
CodeListItemService,
AppConfig, AppConfig,
AccessTokenInterceptor, AccessTokenInterceptor,
AuthGuard, AuthGuard,
@ -77,7 +51,7 @@ export {FolderService,
] ]
}) })
export class AppCommonServiceModule { export class AppCommonServiceModule {
constructor (@Optional() @SkipSelf() parentModule: AppCommonServiceModule) { constructor(@Optional() @SkipSelf() parentModule: AppCommonServiceModule) {
if (parentModule) { if (parentModule) {
throw new Error( throw new Error(
'AppCommonServiceModule is already loaded. Import it in the AppModule only'); 'AppCommonServiceModule is already loaded. Import it in the AppModule only');
@ -91,9 +65,9 @@ export class AppCommonServiceModule {
{ {
provide: APP_INITIALIZER, provide: APP_INITIALIZER,
useFactory: appConfigFactory, useFactory: appConfigFactory,
deps: [Injector, AppConfig, OAuthService,AuthConfigFactory], deps: [Injector, AppConfig, OAuthService, AuthConfigFactory],
multi: true multi: true
}, },
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: AccessTokenInterceptor, useClass: AccessTokenInterceptor,

38
projects/common/src/fm/common.module.ts
View File

@ -1,26 +1,26 @@
// angular modules // angular modules
import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core'; import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common'; import { CommonModule, DatePipe } from '@angular/common';
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
// external modules // external modules
import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
import { StoreModule,Store } from '@ngrx/store'; import { StoreModule, Store } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import {UploadxModule } from 'ngx-uploadx'; import { UploadxModule } from 'ngx-uploadx';
// routing module // routing module
import { AppCommonRoutingModule } from './common-routing.module'; import { AppCommonRoutingModule } from './common-routing.module';
import { MODULE_NAME } from './module-name'; import { MODULE_NAME } from './module-name';
//components //components
import { SafePipe } from './shared/safe.pipe'; import { SafePipe } from './shared/safe.pipe';
import { AuthConfigFactory,IAuthconfigFactory} from './shared/authconfigFactory'; import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
import { AppComponent} from './components/app/app.component'; import { AppComponent } from './components/app/app.component';
import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component'; import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component'; import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component'; import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
@ -29,15 +29,16 @@ import { NotImplementedComponent } from './components/not-implemented/not-implem
import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { SidePanelComponent } from './components/side-panel/side-panel.component';
import { TimespanComponent } from './components/timespan/timespan.component'; import { TimespanComponent } from './components/timespan/timespan.component';
import { TagInputComponent } from './components/tag-input/tag-input.component'; import { TagInputComponent } from './components/tag-input/tag-input.component';
import {MenuBackgroundComponent} from './components/menu-background/menu-background.component'; import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
import {IEventMessage } from './models/event.message'; import { IEventMessage } from './models/event.message';
import { IItem, Item } from './models/item'; import { IItem, Item } from './models/item';
import {IItemType} from './models/item.type'; import { IItemType } from './models/item.type';
import {IItemTypes} from './models/item.types'; import { IItemTypes } from './models/item.types';
import {IItemTask,ItemTask} from './models/itemTask'; import { IItemTask, ItemTask } from './models/itemTask';
import {IListItem} from './models/list.item'; import { IListItem } from './models/list.item';
import {ITypeaheadItem} from './models/typeahead.item'; import { ITypeaheadItem } from './models/typeahead.item';
import {IUser} from './models/user'; import { IUser } from './models/user';
import { ICodeListItem } from './models/code.list.item';
import * as commonActions from './actions/app-common.actions'; import * as commonActions from './actions/app-common.actions';
import * as commonReducers from './reducers/app-common.reducer'; import * as commonReducers from './reducers/app-common.reducer';
import * as commonEffects from './effects/app-common.effects'; import * as commonEffects from './effects/app-common.effects';
@ -63,6 +64,7 @@ export {
IListItem, IListItem,
ITypeaheadItem, ITypeaheadItem,
IUser, IUser,
ICodeListItem,
commonActions, commonActions,
commonReducers, commonReducers,
IAuthconfigFactory, IAuthconfigFactory,
@ -75,7 +77,7 @@ export {
CommonModule, CommonModule,
HttpClientModule, HttpClientModule,
AppCommonRoutingModule, AppCommonRoutingModule,
StoreModule.forFeature(MODULE_NAME, commonReducers.reducer ), StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
EffectsModule.forFeature([commonEffects.AppCommonEffects]), EffectsModule.forFeature([commonEffects.AppCommonEffects]),
OAuthModule.forRoot(), OAuthModule.forRoot(),
NgbModule, NgbModule,
@ -100,7 +102,7 @@ export {
UploadxModule, UploadxModule,
CommonModule, CommonModule,
AppComponent, AppComponent,
ResumableFileUploadComponent, ResumableFileUploadComponent,
AuthCallbackComponent, AuthCallbackComponent,
SidePanelComponent, SidePanelComponent,
SafePipe, SafePipe,
@ -111,7 +113,7 @@ export {
TagInputComponent, TagInputComponent,
SessionClearedComponent, SessionClearedComponent,
MenuBackgroundComponent MenuBackgroundComponent
] ]
}) })
export class AppCommonModule { export class AppCommonModule {
} }