@wavemaker/app-ng-runtime 11.4.0-next.141076 → 11.4.0-next.141078

app-ng-runtime/mobile/components/page/default/fesm2015/index.js

@@ -1,6 +1,7 @@
 import { Component, ElementRef, Directive, NgModule } from '@angular/core';
 import { addClass, App, AbstractNavigationService } from '@wm/core';
 import { provideAsWidgetRef, WmComponentsModule } from '@wm/components/base';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { PageDirective } from '@wm/components/page';
 import { DeviceService } from '@wm/mobile/core';
 import { CommonModule } from '@angular/common';
@@ -24,16 +25,30 @@ PageContentLoaderComponent.ctorParameters = () => [
 ];
 
 class MobilePageDirective {
-    constructor(app, elRef, deviceService, page, navigationService) {
+    constructor(app, elRef, modalService, deviceService, page, navigationService) {
+        this.modalService = modalService;
         this.deviceService = deviceService;
         this.page = page;
         this.navigationService = navigationService;
+        this.subscriptions = [];
         addClass(elRef.nativeElement, 'mobile-app-page');
         this._$ele = $(elRef.nativeElement);
         page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));
+        let modalsOpened = [];
+        this.subscriptions = [
+            modalService.onShown.subscribe(({ id }) => {
+                id && modalsOpened.push(id);
+            }),
+            modalService.onHidden.subscribe(({ id }) => {
+                id && _.remove(modalsOpened, id);
+            })
+        ];
         // add backbutton listener on every page.
         this._backBtnListenerDestroyer = deviceService.onBackButtonTap($event => {
-            if (app.landingPageName === app.activePageName) {
+            if (modalsOpened.length > 0) {
+                modalService.hide(modalsOpened.pop());
+            }
+            else if (app.landingPageName === app.activePageName) {
                 window.navigator['app'].exitApp();
             }
             else {
@@ -43,6 +58,7 @@ class MobilePageDirective {
         });
     }
     ngOnDestroy() {
+        this.subscriptions.map((s) => s.unsubscribe());
         this._backBtnListenerDestroyer();
     }
 }
@@ -54,6 +70,7 @@ MobilePageDirective.decorators = [
 MobilePageDirective.ctorParameters = () => [
     { type: App },
     { type: ElementRef },
+    { type: BsModalService },
     { type: DeviceService },
     { type: PageDirective },
     { type: AbstractNavigationService }

app-ng-runtime/mobile/components/page/default/fesm2015/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../projects/mobile/components/page/default/src/page-content-loader/page-content-loader.component.ts","../../../../../../projects/mobile/components/page/default/src/page.directive.ts","../../../../../../projects/mobile/components/page/default/src/page.module.ts","../../../../../../projects/mobile/components/page/default/src/index.ts"],"sourcesContent":["import { Component, ElementRef } from '@angular/core';\n\nimport { addClass } from '@wm/core';\nimport { provideAsWidgetRef } from '@wm/components/base';\n\n@Component({\n    selector: '[wmPageContentLoader]',\n    templateUrl: './page-content-loader.component.html',\n    providers: [\n        provideAsWidgetRef(PageContentLoaderComponent)\n    ]\n})\nexport class PageContentLoaderComponent {\n\n    constructor(el: ElementRef) {\n        addClass(el.nativeElement, 'app-page-content-loader');\n    }\n}\n","import { Directive, ElementRef, OnDestroy } from '@angular/core';\n\nimport { addClass, AbstractNavigationService, App } from '@wm/core';\nimport { PageDirective } from '@wm/components/page';\nimport { DeviceService } from '@wm/mobile/core';\n\ndeclare const $;\n\n@Directive({\n    selector: '[wmPage]'\n})\nexport class MobilePageDirective implements OnDestroy {\n\n    private _$ele;\n\n    private _backBtnListenerDestroyer;\n\n    constructor(app: App,\n                elRef: ElementRef,\n                private deviceService: DeviceService,\n                private page: PageDirective,\n                private navigationService: AbstractNavigationService) {\n        addClass(elRef.nativeElement, 'mobile-app-page');\n        this._$ele = $(elRef.nativeElement);\n        page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));\n\n        // add backbutton listener on every page.\n        this._backBtnListenerDestroyer = deviceService.onBackButtonTap($event => {\n            if (app.landingPageName === app.activePageName) {\n                window.navigator['app'].exitApp();\n            } else {\n                this.navigationService.goToPrevious();\n            }\n            return false;\n        });\n    }\n\n    public ngOnDestroy() {\n        this._backBtnListenerDestroyer();\n    }\n}\n","import { NgModule } from '@angular/core';\nimport { CommonModule } from '@angular/common';\n\nimport { WmComponentsModule } from '@wm/components/base';\n\nimport { MobilePageDirective } from './page.directive';\nimport { PageContentLoaderComponent } from './page-content-loader/page-content-loader.component';\n\nconst components = [\n    MobilePageDirective,\n    PageContentLoaderComponent\n];\n\n@NgModule({\n    imports: [\n        CommonModule,\n        WmComponentsModule\n    ],\n    declarations: [...components],\n    exports: [...components],\n    entryComponents: []\n})\nexport class PageModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":[],"mappings":";;;;;;;MAYa,0BAA0B;IAEnC,YAAY,EAAc;QACtB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;KACzD;;;YAXJ,SAAS,SAAC;gBACP,QAAQ,EAAE,uBAAuB;gBACjC,oFAAmD;gBACnD,SAAS,EAAE;oBACP,kBAAkB,CAAC,0BAA0B,CAAC;iBACjD;aACJ;;;YAXmB,UAAU;;;MCWjB,mBAAmB;IAM5B,YAAY,GAAQ,EACR,KAAiB,EACT,aAA4B,EAC5B,IAAmB,EACnB,iBAA4C;QAF5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,SAAI,GAAJ,IAAI,CAAe;QACnB,sBAAiB,GAAjB,iBAAiB,CAA2B;QAC5D,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;;QAGhF,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM;YACjE,IAAI,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,cAAc,EAAE;gBAC5C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aACrC;iBAAM;gBACH,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;aACzC;YACD,OAAO,KAAK,CAAC;SAChB,CAAC,CAAC;KACN;IAEM,WAAW;QACd,IAAI,CAAC,yBAAyB,EAAE,CAAC;KACpC;;;YA/BJ,SAAS,SAAC;gBACP,QAAQ,EAAE,UAAU;aACvB;;;YAR6C,GAAG;YAF7B,UAAU;YAIrB,aAAa;YADb,aAAa;YADH,yBAAyB;;;ACM5C,MAAM,UAAU,GAAG;IACf,mBAAmB;IACnB,0BAA0B;CAC7B,CAAC;MAWW,UAAU;;;YATtB,QAAQ,SAAC;gBACN,OAAO,EAAE;oBACL,YAAY;oBACZ,kBAAkB;iBACrB;gBACD,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;gBACxB,eAAe,EAAE,EAAE;aACtB;;;ACrBD;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../../projects/mobile/components/page/default/src/page-content-loader/page-content-loader.component.ts","../../../../../../projects/mobile/components/page/default/src/page.directive.ts","../../../../../../projects/mobile/components/page/default/src/page.module.ts","../../../../../../projects/mobile/components/page/default/src/index.ts"],"sourcesContent":["import { Component, ElementRef } from '@angular/core';\n\nimport { addClass } from '@wm/core';\nimport { provideAsWidgetRef } from '@wm/components/base';\n\n@Component({\n    selector: '[wmPageContentLoader]',\n    templateUrl: './page-content-loader.component.html',\n    providers: [\n        provideAsWidgetRef(PageContentLoaderComponent)\n    ]\n})\nexport class PageContentLoaderComponent {\n\n    constructor(el: ElementRef) {\n        addClass(el.nativeElement, 'app-page-content-loader');\n    }\n}\n","import { Directive, ElementRef, OnDestroy } from '@angular/core';\nimport { BsModalService } from 'ngx-bootstrap/modal';\nimport { Subscription } from 'rxjs';\n\nimport { addClass, AbstractNavigationService, App } from '@wm/core';\nimport { PageDirective } from '@wm/components/page';\nimport { DeviceService } from '@wm/mobile/core';\n\ndeclare const $, _;\n\n@Directive({\n    selector: '[wmPage]'\n})\nexport class MobilePageDirective implements OnDestroy {\n\n    private _$ele;\n\n    private subscriptions: Subscription[] = [];\n    private _backBtnListenerDestroyer;\n\n    constructor(app: App,\n                elRef: ElementRef,\n                private modalService: BsModalService,\n                private deviceService: DeviceService,\n                private page: PageDirective,\n                private navigationService: AbstractNavigationService) {\n        addClass(elRef.nativeElement, 'mobile-app-page');\n        this._$ele = $(elRef.nativeElement);\n        page.subscribe('wmMobileTabbar:ready', () => this._$ele.addClass('has-tabbar'));\n        let modalsOpened = [];\n        this.subscriptions = [\n            modalService.onShown.subscribe(({id}) => {\n                id && modalsOpened.push(id);\n            }),\n            modalService.onHidden.subscribe(({id}) => {\n                id && _.remove(modalsOpened, id);\n            })\n        ];\n        // add backbutton listener on every page.\n        this._backBtnListenerDestroyer = deviceService.onBackButtonTap($event => {\n            if (modalsOpened.length > 0) {\n                modalService.hide(modalsOpened.pop());\n            } else if (app.landingPageName === app.activePageName) {\n                window.navigator['app'].exitApp();\n            } else {\n                this.navigationService.goToPrevious();\n            }\n            return false;\n        });\n    }\n\n    public ngOnDestroy() {\n        this.subscriptions.map((s) => s.unsubscribe());\n        this._backBtnListenerDestroyer();\n    }\n}\n","import { NgModule } from '@angular/core';\nimport { CommonModule } from '@angular/common';\n\nimport { WmComponentsModule } from '@wm/components/base';\n\nimport { MobilePageDirective } from './page.directive';\nimport { PageContentLoaderComponent } from './page-content-loader/page-content-loader.component';\n\nconst components = [\n    MobilePageDirective,\n    PageContentLoaderComponent\n];\n\n@NgModule({\n    imports: [\n        CommonModule,\n        WmComponentsModule\n    ],\n    declarations: [...components],\n    exports: [...components],\n    entryComponents: []\n})\nexport class PageModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public_api';\n"],"names":[],"mappings":";;;;;;;;MAYa,0BAA0B;IAEnC,YAAY,EAAc;QACtB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;KACzD;;;YAXJ,SAAS,SAAC;gBACP,QAAQ,EAAE,uBAAuB;gBACjC,oFAAmD;gBACnD,SAAS,EAAE;oBACP,kBAAkB,CAAC,0BAA0B,CAAC;iBACjD;aACJ;;;YAXmB,UAAU;;;MCajB,mBAAmB;IAO5B,YAAY,GAAQ,EACR,KAAiB,EACT,YAA4B,EAC5B,aAA4B,EAC5B,IAAmB,EACnB,iBAA4C;QAH5C,iBAAY,GAAZ,YAAY,CAAgB;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,SAAI,GAAJ,IAAI,CAAe;QACnB,sBAAiB,GAAjB,iBAAiB,CAA2B;QARxD,kBAAa,GAAmB,EAAE,CAAC;QASvC,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QAChF,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG;YACjB,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,EAAC;gBAChC,EAAE,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC/B,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,EAAC;gBACjC,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;aACpC,CAAC;SACL,CAAC;;QAEF,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM;YACjE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;aACzC;iBAAM,IAAI,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,cAAc,EAAE;gBACnD,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aACrC;iBAAM;gBACH,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;aACzC;YACD,OAAO,KAAK,CAAC;SAChB,CAAC,CAAC;KACN;IAEM,WAAW;QACd,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,yBAAyB,EAAE,CAAC;KACpC;;;YA5CJ,SAAS,SAAC;gBACP,QAAQ,EAAE,UAAU;aACvB;;;YAR6C,GAAG;YAJ7B,UAAU;YACrB,cAAc;YAKd,aAAa;YADb,aAAa;YADH,yBAAyB;;;ACI5C,MAAM,UAAU,GAAG;IACf,mBAAmB;IACnB,0BAA0B;CAC7B,CAAC;MAWW,UAAU;;;YATtB,QAAQ,SAAC;gBACN,OAAO,EAAE;oBACL,YAAY;oBACZ,kBAAkB;iBACrB;gBACD,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;gBACxB,eAAe,EAAE,EAAE;aACtB;;;ACrBD;;;;;;"}

app-ng-runtime/mobile/components/page/default/index.metadata.json

@@ -1 +1 @@
-{"__symbolic":"module","version":4,"metadata":{"PageContentLoaderComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":5,"character":1},"arguments":[{"selector":"[wmPageContentLoader]","providers":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@wm/components/base","name":"provideAsWidgetRef","line":9,"character":8},"arguments":[{"__symbolic":"reference","name":"PageContentLoaderComponent"}]}],"template":"<div class=\"loader bg-primary\"></div>\n<div class=\"load-info\"></div>"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":14,"character":20}]}]}},"MobilePageDirective":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":8,"character":1},"arguments":[{"selector":"[wmPage]"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@wm/core","name":"App","line":17,"character":21},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":18,"character":23},{"__symbolic":"reference","module":"@wm/mobile/core","name":"DeviceService","line":19,"character":39},{"__symbolic":"reference","module":"@wm/components/page","name":"PageDirective","line":20,"character":30},{"__symbolic":"reference","module":"@wm/core","name":"AbstractNavigationService","line":21,"character":43}]}],"ngOnDestroy":[{"__symbolic":"method"}]}},"PageModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule","line":13,"character":1},"arguments":[{"imports":[{"__symbolic":"reference","module":"@angular/common","name":"CommonModule","line":15,"character":8},{"__symbolic":"reference","module":"@wm/components/base","name":"WmComponentsModule","line":16,"character":8}],"declarations":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"exports":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"entryComponents":[]}]}],"members":{}}},"origins":{"PageContentLoaderComponent":"./page-content-loader/page-content-loader.component","MobilePageDirective":"./page.directive","PageModule":"./page.module"},"importAs":"@wm/mobile/components/page"}
+{"__symbolic":"module","version":4,"metadata":{"PageContentLoaderComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":5,"character":1},"arguments":[{"selector":"[wmPageContentLoader]","providers":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@wm/components/base","name":"provideAsWidgetRef","line":9,"character":8},"arguments":[{"__symbolic":"reference","name":"PageContentLoaderComponent"}]}],"template":"<div class=\"loader bg-primary\"></div>\n<div class=\"load-info\"></div>"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":14,"character":20}]}]}},"MobilePageDirective":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":10,"character":1},"arguments":[{"selector":"[wmPage]"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@wm/core","name":"App","line":20,"character":21},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":21,"character":23},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":22,"character":38},{"__symbolic":"reference","module":"@wm/mobile/core","name":"DeviceService","line":23,"character":39},{"__symbolic":"reference","module":"@wm/components/page","name":"PageDirective","line":24,"character":30},{"__symbolic":"reference","module":"@wm/core","name":"AbstractNavigationService","line":25,"character":43}]}],"ngOnDestroy":[{"__symbolic":"method"}]}},"PageModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule","line":13,"character":1},"arguments":[{"imports":[{"__symbolic":"reference","module":"@angular/common","name":"CommonModule","line":15,"character":8},{"__symbolic":"reference","module":"@wm/components/base","name":"WmComponentsModule","line":16,"character":8}],"declarations":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"exports":[{"__symbolic":"reference","name":"MobilePageDirective"},{"__symbolic":"reference","name":"PageContentLoaderComponent"}],"entryComponents":[]}]}],"members":{}}},"origins":{"PageContentLoaderComponent":"./page-content-loader/page-content-loader.component","MobilePageDirective":"./page.directive","PageModule":"./page.module"},"importAs":"@wm/mobile/components/page"}

app-ng-runtime/mobile/components/page/default/page.directive.d.ts

@@ -1,13 +1,16 @@
 import { ElementRef, OnDestroy } from '@angular/core';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { AbstractNavigationService, App } from '@wm/core';
 import { PageDirective } from '@wm/components/page';
 import { DeviceService } from '@wm/mobile/core';
 export declare class MobilePageDirective implements OnDestroy {
+    private modalService;
     private deviceService;
     private page;
     private navigationService;
     private _$ele;
+    private subscriptions;
     private _backBtnListenerDestroyer;
-    constructor(app: App, elRef: ElementRef, deviceService: DeviceService, page: PageDirective, navigationService: AbstractNavigationService);
+    constructor(app: App, elRef: ElementRef, modalService: BsModalService, deviceService: DeviceService, page: PageDirective, navigationService: AbstractNavigationService);
     ngOnDestroy(): void;
 }

app-ng-runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-ng-runtime",
-    "version": "11.4.0-next.141076",
+    "version": "11.4.0-next.141078",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-ng-runtime/variables/bundles/index.umd.js

@@ -3486,6 +3486,14 @@
         { type: core.AbstractHttpService }
     ]; };
 
+    var Formatter = /** @class */ (function () {
+        function Formatter() {
+        }
+        Formatter.prototype.format = function (value, format) {
+            return exports.appManager.getPipe('date').transform(value, format);
+        };
+        return Formatter;
+    }());
     var VariablesService = /** @class */ (function () {
         function VariablesService(httpService, metadataService, navigationService, routerService, toasterService, oAuthService, securityService, dialogService) {
             this.httpService = httpService;
@@ -3611,6 +3619,7 @@
                 if (this.isVariableSeperated(variablesJson, variableName)) {
                     this.processBinding(varInstance, scope, 'dataBinding', this.getBindSourceTarget(varInstance));
                     varInstance.httpService = this.httpService;
+                    varInstance.dateFormatter = new Formatter();
                     varInstance.subscribe('afterInvoke', function () { return core.$invokeWatchers(true); });
                     if (varInstance.category === 'wm.LiveVariable' && varInstance.operation === 'read') {
                         core.processFilterExpBindNode(varInstance._context, varInstance.filterExpressions, varInstance);
@@ -3705,6 +3714,7 @@
     exports.DB_CONSTANTS = DB_CONSTANTS;
     exports.DeviceVariableManager = DeviceVariableManager;
     exports.DeviceVariableService = DeviceVariableService;
+    exports.Formatter = Formatter;
     exports.MetadataService = MetadataService;
     exports.SWAGGER_CONSTANTS = SWAGGER_CONSTANTS;
     exports.VARIABLE_CONSTANTS = VARIABLE_CONSTANTS;