fix(core): sort pipe key error

npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts

@@ -37,8 +37,8 @@ export class SortPipe implements PipeTransform {
       ...stringArray,
       ...value.filter(
         item =>
-          typeof item[sortKey] !== 'number' &&
+          typeof (sortKey ? item[sortKey] : item) !== 'number' &&
-          typeof item[sortKey] !== 'string',
+          typeof (sortKey ? item[sortKey] : item) !== 'string',
       ),
     ];
     return sortOrder === 'asc' ? sorted : sorted.reverse();

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

@@ -1,8 +1,15 @@
-import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
+import {
+  createServiceFactory,
+  SpectatorService,
+  SpyObject,
+} from '@ngneat/spectator/jest';
 import { Store } from '@ngxs/store';
 import { ReplaySubject, timer, Subject, of } from 'rxjs';
 import { Config } from '../models/config';
-import { ApplicationConfigurationService, ConfigStateService } from '../services';
+import {
+  ApplicationConfigurationService,
+  ConfigStateService,
+} from '../services';
 import { ConfigState } from '../states';
 import { SetLanguage, PatchRouteByName } from '../actions';
 
@@ -91,6 +98,7 @@ export const CONFIG_STATE_DATA = {
     },
     grantedPolicies: {
       'Abp.Identity': false,
+      'Abp.Account': true,
     },
   },
   setting: {
@@ -126,7 +134,10 @@ describe('ConfigState', () => {
     store = spectator.get(Store);
     service = spectator.service;
     appConfigService = spectator.get(ApplicationConfigurationService);
-    state = new ConfigState(spectator.get(ApplicationConfigurationService), store);
+    state = new ConfigState(
+      spectator.get(ApplicationConfigurationService),
+      store,
+    );
   });
 
   describe('#getAll', () => {
@@ -137,24 +148,34 @@ describe('ConfigState', () => {
 
   describe('#getApplicationInfo', () => {
     it('should return application property', () => {
-      expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.application);
+      expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment.application,
+      );
     });
   });
 
   describe('#getOne', () => {
     it('should return one property', () => {
-      expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment);
+      expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment,
+      );
     });
   });
 
   describe('#getDeep', () => {
     it('should return deeper', () => {
-      expect(ConfigState.getDeep('environment.localization.defaultResourceName')(CONFIG_STATE_DATA)).toEqual(
+      expect(
-        CONFIG_STATE_DATA.environment.localization.defaultResourceName,
+        ConfigState.getDeep('environment.localization.defaultResourceName')(
-      );
+          CONFIG_STATE_DATA,
-      expect(ConfigState.getDeep(['environment', 'localization', 'defaultResourceName'])(CONFIG_STATE_DATA)).toEqual(
+        ),
-        CONFIG_STATE_DATA.environment.localization.defaultResourceName,
+      ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName);
-      );
+      expect(
+        ConfigState.getDeep([
+          'environment',
+          'localization',
+          'defaultResourceName',
+        ])(CONFIG_STATE_DATA),
+      ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName);
 
       expect(ConfigState.getDeep('test')(null)).toBeFalsy();
     });
@@ -162,21 +183,33 @@ describe('ConfigState', () => {
 
   describe('#getRoute', () => {
     it('should return route', () => {
-      expect(ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]);
+      expect(
-      expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[1]);
+        ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA),
+      ).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]);
+      expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.flattedRoutes[1],
+      );
     });
   });
 
   describe('#getApiUrl', () => {
     it('should return api url', () => {
-      expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.other.url);
+      expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual(
-      expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.default.url);
+        CONFIG_STATE_DATA.environment.apis.other.url,
+      );
+      expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.environment.apis.default.url,
+      );
     });
   });
 
   describe('#getSetting', () => {
     it('should return a setting', () => {
-      expect(ConfigState.getSetting('Abp.Localization.DefaultLanguage')(CONFIG_STATE_DATA)).toEqual(
+      expect(
+        ConfigState.getSetting('Abp.Localization.DefaultLanguage')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toEqual(
         CONFIG_STATE_DATA.setting.values['Abp.Localization.DefaultLanguage'],
       );
     });
@@ -184,41 +217,82 @@ describe('ConfigState', () => {
 
   describe('#getSettings', () => {
     it('should return settings', () => {
-      expect(ConfigState.getSettings('Localization')(CONFIG_STATE_DATA)).toEqual({
+      expect(
+        ConfigState.getSettings('Localization')(CONFIG_STATE_DATA),
+      ).toEqual({
         'Abp.Localization.DefaultLanguage': 'en',
       });
 
-      expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.setting.values);
+      expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual(
+        CONFIG_STATE_DATA.setting.values,
+      );
     });
   });
 
   describe('#getGrantedPolicy', () => {
     it('should return a granted policy', () => {
-      expect(ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA)).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Identity || Abp.Account')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe(true);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Account && Abp.Identity')(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('Abp.Account &&')(CONFIG_STATE_DATA),
+      ).toBe(false);
+      expect(
+        ConfigState.getGrantedPolicy('|| Abp.Account')(CONFIG_STATE_DATA),
+      ).toBe(false);
       expect(ConfigState.getGrantedPolicy('')(CONFIG_STATE_DATA)).toBe(true);
     });
   });
 
   describe('#getLocalization', () => {
     it('should return a localization', () => {
-      expect(ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA)).toBe('identity');
+      expect(
-
+        ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA),
-      expect(ConfigState.getLocalization('AbpIdentity::NoIdentity')(CONFIG_STATE_DATA)).toBe('AbpIdentity::NoIdentity');
+      ).toBe('identity');
-
+
-      expect(ConfigState.getLocalization({ key: '', defaultValue: 'default' })(CONFIG_STATE_DATA)).toBe('default');
+      expect(
-
+        ConfigState.getLocalization('AbpIdentity::NoIdentity')(
-      expect(ConfigState.getLocalization("::'{0}' and '{1}' do not match.", 'first', 'second')(CONFIG_STATE_DATA)).toBe(
+          CONFIG_STATE_DATA,
-        'first and second do not match.',
+        ),
-      );
+      ).toBe('AbpIdentity::NoIdentity');
+
+      expect(
+        ConfigState.getLocalization({ key: '', defaultValue: 'default' })(
+          CONFIG_STATE_DATA,
+        ),
+      ).toBe('default');
+
+      expect(
+        ConfigState.getLocalization(
+          "::'{0}' and '{1}' do not match.",
+          'first',
+          'second',
+        )(CONFIG_STATE_DATA),
+      ).toBe('first and second do not match.');
 
       try {
         ConfigState.getLocalization('::Test')({
           ...CONFIG_STATE_DATA,
-          environment: { ...CONFIG_STATE_DATA.environment, localization: {} as any },
+          environment: {
+            ...CONFIG_STATE_DATA.environment,
+            localization: {} as any,
+          },
         });
         expect(false).toBeTruthy(); // fail
       } catch (error) {
-        expect((error as Error).message).toContain('Please check your environment');
+        expect((error as Error).message).toContain(
+          'Please check your environment',
+        );
       }
     });
   });
@@ -273,7 +347,9 @@ describe('ConfigState', () => {
         name: 'Home',
         path: 'home',
         url: '/home',
-        children: [{ path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' }],
+        children: [
+          { path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' },
+        ],
       });
     });
 

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

@@ -17,10 +17,28 @@ describe('SortPipe', () => {
   });
 
   test('should sort object array in given order with given key', () => {
-    const array = [{ key: 5 }, { key: 'b' }, { key: 1 }, { key: 'a' }];
+    const array = [
+      { key: 5 },
+      { key: 'b' },
+      { key: 1 },
+      { key: 'a' },
+      { key: null },
+    ];
 
-    expect(pipe.transform(array, 'asc', 'key')).toEqual([{ key: 1 }, { key: 5 }, { key: 'a' }, { key: 'b' }]);
+    expect(pipe.transform(array, 'asc', 'key')).toEqual([
-    expect(pipe.transform(array, 'desc', 'key')).toEqual([{ key: 'b' }, { key: 'a' }, { key: 5 }, { key: 1 }]);
+      { key: 1 },
+      { key: 5 },
+      { key: 'a' },
+      { key: 'b' },
+      { key: null },
+    ]);
+    expect(pipe.transform(array, 'desc', 'key')).toEqual([
+      { key: null },
+      { key: 'b' },
+      { key: 'a' },
+      { key: 5 },
+      { key: 1 },
+    ]);
   });
 
   test('should require an array as value', () => {