Merged in bugfix/SHIBUI-599 (pull request #160)

SHIBUI-599 Fixed missing loader * SHIBUI-599 Fixed missing loader * SHIBUI-599 Fixed bug with test Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com> Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Aug 15, 2018 · 0d4c976 · 0d4c976
1 parent a25470f
commit 0d4c976
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -15,6 +15,7 @@ import { ProviderEditorNavComponent } from '../component/provider-editor-nav.com
 import { NgbModalStub } from '../../../../testing/modal.stub';
 import { MetadataProvider } from '../../domain/model';
 import { of } from 'rxjs';
+import { DifferentialService } from '../../../core/service/differential.service';
 
 @Component({
     template: `
@@ -44,7 +45,11 @@ describe('Provider Edit Component', () => {
         TestBed.configureTestingModule({
             imports: [
                 NgbDropdownModule.forRoot(),
-                RouterTestingModule,
+                RouterTestingModule.withRoutes([
+                    {path: 'edit', children: []},
+                    {path: 'foo', children: []},
+                    {path: '', children: []}
+                ]),
                 SharedModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),
@@ -64,6 +69,7 @@ describe('Provider Edit Component', () => {
                 ProviderEditorNavComponent
             ],
             providers: [
+                DifferentialService,
                 { provide: NgbModal, useClass: NgbModalStub },
                 { provide: ActivatedRoute, useValue: activatedRoute },
                 { provide: APP_BASE_HREF, useValue: '/' }

diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
@@ -42,7 +42,7 @@ <h3 class="tag tag-primary">
                 role="button">
                 <span class="label pull-left" i18n="@@action--save">Save</span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                    <i class="fa fa-fw next d-block fa-2x"
                         [ngClass]="{
                             'fa-save': !(wizardIsSaving$ | async),
                             'fa-spinner': (wizardIsSaving$ | async),

diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -30,7 +30,11 @@ <h3 class="tag tag-primary">
                     <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave(resolver)" [disabled]="saving$ | async">
                         <span class="label pull-left" i18n="@@action--save">Save</span>
                         <span class="direction pull-right">
-                            <i class="fa fa-fw fa-save next d-block fa-2x"></i>
+                            <i class="fa fa-fw next d-block fa-2x"
+                                [ngClass]="{
+                                    'fa-save': !(saving$ | async),
+                                    'fa-spinner fa-pulse': (saving$ | async)
+                                }"></i>
                             <ng-container i18n="@@action--save">Save</ng-container>
                         </span>
                     </button>

diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
@@ -51,7 +51,7 @@ <h3 class="tag tag-primary">
                     Save
                 </span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                    <i class="fa fa-fw next d-block fa-2x"
                         [ngClass]="{
                             'fa-save': !(disabled$ | async),
                             'fa-spinner': (disabled$ | async),