Fix spinner in production mode

ghillert · ghillert · commit 5b86399f9dd3 · 2018-02-14T10:42:21.000-10:00
diff --git a/ui/package.json b/ui/package.json
@@ -42,7 +42,7 @@
     "stompjs": "2.3.3",
     "jshint": "2.9.5",
     "spring-flo": "git://github.com/spring-projects/spring-flo.git#angular5",
-    "angular2-busy": "git://github.com/devyumao/angular2-busy.git"
+    "ng-busy": "1.4.4"
   },
   "devDependencies": {
     "@angular/cli": "1.6.7",
diff --git a/ui/src/app/about/about-details.component.spec.ts b/ui/src/app/about/about-details.component.spec.ts
@@ -1,5 +1,5 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {ToastyService} from 'ng2-toasty';
 import {MockToastyService} from '../tests/mocks/toasty';
 import {MockActivatedRoute} from '../tests/mocks/activated-route';
@@ -28,7 +28,7 @@ describe('AboutDetailsComponent', () => {
     activeRoute = new MockActivatedRoute();
     TestBed.configureTestingModule({
       imports: [
-        BusyModule,
+        NgBusyModule,
         RouterTestingModule.withRoutes([]),
         ClipboardModule
       ],
diff --git a/ui/src/app/about/about.component.spec.ts b/ui/src/app/about/about.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import { AboutComponent } from './about.component';
 import {ToastyService} from 'ng2-toasty';
 import {MockToastyService} from '../tests/mocks/toasty';
@@ -23,7 +23,7 @@ describe('AboutComponent', () => {
     activeRoute = new MockActivatedRoute();
     TestBed.configureTestingModule({
       imports: [
-        BusyModule,
+        NgBusyModule,
         RouterTestingModule.withRoutes([])
       ],
       declarations:   [ AboutComponent ],
diff --git a/ui/src/app/analytics/dashboard/dashboard.component.spec.ts b/ui/src/app/analytics/dashboard/dashboard.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DashboardComponent } from './dashboard.component';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {AnalyticsModule} from '../analytics.module';
 
 describe('DashboardComponent', () => {
@@ -10,7 +10,7 @@ describe('DashboardComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ],
-      imports: [BusyModule, AnalyticsModule]
+      imports: [NgBusyModule, AnalyticsModule]
     })
       .compileComponents();
   }));
diff --git a/ui/src/app/auth/feature-disabled.component.spec.ts b/ui/src/app/auth/feature-disabled.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { FormsModule } from '@angular/forms';
 
 import { LogoutComponent } from './logout.component';
@@ -27,7 +27,7 @@ describe('LogoutComponent', () => {
     activeRoute = new MockActivatedRoute();
     TestBed.configureTestingModule({
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         RouterTestingModule.withRoutes([])
       ],
diff --git a/ui/src/app/auth/login.component.spec.ts b/ui/src/app/auth/login.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { FormsModule } from '@angular/forms';
 
 import { LoginComponent } from './login.component';
@@ -32,7 +32,7 @@ describe('LoginComponent', () => {
     activeRoute = new MockActivatedRoute();
     TestBed.configureTestingModule({
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         RouterTestingModule.withRoutes([])
       ],
diff --git a/ui/src/app/auth/logout.component.spec.ts b/ui/src/app/auth/logout.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { FormsModule } from '@angular/forms';
 
 import { LogoutComponent } from './logout.component';
@@ -27,7 +27,7 @@ describe('LogoutComponent', () => {
     activeRoute = new MockActivatedRoute();
     TestBed.configureTestingModule({
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         RouterTestingModule.withRoutes([])
       ],
diff --git a/ui/src/app/jobs/jobs.component.spec.ts b/ui/src/app/jobs/jobs.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { NgxPaginationModule } from 'ngx-pagination';
 import { ToastyService } from 'ng2-toasty';
 import { JobsComponent } from './jobs.component';
@@ -27,7 +27,7 @@ describe('JobsComponent', () => {
         DefinitionStatusComponent
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         NgxPaginationModule,
         RouterTestingModule.withRoutes([])
       ],
diff --git a/ui/src/app/runtime/runtime-apps.component.spec.ts b/ui/src/app/runtime/runtime-apps.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { NgxPaginationModule } from 'ngx-pagination';
 import { ToastyService } from 'ng2-toasty';
 import { ModalModule } from 'ngx-bootstrap';
@@ -26,7 +26,7 @@ describe('RuntimeAppsComponent', () => {
         KeyValuePipe
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         NgxPaginationModule,
         ModalModule.forRoot()
       ],
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
@@ -6,7 +6,7 @@ import { HttpModule } from '@angular/http';
 
 import { ToastyModule } from 'ng2-toasty';
 
-import { BusyModule, BusyConfig, BUSY_CONFIG_DEFAULTS } from 'angular2-busy';
+import { NgBusyModule, BusyConfig, BUSY_CONFIG_DEFAULTS } from 'ng-busy';
 import { ErrorHandler } from './model/error-handler';
 import { CapitalizePipe } from './pipes/capitalize.pipe';
 import { TriStateCheckboxComponent } from './components/tri-state-checkbox.component';
@@ -61,7 +61,7 @@ const busyConfig: BusyConfig = {
     HttpModule,
     ReactiveFormsModule,
     FloModule,
-    BusyModule.forRoot(busyConfig),
+    NgBusyModule.forRoot(busyConfig),
     ModalModule.forRoot(),
     TooltipModule.forRoot(),
     BsDropdownModule.forRoot(),
@@ -95,7 +95,7 @@ const busyConfig: BusyConfig = {
     ErrorHandler
   ],
   exports: [
-    BusyModule,
+    NgBusyModule,
     ClickOutsideDirective,
     CommonModule,
     FormsModule,
diff --git a/ui/src/app/streams/stream-create/stream-create.component.spec.ts b/ui/src/app/streams/stream-create/stream-create.component.spec.ts
@@ -1,5 +1,5 @@
 import {StreamCreateComponent} from './stream-create.component';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {MockActivatedRoute} from '../../tests/mocks/activated-route';
@@ -44,7 +44,7 @@ describe('StreamCreateComponent', () => {
         RouterTestingModule.withRoutes([]),
         ModalModule,
         FloModule,
-        BusyModule,
+        NgBusyModule,
         NoopAnimationsModule
       ],
       providers: [
diff --git a/ui/src/app/streams/stream-definitions/stream-definitions.component.spec.ts b/ui/src/app/streams/stream-definitions/stream-definitions.component.spec.ts
@@ -1,5 +1,5 @@
 import {async, ComponentFixture, TestBed, tick} from '@angular/core/testing';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {NgxPaginationModule} from 'ngx-pagination';
 import {ToastyService} from 'ng2-toasty';
 import {BsModalRef, ModalModule, PopoverModule} from 'ngx-bootstrap';
@@ -64,7 +64,7 @@ describe('StreamDefinitionsComponent', () => {
         StreamDeployMultiComponent
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         NgxPaginationModule,
         ModalModule.forRoot(),
         PopoverModule.forRoot(),
diff --git a/ui/src/app/streams/stream-deploy-multi/stream-deploy-multi.component.spec.ts b/ui/src/app/streams/stream-deploy-multi/stream-deploy-multi.component.spec.ts
@@ -1,5 +1,5 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {ToastyService} from 'ng2-toasty';
 import {MockToastyService} from '../../tests/mocks/toasty';
 import {MockStreamsService} from '../../tests/mocks/streams';
@@ -35,7 +35,7 @@ describe('StreamDeployMultiComponent', () => {
         DeploymentPropertiesComponent
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         ModalModule.forRoot(),
         ReactiveFormsModule
diff --git a/ui/src/app/streams/stream-deploy/stream-deploy.component.spec.ts b/ui/src/app/streams/stream-deploy/stream-deploy.component.spec.ts
@@ -1,5 +1,5 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {BusyModule} from 'angular2-busy';
+import {NgBusyModule} from 'ng-busy';
 import {ToastyService} from 'ng2-toasty';
 import {MockToastyService} from '../../tests/mocks/toasty';
 import {MockStreamsService} from '../../tests/mocks/streams';
@@ -39,7 +39,7 @@ describe('StreamDeployComponent', () => {
         StreamDeployComponent
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         ReactiveFormsModule,
         RouterTestingModule.withRoutes([{ path: 'streams/definitions', component: MockComponent }])
diff --git a/ui/src/app/tasks/task-app-details/task-app-details.component.spec.ts b/ui/src/app/tasks/task-app-details/task-app-details.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { ToastyService } from 'ng2-toasty';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TasksService } from '../tasks.service';
@@ -28,7 +28,7 @@ describe('TaskAppDetailsComponent', () => {
         TaskAppDetailsComponent
       ],
       imports: [
-        BusyModule
+        NgBusyModule
       ],
       providers: [
         { provide: TasksService, useValue: tasksService },
diff --git a/ui/src/app/tasks/task-apps/task-apps.component.spec.ts b/ui/src/app/tasks/task-apps/task-apps.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { NgxPaginationModule } from 'ngx-pagination';
 import { ToastyService } from 'ng2-toasty';
 import { Router } from '@angular/router';
@@ -34,7 +34,7 @@ describe('TaskAppsComponent', () => {
         TaskAppsComponent, RolesDirective
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         NgxPaginationModule
       ],
       providers: [
diff --git a/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.spec.ts b/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.spec.ts
@@ -8,7 +8,7 @@ import { MetamodelService } from '../flo/metamodel.service';
 import { RenderService } from '../flo/render.service';
 import { EditorService } from '../flo/editor.service';
 import { ContentAssistService } from '../flo/content-assist.service';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MockSharedAppService } from '../../tests/mocks/shared-app';
 import { MockToolsService } from '../../tests/mocks/mock-tools';
@@ -37,7 +37,7 @@ describe('TaskCreateComposedTaskComponent', () => {
         RouterTestingModule.withRoutes([]),
         ModalModule,
         FloModule,
-        BusyModule,
+        NgBusyModule,
         NoopAnimationsModule
       ],
       providers: [
diff --git a/ui/src/app/tasks/task-create/task-create.component.spec.ts b/ui/src/app/tasks/task-create/task-create.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { ToastyService } from 'ng2-toasty';
 import { ActivatedRoute } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -35,7 +35,7 @@ describe('TaskCreateComponent', () => {
         TaskCreateComponent
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         ReactiveFormsModule,
         RouterTestingModule.withRoutes([])
diff --git a/ui/src/app/tasks/task-details/task-details.component.spec.ts b/ui/src/app/tasks/task-details/task-details.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { BusyModule } from 'angular2-busy';
+import { NgBusyModule } from 'ng-busy';
 import { ToastyService } from 'ng2-toasty';
 import { ActivatedRoute } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -47,7 +47,7 @@ describe('TaskExecutionsDetailsComponent', () => {
         DataflowDurationPipe
       ],
       imports: [
-        BusyModule,
+        NgBusyModule,
         FormsModule,
         ReactiveFormsModule,
         RouterTestingModule.withRoutes([])
diff --git a/ui/src/styles.scss b/ui/src/styles.scss
@@ -48,7 +48,7 @@ $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
 //   @include make-grid(xl);
 // }
 
-@import '../node_modules/angular2-busy/build/style/busy.css';
+@import '../node_modules/ng-busy/src/style/busy.css';
 
 @import '../node_modules/ng2-toasty/bundles/style.css';
 @import '../node_modules/ng2-toasty/bundles/style-bootstrap.css';
