From 8a6fe08c220d1925e0c2f4f8780e7c391749a0ee Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Wed, 22 Jan 2020 14:58:37 +0100
Subject: [PATCH] drag drop styling

---
 src/app/core/data/lookup-relation.service.ts  |  1 -
 ...amic-form-control-container.component.html |  3 +-
 ...ynamic-form-control-container.component.ts |  2 +-
 .../ds-dynamic-form.component.html            |  1 +
 ...sting-metadata-list-element.component.html |  6 +--
 ...sting-metadata-list-element.component.scss |  3 ++
 .../dynamic-form-array.component.html         |  6 +--
 .../dynamic-form-array.component.scss         | 44 ++++++++++++++++++-
 .../dynamic-form-group.component.html         |  2 -
 ...-lookup-relation-search-tab.component.html |  1 -
 src/app/shared/form/form.component.html       |  2 +-
 .../form/section-form-operations.service.ts   |  1 -
 12 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
index 76823dbfe0..69ba7925af 100644
--- a/src/app/core/data/lookup-relation.service.ts
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -51,7 +51,6 @@ export class LookupRelationService {
     if (setSearchConfig) {
       this.searchConfig = newConfig;
     }
-    console.log(newConfig);
     return this.searchService.search(newConfig).pipe(
       /* Make sure to only listen to the first x results, until loading is finished */
       /* TODO: in Rxjs 6.4.0 and up, we can replace this with takeWhile(predicate, true) - see https://stackoverflow.com/a/44644237 */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 70dbf2c6ca..70cdce24dd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,7 +1,6 @@
-<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
+<div [class.form-group]="asBootstrapFormGroup"
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
-
     <label *ngIf="!isCheckbox && hasLabel"
            [for]="model.id"
            [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index e8e89a29cc..6f7b476e9f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -172,7 +172,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
 
   @Input() formId: string;
-  @Input() asBootstrapFormGroup = true;
+  @Input() asBootstrapFormGroup = false;
   @Input() bindId = true;
   @Input() context: any | null = null;
   @Input() group: FormGroup;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index 4d8123a4b9..5684f4eac9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -7,6 +7,7 @@
                                    [model]="model"
                                    [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]"
                                    [templates]="templates"
+                                   [asBootstrapFormGroup]="true"
                                    (dfBlur)="onEvent($event, 'blur')"
                                    (dfChange)="onEvent($event, 'change')"
                                    (dfFocus)="onEvent($event, 'focus')"></ds-dynamic-form-control-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index ead7bc1ff6..d92310b272 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,6 +1,6 @@
-<div *ngIf="metadataRepresentation" class="mt-2 mb-4 d-flex">
-    <span class="d-inline-block align-middle ml-1 mr-auto">
-              <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation"></ds-metadata-representation-loader>
+<div *ngIf="metadataRepresentation" class="d-flex">
+    <span class="mr-auto text-contents">
+        <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation"></ds-metadata-representation-loader>
     </span>
     <button type="button" class="btn btn-secondary"
             (click)="removeSelection()">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
index e69de29bb2..ab63e324bd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
@@ -0,0 +1,3 @@
+span.text-contents{
+    padding: $btn-padding-y 0;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 956128a154..9723a6ea74 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -10,11 +10,9 @@
         </div>
         <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
             <div *ngFor="let groupModel of model.groups; let idx = index" role="group"
-                 [formGroupName]="idx" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]" cdkDrag>
+                 [formGroupName]="idx" [ngClass]="{'pt-2 pb-2': idx > 0}" cdkDrag cdkDragHandle [class]="getClass('element', 'group') + ' ' + getClass('grid', 'group')">
                 <ng-container *ngIf="idx > 0">
-                    <button type="button" class="close float-left drag-button" cdkDragHandle>
-                        <i class="fas fa-grip-vertical fa-fw"></i>
-                    </button>
+                    <i class="drag-icon fas fa-grip-vertical fa-fw"></i>
                     <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
                     <ng-container *ngTemplateOutlet="controlContainer; context: {$implicit: idx}"></ng-container>
                     <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index 4e1d2fbc1c..3acf5f7604 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -1,5 +1,45 @@
 @import './../../../../../../../styles/variables';
 
-button.drag-button {
-    height: $button-height;
+.cdk-drag {
+    margin-left: -(1.5 * $spacer);
+    .drag-icon {
+        visibility: hidden;
+        width: (1.5 * $spacer);
+        color: $gray-600;
+        margin: $btn-padding-y 0;
+        line-height: $btn-line-height;
+    }
+
+    &:hover, &:focus {
+        cursor: grab;
+        .drag-icon {
+            visibility: visible;
+        }
+    }
+
+}
+
+.cdk-drop-list-dragging {
+    .cdk-drag {
+        cursor: grabbing;
+        .drag-icon {
+            visibility: hidden;
+        }
+    }
+}
+
+.cdk-drag-preview {
+    background-color: white;
+    border-radius: $border-radius-sm;
+    margin-left: 0;
+    box-shadow: 0 5px 5px 0px rgba(0, 0, 0, 0.2),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12);
+    .drag-icon {
+        visibility: visible;
+    }
+}
+
+.cdk-drag-placeholder {
+    opacity: 0;
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 6fede2eff0..aa46638314 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -6,7 +6,6 @@
        [ngClass]="getClass('element','control')">
 
     <ds-dynamic-form-control-container *ngFor="let _model of model.group"
-                                       [asBootstrapFormGroup]="true"
                                        [formId]="formId"
                                        [group]="control"
                                        [hasErrorMessaging]="model.hasErrorMessages"
@@ -20,5 +19,4 @@
                                        (dfFocus)="onFocus($event)"
                                        (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
   </div>
-
 </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 9c15dd5f5e..a1b1561e36 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -56,7 +56,6 @@
             </div>
         </div>
 
-        {{(resultsRD$ | async)?.state}}
         <ds-search-results [searchResults]="(resultsRD$ | async)"
                            [sortConfig]="this.lookupRelationService.searchConfig?.sort"
                            [searchConfig]="this.lookupRelationService.searchConfig"
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index c9d41a7982..8fff3dec57 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -17,7 +17,7 @@
                     <div class="btn-group" role="group" aria-label="Add and remove button">
                         <button type="button" class="btn btn-secondary"
                                 [disabled]="isItemReadOnly(context, index)"
-                                (click)="insertItem($event, group.context, group.index + 1)">
+                                (click)="insertItem($event, group.context, group.index)">
                             <i class="fas fa-plus" aria-hidden="true"></i>
                         </button>
                     </div>
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 100d80afac..f7cf8f36dd 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -327,7 +327,6 @@ export class SectionFormOperationsService {
           this.operationsBuilder.remove(pathCombiner.getPath(path));
         }
       } else if (hasValue(event.$event) && hasValue(event.$event.previousIndex)) {
-        console.log(event, path);
         this.operationsBuilder.move(
           pathCombiner.getPath(path),
           pathCombiner.getPath(segmentedPath + '/' + event.$event.previousIndex).path