Prevent current folder from being picked to move to

app/src/modules/files/components/folder-picker/folder-picker-list-item.vue

@@ -21,6 +21,8 @@
 			:folder="childFolder"
 			:current-folder="currentFolder"
 			:click-handler="clickHandler"
+			:disabled="disabledFolders.includes(childFolder.id)"
+			:disabled-folders="disabledFolders"
 		/>
 	</v-list-group>
 </template>
@@ -53,6 +55,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		disabledFolders: {
+			type: Array as PropType<string[]>,
+			default: () => [],
+		},
 	},
 });
 </script>

app/src/modules/files/components/folder-picker/folder-picker.vue

@@ -17,6 +17,7 @@
 					:current-folder="value"
 					:click-handler="(id) => $emit('input', id)"
 					:disabled="disabledFolders.includes(folder.id)"
+					:disabled-folders="disabledFolders"
 				/>
 			</v-list-group>
 		</v-list>
@@ -96,6 +97,7 @@ export default defineComponent({
 				const response = await api.get(`/folders`, {
 					params: {
 						limit: -1,
+						sort: 'name',
 					},
 				});
 

app/src/modules/files/composables/use-folders.ts

@@ -64,7 +64,7 @@ export function nestChildren(rawFolder: FolderRaw, rawFolders: FolderRaw[]) {
 	const folder: FolderRaw & Folder = { ...rawFolder };
 
 	const children = rawFolders
-		.filter((childFolder) => childFolder.parent_folder === rawFolder.id)
+		.filter((childFolder) => childFolder.parent_folder === rawFolder.id && childFolder.id !== rawFolder.id)
 		.map((childRawFolder) => nestChildren(childRawFolder, rawFolders));
 
 	if (children.length > 0) {