Issues #18, #34 and #35 for version 3.2.0

mattcasters · Jan 10, 2019 · ca48fcc · ca48fcc
1 parent 62cb835
commit ca48fcc
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 229 deletions.
diff --git a/pom.xml b/pom.xml
@@ -144,8 +144,6 @@
     </dependencies>
   </dependencyManagement>
 
-
-
   <groupId>pentaho-kettle-dataset</groupId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
 </project>
diff --git a/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java b/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java
@@ -15,6 +15,8 @@
 import org.pentaho.di.core.row.RowMetaInterface;
 import org.pentaho.di.core.row.ValueMetaInterface;
 import org.pentaho.di.core.row.value.ValueMetaString;
+import org.pentaho.di.core.variables.VariableSpace;
+import org.pentaho.di.core.variables.Variables;
 import org.pentaho.di.core.vfs.KettleVFS;
 
 import java.io.BufferedInputStream;
@@ -52,6 +54,11 @@ private static String getDataSetFolder( DataSetGroup group ) {
     if ( StringUtils.isEmpty( folderName ) ) {
       // Local folder
       folderName = ".";
+    } else {
+      // Let's not forget to replace variables as well...
+      //
+      VariableSpace space = Variables.getADefaultVariableSpace();
+      folderName = space.environmentSubstitute( folderName );
     }
 
     if ( !folderName.endsWith( File.separator ) ) {
@@ -111,7 +118,6 @@ public static final List<Object[]> getAllRows( LogChannelInterface log, DataSetG
             for ( int i = 0; i < setRowMeta.size(); i++ ) {
               ValueMetaInterface valueMeta = setRowMeta.getValueMeta( i );
               String value = csvRecord.get( i );
-              System.out.println("parsing record number : "+csvRecord.getRecordNumber()+" value='"+value+"'  metadata="+valueMeta);
               row[ i ] = valueMeta.convertDataFromString( value, constantValueMeta, null, null, ValueMetaInterface.TRIM_TYPE_NONE );
             }
             rows.add( row );
@@ -247,7 +253,6 @@ public static final void writeDataSetData( LoggingObjectInterface loggingObject,
           String string = valueMeta.getString( row[ i ] );
           strings.add( string );
         }
-        System.out.println( "Writing strings: " + strings );
         csvPrinter.printRecord( strings );
       }
       csvPrinter.flush();

diff --git a/src/main/java/org/pentaho/di/dataset/spoon/DataSetHelper.java b/src/main/java/org/pentaho/di/dataset/spoon/DataSetHelper.java
diff --git a/src/main/java/org/pentaho/di/dataset/spoon/messages/messages_en_US.properties b/src/main/java/org/pentaho/di/dataset/spoon/messages/messages_en_US.properties
@@ -22,3 +22,11 @@ DataSetHelper.ErrorDeletingUnitTest.Message=There was an error deleting unit tes
 
 DataSetHelper.ErrorEditingUnitTest.Title = Error
 DataSetHelper.ErrorEditingUnitTest.Message = There was an error while editing a unit test
+
+DataSetHelper.YouSureToDeleteDataSet.Title = Delete?
+DataSetHelper.YouSureToDeleteDataSet.Message = Are you sure you want to delete data set ''{0}''? Please note that this does not delete the underlying data, just the metadata.
+
+DataSetHelper.ErrorDeletingDataSet.Title = Error
+DataSetHelper.ErrorDeletingDataSet.Message = There was an error deleting the data set!
+
+
diff --git a/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/InjectDataSetIntoTransExtensionPoint.java b/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/InjectDataSetIntoTransExtensionPoint.java
@@ -219,7 +219,7 @@ private void injectDataSetIntoStep( final Trans trans, final String dataSetName,
         injectRowMeta.addValueMeta( injectValueMeta );
       }
 
-      log.logBasic( "Injecting data set '" + dataSetName + "' into step '" + stepMeta.getName() + "', fields: " + Arrays.toString( injectRowMeta.getFieldNames() ) );
+      log.logDetailed( "Injecting data set '" + dataSetName + "' into step '" + stepMeta.getName() + "', fields: " + Arrays.toString( injectRowMeta.getFieldNames() ) );
 
       // Pass rows
       //

diff --git a/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java b/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java
@@ -99,6 +99,7 @@ public void callExtensionPoint( LogChannelInterface log, Object object ) throws
             Listener lsDisable = event -> disableUnitTest( unitTestName );
             Listener lsDataSetNew = event -> DataSetHelper.getInstance().addDataSet();
             Listener lsDataSetEdit = event -> DataSetHelper.getInstance().editDataSet();
+            Listener lsDataSetDelete = event -> DataSetHelper.getInstance().deleteDataSet();
             Listener lsGroupNew = event -> DataSetHelper.getInstance().addDataSetGroup();
             Listener lsGroupEdit = event -> DataSetHelper.getInstance().editDataSetGroup();
             Listener lsOpenTrans = event -> DataSetHelper.getInstance().openUnitTestTransformation();
@@ -200,6 +201,13 @@ public void callExtensionPoint( LogChannelInterface log, Object object ) throws
             editDataSetItem.setText( BaseMessages.getString( PKG, "ShowUnitTestMenuExtensionPoint.UnitTest.EditDataSet.Label" ) );
             editDataSetItem.addListener( SWT.Selection, lsDataSetEdit );
 
+            new MenuItem( dataSetMenu, SWT.SEPARATOR );
+
+            // delete data set
+            MenuItem deleteDataSetItem = new MenuItem( dataSetMenu, SWT.PUSH );
+            deleteDataSetItem.setText( BaseMessages.getString( PKG, "ShowUnitTestMenuExtensionPoint.UnitTest.DeleteDataSet.Label" ) );
+            deleteDataSetItem.addListener( SWT.Selection, lsDataSetDelete );
+
             new MenuItem( menu, SWT.SEPARATOR );
 
             MenuItem testItem = new MenuItem( menu, SWT.CASCADE );

diff --git a/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/messages/messages_en_US.properties b/src/main/java/org/pentaho/di/dataset/spoon/xtpoint/messages/messages_en_US.properties
@@ -12,14 +12,15 @@ ShowUnitTestMenuExtensionPoint.ErrorSwitchingUnitTest.Title = Error
 ShowUnitTestMenuExtensionPoint.ErrorSwitchingUnitTest.Message = Error switching to unit test ''{0}''
 
 ShowUnitTestMenuExtensionPoint.UnitTest.Groups.Label = Data Set Groups
-ShowUnitTestMenuExtensionPoint.UnitTest.NewGroup.Label = New group
-ShowUnitTestMenuExtensionPoint.UnitTest.EditGroup.Label = Edit group
+ShowUnitTestMenuExtensionPoint.UnitTest.NewGroup.Label = Create a data set group (DB or CSV)
+ShowUnitTestMenuExtensionPoint.UnitTest.EditGroup.Label = Edit a data set group
 
 ShowUnitTestMenuExtensionPoint.UnitTest.DataSet.Label = Data Sets
-ShowUnitTestMenuExtensionPoint.UnitTest.NewDataSet.Label = New data set
-ShowUnitTestMenuExtensionPoint.UnitTest.EditDataSet.Label = Edit data set
+ShowUnitTestMenuExtensionPoint.UnitTest.NewDataSet.Label = Create a data set
+ShowUnitTestMenuExtensionPoint.UnitTest.EditDataSet.Label = Edit a data set
+ShowUnitTestMenuExtensionPoint.UnitTest.DeleteDataSet.Label = Delete a data set
 
 ShowUnitTestMenuExtensionPoint.UnitTest.UnitTest.Label = Unit Tests
-ShowUnitTestMenuExtensionPoint.UnitTest.OpenTrans.Label = Open transformation and test
-ShowUnitTestMenuExtensionPoint.UnitTest.DeleteTest.Label = Delete a test
+ShowUnitTestMenuExtensionPoint.UnitTest.OpenTrans.Label = Open transformation and unit test
+ShowUnitTestMenuExtensionPoint.UnitTest.DeleteTest.Label = Delete unit a test
 
diff --git a/src/main/java/org/pentaho/di/dataset/spoon/xul/spoon_overlays.xul b/src/main/java/org/pentaho/di/dataset/spoon/xul/spoon_overlays.xul
@@ -17,17 +17,20 @@ Add an entry to the spoon menu bar
 
         <menu id="spoon-tools-menu-dataset-groups" label="Data set groups">
           <menupopup id="spoon-tools-menu-datasetgroups-popup">
-            <menuitem label="Add data set group" command="dataSetHelper.addDataSetGroup()" />
-            <menuitem label="Edit data set group" command="dataSetHelper.editDataSetGroup()" />
-            <menuitem label="Remove data set group" command="dataSetHelper.removeDataSetGroup()" />
+            <menuitem label="Create a data set group" command="dataSetHelper.addDataSetGroup()" />
+            <menuitem label="Edit a data set group" command="dataSetHelper.editDataSetGroup()" />
+            <menuseparator/>
+            <menuitem label="Delete a data set group" command="dataSetHelper.removeDataSetGroup()" />
 
           </menupopup>
         </menu>
 
         <menu id="spoon-tools-menu-datasets" label="Data sets">
           <menupopup id="spoon-tools-menu-datasets-popup">
-            <menuitem label="Add data set" command="dataSetHelper.addDataSet()" />
-            <menuitem label="Edit data set" command="dataSetHelper.editDataSet()" />
+            <menuitem label="Create a data set" command="dataSetHelper.addDataSet()" />
+            <menuitem label="Edit a data set" command="dataSetHelper.editDataSet()" />
+            <menuseparator/>
+            <menuitem label="Delete a data set" command="dataSetHelper.deleteDataSet()" />
           </menupopup>
         </menu>