Merge tag '22.6.1' into develop

Hotfix for recursive move

Author: adlius

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [22.6.1] - 2022-6-23
+### Hotfix
+- Fix bug where users can initiate moving a folder to within itself
+
 ## [22.6.0] - 2022-6-22
 ### Added
 - Files page redesign phase 2

lib/osf-components/addon/components/move-file-modal/list-item/component.ts

@@ -26,7 +26,8 @@ export default class ListItemComponent extends Component<ListItemArgs> {
     @service toast!: Toast;
 
     get isBeingMoved() {
-        return this.args.filesToMove.includes(this.args.item as File);
+        const { item, filesToMove } = this.args;
+        return filesToMove.findBy('id', item.id);
     }
 
     get isReadOnlyProvider() {
@@ -44,13 +45,6 @@ export default class ListItemComponent extends Component<ListItemArgs> {
         return this.isBeingMoved || this.isReadOnlyProvider || currentUserIsReadOnly;
     }
 
-    get destinationSelectHelpText() {
-        if (this.args.currentNode && !this.args.currentNode.userHasWritePermission) {
-            return this.intl.t('osf-components.move_file_modal.no_write_permission');
-        }
-        return this.intl.t('osf-components.move_file_modal.select_provider');
-    }
-
     get assetPrefix() {
         return config.assetsPrefix;
     }

lib/osf-components/addon/components/move-file-modal/list-item/template.hbs

@@ -18,7 +18,7 @@
             data-analytics-name='Go to nested folder'
             data-test-move-to-folder={{@item.name}}
             @layout='fake-link'
-            local-class='NavButton {{if this.isReadOnlyProvider 'InvalidDestination'}}'
+            local-class='NavButton {{if this.shouldDisable 'InvalidDestination'}}'
             disabled={{this.shouldDisable}}
             {{on 'click' (fn @onFolderSelect @item)}}
         >
@@ -31,10 +31,16 @@
                     >
                     {{t (concat 'osf-components.file-browser.storage_providers.' @item.name)}}
                     {{#if this.isReadOnlyProvider}}
-                        <span local-class='ReadOnlyProvider'>
+                        <span>
                             {{t 'osf-components.move_file_modal.read_only_provider'}}
                         </span>
                     {{/if}}
+                {{else if this.isBeingMoved}}
+                    <FaIcon @icon='folder-open' />
+                    {{@item.name}}
+                    <span>
+                        {{t (concat 'osf-components.move_file_modal.'(if @preserveOriginal 'is_being_copied' 'is_being_moved'))}}
+                    </span>
                 {{else}}
                     <FaIcon @icon='folder-open' />
                     {{@item.name}}

lib/osf-components/addon/components/move-file-modal/template.hbs

@@ -118,6 +118,7 @@
                         @onNodeSelect={{this.updateNode}}
                         @onFolderSelect={{this.updateFolder}}
                         @isProvider={{eq this.breadcrumbs.length 0}}
+                        @preserveOriginal={{@preserveOriginal}}
                     />
                 </:item>
                 <:empty>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "22.6.0",
+  "version": "22.6.1",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",

translations/en-us.yml

@@ -1831,6 +1831,8 @@ osf-components:
         no_children: 'No children'
         no_folders: 'No files or folders'
         read_only_provider: '- Cannot move or copy to this file provider'
+        is_being_moved: '- This folder is being moved'
+        is_being_copied: '- This folder is being copied'
         read_only_warning: 'Moving or copying files to this file provider is not supported. Please select a different provider.'
         icon_alt: 'Icon for {provider}'
         moving_files: 'Moving...'