Resolve #64

dev/Model/FolderCollection.js

@@ -116,6 +116,8 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		this.namespace;
 		this.optimized
 		this.capabilities
+		this.allow; // allow adding
+//		this.exist;
 	}
 */
 
@@ -303,6 +305,7 @@ export class FolderModel extends AbstractModel {
 		super();
 
 		this.fullName = '';
+		this.parentName = '';
 		this.delimiter = '';
 		this.deep = 0;
 		this.expires = 0;
@@ -323,12 +326,10 @@ export class FolderModel extends AbstractModel {
 
 			focused: false,
 			selected: false,
-			editing: false,
 			isSubscribed: true,
 			checkable: false, // Check for new messages
 			askDelete: false,
 
-			nameForEdit: '',
 			errorMsg: '',
 
 			totalEmails: 0,
@@ -348,7 +349,6 @@ export class FolderModel extends AbstractModel {
 		this.addSubscribables({
 			kolabType: sValue => this.metadata[FolderMetadataKeys.KolabFolderType] = sValue,
 			permanentFlags: aValue => this.tagsAllowed(aValue.includes('\\*')),
-			editing: value => value && this.nameForEdit(this.name()),
 			unreadEmails: unread => FolderType.Inbox === this.type() && fireEvent('mailbox.inbox-unread-count', unread)
 		});
 
@@ -485,18 +485,21 @@ export class FolderModel extends AbstractModel {
 		showScreenPopup(FolderPopupView, [this]);
 	}
 
-	rename() {
+	rename(nameToEdit, parentName) {
+		nameToEdit = nameToEdit.trim();
 		const folder = this,
-			nameToEdit = folder.nameForEdit().trim();
-		if (nameToEdit && folder.name() !== nameToEdit) {
+			oldFullname = folder.fullName,
+			newFullname = parentName + folder.delimiter + nameToEdit;
+		if (nameToEdit && newFullname != oldFullname) {
 			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
-					folder: folder.fullName,
-					newFolderName: nameToEdit,
+					oldName: oldFullname,
+					newName: newFullname,
 					subscribe: folder.isSubscribed() ? 1 : 0
 				})
-				.then(data => {
-					folder.name(nameToEdit/*data.name*/);
-					if (folder.subFolders.length) {
+				.then(() => {
+					folder.fullName = newFullname;
+					folder.name(nameToEdit);
+					if (folder.subFolders.length || folder.parentName != parentName) {
 						Remote.setTrigger(FolderUserStore.foldersLoading, true);
 //						clearTimeout(Remote.foldersTimeout);
 //						Remote.foldersTimeout = setTimeout(loadFolders, 500);
@@ -504,7 +507,6 @@ export class FolderModel extends AbstractModel {
 						// TODO: rename all subfolders with folder.delimiter to prevent reload?
 					} else {
 						removeFolderFromCacheList(folder.fullName);
-						folder.fullName = data.Result.fullName;
 						setFolder(folder);
 						const parent = getFolderFromCacheList(folder.parentName);
 						sortFolders(parent ? parent.subFolders : FolderUserStore.folderList);

dev/Remote/User/Fetch.js

@@ -64,16 +64,6 @@ class RemoteUserFetch extends AbstractFetchRemote {
 			[key]: value
 		});
 	}
-
-/*
-	folderMove(sPrevFolderFullName, sNewFolderFullName, bSubscribe) {
-		return this.post('FolderMove', FolderUserStore.foldersRenaming, {
-			folder: sPrevFolderFullName,
-			newFolder: sNewFolderFullName,
-			subscribe: bSubscribe ? 1 : 0
-		});
-	}
-*/
 }
 
 export default new RemoteUserFetch();

dev/View/Popup/Folder.js

@@ -1,24 +1,42 @@
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
-import { addObservablesTo } from 'External/ko';
+import { addObservablesTo, koComputable } from 'External/ko';
 import Remote from 'Remote/User/Fetch';
 import { FolderUserStore } from 'Stores/User/Folder';
 
+import { defaultOptionsAfterRender } from 'Common/Utils';
+import { folderListOptionsBuilder } from 'Common/Folders';
+
 export class FolderPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Folder');
 		addObservablesTo(this, {
-			folder: null // FolderModel
+			folder: null, // FolderModel
+			parentFolder: '',
+			name: '',
+			editing: false
 		});
 		this.ACLAllowed = FolderUserStore.hasCapability('ACL');
 		this.ACL = ko.observableArray();
+
+		this.parentFolderSelectList = koComputable(() =>
+			folderListOptionsBuilder(
+				[],
+				[['', '']],
+				oItem => oItem ? oItem.detailedName() : '',
+				item => !item.subFolders.allow
+					|| (FolderUserStore.namespace && !item.fullName.startsWith(FolderUserStore.namespace))
+			)
+		);
+
+		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 	}
 
 	afterHide() {
-		this.folder().editing(false);
+		this.editing(false);
 	}
 
 	submitForm(form) {
-		this.folder().rename();
+		this.folder().rename(this.name(), this.parentFolder());
 		console.dir({form});
 		this.close();
 	}
@@ -32,7 +50,9 @@ export class FolderPopupView extends AbstractViewPopup {
 		}, {
 			folder: folder.fullName
 		});
-		folder.editing(!folder.type() && folder.exists && folder.selectable());
+		this.editing(!folder.type() && folder.exists && folder.selectable());
+		this.name(folder.name()),
+		this.parentFolder(folder.parentName);
 		this.folder(folder);
 	}
 }