From 4a1c4c0d20ad5dbd72d661fdfddf77bca2e855f3 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 1 Nov 2017 16:12:32 +0100 Subject: [PATCH] Tests fixed --- .../pages/rules/rule-wizard.component.html | 22 +- .../pages/rules/rule-wizard.component.ts | 88 +++++- .../pages/rules/rules-page.component.html | 8 +- .../rules/pages/rules/rules-page.component.ts | 24 ++ .../app/framework/angular/keys.pipe.spec.ts | 2 +- .../app/shared/services/rules.service.spec.ts | 41 ++- .../app/shared/services/rules.service.ts | 25 +- .../app/theme/icomoon/demo-files/demo.css | 4 +- src/Squidex/app/theme/icomoon/demo.html | 290 ++++++++--------- .../app/theme/icomoon/fonts/icomoon.eot | Bin 21860 -> 21988 bytes .../app/theme/icomoon/fonts/icomoon.svg | 3 +- .../app/theme/icomoon/fonts/icomoon.ttf | Bin 21696 -> 21824 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 21772 -> 21900 bytes src/Squidex/app/theme/icomoon/selection.json | 299 ++++++++++-------- src/Squidex/app/theme/icomoon/style.css | 31 +- 15 files changed, 482 insertions(+), 355 deletions(-) diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html index bf9f21d62..88bc0b3a7 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html @@ -1,16 +1,22 @@
-

+

+ Edit Trigger +

+

+ Edit Action +

+

Step 1 of 4: Select Trigger

-

+

Step 2 of 4: Configure Trigger

-

+

Step 3 of 4: Select Action

-

+

Step 4 of 4: Configure Action

@@ -66,10 +72,16 @@
-
+
+ +
+ + +
+
diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts index 019951711..08f979cc5 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ -import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { AppComponentBase, @@ -19,9 +19,14 @@ import { ruleTriggers, RuleDto, RulesService, - SchemaDto + SchemaDto, + UpdateRuleDto } from 'shared'; +export const MODE_WIZARD = 'Wizard'; +export const MODE_EDIT_TRIGGER = 'EditTrigger'; +export const MODE_EDIT_ACTION = 'EditAction'; + @Component({ selector: 'sqx-rule-wizard', styleUrls: ['./rule-wizard.component.scss'], @@ -30,7 +35,7 @@ import { fadeAnimation ] }) -export class RuleWizardComponent extends AppComponentBase { +export class RuleWizardComponent extends AppComponentBase implements OnInit { public ruleActions = ruleActions; public ruleTriggers = ruleTriggers; @@ -52,22 +57,41 @@ export class RuleWizardComponent extends AppComponentBase { @Output() public created = new EventEmitter(); + @Output() + public ruleTriggerSaved = new EventEmitter(); + + @Output() + public ruleActionSaved = new EventEmitter(); + @Input() public schemas: SchemaDto[]; + @Input() + public rule: RuleDto; + + @Input() + public mode = MODE_WIZARD; + constructor(apps: AppsStoreService, dialogs: DialogService, authService: AuthService, private readonly rulesService: RulesService ) { super(dialogs, apps, authService); } - public selectTriggerType(type: string) { - this.triggerType = type; - this.step++; + public ngOnInit() { + if (this.mode === MODE_EDIT_ACTION) { + this.step = 4; + this.action = this.rule.action; + this.actionType = this.rule.actionType; + } else if (this.mode === MODE_EDIT_TRIGGER) { + this.step = 2; + this.trigger = this.rule.trigger; + this.triggerType = this.rule.triggerType; + } } - public selectTrigger(value: any) { - this.trigger = Object.assign({}, value, { triggerType: this.triggerType }); + public selectTriggerType(type: string) { + this.triggerType = type; this.step++; } @@ -76,18 +100,48 @@ export class RuleWizardComponent extends AppComponentBase { this.step++; } + public selectTrigger(value: any) { + this.trigger = Object.assign({}, value, { triggerType: this.triggerType }); + + if (this.mode === MODE_WIZARD) { + this.step++; + } else { + const requestDto = new UpdateRuleDto(this.trigger, null); + + this.appNameOnce() + .switchMap(app => this.rulesService.putRule(app, this.rule.id, requestDto, this.rule.version)) + .subscribe(dto => { + this.ruleTriggerSaved.emit(this.action); + }, error => { + this.notifyError(error); + }); + } + } + public selectAction(value: any) { this.action = Object.assign({}, value, { actionType: this.actionType }); - const requestDto = new CreateRuleDto(this.trigger, this.action); - - this.appNameOnce() - .switchMap(app => this.rulesService.postRule(app, requestDto, this.authService.user!.id, DateTime.now())) - .subscribe(dto => { - this.created.emit(dto); - }, error => { - this.notifyError(error); - }); + if (this.mode === MODE_WIZARD) { + const requestDto = new CreateRuleDto(this.trigger, this.action); + + this.appNameOnce() + .switchMap(app => this.rulesService.postRule(app, requestDto, this.authService.user!.id, DateTime.now())) + .subscribe(dto => { + this.created.emit(dto); + }, error => { + this.notifyError(error); + }); + } else { + const requestDto = new UpdateRuleDto(null, this.action); + + this.appNameOnce() + .switchMap(app => this.rulesService.putRule(app, this.rule.id, requestDto, this.rule.version)) + .subscribe(dto => { + this.ruleActionSaved.emit(this.action); + }, error => { + this.notifyError(error); + }); + } } public cancel() { diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index abc28c165..cd5532676 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -11,7 +11,7 @@ -
@@ -47,7 +47,7 @@

If

- + @@ -60,7 +60,7 @@

then

- + @@ -98,7 +98,7 @@
- diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts index 619c9c492..629db108c 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts @@ -41,6 +41,9 @@ export class RulesPageComponent extends AppComponentBase implements OnInit { public rules: ImmutableArray; public schemas: SchemaDto[]; + public wizardMode = 'Wizard'; + public wizardRule: RuleDto; + constructor(apps: AppsStoreService, dialogs: DialogService, authService: AuthService, private readonly schemasService: SchemasService, private readonly rulesService: RulesService @@ -70,6 +73,27 @@ export class RulesPageComponent extends AppComponentBase implements OnInit { }); } + public createNew() { + this.wizardMode = 'Wizard'; + this.wizardRule = null; + + this.addRuleDialog.show(); + } + + public editTrigger(rule: RuleDto) { + this.wizardMode = 'EditTrigger'; + this.wizardRule = rule; + + this.addRuleDialog.show(); + } + + public editAction(rule: RuleDto) { + this.wizardMode = 'EditAction'; + this.wizardRule = rule; + + this.addRuleDialog.show(); + } + public onRuleCreated(rule: RuleDto) { this.rules = this.rules.push(rule); diff --git a/src/Squidex/app/framework/angular/keys.pipe.spec.ts b/src/Squidex/app/framework/angular/keys.pipe.spec.ts index 09de18928..f3a3728b9 100644 --- a/src/Squidex/app/framework/angular/keys.pipe.spec.ts +++ b/src/Squidex/app/framework/angular/keys.pipe.spec.ts @@ -21,6 +21,6 @@ describe('KeysPipe', () => { const actual = pipe.transform(value); const expected = ['key1', 'key2']; - expect(actual).toBe(expected); + expect(actual).toEqual(expected); }); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/rules.service.spec.ts b/src/Squidex/app/shared/services/rules.service.spec.ts index 0e1e7570a..daa592c37 100644 --- a/src/Squidex/app/shared/services/rules.service.spec.ts +++ b/src/Squidex/app/shared/services/rules.service.spec.ts @@ -30,16 +30,27 @@ describe('RuleDto', () => { const version = new Version('1'); const newVersion = new Version('2'); - it('should update trigger and action', () => { - const update = new UpdateRuleDto({ param1: 1, triggerType: 'NewType' }, { param2: 2, actionType: 'NewType' }); + it('should update trigger', () => { + const trigger = { param2: 2, triggerType: 'NewType' }; const rule_1 = new RuleDto('id1', creator, creator, creation, creation, version, true, {}, 'contentChanged', {}, 'webhook'); - const rule_2 = rule_1.update(update, modifier, newVersion, modified); + const rule_2 = rule_1.updateTrigger(trigger, modifier, newVersion, modified); - expect(rule_2.trigger).toEqual(update.trigger); - expect(rule_2.triggerType).toEqual(update.trigger.triggerType); - expect(rule_2.action).toEqual(update.action); - expect(rule_2.actionType).toEqual(update.action.actionType); + expect(rule_2.trigger).toEqual(trigger); + expect(rule_2.triggerType).toEqual(trigger.triggerType); + expect(rule_2.lastModified).toEqual(modified); + expect(rule_2.lastModifiedBy).toEqual(modifier); + expect(rule_2.version).toEqual(newVersion); + }); + + it('should update action', () => { + const action = { param2: 2, actionType: 'NewType' }; + + const rule_1 = new RuleDto('id1', creator, creator, creation, creation, version, true, {}, 'contentChanged', {}, 'webhook'); + const rule_2 = rule_1.updateAction(action, modifier, newVersion, modified); + + expect(rule_2.action).toEqual(action); + expect(rule_2.actionType).toEqual(action.actionType); expect(rule_2.lastModified).toEqual(modified); expect(rule_2.lastModifiedBy).toEqual(modifier); expect(rule_2.version).toEqual(newVersion); @@ -133,12 +144,14 @@ describe('RulesService', () => { true, { param1: 1, - param2: 2 + param2: 2, + triggerType: 'ContentChanged' }, 'ContentChanged', { param3: 3, - param4: 4 + param4: 4, + actionType: 'Webhook' }, 'Webhook') ]); @@ -175,19 +188,19 @@ describe('RulesService', () => { }); expect(rule).toEqual( - new RuleDto('id1', 'CreatedBy1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), + new RuleDto('id1', user, user, now, now, version, true, { param1: 1, - param2: 2 + param2: 2, + triggerType: 'ContentChanged' }, 'ContentChanged', { param3: 3, - param4: 4 + param4: 4, + actionType: 'Webhook' }, 'Webhook')); })); diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index 8d64943c1..2a5ae47a0 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -44,17 +44,30 @@ export class RuleDto { ) { } - public update(update: UpdateRuleDto, user: string, version: Version, now?: DateTime): RuleDto { + public updateTrigger(trigger: any, user: string, version: Version, now?: DateTime): RuleDto { return new RuleDto( this.id, this.createdBy, user, this.created, now || DateTime.now(), version, this.isEnabled, - update.trigger, - update.trigger.triggerType, - update.action, - update.action.actionType); + trigger, + trigger.triggerType, + this.action, + this.action.actionType); + } + + public updateAction(action: any, user: string, version: Version, now?: DateTime): RuleDto { + return new RuleDto( + this.id, + this.createdBy, user, + this.created, now || DateTime.now(), + version, + this.isEnabled, + this.trigger, + this.trigger.triggerType, + action, + action.actionType); } public enable(user: string, version: Version, now?: DateTime): RuleDto { @@ -76,7 +89,7 @@ export class RuleDto { this.createdBy, user, this.created, now || DateTime.now(), version, - true, + false, this.trigger, this.triggerType, this.action, diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 5f7c0c6a0..dbb2a37fe 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -147,7 +147,7 @@ p { font-size: 16px; } .fs1 { - font-size: 32px; + font-size: 24px; } .fs2 { font-size: 32px; @@ -159,7 +159,7 @@ p { font-size: 32px; } .fs5 { - font-size: 24px; + font-size: 32px; } .fs6 { font-size: 20px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 4466f99bf..2bb140cd8 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,11 +9,62 @@
-

Font Name: icomoon (Glyphs: 78)

+

Font Name: icomoon (Glyphs: 79)

-

Grid Size: Unknown

+

Grid Size: 24

+
+
+ + + + icon-action-Webhook +
+
+ + +
+
+ liga: + +
+
+
+
+ + + + icon-control-RichText +
+
+ + +
+
+ liga: + +
+
+
+ + + + icon-download +
+
+ + +
+
+ liga: + +
+
+
+
+

Grid Size: Unknown

+
@@ -29,7 +80,7 @@
-
+
@@ -45,7 +96,7 @@
-
+
@@ -61,7 +112,7 @@
-
+
@@ -77,7 +128,7 @@
-
+
@@ -93,7 +144,7 @@
-
+
@@ -109,7 +160,7 @@
-
+
@@ -125,7 +176,7 @@
-
+
@@ -141,7 +192,7 @@
-
+
@@ -157,7 +208,7 @@
-
+
@@ -173,7 +224,7 @@
-
+
@@ -189,7 +240,7 @@
-
+
@@ -205,7 +256,7 @@
-
+
@@ -221,7 +272,7 @@
-
+
@@ -237,7 +288,7 @@
-
+
@@ -253,7 +304,7 @@
-
+
@@ -269,7 +320,7 @@
-
+
@@ -285,7 +336,7 @@
-
+
@@ -301,7 +352,7 @@
-
+
@@ -317,7 +368,7 @@
-
+
@@ -333,7 +384,7 @@
-
+
@@ -349,7 +400,7 @@
-
+
@@ -365,7 +416,7 @@
-
+
@@ -381,7 +432,7 @@
-
+
@@ -397,7 +448,7 @@
-
+
@@ -413,7 +464,7 @@
-
+
@@ -429,7 +480,7 @@
-
+
@@ -445,7 +496,7 @@
-
+
@@ -461,7 +512,7 @@
-
+
@@ -477,7 +528,7 @@
-
+
@@ -493,7 +544,7 @@
-
+
@@ -509,7 +560,7 @@
-
+
-
+
@@ -541,7 +592,7 @@
-
+
@@ -557,7 +608,7 @@
-
+
@@ -573,7 +624,7 @@
-
+
@@ -589,7 +640,7 @@
-
+
@@ -605,7 +656,7 @@
-
+
@@ -621,7 +672,7 @@
-
+
@@ -637,7 +688,7 @@
-
+
@@ -653,7 +704,7 @@
-
+
@@ -669,7 +720,7 @@
-
+
@@ -685,7 +736,7 @@
-
+
@@ -701,7 +752,7 @@
-
+
@@ -717,7 +768,7 @@
-
+
@@ -733,7 +784,7 @@
-
+
@@ -749,7 +800,7 @@
-
+
@@ -765,7 +816,7 @@
-
+
@@ -784,7 +835,7 @@

Grid Size: 14

-
+
@@ -800,7 +851,7 @@
-
+
@@ -816,7 +867,7 @@
-
+
@@ -832,7 +883,7 @@
-
+
@@ -848,7 +899,7 @@
-
+
@@ -864,7 +915,7 @@
-
+
@@ -880,7 +931,7 @@
-
+
@@ -896,7 +947,7 @@
-
+
@@ -912,7 +963,7 @@
-
+
@@ -928,7 +979,7 @@
-
+
@@ -944,7 +995,7 @@
-
+
@@ -960,7 +1011,7 @@
-
+
@@ -976,7 +1027,7 @@
-
+
@@ -992,7 +1043,7 @@
-
+
@@ -1008,7 +1059,7 @@
-
+
@@ -1024,7 +1075,7 @@
-
+
@@ -1040,7 +1091,7 @@
-
+
@@ -1056,7 +1107,7 @@
-
+
@@ -1072,7 +1123,7 @@
-
+
@@ -1088,7 +1139,7 @@
-
+
@@ -1104,7 +1155,7 @@
-
+
@@ -1120,23 +1171,7 @@
-
-
- - - - icon-webhooks -
-
- - -
-
- liga: - -
-
-
+
@@ -1152,26 +1187,10 @@
-
-
- - - - icon-action-Webhook -
-
- - -
-
- liga: - -
-

Grid Size: 16

-
+
@@ -1187,7 +1206,7 @@
-
+
@@ -1203,7 +1222,7 @@
-
+
@@ -1219,7 +1238,7 @@
-
+
@@ -1235,7 +1254,7 @@
-
+
@@ -1251,7 +1270,7 @@
-
+
@@ -1267,7 +1286,7 @@
-
+
@@ -1283,7 +1302,7 @@
-
+
@@ -1299,7 +1318,7 @@
-
+
@@ -1315,7 +1334,7 @@
-
+
@@ -1331,7 +1350,7 @@
-
+
@@ -1347,7 +1366,7 @@
-
+
@@ -1366,7 +1385,7 @@

Grid Size: 32

-
+
@@ -1382,7 +1401,7 @@
-
+
@@ -1398,7 +1417,7 @@
-
+
@@ -1415,41 +1434,6 @@
-
-

Grid Size: 24

-
-
- - - - icon-control-RichText -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-download -
-
- - -
-
- liga: - -
-
-

Grid Size: 20

diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 1a64e68df593819c41c07128fcef7e27c0206a9a..1e7884f44af6c21041e3c3625037c9deb03b5c90 100644 GIT binary patch delta 408 zcmXwzPbdU&6vw}B#xA1P#H>FN8qI3Pw{rcs1DZfX~dfoAsFqr51V9K+1x%uUgFD&2am z%rh_WP2W@^Y<+}F-+-Yj&UfNgI*AyK0>LzM!?YEj*yt(#WL{@~F`1Z2LFNRZhTj~r zOy_olR;bs0CC#x|*6mu(R!J|ta}F5fm2V|4`z}YKM27u1bWo}5m!2ihC5V+E Sjllh@Lb3y)^6W`)n|=WBBx(!* delta 278 zcmaE|n(@ghMz)kt28IJ66WPpI^v&cpPIM?2+`+)Wum^|}l5-OaZmZtfHt~c^eM9V8 zK?VlK2@DMWG8w6fDFU-4+!+`G)&SL+WdH>@nOK8?{3k%ZN=9x;h3-Yca0Z4z4xk>7 zoc!d(Ul*P(V_*mh0Lm}RO{^$j$YhKH@_zvN3VDgSsWZJee={%yO90ik733F}FfapU z7(y0+|&p0_dc$Ijcx|ez%P?8adgBT+i#6Suem?mEg72a$gvXl`3 Ddd5s( diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index fbc6aba5c..68822f2d0 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -78,10 +78,11 @@ - + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index 06f687ca4ea3543067fd4f1cd6663e62df7ff540..7d7a9951ba5eec5e985edcaa6619a29f261b0506 100644 GIT binary patch delta 418 zcmX@GlJUSQ#(D-u1_lOhh6V;^1_S?KeItG$-km^^JwTk0oSRs1TkRH*&nN@r=cFeV z7XWDiAio1hbEM}~roCh}-VWqXU|{f{k&&91A}}{Qo`E4y11N8n0Tke5VhsWE6M%e` zjNFn6!;6BAKz<8Qk55j1vSZ?}WS%b!3_%xw3RdJMRunK~F-9>k1Xlq03VDgSsWZJe ze*^h5fEwBg@{3D=4h4cx1&}-gGxM>D2f7)(C;Koev$hGi^LK78VSMXd&&r_1sLgzh zNgJq|pFx~Ko>5aB%o{1xT!Na0qj7U_7X$m8CAJC8ZX|$l&1MZ~!QC;DA`ze}=3qMusq; ztC$!VHmCRoFw5Lnq<=V`-{va=Hw#dhf#I6`WAJ8~5@aBI(hZq6VgJ!G% delta 288 zcmX@Git)fo#(D-u1_lOhh6V;^1_S?KeItG$-W@=ZJwTk0oSRs1TlLm91_nkMAU`KP zvA6(83jp~YK$;^xr!uV}cC8?gKY@Y4UnV0pF-2guggXO6z#5>uSq4ymlZiDL$bSOl zt7PPsROnt53};{n=`sd}pa7tPWx0tJ1q_*tQ9%9=AYUObF*kLl z7w2yVhF}SxhPHzI;u4@kfgof7NS=Y2`RK$0-Hcw7eHfKlTLs+sJ2savzV+UG*Eg71 zW}}>$emuX;R|aktkQRn(a+!}|^kknvbH<>}ErIrolaB|j;_XxSQttywfvtySCKfO-FlGRSb3pjE+O3`G ziNzqXD?mO66bq#1RHgyN?l3U;&j8_M1)zQ(5H`Fh*qD=_3{>YAECW=u0)&4h^L)uotN>aZd<4i>0OKsi zsJz77RG`=spvE>3p6SK;yCA<9XlW?O!4P%KKo&FevB^A)-HhIoXD}+Wwh6fNcWyqw z_}06gl|hS9oB0}(HUl#QKZ7`fJcBmSAX8;gb0aZXMiDk`Mp0!!c2i?fWl?2QMJNsA z3n~NEC<_{kGEWN&lT=re3UhdMz`^0)6(F(7!6D4Sf$^Z0R+hS?mXul;BZGs3!vUbo zfdgV;{~5Bf7#YHVj$&e9*u23vfLZ3oBK^bh{5D@1xLJV03=G%gC+EZH$ufcFjKP~j f0__50W4u`5762NVmW=TxQv#qKaL_{)HBL+o0?jMT&w28MtiKs9C{EHGQbJp(Anzz}Ev z`1^U=vXjNOc0lV>n0v$hJj@po)K z!1&gCv!-7#v&=?0GyQmeo39MqEI_pk4A