From e8f77b9fbe8cae22eda8f58f79517ec633b012c2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 22 Jun 2018 12:25:38 +0200 Subject: [PATCH] Sorting fixed. --- .../event-consumers-page.component.html | 50 +++++----- .../pages/users/users-page.component.html | 54 +++++------ src/Squidex/app/features/content/module.ts | 2 + .../contents/contents-page.component.html | 28 +++--- .../shared/contents-selector.component.html | 18 ++-- .../shared/references-editor.component.html | 21 ++-- .../events/rule-events-page.component.html | 96 +++++++++---------- .../pages/rules/rules-page.component.html | 80 ++++++++-------- .../schemas/pages/schema/field.component.html | 2 +- .../pages/schema/schema-page.component.html | 2 +- .../contributors-page.component.html | 42 ++++---- .../framework/angular/sorted-dnd.directive.ts | 61 ++++++++++++ .../app/framework/angular/sorted.directive.ts | 7 +- src/Squidex/app/framework/declarations.ts | 1 + src/Squidex/app/framework/module.ts | 3 + src/Squidex/app/theme/_bootstrap.scss | 4 + 16 files changed, 266 insertions(+), 205 deletions(-) create mode 100644 src/Squidex/app/framework/angular/sorted-dnd.directive.ts diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html index 876db4046..14c598818 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -29,33 +29,31 @@ - - - - - - + + + + + - {{eventConsumer.name}} - - - - {{eventConsumer.position}} - - - - - - - - - + {{eventConsumer.name}} + + + + {{eventConsumer.position}} + + + + + + + + diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index a5a65aa75..e95273ecc 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -48,35 +48,33 @@
- - - - - - - + + + + + - - - + + + + + +
- - - {{userInfo.user.displayName}} - - {{userInfo.user.email}} - - - - - - -
+ + + {{userInfo.user.displayName}} + + {{userInfo.user.email}} + + + + -
diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index a372b141c..c3cea97be 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -7,6 +7,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { DndModule } from 'ng2-dnd'; import { CanDeactivateGuard, @@ -81,6 +82,7 @@ const routes: Routes = [ @NgModule({ imports: [ + DndModule, SqxFrameworkModule, SqxSharedModule, RouterModule.forChild(routes) diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index 215b422c7..03440fca8 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -97,21 +97,19 @@
- - - - - - + + + +
diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html index 28945f637..a7506a629 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.html +++ b/src/Squidex/app/features/content/shared/contents-selector.component.html @@ -49,16 +49,14 @@
- - - - - + + +
diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html index be514e0df..7b523e2d8 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -6,17 +6,16 @@
- - - - - - +
+ + +
diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html index 9c6b6288f..d36211583 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html @@ -33,58 +33,56 @@ - - - - - {{event.jobResult}} - - - {{event.eventName}} - - - {{event.description}} - - - {{event.created | sqxFromNow}} - - - - - - - -
-

Last Invocation

+ + + + {{event.jobResult}} + + + {{event.eventName}} + + + {{event.description}} + + + {{event.created | sqxFromNow}} + + + + + + + +
+

Last Invocation

+
+ +
+
+ {{event.result}} +
+
+ Attempts: {{event.numCalls}}
- -
-
- {{event.result}} -
-
- Attempts: {{event.numCalls}} -
-
- Next: {{event.nextAttempt | sqxFromNow}} -
-
- -
+
+ Next: {{event.nextAttempt | sqxFromNow}}
-
-
- -
+
+
- - - - +
+
+
+ +
+
+ + + 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 0f95bfaca..fe785f64d 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 @@ -29,49 +29,47 @@
- - - - - + + + - - - - - - - + + + + + + + +
-

If

- 		- - - - - - {{ruleTriggers[rule.triggerType].name}} - +
+

If

+ 		+ + + - -

then

- 		- - - - - - {{ruleActions[rule.actionType].name}} - + + {{ruleTriggers[rule.triggerType].name}} - - - - -
+

then

+ 		+ + + + + + {{ruleActions[rule.actionType].name}} + + + + + + +
diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index b47fbbbaf..4fd39ca16 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -23,7 +23,7 @@
-
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index 960043fce..0b8926238 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -20,7 +20,7 @@
-
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html index ae284ed0e..2e8018ab4 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html @@ -23,28 +23,26 @@ - - - - - - - - - - + + + + + + + +
- - - {{contributorInfo.contributor.contributorId | sqxUserName}} - - - - -
+ + + {{contributorInfo.contributor.contributorId | sqxUserName}} + + + + +
diff --git a/src/Squidex/app/framework/angular/sorted-dnd.directive.ts b/src/Squidex/app/framework/angular/sorted-dnd.directive.ts new file mode 100644 index 000000000..7c9faf84e --- /dev/null +++ b/src/Squidex/app/framework/angular/sorted-dnd.directive.ts @@ -0,0 +1,61 @@ + +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Directive, EventEmitter, Output } from '@angular/core'; + +import { + DragDropSortableService, + SortableComponent, + SortableContainer +} from 'ng2-dnd'; + +@Directive({ + selector: '[sqxSortedDnd]' +}) +export class SortedDndDirective { + private oldArray: any[]; + + @Output('sqxSortedDnd') + public sorted = new EventEmitter>(); + + constructor( + sortableComponent: SortableComponent, + sortableContainer: SortableContainer, + sortableDragDropService: DragDropSortableService + ) { + const oldDragStartCallback = sortableComponent._onDragStartCallback.bind(sortableComponent); + + if (Array.isArray(sortableContainer.sortableData)) { + sortableComponent._onDragStartCallback = () => { + oldDragStartCallback(); + + this.oldArray = [...sortableContainer.sortableData]; + }; + + const oldDropCallback = sortableComponent._onDropCallback.bind(sortableComponent); + + sortableComponent._onDropCallback = (event: Event) => { + oldDropCallback(event); + + if (sortableDragDropService.isDragged) { + const newArray: any[] = sortableContainer.sortableData; + const oldArray = this.oldArray; + + if (newArray && oldArray && newArray.length === oldArray.length) { + for (let i = 0; i < oldArray.length; i++) { + if (oldArray[i] !== newArray[i]) { + this.sorted.emit(newArray); + break; + } + } + } + } + }; + } + } +} diff --git a/src/Squidex/app/framework/angular/sorted.directive.ts b/src/Squidex/app/framework/angular/sorted.directive.ts index 5a82887d1..8f48f5b9d 100644 --- a/src/Squidex/app/framework/angular/sorted.directive.ts +++ b/src/Squidex/app/framework/angular/sorted.directive.ts @@ -22,6 +22,9 @@ export class SortedDirective implements OnDestroy, OnInit { @Input() public handleClass: string | null = null; + @Input() + public mirrorToSelf: boolean; + @Output('sqxSorted') public sorted = new EventEmitter(); @@ -57,7 +60,9 @@ export class SortedDirective implements OnDestroy, OnInit { } return false; - } + }, + + mirrorContainer: this.mirrorToSelf ? this.elementRef.nativeElement : document.body }); let dragIndex: number; diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index 9c56f81e6..782f84327 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -55,6 +55,7 @@ export * from './angular/popup-link.directive'; export * from './angular/scroll-active.directive'; export * from './angular/shortcut.component'; export * from './angular/sorted.directive'; +export * from './angular/sorted-dnd.directive'; export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; export * from './angular/user-report.component'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index d1c67d92a..44b5e02c3 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -65,6 +65,7 @@ import { ShortTimePipe, SliderComponent, SortedDirective, + SortedDndDirective, StarsComponent, TagEditorComponent, TemplateWrapperDirective, @@ -129,6 +130,7 @@ import { ShortTimePipe, SliderComponent, SortedDirective, + SortedDndDirective, StarsComponent, TagEditorComponent, TemplateWrapperDirective, @@ -188,6 +190,7 @@ import { ShortTimePipe, SliderComponent, SortedDirective, + SortedDndDirective, StarsComponent, TagEditorComponent, TemplateWrapperDirective, diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index e1b74d32c..1a234b8d0 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -537,4 +537,8 @@ a { } } } +} + +.table tbody + tbody { + border: 0; } \ No newline at end of file