@ts-core/angular 13.0.16 → 13.0.19

package/fesm2015/ts-core-angular.mjs

@@ -57,10 +57,10 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { __awaiter } from 'tslib';
 import { TransportTimeoutError, TransportNoConnectionError, TransportEvent } from '@ts-core/common/transport';
-import * as i2$4 from '@angular/router';
+import * as i1$9 from '@angular/router';
 import { NavigationStart, NavigationEnd, NavigationCancel, NavigationError, ActivatedRoute } from '@angular/router';
 import { FilterableMapCollection, MapCollection } from '@ts-core/common/map';
-import * as i1$9 from '@angular/cdk/layout';
+import * as i1$a from '@angular/cdk/layout';
 import { TransportLocal } from '@ts-core/common/transport/local';
 
 class ApplicationBaseComponent extends DestroyableContainer {
@@ -8143,16 +8143,17 @@ class LoginBaseService extends Loadable {
             }
         });
     }
-    tryLoginBySid() {
+    loginBySidIfCan() {
         if (!this.isCanLoginWithSid()) {
             return false;
         }
-        if (!this.isLoggedIn && !this.isLoading) {
-            this.status = LoadableStatus.LOADING;
-            this.observer.next(new ObservableData(LoadableEvent.STARTED));
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_STARTED));
-            this.loginBySid();
+        if (this.isLoggedIn || this.isLoading) {
+            return true;
         }
+        this.status = LoadableStatus.LOADING;
+        this.observer.next(new ObservableData(LoadableEvent.STARTED));
+        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_STARTED));
+        this.loginBySid();
         return true;
     }
     logout() {
@@ -8242,7 +8243,7 @@ class LoginRequireResolver {
     // --------------------------------------------------------------------------
     resolve() {
         if (this.isLoggedIn()) {
-            return Promise.resolve(this.login.loginData);
+            return Promise.resolve();
         }
         let promise = PromiseHandler.create();
         let subscription = this.login.events.subscribe(data => {
@@ -8250,7 +8251,7 @@ class LoginRequireResolver {
                 promise.reject(data.error.toString());
             }
             else if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {
-                promise.resolve(data.data);
+                promise.resolve();
             }
             else if (data.type === LoginBaseServiceEvent.LOGIN_FINISHED) {
                 subscription.unsubscribe();
@@ -8278,7 +8279,7 @@ class LoginGuard extends LoginRequireResolver {
     // 	Public Methods
     //
     // --------------------------------------------------------------------------
-    canActivate() {
+    canActivate(route, state) {
         return this.isLoggedIn() ? true : this.router.parseUrl(LoginGuard.redirectUrl);
     }
 }
@@ -8288,12 +8289,17 @@ class LoginGuard extends LoginRequireResolver {
 //
 // --------------------------------------------------------------------------
 LoginGuard.redirectUrl = '/login';
-LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token: i2$4.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token: i1$9.Router }], target: i0.ɵɵFactoryTarget.Injectable });
 LoginGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return [{ type: LoginBaseService }, { type: i2$4.Router }]; } });
+        }], ctorParameters: function () {
+        return [{ type: undefined, decorators: [{
+                        type: Inject,
+                        args: [LoginBaseService]
+                    }] }, { type: i1$9.Router }];
+    } });
 
 class LoginNotGuard extends LoginRequireResolver {
     // --------------------------------------------------------------------------
@@ -8310,7 +8316,7 @@ class LoginNotGuard extends LoginRequireResolver {
     // 	Public Methods
     //
     // --------------------------------------------------------------------------
-    canActivate() {
+    canActivate(route, state) {
         return !this.isLoggedIn() ? true : this.router.parseUrl(LoginNotGuard.redirectUrl);
     }
 }
@@ -8320,12 +8326,96 @@ class LoginNotGuard extends LoginRequireResolver {
 //
 // --------------------------------------------------------------------------
 LoginNotGuard.redirectUrl = '/';
-LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token: i2$4.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token: i1$9.Router }], target: i0.ɵɵFactoryTarget.Injectable });
 LoginNotGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return [{ type: LoginBaseService }, { type: i2$4.Router }]; } });
+        }], ctorParameters: function () {
+        return [{ type: undefined, decorators: [{
+                        type: Inject,
+                        args: [LoginBaseService]
+                    }] }, { type: i1$9.Router }];
+    } });
+
+class LoginIfCanGuard extends LoginGuard {
+    // --------------------------------------------------------------------------
+    //
+    // 	Constructor
+    //
+    // --------------------------------------------------------------------------
+    constructor(login, router) {
+        super(login, router);
+        this.router = router;
+    }
+    // --------------------------------------------------------------------------
+    //
+    // 	Private Methods
+    //
+    // --------------------------------------------------------------------------
+    loginIfCan() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.login.loginBySidIfCan()) {
+                try {
+                    yield this.resolve();
+                }
+                catch (error) { }
+            }
+        });
+    }
+    // --------------------------------------------------------------------------
+    //
+    // 	Public Methods
+    //
+    // --------------------------------------------------------------------------
+    canActivate(route, state) {
+        const _super = Object.create(null, {
+            canActivate: { get: () => super.canActivate }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (state.url !== LoginGuard.redirectUrl) {
+                LoginNotGuard.redirectUrl = state.url;
+            }
+            if (!this.isLoggedIn()) {
+                yield this.loginIfCan();
+            }
+            return _super.canActivate.call(this, route, state);
+        });
+    }
+}
+LoginIfCanGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginIfCanGuard, deps: [{ token: LoginBaseService }, { token: i1$9.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+LoginIfCanGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginIfCanGuard, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginIfCanGuard, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: function () {
+        return [{ type: undefined, decorators: [{
+                        type: Inject,
+                        args: [LoginBaseService]
+                    }] }, { type: i1$9.Router }];
+    } });
+
+class LoginResolver extends LoginRequireResolver {
+    // --------------------------------------------------------------------------
+    //
+    // 	Constructor
+    //
+    // --------------------------------------------------------------------------
+    constructor(login) {
+        super(login);
+    }
+}
+LoginResolver.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, deps: [{ token: LoginBaseService }], target: i0.ɵɵFactoryTarget.Injectable });
+LoginResolver.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: function () {
+        return [{ type: undefined, decorators: [{
+                        type: Inject,
+                        args: [LoginBaseService]
+                    }] }];
+    } });
 
 class MenuItemBase {
     // --------------------------------------------------------------------------
@@ -9105,12 +9195,12 @@ BootstrapBreakpointService.DEFAULT_MD = 768;
 BootstrapBreakpointService.DEFAULT_LG = 992;
 BootstrapBreakpointService.DEFAULT_XL = 1200;
 BootstrapBreakpointService.DEFAULT_XXL = 1400;
-BootstrapBreakpointService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, deps: [{ token: i1$9.BreakpointObserver }], target: i0.ɵɵFactoryTarget.Injectable });
+BootstrapBreakpointService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, deps: [{ token: i1$a.BreakpointObserver }], target: i0.ɵɵFactoryTarget.Injectable });
 BootstrapBreakpointService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return [{ type: i1$9.BreakpointObserver }]; } });
+        }], ctorParameters: function () { return [{ type: i1$a.BreakpointObserver }]; } });
 var BootstrapBreakpointServiceEvent;
 (function (BootstrapBreakpointServiceEvent) {
     BootstrapBreakpointServiceEvent["CHANGED"] = "CHANGED";
@@ -9685,5 +9775,5 @@ class TransportLazyModule {
  * Generated bundle index. Do not edit.
  */
 
-export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetFilePipe, AssetIconPipe, AssetImagePipe, AssetModule, AssetSoundPipe, AssetVideoPipe, AutoScrollBottomDirective, BootstrapBreakpoint, BootstrapBreakpointService, BootstrapBreakpointServiceEvent, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, CdkTableBaseComponent, CdkTableCellClassNamePipe, CdkTableColumnClassNamePipe, CdkTableColumnStyleNamePipe, CdkTableColumnValuePipe, CdkTableDataSource, CdkTableFilterableComponent, CdkTableFilterableMapCollection, CdkTablePaginableBookmarkComponent, CdkTablePaginableBookmarkMapCollection, CdkTablePaginableComponent, CdkTablePaginableMapCollection, CdkTableRowClassNamePipe, CdkTableRowStyleNamePipe, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, Direction, FinancePipe, FocusDirective, FocusManager, FormElementAsync, FormElementSync, HTMLContentTitleDirective, INotification, INotificationContent, IUser, IVICommonOptions, IWindow, IWindowContent, InfiniteScrollDirective, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageMatPaginatorIntl, LanguageModule, LanguageMomentDateAdapter, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LanguageSelectorComponent, LazyModuleLoader, ListItem, ListItems, LoginBaseService, LoginBaseServiceEvent, LoginGuard, LoginNotGuard, LoginRequireResolver, MenuItem, MenuItemBase, MenuItems, MenuListComponent, MenuTriggerForDirective, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationBaseComponent, NotificationComponent, NotificationConfig, NotificationEvent, NotificationFactory, NotificationModule, NotificationService, NotificationServiceEvent, PipeBaseService, PrettifyPipe, PropertiesManager, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, SanitizePipe, ScrollCheckDirective, ScrollDirective, SelectListComponent, SelectListItem, SelectListItems, SelectOnFocusDirective, ShellBaseComponent, StartCasePipe, THEME_OPTIONS, TabGroupComponent, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TransportLazy, TransportLazyModule, TransportLazyModuleLoadedEvent, TruncatePipe, UserBaseService, UserBaseServiceEvent, VICommonModule, VIComponentModule, VI_ANGULAR_OPTIONS, ViewUtil, WINDOW_CONTENT_CONTAINER, WindowAlign, WindowBase, WindowBaseComponent, WindowCloseElementComponent, WindowConfig, WindowDragAreaDirective, WindowEvent, WindowFactory, WindowImpl, WindowMinimizeElementComponent, WindowModule, WindowQuestionBaseComponent, WindowQuestionComponent, WindowResizeElementComponent, WindowService, WindowServiceEvent, cookieServiceFactory, languageServiceFactory, loggerServiceFactory, notificationServiceFactory, themeAssetServiceFactory, themeServiceFactory, windowServiceFactory };
+export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetFilePipe, AssetIconPipe, AssetImagePipe, AssetModule, AssetSoundPipe, AssetVideoPipe, AutoScrollBottomDirective, BootstrapBreakpoint, BootstrapBreakpointService, BootstrapBreakpointServiceEvent, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, CdkTableBaseComponent, CdkTableCellClassNamePipe, CdkTableColumnClassNamePipe, CdkTableColumnStyleNamePipe, CdkTableColumnValuePipe, CdkTableDataSource, CdkTableFilterableComponent, CdkTableFilterableMapCollection, CdkTablePaginableBookmarkComponent, CdkTablePaginableBookmarkMapCollection, CdkTablePaginableComponent, CdkTablePaginableMapCollection, CdkTableRowClassNamePipe, CdkTableRowStyleNamePipe, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, Direction, FinancePipe, FocusDirective, FocusManager, FormElementAsync, FormElementSync, HTMLContentTitleDirective, INotification, INotificationContent, IUser, IVICommonOptions, IWindow, IWindowContent, InfiniteScrollDirective, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageMatPaginatorIntl, LanguageModule, LanguageMomentDateAdapter, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LanguageSelectorComponent, LazyModuleLoader, ListItem, ListItems, LoginBaseService, LoginBaseServiceEvent, LoginGuard, LoginIfCanGuard, LoginNotGuard, LoginRequireResolver, LoginResolver, MenuItem, MenuItemBase, MenuItems, MenuListComponent, MenuTriggerForDirective, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationBaseComponent, NotificationComponent, NotificationConfig, NotificationEvent, NotificationFactory, NotificationModule, NotificationService, NotificationServiceEvent, PipeBaseService, PrettifyPipe, PropertiesManager, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, SanitizePipe, ScrollCheckDirective, ScrollDirective, SelectListComponent, SelectListItem, SelectListItems, SelectOnFocusDirective, ShellBaseComponent, StartCasePipe, THEME_OPTIONS, TabGroupComponent, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TransportLazy, TransportLazyModule, TransportLazyModuleLoadedEvent, TruncatePipe, UserBaseService, UserBaseServiceEvent, VICommonModule, VIComponentModule, VI_ANGULAR_OPTIONS, ViewUtil, WINDOW_CONTENT_CONTAINER, WindowAlign, WindowBase, WindowBaseComponent, WindowCloseElementComponent, WindowConfig, WindowDragAreaDirective, WindowEvent, WindowFactory, WindowImpl, WindowMinimizeElementComponent, WindowModule, WindowQuestionBaseComponent, WindowQuestionComponent, WindowResizeElementComponent, WindowService, WindowServiceEvent, cookieServiceFactory, languageServiceFactory, loggerServiceFactory, notificationServiceFactory, themeAssetServiceFactory, themeServiceFactory, windowServiceFactory };
 //# sourceMappingURL=ts-core-angular.mjs.map