Merge pull request #4691 from bmorrise/BACKLOG-19539

[BACKLOG-19539] Update for setting dialog title for open/save
pentaho · Dec 11, 2017 · a87b51f · a87b51f
2 parents 6b8080a + 138ec81
commit a87b51f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 32 deletions.
diff --git a/.../resources/org/pentaho/di/job/entries/exportrepository/messages/messages_en_US.properties b/.../resources/org/pentaho/di/job/entries/exportrepository/messages/messages_en_US.properties
@@ -110,3 +110,4 @@ JobExportRepository.SelectRepository.Title=Select repository
 JobExportRepository.Limit.Label=Limit
 JobExportRepository.TargetFilename.Tooltip=Target filename
 JobExportRepository.Error.NoRepDefined.DialogMessage=No repositories defined on this system.
+JobExportRepository.SelectDirectoryDialog.Title=Select a folder
diff --git a/...s/file-open-save/core/src/main/java/org/pentaho/repo/dialog/RepositoryOpenSaveDialog.java b/...s/file-open-save/core/src/main/java/org/pentaho/repo/dialog/RepositoryOpenSaveDialog.java
@@ -58,7 +58,7 @@ public RepositoryOpenSaveDialog( Shell shell, int width, int height ) {
     super( shell, width, height );
   }
 
-  public void open( Repository repository, String directory, String state, String filter, String origin ) {
+  public void open( Repository repository, String directory, String state, String title, String filter, String origin ) {
     RepositoryBrowserController.repository = repository;
     StringBuilder clientPath = new StringBuilder();
     clientPath.append( getClientPath() );
@@ -68,7 +68,8 @@ public void open( Repository repository, String directory, String state, String
     clientPath.append( !Utils.isEmpty( filter ) ? "filter=" + filter : "" );
     clientPath.append( !Utils.isEmpty( filter ) ? "&" : "" );
     clientPath.append( !Utils.isEmpty( origin ) ? "origin=" + origin : "" );
-    super.createDialog( StringUtils.capitalize( state ), getRepoURL( clientPath.toString() ), OPTIONS, LOGO );
+    super.createDialog( title != null ? title : StringUtils.capitalize( state ), getRepoURL( clientPath.toString() ),
+      OPTIONS, LOGO );
     super.dialog.setMinimumSize( 545, 458 );
 
     new BrowserFunction( browser, "close" ) {

diff --git a/...-save/core/src/main/java/org/pentaho/repo/extension/RepositoryOpenSaveExtensionPoint.java b/...-save/core/src/main/java/org/pentaho/repo/extension/RepositoryOpenSaveExtensionPoint.java
@@ -15,13 +15,13 @@
 
 package org.pentaho.repo.extension;
 
+import org.pentaho.di.core.Const;
 import org.pentaho.di.core.LastUsedFile;
 import org.pentaho.di.core.exception.KettleException;
 import org.pentaho.di.core.extension.ExtensionPoint;
 import org.pentaho.di.core.extension.ExtensionPointInterface;
 import org.pentaho.di.core.logging.LogChannelInterface;
 import org.pentaho.di.core.util.Utils;
-import org.pentaho.di.core.Const;
 import org.pentaho.di.repository.Repository;
 import org.pentaho.di.repository.RepositoryObject;
 import org.pentaho.di.repository.RepositoryObjectType;
@@ -67,12 +67,14 @@ public class RepositoryOpenSaveExtensionPoint implements ExtensionPointInterface
       List<LastUsedFile> lastUsedFileList =
         propsUI.getLastUsedRepoFiles().getOrDefault( repoAndUser, Collections.emptyList() );
       startingDir = getStartingDir( fileDialogOperation, lastUsedFileList );
+    } else {
+      startingDir = fileDialogOperation.getStartDir();
     }
 
     RepositoryOpenSaveDialog repositoryOpenSaveDialog =
       new RepositoryOpenSaveDialog( spoonSupplier.get().getShell(), WIDTH, HEIGHT );
     repositoryOpenSaveDialog.open( fileDialogOperation.getRepository(), startingDir, fileDialogOperation.getCommand(),
-      fileDialogOperation.getFilter(), fileDialogOperation.getOrigin() );
+      fileDialogOperation.getTitle(), fileDialogOperation.getFilter(), fileDialogOperation.getOrigin() );
 
     if ( !Utils.isEmpty( repositoryOpenSaveDialog.getObjectName() ) ) {
       RepositoryObject repositoryObject = new RepositoryObject();

diff --git a/plugins/file-open-save/core/src/main/javascript/app/app.component.js b/plugins/file-open-save/core/src/main/javascript/app/app.component.js
@@ -120,7 +120,7 @@ define([
       vm.searchString = "";
       _resetFileAreaMessage();
 
-      // vm.origin = $location.search().origin;
+      vm.origin = $location.search().origin;
       $timeout(function() {
         if ($state.is('open')) {
           vm.headerTitle = i18n.get("file-open-save-plugin.app.header.open.title");
@@ -158,6 +158,14 @@ define([
       if (path) {
         selectFolderByPath(path);
         vm.autoExpand = true;
+      } else {
+        if ($state.is('selectFolder')) {
+          if (isPentahoRepo()) {
+            selectFolderByPath("/home");
+          } else {
+            selectFolderByPath("/");
+          }
+        }
       }
       if (vm.folders[0].path === "/" && !isPentahoRepo()) {
         vm.includeRoot = true;
@@ -167,13 +175,6 @@ define([
         vm.loading = false;
       });
       _setFileToSaveName();
-      if ($state.is('selectFolder')) {
-        if (isPentahoRepo()) {
-          selectFolderByPath("/home");
-        } else {
-          selectFolderByPath("/");
-        }
-      }
     }
 
     /**

diff --git a/ui/src/main/java/org/pentaho/di/ui/core/FileDialogOperation.java b/ui/src/main/java/org/pentaho/di/ui/core/FileDialogOperation.java
@@ -35,6 +35,7 @@ public class FileDialogOperation {
   private String origin;
   private RepositoryObjectInterface repositoryObject;
   private String startDir;
+  private String title;
 
   public FileDialogOperation( String command ) {
     this.command = command;
@@ -92,4 +93,12 @@ public Repository getRepository() {
   public void setRepository( Repository repository ) {
     this.repository = repository;
   }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle( String title ) {
+    this.title = title;
+  }
 }
diff --git a/...n/java/org/pentaho/di/ui/job/entries/exportrepository/JobEntryExportRepositoryDialog.java b/...n/java/org/pentaho/di/ui/job/entries/exportrepository/JobEntryExportRepositoryDialog.java
@@ -48,22 +48,22 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.pentaho.di.core.Const;
+import org.pentaho.di.core.Props;
 import org.pentaho.di.core.exception.KettleException;
 import org.pentaho.di.core.extension.ExtensionPointHandler;
 import org.pentaho.di.core.extension.KettleExtensionPoint;
-import org.pentaho.di.core.util.Utils;
-import org.pentaho.di.core.Props;
 import org.pentaho.di.core.plugins.PluginRegistry;
 import org.pentaho.di.core.plugins.RepositoryPluginType;
+import org.pentaho.di.core.util.Utils;
 import org.pentaho.di.i18n.BaseMessages;
 import org.pentaho.di.job.JobMeta;
 import org.pentaho.di.job.entries.exportrepository.JobEntryExportRepository;
 import org.pentaho.di.job.entry.JobEntryDialogInterface;
 import org.pentaho.di.job.entry.JobEntryInterface;
 import org.pentaho.di.repository.RepositoriesMeta;
 import org.pentaho.di.repository.Repository;
-import org.pentaho.di.repository.RepositoryDirectoryInterface;
 import org.pentaho.di.repository.RepositoryMeta;
+import org.pentaho.di.repository.RepositoryObject;
 import org.pentaho.di.ui.core.FileDialogOperation;
 import org.pentaho.di.ui.core.dialog.EnterSelectionDialog;
 import org.pentaho.di.ui.core.gui.GUIResource;
@@ -1257,25 +1257,28 @@ private void displaydirectoryList() {
           .getString( PKG, "JobExportRepository.Error.CanNotConnectMsg", wRepositoryname.getText() ), true );
       }
 
-      RepositoryDirectoryInterface rd = null;
-      try {
-        FileDialogOperation fileDialogOperation =
-          new FileDialogOperation( FileDialogOperation.SELECT_FOLDER, FileDialogOperation.ORIGIN_SPOON );
-        fileDialogOperation.setFilter( null );
-        fileDialogOperation.setRepository( repos );
-        ExtensionPointHandler.callExtensionPoint( null, KettleExtensionPoint.SpoonOpenSaveRepository.id,
-          fileDialogOperation );
-        if ( fileDialogOperation.getRepositoryObject() != null ) {
-          rd = repos.findDirectory( fileDialogOperation.getRepositoryObject().getObjectId() );
+      if ( repos.isConnected() ) {
+        try {
+          FileDialogOperation fileDialogOperation =
+            new FileDialogOperation( FileDialogOperation.SELECT_FOLDER, FileDialogOperation.ORIGIN_SPOON );
+          fileDialogOperation
+            .setTitle( BaseMessages.getString( PKG, "JobExportRepository.SelectDirectoryDialog.Title" ) );
+          fileDialogOperation.setFilter( null );
+          fileDialogOperation.setRepository( repos );
+          if ( !Utils.isEmpty( wFoldername.getText() ) ) {
+            fileDialogOperation.setStartDir( wFoldername.getText() );
+          }
+          ExtensionPointHandler.callExtensionPoint( null, KettleExtensionPoint.SpoonOpenSaveRepository.id,
+            fileDialogOperation );
+          if ( fileDialogOperation.getRepositoryObject() != null ) {
+            String path =
+              ( (RepositoryObject) fileDialogOperation.getRepositoryObject() ).getRepositoryDirectory().getPath();
+            wFoldername.setText( path );
+          }
+        } catch ( KettleException e ) {
+          // Do Nothing
         }
-      } catch ( KettleException e ) {
-        // Do something
-      }
-
-      if ( rd != null ) {
-        wFoldername.setText( rd.getPath() );
       }
-
     } catch ( Exception e ) {
       displayMsg( BaseMessages.getString( PKG, "System.Dialog.Error.Title" ), BaseMessages.getString(
         PKG, "JobExportRepository.ErrorGettingFolderds.DialogMessage" )