fix(errors): Add guards to frames and fix work with mock items on grid

apps/demo/src/app/pages/account-page/account-page.routes.ts

@@ -9,7 +9,8 @@ export const children = [
   {
     path: 'profile',
     loadChildren: './profile-frame/profile-frame.module#DemoProfileFrameModule',
-    data: DemoProfileFrameRoutes[0].data
+    data: DemoProfileFrameRoutes[0].data,
+    canActivate: [AuthGuardService]
   }
 ];
 export const DemoAccountPageRoutes: Routes = [

apps/demo/src/app/pages/account-page/profile-frame/profile-frame.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
 import { translate } from '@rucken/core';
 import { ProfileFrameComponent } from '@rucken/web';
+import { AuthGuardService } from '@rucken/web';
 
 export const DemoProfileFrameRoutes: Routes = [
   {
@@ -10,6 +11,7 @@ export const DemoProfileFrameRoutes: Routes = [
       name: 'profile',
       title: translate('Profile'),
       visible: true
-    }
+    },
+    canActivate: [AuthGuardService]
   }
 ];

apps/demo/src/app/pages/admin-page/admin-page.routes.ts

@@ -10,12 +10,14 @@ export const children = [
   {
     path: 'users',
     loadChildren: './users-frame/users-frame.module#DemoUsersFrameModule',
-    data: DemoUsersFrameRoutes[0].data
+    data: DemoUsersFrameRoutes[0].data,
+    canActivate: [AuthGuardService]
   },
   {
     path: 'groups',
     loadChildren: './groups-frame/groups-frame.module#DemoGroupsFrameModule',
-    data: DemoGroupsFrameRoutes[0].data
+    data: DemoGroupsFrameRoutes[0].data,
+    canActivate: [AuthGuardService]
   }
 ];
 export const DemoAdminPageRoutes: Routes = [

apps/demo/src/app/pages/admin-page/groups-frame/groups-frame.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
 import { translate } from '@rucken/core';
 import { GroupsFrameComponent } from '@rucken/web';
+import { AuthGuardService } from '@rucken/web';
 
 export const DemoGroupsFrameRoutes: Routes = [
   {
@@ -10,6 +11,7 @@ export const DemoGroupsFrameRoutes: Routes = [
       name: 'groups',
       title: translate('Groups'),
       visible: true
-    }
+    },
+    canActivate: [AuthGuardService]
   }
 ];

apps/demo/src/app/pages/admin-page/users-frame/users-frame.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
 import { translate } from '@rucken/core';
 import { UsersFrameComponent } from '@rucken/web';
+import { AuthGuardService } from '@rucken/web';
 
 export const DemoUsersFrameRoutes: Routes = [
   {
@@ -10,6 +11,7 @@ export const DemoUsersFrameRoutes: Routes = [
       name: 'users',
       title: translate('Users'),
       visible: true
-    }
+    },
+    canActivate: [AuthGuardService]
   }
 ];

apps/demo/src/app/pages/components-page/components-page.routes.ts

@@ -9,7 +9,8 @@ export const children = [
   {
     path: 'controls',
     loadChildren: './controls-frame/controls-frame.module#DemoControlsFrameModule',
-    data: DemoControlsFrameRoutes[0].data
+    data: DemoControlsFrameRoutes[0].data,
+    canActivate: [AuthGuardService]
   }
 ];
 export const DemoComponentsPageRoutes: Routes = [

apps/demo/src/app/pages/components-page/controls-frame/controls-frame.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
 import { translate } from '@rucken/core';
 import { ControlsFrameComponent } from '@rucken/web';
+import { AuthGuardService } from '@rucken/web';
 
 export const DemoControlsFrameRoutes: Routes = [
   {
@@ -10,6 +11,7 @@ export const DemoControlsFrameRoutes: Routes = [
       name: 'controls',
       title: translate('Controls'),
       visible: true
-    }
+    },
+    canActivate: [AuthGuardService]
   }
 ];

libs/core/src/index.ts

@@ -58,14 +58,14 @@ import { inValues } from './shared/utils/utils';
 export { inValues } from './shared/utils/utils';
 import { BaseResourceModel } from './shared/base/models/base-resource.model';
 export { BaseResourceModel } from './shared/base/models/base-resource.model';
-import { BaseRemoteRepositoryService } from './shared/base/services/base-remote-repository.service';
-export { BaseRemoteRepositoryService } from './shared/base/services/base-remote-repository.service';
 import { BaseLocalRepositoryService } from './shared/base/services/base-local-repository.service';
 export { BaseLocalRepositoryService } from './shared/base/services/base-local-repository.service';
+import { BaseRemoteRepositoryService } from './shared/base/services/base-remote-repository.service';
+export { BaseRemoteRepositoryService } from './shared/base/services/base-remote-repository.service';
 import { BaseRepositoryService } from './shared/base/services/base-repository.service';
 export { BaseRepositoryService } from './shared/base/services/base-repository.service';
 export const RuckenCoreModules: any[] = [];
 export const RuckenCoreComponents: any[] = [];
 export const RuckenCoreShareds: any[] = [RuckenCoreRuI18n, EndpointStatusEnum, EndpointHelper, HttpHelper, RepositoryHelper, FontawesomeItemsMock, ThemeItemsMock, ContentType, Fontawesome, GroupPermission, Group, MetaModel, Permission, Theme, UserGroup, User, translate, isJson, inValues, BaseResourceModel];
-export const RuckenCoreServices: any[] = [AccountService, AppService, ContentTypesService, FontawesomeService, GroupPermissionsService, GroupsService, PermissionsService, ThemesService, UserGroupsService, UsersService, BaseRemoteRepositoryService, BaseLocalRepositoryService, BaseRepositoryService];
+export const RuckenCoreServices: any[] = [AccountService, AppService, ContentTypesService, FontawesomeService, GroupPermissionsService, GroupsService, PermissionsService, ThemesService, UserGroupsService, UsersService, BaseLocalRepositoryService, BaseRemoteRepositoryService, BaseRepositoryService];
 export const RuckenCorePipes: any[] = [];

libs/core/src/package.json

@@ -24,4 +24,4 @@
         "lodash": "*",
         "moment": "*"
     }
-}
+}

libs/web/src/base/base-app/base-app.component.ts

@@ -2,9 +2,9 @@ import 'moment/locale/ru';
 
 import { Component, ComponentFactoryResolver, EventEmitter, ViewContainerRef, ViewEncapsulation } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { AppService } from '@rucken/core';
-import { RuckenCoreRuI18n } from '@rucken/core';
 import { translate } from '@rucken/core';
+import { RuckenCoreRuI18n } from '@rucken/core';
+import { AppService } from '@rucken/core';
 import * as _ from 'lodash';
 import * as moment from 'moment/moment';
 
@@ -34,6 +34,7 @@ export class BaseAppComponent extends BaseComponent {
   currentLang: string = null;
   defaultLang = 'en';
   autoLoadLang = true;
+  errorModalOpened = false;
 
   constructor(
     public viewContainerRef: ViewContainerRef,
@@ -74,6 +75,9 @@ export class BaseAppComponent extends BaseComponent {
     this.translateService.use(lang);
   }
   showErrorModal(message: string, title?: string, size?: string): EventEmitter<any> {
+    if (this.errorModalOpened) {
+      return new EventEmitter();
+    }
     if (size === undefined) {
       size = 'md';
     }
@@ -87,6 +91,8 @@ export class BaseAppComponent extends BaseComponent {
     alert.size = size;
     alert.buttonText = this.translateService.instant('Close');
     alert.modal.show();
+    this.errorModalOpened = true;
+    alert.onClose.subscribe(() => this.errorModalOpened = false);
     return alert.onClose;
   }
   showInfoModal(message: string, title?: string, size?: string): EventEmitter<any> {

libs/web/src/base/base-app/base-app.routes.ts

@@ -4,28 +4,34 @@ import { AccountPageRoutes } from './../../pages/account-page/account-page.route
 import { AdminPageRoutes } from './../../pages/admin-page/admin-page.routes';
 import { HomePageRoutes } from './../../pages/home-page/home-page.routes';
 import { ThemesPageRoutes } from './../../pages/themes-page/themes-page.routes';
+import { HomeGuardService } from '../../guards/home-guard.service';
+import { AuthGuardService } from '../../guards/auth-guard.service';
 
 export const BaseRoutes: Routes = [
   { path: '', redirectTo: '/home', pathMatch: 'full' },
   {
     path: 'home',
     loadChildren: './../../pages/home-page/home-page.module#HomePageModule',
-    data: HomePageRoutes[0].data
+    data: HomePageRoutes[0].data,
+    canActivate: [HomeGuardService]
   },
   {
     path: 'themes',
     loadChildren: './../../pages/themes-page/themes-page.module#ThemesPageModule',
-    data: ThemesPageRoutes[0].data
+    data: ThemesPageRoutes[0].data,
+    canActivate: [AuthGuardService]
   },
   {
     path: 'admin',
     loadChildren: './../../pages/admin-page/admin-page.module#AdminPageModule',
-    data: AdminPageRoutes[0].data
+    data: AdminPageRoutes[0].data,
+    canActivate: [AuthGuardService]
   },
   {
     path: 'account',
     loadChildren: './../../pages/account-page/account-page.module#AccountPageModule',
-    data: AccountPageRoutes[0].data
+    data: AccountPageRoutes[0].data,
+    canActivate: [AuthGuardService]
   },
   {
     path: '**',

libs/web/src/base/base-component/base-component.component.ts

@@ -10,7 +10,7 @@ export class BaseComponent implements OnInit, OnDestroy {
   @Input()
   text = '';
   @Input()
-  tooltipEnable: boolean;
+  tooltipEnable?= false;
   @Input()
   tooltipText = '';
   @Input()

libs/web/src/base/base-resources-grid/base-resource-input/base-resource-input.component.ts

@@ -36,7 +36,7 @@ export class BaseResourceInputComponent extends BaseComponent {
   @Output()
   modelAsStringChange: EventEmitter<string> = new EventEmitter<string>();
   @Input()
-  loadAll = false;
+  loadAll?= false;
 
   items: any[];
   cachedResourcesService: any;
@@ -70,12 +70,12 @@ export class BaseResourceInputComponent extends BaseComponent {
   }
   afterCreate() {
     this.translateService.onLangChange.subscribe(() => this.init());
-  }
-  init() {
-    super.init();
     if (this.lookupTooltip === undefined) {
       this.lookupTooltip = this.translateService.instant('Select');
     }
+  }
+  init() {
+    super.init();
     if (this.select && this.loadAll) {
       this.search();
     }

libs/web/src/base/base-resources-grid/base-resource-select-input/base-resource-select-input.component.ts

@@ -42,11 +42,11 @@ export class BaseResourceSelectInputComponent extends BaseComponent {
   @Input()
   hardValue: any = null;
   @Input()
-  select: boolean;
+  select?: boolean;
   @Input()
   width: string = null;
   @Input()
-  loadAll = true;
+  loadAll?= false;
 
   items: any[];
   cachedResourcesService: any;

libs/web/src/base/base-resources-grid/base-resources-grid.component.ts

@@ -10,25 +10,26 @@ import { BaseComponent } from './../../base/base-component/base-component.compon
 export class BaseResourcesGridComponent extends BaseComponent {
 
   @Input()
-  loadAll?: boolean;
+  loadAll?= true;
   @Output()
   onSelectItems: EventEmitter<any[] | any> = new EventEmitter();
   @Input()
-  onEnterEnabled?= false;
+  onEnterEnabled?= true;
   @Output()
   onEnter: EventEmitter<any[] | any> = new EventEmitter();
   @Input()
-  readonly: boolean;
+  readonly?: boolean;
   @Input()
-  hardReadonly = false;
+  hardReadonly?= true;
 
   modelMeta: any;
   items: any[];
+  mockedItems?: any[];
   searchText = '';
   selectedItems: any[];
   cachedResourcesService: any;
   maxSelectCount = 1;
-  modalIsOpened: boolean;
+  modalIsOpened?: boolean;
 
   @HostListener('document:keypress', ['$event'])
   handleKeyboardEvent(event: KeyboardEvent) {
@@ -56,17 +57,6 @@ export class BaseResourcesGridComponent extends BaseComponent {
     }
     return {};
   }
-  set mockedItems(items) {
-    if (this.cachedResourcesService) {
-      this.cachedResourcesService.mockedItems = items;
-    }
-  }
-  get mockedItems() {
-    if (this.cachedResourcesService) {
-      return this.cachedResourcesService.mockedItems;
-    }
-    return [];
-  }
   get statusListMessage() {
     if (!this.cachedResourcesService) {
       return '';
@@ -102,8 +92,6 @@ export class BaseResourcesGridComponent extends BaseComponent {
         });
     }
     super.init();
-    this.loadAll = this.loadAll === undefined ? true : this.loadAll;
-
     if (this.loadAll) {
       this.search();
     }
@@ -138,6 +126,9 @@ export class BaseResourcesGridComponent extends BaseComponent {
     const filter: any = {};
     if (this.cachedResourcesService) {
       this.cachedResourcesService.ignoreCache = ignoreCache;
+      if (this.mockedItems) {
+        this.cachedResourcesService.mockedItems = this.mockedItems;
+      }
       this.cachedResourcesService.loadAll(this.searchText, filter);
     }
   }

libs/web/src/controls/footer-buttons/footer-buttons.component.ts

@@ -23,7 +23,7 @@ export class FooterButtonsComponent extends BaseComponent {
   @Input()
   okTitle = translate('OK');
   @Input()
-  readonly: boolean;
+  readonly?: boolean;
   @Output()
   onClose: EventEmitter<boolean | any> = new EventEmitter();
   @Output()

libs/web/src/controls/text-input/text-input.component.ts

@@ -61,6 +61,7 @@ export class TextInputComponent extends BaseComponent {
   isNativeDateInput?: boolean;
   @Input()
   startingDay: number;
+
   private _dateValue: any;
 
   constructor(

libs/web/src/grids/group-permissions-grid/group-permissions-grid.component.ts

@@ -35,7 +35,7 @@ export class GroupPermissionsGridComponent extends BaseResourcesGridComponent {
   @Input()
   group: any | Group;
   @Input()
-  readonly: boolean;
+  readonly?: boolean;
   @Input()
   hardReadonly = false;
 

libs/web/src/grids/user-groups-grid/user-groups-grid.component.ts

@@ -30,7 +30,7 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
   @Output()
   onSelectItems: EventEmitter<any | UserGroup[] | UserGroup>;
   @Input()
-  readonly: boolean;
+  readonly?: boolean;
   @Input()
   hardReadonly = false;
 

libs/web/src/grids/users-grid/account-profile-form/account-profile-form.component.html

@@ -42,7 +42,7 @@
   </div>
   <div class="row">
     <div class="col-md-12">
-      <footer-buttons (onClose)="cancel()" (onOk)="save()" [readonly]="readonly" [okTitle]="text" [okInProcess]="okInProcess"></footer-buttons>
+      <footer-buttons (onClose)="cancel()" (onOk)="ok()" [readonly]="readonly" [okTitle]="text" [okInProcess]="okInProcess"></footer-buttons>
     </div>
   </div>
 </form>