Skip to content

Commit

Permalink
SHIBUI=572: Adding new provider and various TS updates (not working);
Browse files Browse the repository at this point in the history
  • Loading branch information
Jodie Muramoto committed Jun 21, 2018
1 parent 3c1d15b commit f35b39e
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 6 deletions.
61 changes: 61 additions & 0 deletions ui/src/app/metadata/metadata.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { EditorComponent } from './resolver/container/editor.component';
import { CanDeactivateGuard } from '../core/service/can-deactivate.guard';
import { DraftComponent } from './resolver/container/draft.component';
import { WizardComponent } from './resolver/container/wizard.component';
import { NewProviderComponent } from './provider/container/new-provider.component';
import { ProviderWizardComponent } from './provider/container/wizard.component';

const routes: Routes = [
{
Expand Down Expand Up @@ -78,6 +80,65 @@ const routes: Routes = [
]
}
]
},
{
path: 'provider',
children: [
{
path: 'new',
component: NewProviderComponent,
children: [
{ path: '', redirectTo: 'blank', pathMatch: 'prefix' }
// ,
// {
// path: 'blank',
// component: BlankProviderComponent,
// canDeactivate: []
// },
// {
// path: 'upload',
// component: UploadProviderComponent,
// canDeactivate: []
// },
// {
// path: 'copy',
// component: CopyProviderComponent,
// canDeactivate: []
// }
]
},
{
path: 'new/copy/confirm',
component: ConfirmCopyComponent,
canActivate: [CopyIsSetGuard]
},
{
path: ':id',
component: ResolverComponent,
canActivate: [],
children: [
{ path: 'edit', redirectTo: 'edit/2' },
{
path: 'edit/:index',
component: EditorComponent,
canDeactivate: [CanDeactivateGuard]
}
]
},
{
path: ':entityId',
component: DraftComponent,
canActivate: [],
children: [
{ path: 'wizard', redirectTo: 'wizard/2' },
{
path: 'wizard/:index',
component: WizardComponent,
canDeactivate: [CanDeactivateGuard]
}
]
}
]
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="container-fluid p-3" role="main">
Hi. I'm a new provider component page.
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// :host {
// .provider-nav-option {
// width: 160px;
// }
// }
Empty file.
11 changes: 11 additions & 0 deletions ui/src/app/metadata/provider/container/new-provider.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';

@Component({
selector: 'new-provider-page',
templateUrl: './new-provider.component.html',
styleUrls: ['./new-provider.component.scss']
})
export class NewProviderComponent {
constructor() {}
} /* istanbul ignore next */
6 changes: 3 additions & 3 deletions ui/src/app/metadata/provider/container/wizard.component.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
import { ActivatedRoute } from '@angular/router';

@Component({
selector: 'wizard-page',
selector: 'provider-wizard-page',
templateUrl: './wizard.component.html',
styleUrls: ['./wizard.component.scss']
})

export class WizardComponent {
export class ProviderWizardComponent {

}

11 changes: 8 additions & 3 deletions ui/src/app/metadata/provider/provider.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { NgModule, ModuleWithProviders } from '@angular/core';
import { ProviderWizardComponent } from './container/wizard.component';
import { NewProviderComponent } from './container/new-provider.component';

@NgModule({
declarations: [],
declarations: [
NewProviderComponent,
ProviderWizardComponent
],
entryComponents: [],
imports: [],
exports: []
Expand All @@ -17,9 +22,9 @@ export class ProviderModule {

@NgModule({
imports: [
ProviderModule,
ProviderModule
// StoreModule.forFeature('provider', fromResolver.reducers),
// EffectsModule.forFeature([])
],
]
})
export class RootProviderModule { }

0 comments on commit f35b39e

Please sign in to comment.