Normalized remaining space options into settings admin

Moved space naming and category management into space settings.

Author: HarveyKandola

gui/app/components/folder/category-admin-sidebar.js

@@ -14,16 +14,18 @@ import { A } from '@ember/array';
 import { inject as service } from '@ember/service';
 import TooltipMixin from '../../mixins/tooltip';
 import ModalMixin from '../../mixins/modal';
+import Notifer from '../../mixins/notifier';
 import Component from '@ember/component';
 
-export default Component.extend(ModalMixin, TooltipMixin, {
+export default Component.extend(ModalMixin, TooltipMixin, Notifer, {
 	spaceSvc: service('folder'),
 	groupSvc: service('group'),
 	categorySvc: service('category'),
 	appMeta: service(),
 	store: service(),
 	deleteId: '',
 	dropdown: null,
+	newCategory: '',
 
 	init() {
 		this._super(...arguments);
@@ -43,11 +45,11 @@ export default Component.extend(ModalMixin, TooltipMixin, {
 
 	load() {
 		// get categories
-		this.get('categorySvc').getAll(this.get('folder.id')).then((c) => {
+		this.get('categorySvc').getAll(this.get('space.id')).then((c) => {
 			this.set('category', c);
 
 			// get summary of documents and users for each category in space
-			this.get('categorySvc').getSummary(this.get('folder.id')).then((s) => {
+			this.get('categorySvc').getSummary(this.get('space.id')).then((s) => {
 				c.forEach((cat) => {
 					let docs = _.where(s, {categoryId: cat.get('id'), type: 'documents'});
 					let docCount = 0;
@@ -67,7 +69,7 @@ export default Component.extend(ModalMixin, TooltipMixin, {
 	permissionRecord(who, whoId, name) {
 		let raw = {
 			id: whoId,
-			orgId: this.get('folder.orgId'),
+			orgId: this.get('space.orgId'),
 			categoryId: this.get('currentCategory.id'),
 			whoId: whoId,
 			who: who,
@@ -91,6 +93,31 @@ export default Component.extend(ModalMixin, TooltipMixin, {
 	},
 
 	actions: {
+		onAdd(e) {
+			e.preventDefault();
+
+			let cat = this.get('newCategory');
+
+			if (cat === '') {
+				$('#new-category-name').addClass('is-invalid').focus();
+				return;
+			}
+
+			$('#new-category-name').removeClass('is-invalid').focus();
+			this.set('newCategory', '');
+
+			let c = {
+				category: cat,
+				folderId: this.get('space.id')
+			};
+
+			this.showWait();
+			this.get('categorySvc').add(c).then(() => {
+				this.load();
+				this.showDone();
+			});
+		},
+
 		onShowDelete(id) {
 			let cat = this.get('category').findBy('id', id);
 			this.set('deleteId', cat.get('id'));
@@ -144,7 +171,7 @@ export default Component.extend(ModalMixin, TooltipMixin, {
 			this.set('categoryPermissions', categoryPermissions);
 
 			// get space permissions
-			this.get('spaceSvc').getPermissions(this.get('folder.id')).then((spacePermissions) => {
+			this.get('spaceSvc').getPermissions(this.get('space.id')).then((spacePermissions) => {
 				spacePermissions.forEach((sp) => {
 					let cp  = this.permissionRecord(sp.get('who'), sp.get('whoId'), sp.get('name'));
 					cp.set('selected', false);
@@ -172,11 +199,11 @@ export default Component.extend(ModalMixin, TooltipMixin, {
 		onGrantAccess() {
 			this.set('showCategoryAccess', false);
 
-			let folder = this.get('folder');
+			let space = this.get('space');
 			let category = this.get('currentCategory');
 			let perms = this.get('categoryPermissions').filterBy('selected', true);
 
-			this.get('categorySvc').setViewers(folder.get('id'), category.get('id'), perms).then(() => {
+			this.get('categorySvc').setViewers(space.get('id'), category.get('id'), perms).then(() => {
 				this.load();
 			});
 		}

gui/app/components/folder/category-admin.js renamed to gui/app/components/folder/settings-category.js

@@ -13,6 +13,7 @@ import { A } from '@ember/array';
 import { inject as service } from '@ember/service';
 import { schedule } from '@ember/runloop';
 import { computed } from '@ember/object';
+import { empty } from '@ember/object/computed';
 import AuthMixin from '../../mixins/auth';
 import Notifier from '../../mixins/notifier';
 import Component from '@ember/component';
@@ -26,6 +27,8 @@ export default Component.extend(AuthMixin, Notifier, {
 		return this.get('permissions.spaceOwner') || this.get('permissions.spaceManage');
 	}),
 
+	spaceName: '',
+	hasNameError: empty('spaceName'),
 	spaceTypeOptions: A([]),
 	spaceType: 0,
 	likes: '',
@@ -51,6 +54,8 @@ export default Component.extend(AuthMixin, Notifier, {
 		} else {
 			this.set('likes', 'Did this help you?');
 		}
+
+		this.set('spaceName', this.get('space.name'));
 	},
 
 	actions: {
@@ -75,6 +80,10 @@ export default Component.extend(AuthMixin, Notifier, {
 			let allowLikes = this.get('allowLikes');
 			space.set('likes', allowLikes ? this.get('likes') : '');
 
+			let spaceName = this.get('spaceName').trim();
+			if (spaceName.length === 0) return;
+			space.set('name', spaceName);
+
 			this.showWait();
 
 			this.get('spaceSvc').save(space).then(() => {

gui/app/components/folder/settings-general.js

@@ -28,8 +28,6 @@
 
 	{{#layout/middle-zone-sidebar}}
 		<div id="sidebar" class="sidebar">
-			{{folder/space-heading space=model.folder permissions=model.permissions}}
-
 			{{folder/space-view
 				spaces=model.folders
 				space=model.folder

gui/app/components/folder/space-heading.js

@@ -32,6 +32,10 @@
 		{{#if (eq tab 'blocks')}}
 			{{folder/settings-blocks permissions=model.permissions space=model.folder}}
 		{{/if}}
+
+		{{#if (eq tab 'categories')}}
+			{{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}}
+		{{/if}}
 	{{/layout/middle-zone-content}}
 
 	{{#layout/middle-zone-sidebar}}
@@ -42,7 +46,7 @@
 				<li class="tab tab-vertical {{if (eq tab 'invitations') 'selected'}}" {{action 'onTab' 'invitations'}}>Invite Users</li>
 				<li class="tab tab-vertical {{if (eq tab 'templates') 'selected'}}" {{action 'onTab' 'templates'}}>Document Templates</li>
 				<li class="tab tab-vertical {{if (eq tab 'blocks') 'selected'}}" {{action 'onTab' 'blocks'}}>Content Blocks</li>
-				<li class="tab tab-vertical" {{action 'onCategories'}}>Categories</li>
+				<li class="tab tab-vertical {{if (eq tab 'categories') 'selected'}}" {{action 'onTab' 'categories'}}>Categories</li>
 			</ul>
 		</div>
 	{{/layout/middle-zone-sidebar}}

gui/app/pods/folder/category/controller.js

@@ -35,9 +35,6 @@ export default Router.map(function () {
 			path: 's/:folder_id/:folder_slug'
 		},
 		function () {
-			this.route('category', {
-				path: 'category'
-			});
 			this.route('settings', {
 				path: 'settings'
 			});