no message

dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html

@@ -1,4 +1,6 @@
 <div class="dataset-wizard">
+        <h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
+        <h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
     <mat-horizontal-stepper [linear]="isLinear">
         <mat-step [stepControl]="formGroup">
             <form *ngIf="formGroup" [formGroup]="formGroup">
@@ -79,7 +81,7 @@
                             {{option.label}}
                         </div>
                     </ng-template>
-                    <mat-progress-bar [style.height.px]="2" mode="indeterminate"></mat-progress-bar>
+                    <mat-progress-bar [style.height.px]="2" *ngIf="filteredExternalDatasetsAsync" mode="indeterminate"></mat-progress-bar>
                 </td-chips>
 
                 <div class="navigation-buttons-container">

dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts

@@ -81,6 +81,7 @@ export class DatasetWizardComponent implements AfterViewInit {
           .subscribe(data => {
             this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel);
             this.formGroup = this.datasetWizardModel.buildForm();
+            this.loadDatasetProfiles();
           });
       } else if (dmpId != null) {
         this.isNew = true;

dmp-frontend/src/app/datasets/dataset-listing.component.html

@@ -61,7 +61,7 @@
 			<!-- Column Definition: Created -->
 			<ng-container cdkColumnDef="created">
 				<mat-header-cell *matHeaderCellDef>{{'DATASET-LISTING.COLUMNS.CREATED' | translate}}</mat-header-cell>
-				<mat-cell *matCellDef="let row">{{row.created}}</mat-cell>
+				<mat-cell *matCellDef="let row">{{row.created | date:'shortDate'}}</mat-cell>
 			</ng-container>
 
 			<!-- Column Definition: Submission Time -->

dmp-frontend/src/app/dmps/dmp-listing.component.html

@@ -53,6 +53,7 @@
                         <button mat-menu-item (click)="openShareDialog(row.id,row.label)"><mat-icon>share</mat-icon>{{'DMP-LISTING.ACTIONS.INVITE' | translate}}</button>
                         <button mat-menu-item (click)="addDataset(row.id)"><mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DATASET' | translate}}</button>
                         <button mat-menu-item (click)="showDatasets(row.id)"><mat-icon>list</mat-icon>{{'DMP-LISTING.ACTIONS.DATASETS' | translate}}</button>
+                        <button mat-menu-item (click)="newVersion(row.id)"><mat-icon>filter_none</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}</button>
                     </mat-menu>
                     <button mat-icon-button [matMenuTriggerFor]="actionsMenu">
                             <mat-icon>more_vert</mat-icon>

dmp-frontend/src/app/dmps/dmp-listing.component.ts

@@ -61,6 +61,10 @@ export class DataManagementPlanListingComponent implements OnInit {
     this.router.navigate(['/datasets/' + rowId]);
   }
 
+  newVersion(rowId: String) {
+    //this.router.navigate(['/datasets/' + rowId]);
+  }
+
   getDefaultCriteria(): DataManagementPlanCriteria {
     const defaultCriteria = new DataManagementPlanCriteria();
     return defaultCriteria;

dmp-frontend/src/app/form/dynamic-form.component.html

@@ -1,10 +1,10 @@
-<div class="full-width full-height">
+<div class="dynamic-form-editor">
-	<mat-sidenav-container class="ng-sidebar-container">
+	<!-- <mat-sidenav-container class="ng-sidebar-container"> -->
 		<!-- <mat-sidenav mode="push" position="right" [(opened)]="visibleSidebar">
 			<table-of-content class="toc-container full-height" [model]="datasetProfileDefinitionModel"></table-of-content>
 		</mat-sidenav> -->
 
-		<mat-sidenav-content>
+		<!-- <mat-sidenav-content> -->
 			<!-- <button mat-raised-button color="primary" style="margin: 15px;" (click)="toggleSidebar()" icon="fa-arrow-left">Table Of Contents</button> -->
 			<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
 				<button mat-raised-button color="primary" *ngIf="datasetProfileDefinitionModel&&datasetProfileDefinitionModel.status != 1"
@@ -44,7 +44,7 @@
 
 				</div>
 			</form>
-		</mat-sidenav-content>
+		<!-- </mat-sidenav-content>
-	</mat-sidenav-container>
+	</mat-sidenav-container> -->
 </div>
 <!-- <p>Form value: {{ form.value | json }}</p> -->

dmp-frontend/src/app/form/dynamic-form.component.scss

@@ -4,7 +4,7 @@
     width: 40%;  
 }
 
-.toc-container {
+/* .toc-container {
     background: #f9f9f9 none repeat scroll 0 0;
     border: 1px solid #aaa;
     display: table;
@@ -12,12 +12,20 @@
     margin-bottom: 1em;
     padding: 20px;
     width: 100%;
-}
+} */
 
 .ui-steps .ui-steps-item {
     min-width: 10%;
 }
 
+.dynamic-form-editor {
+    // background-color: #e0e0e0;
+    // min-height: 80vh;
+    mat-vertical-stepper {
+        background-color: #e0e0e0;
+    }
+}
+
 .ng-sidebar-container {
     overflow: inherit !important; 
     

dmp-frontend/src/app/form/dynamic-form.component.ts

@@ -22,7 +22,7 @@ declare function simple_notifier(type: string, title: string, message: string):
   selector: 'dynamic-form',
   templateUrl: './dynamic-form.component.html',
   styleUrls: [
-    './dynamic-form.component.css'
+    './dynamic-form.component.scss'
   ],
   providers: [
   ],

dmp-frontend/src/app/user-management/login/login.component.html

@@ -21,7 +21,7 @@
             </div>
           </div>
           <div *ngIf = "hasNativeLogin()">
-            <p class="tip">Or Be Classical</p>
+            <!-- <p class="tip">Or Be Classical</p> -->
             <div class="card-form">
               <div class="form-row">
                 <i class="material-icons">email</i>

dmp-frontend/src/assets/lang/en.json

@@ -11,6 +11,7 @@
         },
         "SNACK-BAR": {
             "SUCCESSFUL-CREATION": "Created Successfully",
+            "SUCCESSFUL-UPDATE": "Updated Successfully",
             "SUCCESSFUL-LOGIN": "Successful Login",
             "SUCCESSFUL-LOGOUT": "Successful Logout",
             "UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
@@ -48,7 +49,8 @@
             "EDIT": "Edit",
             "INVITE": "Invite",
             "ADD-DATASET": "Add Dataset",
-            "DATASETS": "Datasets"
+            "DATASETS": "Datasets",
+            "NEW-VERSION": "New Version"
         }
     },
     "DATASET-WIZARD": {