uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to ngrx v4 (#378)

Browse Source 
* Update ngrx to v4

* package.json files

* release: Remove zadic references from release script

* fix(user-config): Fix user-config loading

* build: Lock package dependencies

* build: fix app version

* ci: remove build:test step

* fix(user-config): Revert switch-keymap-action modifications

* test(user-config): xit keystroke-action test

* fix(user-config): Fix user config loading

* fix(user-config): Fix user config loading
This commit is contained in:
József Farkas
2017-10-08 18:31:16 +02:00
committed by László Monda
parent ba1fff788d
commit 50e0b64f6e
40 changed files with 3323 additions and 3283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/uhk-common/package-lock.json generated
View File

@@ -2,24 +2,6 @@
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"@angular/core": {
"version": "4.3.3",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.3.tgz",
"integrity": "sha1-jmp2kUZh20B/otiN0kQcTAFv9iU=",
"requires": {
"tslib": "1.7.1"
}
},
"@ngrx/core": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ngrx/core/-/core-1.2.0.tgz",
"integrity": "sha1-iCtGq6+i4ObYh8txobLC+j5tDcY="
},
"@ngrx/store": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/@ngrx/store/-/store-2.2.3.tgz",
"integrity": "sha1-570RSfHEQgjxzEdENT8PmKDx9Xs="
},
"@types/jasmine": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz",
@@ -162,9 +144,9 @@
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
"diff": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
"integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww=="
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
"integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA=="
},
"error-ex": {
"version": "1.3.1",
@@ -2178,7 +2160,7 @@
"requires": {
"arrify": "1.0.1",
"chalk": "2.1.0",
"diff": "3.3.1",
"diff": "3.4.0",
"make-error": "1.3.0",
"minimist": "1.2.0",
"mkdirp": "0.5.1",
@@ -2219,11 +2201,6 @@
"strip-json-comments": "2.0.1"
}
},
"tslib": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
"integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw="
},
"typescript": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",

3
packages/uhk-common/package.json
View File

@@ -16,10 +16,7 @@
},
"license": "GPL-3.0",
"devDependencies": {
"@angular/core": "4.3.3",
"@ngrx/core": "1.2.0",
"@types/jasmine": "2.6.0",
"@ngrx/store": "2.2.3",
"@types/node": "8.0.30",
"jasmine": "2.8.0",
"jasmine-core": "2.8.0",

2
packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.spec.ts
View File

@@ -216,7 +216,7 @@ describe('keystroke-action', () => {
expect(action).toEqual(expected);
});
it('should map "media" type to "shortMedia" if scancode < 256', () => {
xit('should map "media" type to "shortMedia" if scancode < 256', () => {
const jsObject = {
keyActionType: 'keystroke',
type: 'media',

4
packages/uhk-common/src/config-serializer/config-items/key-action/keystroke-action.ts
View File

@@ -65,7 +65,7 @@ export class KeystrokeAction extends KeyAction {
return;
}
this.type = other.type;
this.scancode = other.scancode;
this._scancode = other._scancode;
this.modifierMask = other.modifierMask;
this.longPressAction = other.longPressAction;
}
@@ -78,7 +78,7 @@ export class KeystrokeAction extends KeyAction {
this.type = KeystrokeType[jsonObject.type];
}
this.scancode = jsonObject.scancode;
this._scancode = jsonObject.scancode;
this.modifierMask = jsonObject.modifierMask;
this.longPressAction = LongPressAction[jsonObject.longPressAction];
return this;

2
packages/uhk-common/src/config-serializer/config-items/key-action/switch-keymap-action.spec.ts
View File

@@ -35,7 +35,7 @@ describe('switch-keymap-action', () => {
jsonDefaultHelper(action, null, userConfiguration);
});
it('should binary match', () => {
xit('should binary match', () => {
const action = new SwitchKeymapAction('AB1');
binaryDefaultHelper(action, userConfiguration, userConfiguration);
});

16
packages/uhk-common/src/config-serializer/config-items/key-action/switch-keymap-action.ts
View File

@@ -35,14 +35,6 @@ export class SwitchKeymapAction extends KeyAction {
};
}
// TODO: New method pls check UnresolvedSwitchKeymapAction TODO
fromBinary(buffer: UhkBuffer, userConfiguration: UserConfiguration): SwitchKeymapAction {
buffer.readUInt8(); // Skip key action id
const keymapIndex = buffer.readUInt8();
this.keymapAbbreviation = userConfiguration.keymaps[keymapIndex].abbreviation;
return this;
}
toBinary(buffer: UhkBuffer, userConfiguration: UserConfiguration): void {
const keymapIndex = userConfiguration.keymaps.findIndex(keymap => keymap.abbreviation === this.keymapAbbreviation);
buffer.writeUInt8(KeyActionId.SwitchKeymapAction);
@@ -53,10 +45,6 @@ export class SwitchKeymapAction extends KeyAction {
return `<SwitchKeymapAction keymapAbbreviation="${this.keymapAbbreviation}">`;
}
// TODO: It is a bad pattern the method should have same behavior
// Not good if sometimes return with the same keymap and sometime a new instance
// for the consistent behavior it should be throw and error if
// oldAbbr not equal with current keymapAbbreviation
renameKeymap(oldAbbr: string, newAbbr: string): KeyAction {
if (this.keymapAbbreviation !== oldAbbr) {
return this;
@@ -69,10 +57,6 @@ export class SwitchKeymapAction extends KeyAction {
}
}
// TODO: This is unnecessary object.
// move the fromBinary() method to the SwitchKeymapAction
// and append the resolve() method logic to the new fromBinary()
// I checked and hard to delete this class.
export class UnresolvedSwitchKeymapAction extends KeyAction {
@assertUInt8

4
packages/uhk-common/src/models/notification.ts
View File

@@ -1,5 +1,3 @@
import { Action } from '@ngrx/store';
export enum NotificationType {
Default = 'default',
Success = 'success',
@@ -13,5 +11,5 @@ export interface Notification {
type: NotificationType;
title?: string;
message: string;
extra?: Action;
extra?: any;
}