Upload dataseta #129

5 files changed, 34 insertions, 16 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 9d4b67a9..e8207718 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -13,7 +13,7 @@ export default class Dataset extends FolderFile {
         dateCreated: Date = new Date(),
         lastUpdated: Date = new Date(),
         public uploaderId: string = '',
-        public delimiter: string = '',
+        public delimiter: string = ',',
         public hasHeader: boolean = true,
 
         public columnInfo: ColumnInfo[] = [],
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index b4e90e56..d1e36ce0 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -60,7 +60,7 @@
                     </button>
                 </div>
                 <app-form-model [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model>
-                <app-form-dataset *ngSwitchCase="FolderType.Dataset"></app-form-dataset>
+                <app-form-dataset *ngSwitchCase="FolderType.Dataset" ></app-form-dataset>
             </div>
             <div *ngSwitchCase="true" class="list-view">
                 <div *ngFor="let file of filteredFiles; let i = index" class="list-item">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 23a982fb..80633300 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -1,8 +1,12 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import Dataset from 'src/app/_data/Dataset';
 import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
 import Model from 'src/app/_data/Model';
 import { DatasetsService } from 'src/app/_services/datasets.service';
+import shared from 'src/app/Shared';
+import { ModelsService } from 'src/app/_services/models.service';
+import { FormDatasetComponent } from '../form-dataset/form-dataset.component';
+
 
 @Component({
   selector: 'app-folder',
@@ -11,6 +15,8 @@ import { DatasetsService } from 'src/app/_services/datasets.service';
 })
 export class FolderComponent implements OnInit {
 
+  @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
+
   @Input() folderName: string = 'Moji podaci';
 
   @Input() files!: FolderFile[]
@@ -34,18 +40,11 @@ export class FolderComponent implements OnInit {
 
   myDatasets : Dataset[] = [];
 
-  constructor(private datasets: DatasetsService) {
+  constructor(private datasets: DatasetsService, private modelsService: ModelsService) {
     //PLACEHOLDER
 
-    this.datasets.getMyDatasets().subscribe((datasets) => {
-      this.myDatasets = datasets;
-    });
-
-    this.files = this.myDatasets;
+    this.refreshFiles();
 
-
-    this.filteredFiles.length = 0;
-    this.filteredFiles.push(...this.files);
   }
 
   ngOnInit(): void {
@@ -56,6 +55,11 @@ export class FolderComponent implements OnInit {
     }
   }
 
+  displayFile(){
+    if(this.type == FolderType.Dataset)
+      this.formDataset!.dataset = <Dataset>this.fileToDisplay;
+  }
+
   hoverOverFile(i: number) {
     this.hoveringOverFileIndex = i;
     if (i != -1) {
@@ -67,6 +71,7 @@ export class FolderComponent implements OnInit {
         this.fileToDisplay = this.files[this.selectedFileIndex];
       }
     }
+    this.displayFile();
   }
 
   selectNewFile() {
@@ -79,6 +84,7 @@ export class FolderComponent implements OnInit {
     this.newFileSelected = true;
     this.listView = false;
     this.selectedFileChanged.emit(this.newFile);
+    this.displayFile();
   }
 
   selectFile(index: number) {
@@ -88,6 +94,7 @@ export class FolderComponent implements OnInit {
     this.newFileSelected = false;
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
+    this.displayFile();
   }
 
   createNewFile() {
@@ -102,8 +109,17 @@ export class FolderComponent implements OnInit {
     this.okPressed.emit();
   }
 
+  refreshFiles(){
+    this.datasets.getMyDatasets().subscribe((datasets) => {
+      this.myDatasets = datasets;
+      this.files = this.myDatasets;
+      this.searchTermsChanged();
+    });
+  }
+
   saveNewFile() {
-    // TODO
+    if(this.type == FolderType.Dataset)
+      this.formDataset!.uploadDataset();
   }
 
   calcZIndex(i: number) {
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
index ab1b417e..c7aebd07 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -30,7 +30,7 @@
                     <div class="row">
                         <mat-form-field class="example-full-width" appearance="fill">
                             <mat-label>Naziv</mat-label>
-                            <input type="text" matInput value="{{filename.slice(0, this.filename.length - 4)}}">
+                            <input type="text" matInput value="{{dataset.name}}">
                             <!--[formControl]="nameFormControl"-->
 
                             <mat-error *ngIf="nameFormControl.hasError('required')">
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
index 254f5fe4..63376524 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import Dataset from 'src/app/_data/Dataset';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 import { ModelsService } from 'src/app/_services/models.service';
@@ -25,7 +25,7 @@ export class FormDatasetComponent {
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
-  dataset: Dataset; //dodaj ! potencijalno
+  @Input() dataset: Dataset; //dodaj ! potencijalno
 
   tableData: TableData = new TableData();
 
@@ -81,6 +81,8 @@ export class FormDatasetComponent {
       }
     }
     fileReader.readAsText(this.files[0]);
+
+    this.dataset.name = this.filename.slice(0, this.filename.length - 4);
   }
 
   checkAccessible() {