Merge branch 'ajthinking:main' into main

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-story/core",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "main": "dist/main/index.js",
   "type": "commonjs",
   "types": "dist/main/index.d.ts",

packages/ds-ext/package.json

@@ -1,9 +1,10 @@
 {
   "name": "ds-ext",
-  "displayName": "ds-ext",
+  "displayName": "data-story",
   "description": "",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "publisher": "ajthinking",
+  "icon": "icon.png",
   "engines": {
     "vscode": "^1.80.0"
   },

packages/ds-ext/src/app/onDrop.ts

@@ -3,16 +3,69 @@ import { NodeDescription, str } from '@data-story/core';
 export const onDrop = (event: any, addNodeFromDescription: any) => {
   event.preventDefault();
 
+  if(isDropFromOs(event)) return onDropFromOs(
+    event,
+    addNodeFromDescription
+  );
+
+  if(isDropFromExplorer(event)) return onDropFromExplorer(
+    event,
+    addNodeFromDescription
+  );
+};
+
+export const isDropFromOs = (event: any) => {
+  return event.dataTransfer.files.length;
+};
+
+export const isDropFromExplorer = (event: any) => {
+  return event.dataTransfer.getData('text/plain');
+};
+
+export const onDropFromOs = (event: any, addNodeFromDescription: any) => {
+  const file = event.dataTransfer.files[0];
+  const path = file.path;
+  const filename = path.split('/').pop();
+  const extention = filename.split('.').pop();
+
+  if (extention !== 'json') {
+    console.warn({
+      message: 'Currently, only JSON files are supported.',
+      path,
+      filename,
+      extention,
+    });
+
+    return;
+  }
+
+  const description = createJsonFileReadDescription(filename, path);
+  addNodeFromDescription(description);
+};
+
+export const onDropFromExplorer = (event: any, addNodeFromDescription: any) => {
+  // DROP FROM EXPLORER
   const path = event.dataTransfer.getData('text/plain');
   const filename = path.split('/').pop();
   const extention = filename.split('.').pop();
 
   if (extention !== 'json') {
-    console.warn('Currently, only JSON files are supported.');
+    console.warn({
+      message: 'Currently, only JSON files are supported.',
+      path,
+      filename,
+      extention,
+    });
+
     return;
   }
 
-  const description: NodeDescription = {
+  const description = createJsonFileReadDescription(filename, path);
+  addNodeFromDescription(description);
+};
+
+export const createJsonFileReadDescription = (filename: string, path: string): NodeDescription => {
+  return {
     name: 'JsonFile.read',
     label: filename,
     inputs: [],
@@ -40,6 +93,4 @@ export const onDrop = (event: any, addNodeFromDescription: any) => {
       }),
     ],
   };
-
-  addNodeFromDescription(description);
 };

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-story/nodejs",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "main": "dist/index.js",
   "type": "commonjs",
   "types": "dist/index.d.ts",

packages/nodejs/src/computers/JsonFileRead/JsonFileRead.ts

@@ -1,5 +1,6 @@
 import * as glob from 'glob';
 import fs from 'fs';
+import path from 'path'; // Import path module
 import { Computer, get, serializeError, str } from '@data-story/core';
 
 export const JsonFileRead: Computer = {
@@ -33,15 +34,31 @@ export const JsonFileRead: Computer = {
   async *run({ output, params }) {
     const pathPattern = params.file_path as string;
     const itemsPath = params.items_path as string;
+
+    // Check if the provided path is absolute
+    const isAbsolutePath = path.isAbsolute(pathPattern);
+
+    let files: string[] = [];
     try {
-      // Use glob to get all matching file paths
-      const files = glob.sync(pathPattern, {
-        cwd: process.env.WORKSPACE_FOLDER_PATH,
-        ignore: ['**/node_modules/**'],
-        root: process.env.WORKSPACE_FOLDER_PATH,
-        absolute: true,
-      });
+      if (isAbsolutePath) {
+        // If it's an absolute path, use it directly with glob
+        files = glob.sync(pathPattern, {
+          ignore: ['**/node_modules/**'],
+          absolute: true,
+        });
+      } else {
+        // If it's a relative path, resolve using the workspace folder
+        const cwd = process.env.WORKSPACE_FOLDER_PATH as string;
+        files = glob.sync(pathPattern, {
+          cwd, // Resolve relative paths from the workspace folder
+          ignore: ['**/node_modules/**'],
+          absolute: true,
+        });
+      }
+
+      console.log({ files }); // Debug output
 
+      // Process each file found by glob
       for (const file of files) {
         try {
           const content = fs.readFileSync(file, 'utf-8');

packages/nodejs/src/computers/JsonFileWrite/JsonFileWrite.ts

@@ -20,20 +20,32 @@ export const JsonFileWrite: Computer = {
   ],
 
   canRun({ input }) {
-    return input.haveAllItemsAtInput('input')
+    return input.haveAllItemsAtInput('input');
   },
 
   async *run({ input, params }) {
-    const incoming = input.pull()
+    const incoming = input.pull();
+    const filePath = params.file_path as string;
+    const content = JSON.stringify(incoming.map(i => i.value), null, 2);
 
-    const filePath = params.file_path as string
-    const content = JSON.stringify(incoming.map(i => i.value), null, 2)
+    // Determine if the path is absolute
+    const isAbsolutePath = path.isAbsolute(filePath);
 
-    const root = process.env.WORKSPACE_FOLDER_PATH;
-    if(!root) throw new Error('WORKSPACE_FOLDER_PATH not set')
+    // Resolve the full path based on whether it's absolute or relative
+    const fullPath = isAbsolutePath
+      ? filePath // Use the absolute path directly
+      : path.join(process.env.WORKSPACE_FOLDER_PATH as string, filePath); // Prepend the workspace root for relative paths
 
-    const fullPath = path.join(root, filePath)
-    await fs.mkdir(path.dirname(fullPath), { recursive: true })
-    await fs.writeFile(fullPath, content, 'utf-8')
+    console.log({ fullPath }); // Debug output to check resolved path
+
+    try {
+      // Create the directory recursively if it doesn't exist
+      await fs.mkdir(path.dirname(fullPath), { recursive: true });
+      // Write the file content
+      await fs.writeFile(fullPath, content, 'utf-8');
+    } catch (error: any) {
+      console.error('Error writing file:', error);
+      throw new Error(`Failed to write file: ${error.message}`);
+    }
   },
-};
+};

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-story/ui",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "main": "./dist/bundle.js",
   "types": "./dist/src/index.d.ts",
   "module": "./dist/bundle.mjs",

packages/ui/src/components/Node/TableNodeComponent.tsx

@@ -202,17 +202,6 @@ const TableNodeComponent = ({ id, data }: {
       <div
         ref={tableRef}
         className="shadow-xl bg-gray-50 border rounded border-gray-300 text-xxxs"
-        onDoubleClick={() => {
-          const blob = new Blob([
-            JSON.stringify(tableInstance.options.data, null, 2)
-          ], { type: 'application/json' });
-
-          const url = URL.createObjectURL(blob);
-
-          if (typeof window !== 'undefined') {
-            const handle = window.open(url, '_blank');
-          }
-        }}
       >
         <CustomHandle id={input.id} isConnectable={true} isInput={true} />