@wavemaker/app-ng-runtime 11.4.1-next.141648 → 11.4.1-next.141649

app-ng-runtime/runtime/base/fesm2020/index.mjs

@@ -1701,15 +1701,15 @@ class BaseSpaPageComponent extends FragmentMonitor {
     }
     init() {
         muteWatchers();
-        this.App = this.injector.get(App);
-        this.route = this.injector.get(ActivatedRoute);
-        this.appManager = this.injector.get(AppManagerService);
-        this.navigationService = this.injector.get(AbstractNavigationService);
-        this.scriptLoaderService = this.injector.get(ScriptLoaderService);
-        this.i18nService = this.injector.get(AbstractI18nService);
-        this.router = this.injector.get(Router);
-        this.Viewport = this.injector.get(Viewport);
-        this.layoutDirective = this.injector.get(LayoutDirective);
+        this.App = inject(App);
+        this.route = inject(ActivatedRoute);
+        this.appManager = inject(AppManagerService);
+        this.navigationService = inject(AbstractNavigationService);
+        this.scriptLoaderService = inject(ScriptLoaderService);
+        this.i18nService = inject(AbstractI18nService);
+        this.router = inject(Router);
+        this.Viewport = inject(Viewport);
+        this.layoutDirective = inject(LayoutDirective);
         // register functions for binding evaluation
         this.registerExpressions();
         this.initUserScript();
@@ -1731,7 +1731,7 @@ class BaseSpaPageComponent extends FragmentMonitor {
     }
     initUserScript() {
         try {
-            this.evalUserScript(this, this.App, this.injector.get(UtilsService));
+            this.evalUserScript(this, this.App, inject(UtilsService));
         }
         catch (e) {
             console.error(`Error in evaluating page (${this.pageName}) script\n`, e);
@@ -1748,7 +1748,7 @@ class BaseSpaPageComponent extends FragmentMonitor {
         this.appLocale = this.i18nService.getAppLocale();
     }
     initVariables() {
-        const variablesService = this.injector.get(VariablesService);
+        const variablesService = inject(VariablesService);
         // get variables and actions instances for the page
         const variableCollection = variablesService.register(this.pageName, this.getVariables(), this);
         // create namespace for Variables nad Actions on page/partial, which inherits the Variables and Actions from App instance