@finos/legend-application-studio 28.21.3 → 28.21.5

package/src/stores/editor/editor-state/element-editor-state/data/EmbeddedDataState.ts

@@ -32,6 +32,10 @@ import {
 } from '@finos/legend-graph';
 import {
   ContentType,
+  csvDecodeValue,
+  csvEncodeValue,
+  csvStringify,
+  parseCSVContent,
   guaranteeNonEmptyString,
   tryToFormatLosslessJSONString,
   UnsupportedOperationError,
@@ -211,8 +215,12 @@ export class ModelStoreDataState extends EmbeddedDataState {
 
 export class RelationElementState {
   relationElement: RelationElement;
+  supportsColumnEditing: boolean;
 
-  constructor(relationElement: RelationElement) {
+  constructor(
+    relationElement: RelationElement,
+    options?: { supportsColumnEditing?: boolean },
+  ) {
     makeObservable(this, {
       relationElement: observable,
       addColumn: action,
@@ -224,6 +232,7 @@ export class RelationElementState {
       clearAllData: action,
       importCSV: action,
     });
+    this.supportsColumnEditing = options?.supportsColumnEditing ?? true;
     this.relationElement = relationElement;
     this.relationElement = observe_RelationElement(relationElement);
   }
@@ -268,10 +277,16 @@ export class RelationElementState {
 
   updateRow(rowIndex: number, columnIndex: number, value: string): void {
     if (this.relationElement.rows[rowIndex]) {
-      this.relationElement.rows[rowIndex].values[columnIndex] = value;
+      this.relationElement.rows[rowIndex].values[columnIndex] =
+        csvEncodeValue(value);
     }
   }
 
+  getDisplayValue(rowIndex: number, columnIndex: number): string {
+    const value = this.relationElement.rows[rowIndex]?.values[columnIndex];
+    return value !== undefined ? csvDecodeValue(value) : '';
+  }
+
   clearAllData(): void {
     this.relationElement.rows.splice(0);
   }
@@ -280,7 +295,9 @@ export class RelationElementState {
     return JSON.stringify(
       {
         columns: this.relationElement.columns,
-        data: this.relationElement.rows,
+        data: this.relationElement.rows.map((row) => ({
+          values: row.values.map((v) => csvDecodeValue(v)),
+        })),
       },
       null,
       2,
@@ -305,7 +322,7 @@ export class RelationElementState {
     const insertStatements = this.relationElement.rows.map((row) => {
       const values = this.relationElement.columns
         .map((col, colIndex) => {
-          const value = row.values[colIndex] ?? '';
+          const value = csvDecodeValue(row.values[colIndex] ?? '');
           if (value !== '') {
             return `'${value.replace(/'/g, "''")}'`;
           }
@@ -319,75 +336,50 @@ export class RelationElementState {
   }
 
   exportCSV(): string {
-    const headers = this.relationElement.columns.map((col) => col);
-    const csvLines = [headers.join(',')];
-
-    this.relationElement.rows.forEach((row) => {
-      const values = headers.map((header, headerIndex) => {
-        const value = row.values[headerIndex] ?? '';
-        if (value.includes(',') || value.includes('"')) {
-          return `"${value.replace(/"/g, '""')}"`;
-        }
-        return value;
-      });
-      csvLines.push(values.join(','));
-    });
-
-    return csvLines.join('\n');
-  }
-
-  private parseCSVLine(line: string): string[] {
-    const result: string[] = [];
-    let current = '';
-    let inQuotes = false;
-
-    for (let i = 0; i < line.length; i++) {
-      const char = line[i];
-      if (char === '"') {
-        inQuotes = !inQuotes;
-      } else if (char === ',' && !inQuotes) {
-        result.push(current.trim());
-        current = '';
-      } else {
-        current += char;
-      }
-    }
-    result.push(current.trim());
-    return result;
+    // decode so that csvStringify does not double encode
+    const data = this.relationElement.rows.map((row) =>
+      row.values.map((v) => csvDecodeValue(v)),
+    );
+    return csvStringify([this.relationElement.columns, ...data]);
   }
 
   importCSV(csvContent: string): void {
-    const lines = csvContent.trim().split('\n');
-    if (lines.length === 0) {
+    const parsed = parseCSVContent(csvContent);
+    if (parsed.length === 0) {
       return;
     }
 
-    const firstLine = lines[0];
-    if (!firstLine) {
+    const headers = parsed[0];
+    if (!headers) {
       return;
     }
 
-    const headers = this.parseCSVLine(firstLine);
     this.relationElement.columns = headers;
-
-    this.relationElement.rows = lines.slice(1).map((line) => {
-      const values = this.parseCSVLine(line);
+    this.relationElement.rows = parsed.slice(1).map((values) => {
       const row = new RelationRowTestData();
-      row.values = [];
-      headers.forEach((header, index) => {
-        row.values[index] = values[index] ?? '';
-      });
+      row.values = headers.map((_, index) =>
+        csvEncodeValue(values[index] ?? ''),
+      );
       return observe_RelationRowTestData(row);
     });
   }
 }
 
+export interface RelationElementAccessorOption {
+  label: string;
+  value: string;
+  columns: string[];
+}
+
 export class RelationElementsDataState extends EmbeddedDataState {
   override embeddedData: RelationElementsData;
   showImportCSVModal = false;
   showNewRelationElementModal = false;
   activeRelationElement: RelationElementState | undefined;
   relationElementStates: RelationElementState[];
+  accessorOptions: RelationElementAccessorOption[] | undefined;
+  accessorTypeLabel: string | undefined;
+  refreshAccessorOptions: (() => Promise<void>) | undefined;
 
   constructor(editorStore: EditorStore, embeddedData: RelationElementsData) {
     super(editorStore, embeddedData);
@@ -396,10 +388,15 @@ export class RelationElementsDataState extends EmbeddedDataState {
       showImportCSVModal: observable,
       showNewRelationElementModal: observable,
       activeRelationElement: observable,
+      relationElementStates: observable,
+      accessorOptions: observable,
+      accessorTypeLabel: observable,
       setActiveRelationElement: action,
       setShowImportCSVModal: action,
       setShowNewRelationElementModal: action,
       addRelationElement: action,
+      deleteRelationElement: action,
+      setAccessorOptions: action,
     });
     this.embeddedData = embeddedData;
     this.relationElementStates = embeddedData.relationElements.map(
@@ -423,6 +420,18 @@ export class RelationElementsDataState extends EmbeddedDataState {
     this.setActiveRelationElement(newElementState);
   }
 
+  deleteRelationElement(relationElementState: RelationElementState): void {
+    const idx = this.relationElementStates.indexOf(relationElementState);
+    if (idx === -1) {
+      return;
+    }
+    this.relationElementStates.splice(idx, 1);
+    this.embeddedData.relationElements.splice(idx, 1);
+    if (this.activeRelationElement === relationElementState) {
+      this.setActiveRelationElement(this.relationElementStates[0]);
+    }
+  }
+
   setShowImportCSVModal(show: boolean): void {
     this.showImportCSVModal = show;
   }
@@ -430,6 +439,28 @@ export class RelationElementsDataState extends EmbeddedDataState {
   setShowNewRelationElementModal(show: boolean): void {
     this.showNewRelationElementModal = show;
   }
+
+  setAccessorOptions(
+    options: RelationElementAccessorOption[] | undefined,
+    typeLabel: string | undefined,
+  ): void {
+    this.accessorOptions = options;
+    this.accessorTypeLabel = typeLabel;
+  }
+
+  setRefreshAccessorOptions(fn: (() => Promise<void>) | undefined): void {
+    this.refreshAccessorOptions = fn;
+  }
+
+  get availableAccessorOptions(): RelationElementAccessorOption[] {
+    if (!this.accessorOptions) {
+      return [];
+    }
+    const existingPaths = new Set(
+      this.relationElementStates.map((s) => s.relationElement.paths.join('.')),
+    );
+    return this.accessorOptions.filter((opt) => !existingPaths.has(opt.value));
+  }
 }
 
 export class RelationalCSVDataTableState {

package/src/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.ts

@@ -109,6 +109,7 @@ import {
   modelAccessPointGroup_setMapping,
   dataProduct_setSupportInfoIfAbsent,
 } from '../../../../graph-modifier/DSL_DataProduct_GraphModifierHelper.js';
+import { DataProductTestableState } from './testable/DataProductTestableState.js';
 import { LambdaEditorState, LineageState } from '@finos/legend-query-builder';
 import {
   DataProductElementEditorInitialConfiguration,
@@ -129,6 +130,7 @@ export enum DATA_PRODUCT_TAB {
   SUPPORT = 'Support',
   APG = 'APG',
   OPERATIONAL = 'Operational',
+  TESTING = 'Testing',
 }
 
 export enum DATA_PRODUCT_TYPE {
@@ -966,6 +968,7 @@ export class DataProductEditorState extends ElementEditorState {
   selectedGroupState: AccessPointGroupState | undefined;
   selectedTab: DATA_PRODUCT_TAB;
   modelledDataProduct = false;
+  testableState: DataProductTestableState;
 
   constructor(
     editorStore: EditorStore,
@@ -1015,6 +1018,7 @@ export class DataProductEditorState extends ElementEditorState {
       this.deployOnOpen = elementConfig.deployOnOpen ?? false;
     }
     this.selectedTab = DATA_PRODUCT_TAB.HOME;
+    this.testableState = new DataProductTestableState(this);
   }
 
   setDeployOnOpen(value: boolean): void {