Fix AOT build

Signed-off-by: Hamza Hamidi <[email protected]>

Author: hamzahamidi

package-lock.json

@@ -59,8 +59,8 @@
     "@ngrx/store": "^6.0.1",
     "@ngrx/store-devtools": "^6.0.1",
     "@swimlane/ngx-charts": "^8.1.0",
-    "angular2-json-schema-form": "git+https://github.com/hamzahamidi/angular2-json-schema-form.git#build-angular-6",
     "angular2-virtual-scroll": "^0.3.1",
+    "angular6-json-schema-form": "1.0.3",
     "core-js": "^2.5.7",
     "hammerjs": "^2.0.8",
     "hyperlist": "^1.0.0-beta",

package.json

@@ -19,7 +19,7 @@ import { createEntityRelationPaginationKey } from '../../store/helpers/entity-re
 import { getPaginationObservables } from '../../store/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../store/types/api.types';
 import { getIdFromRoute } from '../cloud-foundry/cf.helpers';
-import { JsonPointer } from 'angular2-json-schema-form';
+import { JsonPointer } from 'angular6-json-schema-form';
 
 
 export const getSvcAvailability = (servicePlan: APIResource<IServicePlan>,

src/frontend/app/features/service-catalog/services-helper.ts

@@ -20,6 +20,7 @@ import { SelectPlanStepComponent } from '../select-plan-step/select-plan-step.co
 import { SelectServiceComponent } from '../select-service/select-service.component';
 import { SpecifyDetailsStepComponent } from '../specify-details-step/specify-details-step.component';
 import { AddServiceInstanceComponent } from './add-service-instance.component';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
 
 describe('AddServiceInstanceComponent', () => {
   let component: AddServiceInstanceComponent;
@@ -40,6 +41,7 @@ describe('AddServiceInstanceComponent', () => {
       imports: [
         PageHeaderModule,
         SteppersModule,
+        MaterialDesignFrameworkModule,
         // CoreModule,
         BaseTestModulesNoShared
       ],

src/frontend/app/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts

@@ -6,6 +6,7 @@ import { ServicesService } from '../../../../features/service-catalog/services.s
 import { ServicesServiceMock } from '../../../../features/service-catalog/services.service.mock';
 import { CsiGuidsService } from '../csi-guids.service';
 import { PaginationMonitorFactory } from '../../../monitors/pagination-monitor.factory';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
 
 describe('BindAppsStepComponent', () => {
   let component: BindAppsStepComponent;
@@ -14,7 +15,7 @@ describe('BindAppsStepComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [BindAppsStepComponent],
-      imports: [BaseTestModulesNoShared],
+      imports: [BaseTestModulesNoShared , MaterialDesignFrameworkModule],
       providers: [
         { provide: ServicesService, useClass: ServicesServiceMock },
         CsiGuidsService,

src/frontend/app/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts

@@ -19,7 +19,6 @@ import { StepOnNextResult } from '../../stepper/step/step.component';
 import { CsiGuidsService } from '../csi-guids.service';
 import { SpecifyDetailsStepComponent } from '../specify-details-step/specify-details-step.component';
 import { safeUnsubscribe, prettyValidationErrors } from '../../../../features/service-catalog/services-helper';
-import { JsonPointer } from 'angular2-json-schema-form';
 
 @Component({
   selector: 'app-bind-apps-step',

src/frontend/app/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts

@@ -7,6 +7,7 @@ import { CsiGuidsService } from '../csi-guids.service';
 import { PaginationMonitorFactory } from '../../../monitors/pagination-monitor.factory';
 import { EntityMonitorFactory } from '../../../monitors/entity-monitor.factory.service';
 import { CsiModeService } from '../csi-mode.service';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
 
 describe('SpecifyDetailsStepComponent', () => {
   let component: SpecifyDetailsStepComponent;
@@ -15,7 +16,7 @@ describe('SpecifyDetailsStepComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [SpecifyDetailsStepComponent],
-      imports: [BaseTestModulesNoShared],
+      imports: [BaseTestModulesNoShared, MaterialDesignFrameworkModule],
       providers: [
         CreateServiceInstanceHelperServiceFactory,
         CsiGuidsService,

src/frontend/app/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts

@@ -133,8 +133,7 @@ import { UserPermissionDirective } from './user-permission.directive';
 import { CfEndpointsMissingComponent } from './components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CapitalizeFirstPipe } from './pipes/capitalizeFirstLetter.pipe';
 import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component';
-import { JsonSchemaFormModule, MaterialDesignFrameworkModule } from 'angular2-json-schema-form';
-
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
 @NgModule({
   imports: [
     CommonModule,
@@ -145,8 +144,7 @@ import { JsonSchemaFormModule, MaterialDesignFrameworkModule } from 'angular2-js
     CfAuthModule,
     CdkTableModule,
     NgxChartsModule,
-    MaterialDesignFrameworkModule,
-    JsonSchemaFormModule.forRoot(MaterialDesignFrameworkModule)
+    MaterialDesignFrameworkModule
   ],
   declarations: [
     LoadingPageComponent,