Skip to content

Commit

Permalink
Merged in feature/SHIBUI-572 (pull request #94)
Browse files Browse the repository at this point in the history
SHIBUI-572: Added provider wizard and container folder

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
  • Loading branch information
rmathis committed Jun 22, 2018
2 parents debfc00 + 6ee9dda commit 6c7f3ef
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 4 deletions.
2 changes: 2 additions & 0 deletions ui/src/app/metadata/metadata.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { DomainModule } from './domain/domain.module';
import { MetadataPageComponent } from './metadata.component';
import { ManagerModule } from './manager/manager.module';
import { MetadataRoutingModule } from './metadata.routing';
import { ProviderModule } from './provider/provider.module';


@NgModule({
Expand All @@ -15,6 +16,7 @@ import { MetadataRoutingModule } from './metadata.routing';
FilterModule.forRoot(),
DomainModule.forRoot(),
ManagerModule.forRoot(),
ProviderModule.forRoot(),
MetadataRoutingModule
],
providers: [],
Expand Down
11 changes: 11 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,15 @@ const routes: Routes = [
]
}
]
},
{
path: 'provider',
children: [
{
path: 'new',
component: NewProviderComponent
}
]
}
]
},
Expand Down
40 changes: 40 additions & 0 deletions ui/src/app/metadata/provider/container/new-provider.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<div class="container-fluid p-3" role="main">
<section class="section" aria-label="Add a new metadata source - how are you adding the metadata information?" tabindex="0">
<div class="section-header bg-info p-2 text-white">
<div class="row justify-content-between">
<div class="col-md-12">
<span class="display-6" i18n="@@label--add-a-new-metadata-resolver">Add a new metadata provider</span>
</div>
</div>
</div>
<div class="section-body p-4 border border-top-0 border-info">
<div class="row">
<div class="col col-xl-6 col-lg-9 col-xs-12">
<form [formGroup]="form" role="form">
<ul class="nav nav-wizard m-3">
<li class="nav-item">
<h3 class="tag tag-primary">
<span class="index">1</span>
<ng-container i18n="@@label--name-and-entityid">1. Name and EntityId</ng-container>
</h3>
</li>
<li class="nav-item">
<button class="nav-link next btn clearfix" (click)="next()" [disabled]="form.invalid" aria-label="Next: Step 2, Common Attributes"
role="button">
<span class="label pull-left">
2.
<ng-container i18n="@@label--common-attributes">Common Attributes</ng-container>
</span>
<span class="direction pull-right">
<i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>
<ng-container i18n="@@action--next">Next</ng-container>
</span>
</button>
</li>
</ul>
</form>
</div>
</div>
</div>
</section>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// :host {
// .provider-nav-option {
// width: 160px;
// }
// }
Empty file.
20 changes: 20 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,20 @@
import { Component } from '@angular/core';
import { FormGroup, Validators, FormBuilder } from '@angular/forms';

@Component({
selector: 'new-provider-page',
templateUrl: './new-provider.component.html',
styleUrls: ['./new-provider.component.scss']
})
export class NewProviderComponent {
form: FormGroup = this.fb.group({
name: ['', [Validators.required]],
'@type': ['', [Validators.required]]
});

constructor(
private fb: FormBuilder
) {}

next(): void {}
}
3 changes: 3 additions & 0 deletions ui/src/app/metadata/provider/container/wizard.component.html
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 the metadata provider wizard.
</div>
Empty file.
13 changes: 13 additions & 0 deletions ui/src/app/metadata/provider/container/wizard.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';

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

export class ProviderWizardComponent {

}

18 changes: 14 additions & 4 deletions ui/src/app/metadata/provider/provider.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import { NgModule, ModuleWithProviders } from '@angular/core';
import { ProviderWizardComponent } from './container/wizard.component';
import { NewProviderComponent } from './container/new-provider.component';
import { ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';

@NgModule({
declarations: [],
declarations: [
NewProviderComponent,
ProviderWizardComponent
],
entryComponents: [],
imports: [],
imports: [
ReactiveFormsModule,
CommonModule
],
exports: []
})
export class ProviderModule {
Expand All @@ -17,9 +27,9 @@ export class ProviderModule {

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

0 comments on commit 6c7f3ef

Please sign in to comment.