import 15.2.0 Octopus source

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / app.module.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
index b05168d276f8e96c8824d8270543cf8dd2c39870..bc60f1011c44455838460819e79a3dc56676235a 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
@@ -11,7 +11,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { JwtModule } from '@auth0/angular-jwt';
 import { I18n } from '@ngx-translate/i18n-polyfill';
-import { BlockUIModule } from 'ng-block-ui';
+import { NgBootstrapFormValidationModule } from 'ng-bootstrap-form-validation';
+
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { TabsModule } from 'ngx-bootstrap/tabs';
@@ -35,7 +36,6 @@ export function jwtTokenGetter() {
   declarations: [AppComponent],
   imports: [
     HttpClientModule,
-    BlockUIModule.forRoot(),
     BrowserModule,
     BrowserAnimationsModule,
     ToastrModule.forRoot({
@@ -54,7 +54,8 @@ export function jwtTokenGetter() {
       config: {
         tokenGetter: jwtTokenGetter
       }
-    })
+    }),
+    NgBootstrapFormValidationModule.forRoot()
   ],
   exports: [SharedModule],
   providers: [
@@ -69,10 +70,10 @@ export function jwtTokenGetter() {
     },
     {
       provide: TRANSLATIONS,
-      useFactory: (locale) => {
+      useFactory: (locale: string) => {
         locale = locale || environment.default_lang;
         try {
-          return require(`raw-loader!locale/messages.${locale}.xlf`);
+          return require(`raw-loader!locale/messages.${locale}.xlf`).default;
         } catch (error) {
           return [];
         }