update lpx version

npm/ng-packs/jest.config.ts

@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest');
+import { getJestProjects } from '@nrwl/jest';
 
 export default {
   projects: getJestProjects(),

npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts

@@ -3,8 +3,9 @@ import { SpyObject } from '@ngneat/spectator';
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { Subject, timer } from 'rxjs';
-import { ApiInterceptor } from '../interceptors';
-import { HttpWaitService, SessionStateService } from '../services';
+import { ApiInterceptor } from '../interceptors/api.interceptor';
+import { HttpWaitService } from '../services/http-wait.service';
+import { SessionStateService } from '../services/session-state.service';
 import { TENANT_KEY } from '../tokens/tenant-key.token';
 
 describe('ApiInterceptor', () => {

npm/ng-packs/packages/core/src/lib/tests/container.strategy.spec.ts

@@ -3,7 +3,7 @@ import {
   ClearContainerStrategy,
   CONTAINER_STRATEGY,
   InsertIntoContainerStrategy,
-} from '../strategies';
+} from '../strategies/container.strategy';
 
 describe('ClearContainerStrategy', () => {
   const containerRef = {

npm/ng-packs/packages/core/src/lib/tests/dom.strategy.spec.ts

@@ -1,4 +1,4 @@
-import { DomStrategy, DOM_STRATEGY } from '../strategies';
+import { DOM_STRATEGY, DomStrategy } from '../strategies/dom.strategy';
 
 describe('DomStrategy', () => {
   describe('#insertElement', () => {

npm/ng-packs/packages/core/src/lib/tests/environment-utils.spec.ts

@@ -3,7 +3,7 @@ import { Component, Injector } from '@angular/core';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { BehaviorSubject } from 'rxjs';
 import { Environment, RemoteEnv } from '../models/environment';
-import { EnvironmentService } from '../services';
+import { EnvironmentService } from '../services/environment.service';
 import { getRemoteEnv } from '../utils/environment-utils';
 import { deepMerge } from '../utils/object-utils';
 

npm/ng-packs/packages/core/src/lib/tests/environment.service.spec.ts

@@ -1,7 +1,7 @@
 import { waitForAsync } from '@angular/core/testing';
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
-import { Environment } from '../models';
-import { EnvironmentService } from '../services';
+import { Environment } from '../models/environment';
+import { EnvironmentService } from '../services/environment.service';
 
 export const ENVIRONMENT_DATA = {
   production: false,
@@ -41,27 +41,21 @@ describe('Environment', () => {
   });
 
   describe('#getEnvironment', () => {
-    it(
-      'should return ENVIRONMENT_DATA',
-      waitForAsync(() => {
-        expect(environment.getEnvironment()).toEqual(ENVIRONMENT_DATA);
-        environment.getEnvironment$().subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA));
-      }),
-    );
+    it('should return ENVIRONMENT_DATA', waitForAsync(() => {
+      expect(environment.getEnvironment()).toEqual(ENVIRONMENT_DATA);
+      environment.getEnvironment$().subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA));
+    }));
   });
 
   describe('#getApiUrl', () => {
-    it(
-      'should return api url',
-      waitForAsync(() => {
-        expect(environment.getApiUrl('default')).toEqual(ENVIRONMENT_DATA.apis.default.url);
-        environment
-          .getApiUrl$('other')
-          .subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA.apis.other.url));
-        environment
-          .getApiUrl$('yetAnother')
-          .subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA.apis.default.url));
-      }),
-    );
+    it('should return api url', waitForAsync(() => {
+      expect(environment.getApiUrl('default')).toEqual(ENVIRONMENT_DATA.apis.default.url);
+      environment
+        .getApiUrl$('other')
+        .subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA.apis.other.url));
+      environment
+        .getApiUrl$('yetAnother')
+        .subscribe(data => expect(data).toEqual(ENVIRONMENT_DATA.apis.default.url));
+    }));
   });
 });

npm/ng-packs/packages/core/src/lib/tests/generator-utils.spec.ts

@@ -1,4 +1,4 @@
-import { generateHash, generatePassword } from '../utils';
+import { generateHash, generatePassword } from '../utils/generator-utils';
 
 describe('GeneratorUtils', () => {
   describe('#generateHash', () => {

npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts

@@ -4,15 +4,13 @@ import { OAuthService } from 'angular-oauth2-oidc';
 import { of } from 'rxjs';
 import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
 import { ApplicationConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';
-import {
-  AuthService,
-  ConfigStateService,
-  EnvironmentService,
-  SessionStateService,
-} from '../services';
+import { SessionStateService } from '../services/session-state.service';
+import { EnvironmentService } from '../services/environment.service';
+import { AuthService } from '../services/auth.service';
+import { ConfigStateService } from '../services/config-state.service';
 import * as AuthFlowStrategy from '../strategies/auth-flow.strategy';
 import { CORE_OPTIONS } from '../tokens/options.token';
-import { checkAccessToken, getInitialData, localeInitializer } from '../utils';
+import { checkAccessToken, getInitialData, localeInitializer } from '../utils/initial-utils';
 import * as environmentUtils from '../utils/environment-utils';
 import * as multiTenancyUtils from '../utils/multi-tenancy-utils';
 

npm/ng-packs/packages/core/src/lib/tests/internal-store.spec.ts

@@ -1,7 +1,7 @@
 import clone from 'just-clone';
 import { take } from 'rxjs/operators';
-import { DeepPartial } from '../models';
-import { InternalStore } from '../utils';
+import { DeepPartial } from '../models/utility';
+import { InternalStore } from '../utils/internal-store-utils';
 
 const mockInitialState = {
   foo: {

npm/ng-packs/packages/core/src/lib/tests/lazy-load-utils.spec.ts

@@ -1,6 +1,6 @@
-import { DomStrategy, DOM_STRATEGY } from '../strategies';
-import { CrossOriginStrategy, CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
-import { uuid } from '../utils';
+import { DOM_STRATEGY, DomStrategy } from '../strategies';
+import { CROSS_ORIGIN_STRATEGY, CrossOriginStrategy } from '../strategies/cross-origin.strategy';
+import { uuid } from '../utils/generator-utils';
 import { fromLazyLoad } from '../utils/lazy-load-utils';
 
 describe('Lazy Load Utils', () => {

npm/ng-packs/packages/core/src/lib/tests/lazy-load.service.spec.ts

@@ -1,8 +1,8 @@
 import { of, throwError } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { LazyLoadService } from '../services/lazy-load.service';
-import { ScriptLoadingStrategy } from '../strategies';
-import { ResourceWaitService } from '../services';
+import { ScriptLoadingStrategy } from '../strategies/loading.strategy';
+import { ResourceWaitService } from '../services/resource-wait.service';
 
 describe('LazyLoadService', () => {
   describe('#load', () => {

npm/ng-packs/packages/core/src/lib/tests/loading.strategy.spec.ts

@@ -1,10 +1,10 @@
+import { CROSS_ORIGIN_STRATEGY } from '../strategies/cross-origin.strategy';
 import {
-  CROSS_ORIGIN_STRATEGY,
-  DOM_STRATEGY,
   LOADING_STRATEGY,
   ScriptLoadingStrategy,
   StyleLoadingStrategy,
-} from '../strategies';
+} from '../strategies/loading.strategy';
+import { DOM_STRATEGY } from '../strategies/dom.strategy';
 
 const path = 'http://example.com/';
 

npm/ng-packs/packages/core/src/lib/tests/locale.provider.spec.ts

@@ -1,8 +1,8 @@
 import { Component, LOCALE_ID } from '@angular/core';
 import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
 import { differentLocales } from '../constants/different-locales';
-import { LocaleId } from '../providers';
-import { LocalizationService } from '../services';
+import { LocaleId } from '../providers/locale.provider';
+import { LocalizationService } from '../services/localization.service';
 
 @Component({ selector: 'abp-dummy', template: '' })
 export class DummyComponent {}

npm/ng-packs/packages/core/src/lib/tests/localization.pipe.spec.ts

@@ -1,6 +1,6 @@
 import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
-import { LocalizationPipe } from '../pipes';
-import { LocalizationService } from '../services';
+import { LocalizationPipe } from '../pipes/localization.pipe';
+import { LocalizationService } from '../services/localization.service';
 
 describe('LocalizationPipe', () => {
   let spectator: SpectatorService<LocalizationPipe>;

npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts

@@ -3,7 +3,8 @@ import { Router } from '@angular/router';
 import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
 import { BehaviorSubject } from 'rxjs';
 import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
-import { ConfigStateService, SessionStateService } from '../services';
+import { ConfigStateService } from '../services/config-state.service';
+import { SessionStateService } from '../services/session-state.service';
 import { LocalizationService } from '../services/localization.service';
 import { CORE_OPTIONS } from '../tokens/options.token';
 import { CONFIG_STATE_DATA } from './config-state.service.spec';

npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts

@@ -1,7 +1,7 @@
 import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/jest';
 import { Subject } from 'rxjs';
 import { PermissionDirective } from '../directives/permission.directive';
-import { PermissionService } from '../services';
+import { PermissionService } from '../services/permission.service';
 import { ChangeDetectorRef } from '@angular/core';
 
 describe('PermissionDirective', () => {

npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts

@@ -5,9 +5,10 @@ import { RouterModule } from '@angular/router';
 import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
 import { of } from 'rxjs';
 import { PermissionGuard } from '../guards/permission.guard';
-import { HttpErrorReporterService, PermissionService } from '../services';
+import { HttpErrorReporterService } from '../services/http-error-reporter.service';
+import { PermissionService } from '../services/permission.service';
 import { RoutesService } from '../services/routes.service';
-import { CORE_OPTIONS } from '../tokens';
+import { CORE_OPTIONS } from '../tokens/options.token';
 
 describe('PermissionGuard', () => {
   let spectator: SpectatorService<PermissionGuard>;

npm/ng-packs/packages/core/src/lib/tests/projection.strategy.spec.ts

@@ -1,15 +1,21 @@
-import { Component, ComponentRef, EmbeddedViewRef, TemplateRef, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  ComponentRef,
+  EmbeddedViewRef,
+  TemplateRef,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import {
   ComponentProjectionStrategy,
-  CONTAINER_STRATEGY,
-  ContainerStrategy,
-  CONTEXT_STRATEGY,
-  DOM_STRATEGY,
   PROJECTION_STRATEGY,
   RootComponentProjectionStrategy,
   TemplateProjectionStrategy,
-} from '../strategies';
+} from '../strategies/projection.strategy';
+import { CONTAINER_STRATEGY, ContainerStrategy } from '../strategies/container.strategy';
+import { DOM_STRATEGY } from '../strategies/dom.strategy';
+import { CONTEXT_STRATEGY } from '../strategies/context.strategy';
 
 describe('ComponentProjectionStrategy', () => {
   @Component({

npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts

@@ -2,8 +2,8 @@ import { Component, EventEmitter, Inject, Input, Optional, Output } from '@angul
 import { Router } from '@angular/router';
 import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/jest';
 import { BehaviorSubject } from 'rxjs';
-import { ReplaceableTemplateDirective } from '../directives';
-import { ReplaceableComponents } from '../models';
+import { ReplaceableTemplateDirective } from '../directives/replaceable-template.directive';
+import { ReplaceableComponents } from '../models/replaceable-components';
 import { ReplaceableComponentsService } from '../services/replaceable-components.service';
 
 @Component({

npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts

@@ -2,10 +2,11 @@ import { createHttpFactory, HttpMethod, SpectatorHttp, SpyObject } from '@ngneat
 import { OAuthService } from 'angular-oauth2-oidc';
 import { of, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { Rest } from '../models';
-import { EnvironmentService, HttpErrorReporterService } from '../services';
+import { Rest } from '../models/rest';
+import { EnvironmentService } from '../services/environment.service';
+import { HttpErrorReporterService } from '../services/http-error-reporter.service';
 import { RestService } from '../services/rest.service';
-import { CORE_OPTIONS } from '../tokens';
+import { CORE_OPTIONS } from '../tokens/options.token';
 
 describe('HttpClient testing', () => {
   let spectator: SpectatorHttp<RestService>;

npm/ng-packs/packages/core/src/lib/tests/route-utils.spec.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
-import { RouterOutletComponent } from '../components';
+import { RouterOutletComponent } from '../components/router-outlet.component';
 import { RoutesService } from '../services/routes.service';
 import { findRoute, getRoutePath } from '../utils/route-utils';
 

npm/ng-packs/packages/core/src/lib/tests/routes.handler.spec.ts

@@ -1,6 +1,6 @@
 import { Router } from '@angular/router';
-import { RoutesHandler } from '../handlers';
-import { RoutesService } from '../services';
+import { RoutesHandler } from '../handlers/routes.handler';
+import { RoutesService } from '../services/routes.service';
 
 describe('Routes Handler', () => {
   describe('#add', () => {

npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts

@@ -1,6 +1,6 @@
 import { Subject } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { RoutesService } from '../services';
+import { RoutesService } from '../services/routes.service';
 import { DummyInjector } from './utils/common.utils';
 import { mockPermissionService } from './utils/permission-service.spec.utils';
 

npm/ng-packs/packages/core/src/lib/tests/validators.spec.ts

@@ -1,10 +1,13 @@
 import { FormControl, Validators } from '@angular/forms';
-import { AbpValidators, validateMinAge, validateRange } from '../validators';
+import { validateMinAge } from '../validators/age.validator';
+import { validateRange } from '../validators/range.validator';
 import { validateCreditCard } from '../validators/credit-card.validator';
 import { validateRequired } from '../validators/required.validator';
 import { validateStringLength } from '../validators/string-length.validator';
 import { validateUrl } from '../validators/url.validator';
 
+const emailAddress = () => Validators.email;
+
 describe('Validators', () => {
   describe('Credit Card Validator', () => {
     const error = { creditCard: true };
@@ -41,7 +44,7 @@ describe('Validators', () => {
 
   describe('Email Validator', () => {
     it('should return email validator of Angular', () => {
-      expect(AbpValidators.emailAddress()).toBe(Validators.email);
+      expect(emailAddress()).toBe(Validators.email);
     });
   });
 

npm/ng-packs/packages/core/tsconfig.spec.json

@@ -7,5 +7,5 @@
     "esModuleInterop": true
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
+  "include": ["**/*.ts"]
 }

templates/app-nolayers/angular/angular.json

@@ -75,6 +75,26 @@
                 "inject": false,
                 "bundleName": "abp-bundle"
               },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css",
+                "inject": false,
+                "bundleName": "bootstrap-dim.rtl"
+              },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "ng-bundle.rtl"
+              },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "layout-bundle.rtl"
+              },
+              {
+                "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "abp-bundle.rtl"
+              },
               "node_modules/bootstrap-icons/font/bootstrap-icons.css",
               "src/styles.scss"
             ],

templates/app-nolayers/angular/package.json

@@ -19,7 +19,7 @@
     "@abp/ng.setting-management": "~6.0.0-rc.4",
     "@abp/ng.tenant-management": "~6.0.0-rc.4",
     "@abp/ng.theme.shared": "~6.0.0-rc.4",
-    "@abp/ng.theme.lepton-x": "~1.0.0-rc.3",
+    "@abp/ng.theme.lepton-x": "^1.0.0-rc.6",
     "@angular/animations": "^14.2.1",
     "@angular/common": "^14.2.1",
     "@angular/compiler": "^14.2.1",

templates/app/angular/angular.json

@@ -75,6 +75,26 @@
                 "inject": false,
                 "bundleName": "abp-bundle"
               },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css",
+                "inject": false,
+                "bundleName": "bootstrap-dim.rtl"
+              },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "ng-bundle.rtl"
+              },
+              {
+                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "layout-bundle.rtl"
+              },
+              {
+                "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css",
+                "inject": false,
+                "bundleName": "abp-bundle.rtl"
+              },
               "node_modules/bootstrap-icons/font/bootstrap-icons.css",
               "src/styles.scss"
             ],

templates/app/angular/package.json

@@ -18,7 +18,7 @@
     "@abp/ng.identity": "~6.0.0-rc.4",
     "@abp/ng.setting-management": "~6.0.0-rc.4",
     "@abp/ng.tenant-management": "~6.0.0-rc.4",
-    "@abp/ng.theme.lepton-x": "~1.0.0-rc.4",
+    "@abp/ng.theme.lepton-x": "^1.0.0-rc.6",
     "@abp/ng.theme.shared": "~6.0.0-rc.4",
     "@angular/animations": "^14.2.1",
     "@angular/common": "^14.2.1",

templates/module/angular/angular.json

@@ -95,24 +95,14 @@
                 "bundleName": "ngx-datatable-material"
               },
               {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css",
+                "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css",
                 "inject": false,
-                "bundleName": "bootstrap-dim"
+                "bundleName": "bootstrap-rtl.min"
               },
               {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.css",
-                "inject": false,
-                "bundleName": "ng-bundle"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.css",
-                "inject": false,
-                "bundleName": "layout-bundle"
-              },
-              {
-                "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css",
-                "inject": false,
-                "bundleName": "abp-bundle"
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap-ltr.min"
               },
               "projects/dev-app/src/styles.scss"
             ],