Merge pull request #4517 from hansva/4515

Only hide and disable the project metadata folder, fixes #4515
apache · Nov 4, 2024 · 1111ca0 · 1111ca0
2 parents 902de83 + 9c5a6a9
commit 1111ca0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/explorer/ExplorerPerspective.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/explorer/ExplorerPerspective.java
@@ -502,10 +502,11 @@ private DragSource createTreeDragSource(final Tree tree) {
           @Override
           public void dragStart(DragSourceEvent event) {
             ExplorerFile file = getSelectedFile();
+            String metadataFolder = hopGui.getVariables().getVariable(Const.HOP_METADATA_FOLDER);
             // Avoid moving root folder, metadata folder or hidden file (like .git)
             if (file == null
                 || file.getFilename().equals(rootFolder)
-                || file.getFilename().equals("metadata")
+                || file.getFilename().contains(metadataFolder)
                 || file.getName().startsWith(".")) {
               event.doit = false;
               return;
@@ -1372,10 +1373,13 @@ private void refreshFolder(TreeItem item, String path, int depth) {
         for (FileObject child : children) {
 
           String childName = child.getName().getBaseName();
+          String metadataFolder = hopGui.getVariables().getVariable(Const.HOP_METADATA_FOLDER);
 
           // Skip hidden files or folders
           if (!showingHiddenFiles
-              && (child.isHidden() || childName.startsWith(".") || childName.equals("metadata"))) {
+              && (child.isHidden()
+                  || childName.startsWith(".")
+                  || child.toString().contains(metadataFolder))) {
             continue;
           }