{{'DATASET-PROFILE-EDITOR.TITLE.NEW-PROFILE' | translate}}
@@ -119,7 +119,7 @@
+ [viewOnly]="viewOnly"
+ (dataNeedsRefresh)="onDataNeedsRefresh()">
@@ -172,7 +173,7 @@
+ (fieldsetAdded)="displayItem(_findTocEntryById($event, getTocEntries())); onDataNeedsRefresh();">
@@ -299,11 +300,11 @@
-
+
-
-
+
-
+
+
+
+
+ {{parentLink?.numbering}} {{parentLink?.form.get('title').value? parentLink?.form.get('title').value : 'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.UNTITLED' | translate}}
+
+
-
+ delete
-
- ();
+ @Output() dataNeedsRefresh = new EventEmitter();
+
+
+
@Input() parentLink: ToCEntry;
@Input() itemSelected: ToCEntry;
@@ -70,4 +76,54 @@ export class DatasetProfileTableOfContentsInternalSection extends BaseComponent
}
return false;
}
+
+ get selectedItemInLinks(){
+ if(!this.links || !this.itemSelected) return false;
+
+ const link = this.links.find(l=>l.id === this.itemSelected.id);
+
+ if(link) return true;
+ return false;
+ }
+
+
+ drop(event: CdkDragDrop) {
+ if(!this.links || !this.links.length) return;
+
+
+ moveItemInArray(this.links, event.previousIndex, event.currentIndex);
+
+ let arrayToUpdate: FormArray = this.links[0].form.parent as FormArray;
+ // if(this.parentLink && this.parentLink.form){
+ // switch(this.parentLink.subEntriesType){
+ // case this.tocEntryType.Field:
+ // arrayToUpdate = (this.parentLink.form.get('fields') as FormArray);
+ // break;
+ // case this.tocEntryType.FieldSet:
+ // arrayToUpdate = (this.parentLink.form.get('fieldSets') as FormArray);
+ // break;
+ // case this.tocEntryType.Section:
+ // arrayToUpdate = (this.parentLink.form.get('sections') as FormArray);
+ // break
+ // }
+
+ // }
+ if(arrayToUpdate.controls){
+ moveItemInArray(arrayToUpdate.controls, event.previousIndex, event.currentIndex);
+ //update ordinality
+ arrayToUpdate.controls.forEach((element,idx ) => {
+ element.get('ordinal').setValue(idx);
+ element.updateValueAndValidity();
+ });
+ }
+
+ this.dataNeedsRefresh.emit();
+ // moveItemInArray(this.links, event.previousIndex, event.currentIndex);
+
+ // console.log('dropped');
+ }
+
+ onDataNeedsRefresh(){
+ this.dataNeedsRefresh.emit();
+ }
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
index c9a1868dc..da670d299 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
@@ -12,6 +12,7 @@
[parentLink]="{ subEntriesType: tocEntryType.Page, subEntries : links }"
[itemSelected]="itemSelected"
[viewOnly]="viewOnly"
+ (dataNeedsRefresh)="onDataNeedsRefresh()"
>
+
+
+
+
+
-
+
+
+
+
+
+
+ [viewOnly]="viewOnly"
+ (dataNeedsRefresh)="onDataNeedsRefresh()">
-
-
-
+
+
+
+
-
-->
+
-
-
-
+ -->
+
-
+
Subsection
@@ -95,19 +143,19 @@
Section
-
+
-
+
-
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
index 224a669bc..5872e6c41 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss
@@ -96,7 +96,64 @@
.link-info{
// display: inline-block; cursor: pointer;
+ // padding-top: .6em;
+ // padding-left: .6em;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
+}
+
+
+// .border-left-active{
+// border-left: 1px solid #000;
+// }
+
+
+.cdk-link-list {
+ display: block;
+ // background: white;
+ overflow: hidden;
+}
+
+.link-box {
+ padding: 20px 10px;
+ border-bottom: solid 1px #ccc;
+ color: rgba(0, 0, 0, 0.87);
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+ cursor: move;
+ background: white;
+ font-size: 14px;
+}
+
+.cdk-drag-preview {
+ background-color: #FFF;
+ box-sizing: border-box;
+ border-radius: 4px;
+ box-shadow: 0 5px 5px -3px 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);
+
+ .add-new-entry{
+ display: none;
+ }
+}
+
+.cdk-drag-placeholder {
+ opacity: 0;
+}
+
+.cdk-drag-animating {
+ transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.link-box:last-child {
+ border: none;
+}
+
+.cdk-link-list.cdk-drop-list-dragging .link-box:not(.cdk-drag-placeholder) {
+ transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.ts
index 6bc4eafb6..16af6cb2d 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.ts
@@ -1,5 +1,7 @@
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { DOCUMENT } from '@angular/common';
import { Component, EventEmitter, Inject, Input, OnInit, Output, SimpleChanges } from '@angular/core';
+import { FormArray } from '@angular/forms';
import { BaseComponent } from '@common/base/base.component';
import { Foo, ToCEntry, ToCEntryType } from '../table-of-contents-entry';
@@ -17,6 +19,10 @@ export class DatasetProfileTableOfContentsInternalSection extends BaseComponent
@Output() createFooEntry = new EventEmitter