implementation of uniform data format for IDA

ida-chatbot/src/app/app.component.ts

@@ -11,6 +11,8 @@ import {TabElement} from './models/tab-element';
 import {UniqueIdProviderService} from './service/misc/unique-id-provider.service';
 import {TabType} from './enums/tab-type.enum';
 import {IdaEventService} from './service/event/ida-event.service';
+import {MatDialog} from '@angular/material';
+import {DatasetUploadModalComponent} from './components/dataset-upload-modal/dataset-upload-modal.component';
 
 @Component({
   selector: 'app-root',
@@ -31,7 +33,7 @@ export class AppComponent {
   @ViewChild(SidebarComponent)
   private sbComp: SidebarComponent;
 
-  constructor(private restservice: RestService, private uis: UniqueIdProviderService, private ies: IdaEventService) {
+  constructor(private restservice: RestService, private uis: UniqueIdProviderService, private ies: IdaEventService, public dialog: MatDialog) {
     ies.dtTblEvnt.subscribe((reqTbl) => {
       this.getDataTable(reqTbl);
     });
@@ -65,6 +67,14 @@ export class AppComponent {
       // Open new tab with DataTable
       const newTab = new TabElement(this.uis.getUniqueId(), resp.payload.actvTbl, TabType.DTTBL, resp.payload.dataTable, true, true);
       this.addNewTab(newTab, resp);
+    } else if (resp.actnCode === 6) {
+      this.dialog.open(DatasetUploadModalComponent, {
+        data: {
+          datasetName: resp.payload.datasetName
+        },
+        disableClose: true,
+        width: '350px'
+      });
     } else if (resp.actnCode === 7) {
       // Open new tab with DataTable
       const newTab = new TabElement(this.uis.getUniqueId(), resp.payload.actvTbl, TabType.VENND, resp.payload.vennDiagramData, true, true);

ida-chatbot/src/app/app.module.ts

@@ -60,6 +60,7 @@ import {DatatableDetailComponent} from './components/datatable-detail/datatable-
 import { SsbViewComponent } from './components/ssb-view/ssb-view.component';
 import { VennViewComponent } from './components/venn-view/venn-view.component';
 import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
+import { DatasetUploadModalComponent } from './components/dataset-upload-modal/dataset-upload-modal.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -78,7 +79,8 @@ import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-
     DatatableDetailComponent,
     SsbViewComponent,
     VennViewComponent,
-    DeckglHexViewComponent
+    DeckglHexViewComponent,
+    DatasetUploadModalComponent
   ],
   imports: [
     BrowserModule,
@@ -119,13 +121,15 @@ import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
-    FlexLayoutModule
+    FlexLayoutModule,
+    MatSnackBarModule
   ],
   providers: [{
     provide: HTTP_INTERCEPTORS,
     useClass: RestService ,
     multi: true
   }],
+  entryComponents: [DatasetUploadModalComponent],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

ida-chatbot/src/app/components/dataset-upload-modal/dataset-upload-modal.component.css

@@ -0,0 +1,3 @@
+.file-name:disabled {
+  color: #000;
+}

ida-chatbot/src/app/components/dataset-upload-modal/dataset-upload-modal.component.html

@@ -0,0 +1,24 @@
+<h1 mat-dialog-title>Upload dataset</h1>
+<div mat-dialog-content>
+  <form>
+    <mat-form-field class="full-width">
+      <input matInput class="file-name" [value]="fileName" name="fileName" disabled>
+      <mat-hint>You can only select CSV or XML file.</mat-hint>
+    </mat-form-field>
+    <br>
+    <br>
+    <button mat-stroked-button (click)="fileInput.click()" class="full-width">
+      <mat-icon>cloud_upload</mat-icon>
+      <input #fileInput type="file" [hidden]="true" accept=".xml, .csv" (change)="fileManager($event)"/>
+    </button>
+  </form>
+</div>
+<br>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+  <!-- The mat-dialog-close directive optionally accepts a value as a result for the dialog. -->
+  <button mat-stroked-button color="primary" [disabled]="!fileSelected || showProgress" (click)="uploadDataset()">
+    <mat-spinner *ngIf="showProgress" [diameter]="20" style="margin: auto"></mat-spinner>
+    <span *ngIf="!showProgress">Upload</span>
+  </button>
+</mat-dialog-actions>

ida-chatbot/src/app/components/dataset-upload-modal/dataset-upload-modal.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DatasetUploadModalComponent } from './dataset-upload-modal.component';
+
+describe('DatasetUploadModalComponent', () => {
+  let component: DatasetUploadModalComponent;
+  let fixture: ComponentFixture<DatasetUploadModalComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DatasetUploadModalComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatasetUploadModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ida-chatbot/src/app/components/dataset-upload-modal/dataset-upload-modal.component.ts

@@ -0,0 +1,55 @@
+import {Component, Inject, Input, OnInit} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import {MAT_DIALOG_DATA, MatDialogRef, MatSnackBar} from '@angular/material';
+
+@Component({
+  selector: 'app-dialog-modal',
+  templateUrl: './dataset-upload-modal.component.html',
+  styleUrls: ['./dataset-upload-modal.component.css']
+})
+export class DatasetUploadModalComponent implements OnInit {
+
+  fileName = 'Select CSV or XML file...';
+  file;
+  fileSelected = false;
+  showProgress = false;
+
+  constructor(@Inject(MAT_DIALOG_DATA) public data,
+              private _http: HttpClient,
+              public dialogRef: MatDialogRef<DatasetUploadModalComponent>,
+              public snackBar: MatSnackBar) {}
+
+  ngOnInit() {
+  }
+
+  fileManager(event) {
+    if (event.target.files.length > 0) {
+      this.fileSelected = true;
+      this.file = event.target.files[0];
+      this.fileName = this.file.name;
+    }
+  }
+
+  uploadDataset() {
+    console.log(this.data.datasetName);
+    this.showProgress = true;
+    const formData = new FormData();
+    formData.append('file', this.file);
+    formData.append('fileName', this.data.datasetName);
+    this._http.post('http://localhost:8080/ida-ws/message/file', formData).subscribe(
+      (res) => {
+        this.dialogRef.close();
+        this.snackBar.open('Dataset uploaded successfully', 'Close', {
+          duration: 3000,
+        });
+      },
+      (err) => {
+        this.snackBar.open('Dataset upload failed! Please try again', 'Close', {
+          duration: 3000,
+        });
+        this.showProgress = false;
+      }
+    );
+  }
+
+}

ida-chatbot/src/styles.css

@@ -7,7 +7,9 @@ html, body {
   height: 100%;
   margin: 0;
 }
-
+.full-width {
+  width: 100%;
+}
 .table-cls {
   margin: 15px;
 }

ida-ws/pom.xml

@@ -179,14 +179,24 @@
 			<artifactId>topicmodeling.commons</artifactId>
 			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>apache-jena-libs</artifactId>
+			<version>3.9.0</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>no.acando</groupId>
+			<artifactId>xmltordf</artifactId>
+			<version>1.9.1</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-test</artifactId>
 		    <version>2.1.0.RELEASE</version>
 		    <scope>test</scope>
 		</dependency>
-
 	</dependencies>
 	<build>
 		<finalName>ida-ws</finalName>

ida-ws/src/main/java/upb/ida/constant/IDALiteral.java

@@ -7,12 +7,13 @@
 public interface IDALiteral {
 	public static final String EXAMPLE = "this is an example constant string";
 
-	//Action literals
+	//Action literals (User Interface Action)
 	public static final int UIA_LOADDS = 1;
 	public static final int UIA_FDG = 2;
 	public static final int UIA_BG = 3;
 	public static final int UIA_CLUSTER = 4;
 	public static final int UIA_DTTABLE = 5;
+	public static final int UIA_UPLOAD = 6;
 	public static final int UIA_VENNDIAGRAM = 7;
 	public static final int UIA_GSDIAGRAM = 8;
 
@@ -37,4 +38,6 @@ public interface IDALiteral {
 	//Metadata File name Pattern
 	public static final String DSMD_FILE_PATTERN = ".*_dsmd\\.[jJ][sS][oO][nN]$";
 
+	public static final String DS_PATH = System.getProperty("user.dir") + "/uploads/";
+
 }

ida-ws/src/main/java/upb/ida/provider/LoadDsMetadata.java

@@ -1,8 +1,11 @@
 package upb.ida.provider;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.util.FileManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -12,6 +15,9 @@
 import upb.ida.bean.ResponseBean;
 import upb.ida.constant.IDALiteral;
 import upb.ida.util.FileUtil;
+import upb.ida.util.SessionUtil;
+
+import static upb.ida.constant.IDALiteral.DS_PATH;
 
 /**
  * LoadDataContent is a subroutine that loads the data
@@ -25,7 +31,8 @@ public class LoadDsMetadata implements Subroutine {
 	private FileUtil fileUtil;
 	@Autowired
 	private ResponseBean responseBean;
-
+	@Autowired
+	private SessionUtil sessionUtil;
 	/**
 	 * Method to create response for loading the data set
 	 * 
@@ -41,6 +48,12 @@ public String call(com.rivescript.RiveScript rs, String[] args) {
 		if (fileUtil.datasetExists(message)) {
 			try {
 				Map<String, Object> dataMap = responseBean.getPayload();
+				Model model = FileManager.get().loadModel(DS_PATH + message + ".ttl");
+				Map<String, Object> dsMap = new HashMap<>();
+				if(!dsMap.containsKey(message)){
+					dsMap.put(message, model);
+					sessionUtil.getSessionMap().put("DSModel", dsMap);
+				}
 				dataMap.put("label", message);
 				dataMap.put("dsName", message);
 				dataMap.put("dsMd", fileUtil.getDatasetMetaData(message));

ida-ws/src/main/java/upb/ida/provider/RiveScriptBeanProvider.java

@@ -46,6 +46,10 @@ public class RiveScriptBeanProvider {
 	@Autowired
 	private LoadDsMetadata dsmdLoader;
 	@Autowired
+	private UploadDataset uploadDataset;
+	@Autowired
+	private ShowDataset showDataset;
+  @Autowired
 	private VennDiagramHandler VennDiagramHandler;
 	@Autowired
 	private GeoDiagramHandler GeoDiagramHandler;
@@ -77,6 +81,8 @@ public RiveScript initBotInstance() {
 		bot.setSubroutine("ClusterDataGetter", clusterDataGetter);
 		bot.setSubroutine("CheckParamCollected", checkParamCollected);
 		bot.setSubroutine("LoadDsMetadata", dsmdLoader);
+		bot.setSubroutine("UploadDataset", uploadDataset);
+		bot.setSubroutine("ShowDataset", showDataset);
 		bot.setSubroutine("VennDiagramHandler", VennDiagramHandler);
 		bot.setSubroutine("GeoDiagramHandler", GeoDiagramHandler);
 		return bot;

ida-ws/src/main/java/upb/ida/provider/ShowDataset.java

@@ -0,0 +1,31 @@
+package upb.ida.provider;
+
+import com.rivescript.macro.Subroutine;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import upb.ida.bean.ResponseBean;
+
+import java.io.File;
+
+import static upb.ida.constant.IDALiteral.DS_PATH;
+
+
+@Component
+public class ShowDataset implements Subroutine {
+    @Autowired
+    private ResponseBean responseBean;
+
+    public String call(com.rivescript.RiveScript rs, String[] args) {
+        File directory = new File(DS_PATH);
+        String[] files = directory.list();
+        String temp = "Datasets: ";
+        for (String file: files) {
+            temp = temp + FilenameUtils.removeExtension(file) + ", ";
+        }
+
+        responseBean.setChatmsg(DS_PATH);
+        temp = temp.substring(0, temp.length() - 1);
+        return temp;
+    }
+}

ida-ws/src/main/java/upb/ida/provider/UploadDataset.java

@@ -0,0 +1,30 @@
+package upb.ida.provider;
+
+import com.rivescript.macro.Subroutine;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import upb.ida.bean.ResponseBean;
+import upb.ida.constant.IDALiteral;
+
+import java.io.File;
+import java.util.Map;
+
+@Component
+public class UploadDataset implements Subroutine {
+    @Autowired
+    private ResponseBean responseBean;
+
+    public String call(com.rivescript.RiveScript rs, String[] args) {
+        String message = args[0].toLowerCase().trim();
+        Map<String, Object> dataMap = responseBean.getPayload();
+        dataMap.put("datasetName", message);
+        String resp = IDALiteral.RESP_FAIL_ROUTINE;
+        File file = new File(System.getProperty("user.dir") + "/upload-ds/" + message + ".ttl");
+        if (!file.exists()) {
+            responseBean.setActnCode(IDALiteral.UIA_UPLOAD);
+            responseBean.setPayload(dataMap);
+            resp = IDALiteral.RESP_PASS_ROUTINE;
+        }
+        return resp;
+    }
+}