@wavemaker/angular-codegen 12.0.0-next.45752 → 12.0.0-next.47809

{angular-codegen → package}/templates/page/page.module.ts.hbs

@@ -4,6 +4,12 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { RuntimeBaseModule, CanDeactivateNgPageGuard } from '@wm/runtime/base';
 {{WMComponentsImportStmts requiredWMComponents}}
+{{WMCustomComponentsImportStmts requireCustomComponents}}
+ {{#if
+    requireCustomComponents}}
+import { initCustomWidgetConfig } from '../../customwidgets/customwidget-config';
+initCustomWidgetConfig();
+{{/if}}
 
 import { AppCodeGenModule } from '../../app-codegen.module';
 
@@ -17,7 +23,7 @@ const routes: Routes = [
     {
         path: '',
         component: {{componentName}},
-        canDeactivate: [(component) => inject(CanDeactivateNgPageGuard).canDeactivate(component)]
+        canDeactivate: [(component, currentRoute, currentState, nextState) => inject(CanDeactivateNgPageGuard).canDeactivate(component, currentRoute, currentState, nextState)]
     }
 ];
 
@@ -25,6 +31,10 @@ const requiredComponentModules = [
     {{WMComponentModuleStmts requiredWMComponents}}
 ];
 
+const requiredCustomWidgetComponents= [
+    {{WMCustomComponentStmts requireCustomComponents}}
+]
+
 const requiredPartialModules: any[] = [
     {{PartialModuleStmts requiredPartials}}
 ];
@@ -34,6 +44,7 @@ const requiredPartialModules: any[] = [
     imports: [
         ...requiredComponentModules,
         ...requiredPartialModules,
+        ...requiredCustomWidgetComponents,
         RouterModule.forChild(routes),
         NgCommonModule,
         AppCodeGenModule,

angular-codegen/angular-app/src/app/lazy-load-scripts.resolve.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { isMobileApp, ScriptLoaderService } from '@wm/core';
-
-
-@Injectable()
-export class LazyLoadScriptsResolve {
-
-    constructor(private scriptLoaderService: ScriptLoaderService) {}
-
-    async resolve() {
-        const scriptsToLoad = [];
-        if(isMobileApp()) {
-            scriptsToLoad.push('node_modules-hammerjs-hammer.min.js');
-            scriptsToLoad.push('node_modules-iscroll-build-iscroll.js');
-        }
-        if (scriptsToLoad.length > 0) {
-            await this.scriptLoaderService.load(...scriptsToLoad);
-        }
-    }
-}