Move space deletion & archived docs into Space settings

gui/app/components/customize/archive-admin.js

@@ -1,24 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// This software (Documize Community Edition) is licensed under
-// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
-//
-// You can operate outside the AGPL restrictions by purchasing
-// Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>.
-//
-// https://documize.com
-
-import AuthProvider from '../../mixins/auth';
-import ModalMixin from '../../mixins/modal';
-import Component from '@ember/component';
-
-export default Component.extend(AuthProvider, ModalMixin, {
-
-	init() {
-		this._super(...arguments);
-	},
-
-	actions: {
-	}
-});

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

@@ -0,0 +1,44 @@
+// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
+//
+// This software (Documize Community Edition) is licensed under
+// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
+//
+// You can operate outside the AGPL restrictions by purchasing
+// Documize Enterprise Edition and obtaining a commercial license
+// by contacting <sales@documize.com>.
+//
+// https://documize.com
+
+import $ from 'jquery';
+import { inject as service } from '@ember/service';
+import AuthMixin from '../../mixins/auth';
+import Notifier from '../../mixins/notifier';
+import Component from '@ember/component';
+
+export default Component.extend(AuthMixin, Notifier, {
+	router: service(),
+	spaceSvc: service('folder'),
+	localStorage: service('localStorage'),
+	deleteSpaceName: '',
+
+	actions: {
+		onDelete(e) {
+			e.preventDefault();
+
+			let spaceName = this.get('space').get('name');
+			let spaceNameTyped = this.get('deleteSpaceName');
+
+			if (spaceNameTyped !== spaceName || spaceNameTyped === '' || spaceName === '') {
+				$("#delete-space-name").addClass("is-invalid").focus();
+				return;
+			}
+
+			$("#delete-space-name").removeClass("is-invalid");
+
+			this.get('spaceSvc').delete(this.get('space.id')).then(() => { /* jshint ignore:line */
+				this.get('localStorage').clearSessionItem('folder');
+				this.get('router').transitionTo('folders');
+			});
+		}
+	}
+});

gui/app/components/toolbar/for-space.js

@@ -178,26 +178,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, {
 			return true;
 		},
 
-		onSpaceDelete(e) {
-			e.preventDefault();
-
-			let spaceName = this.get('space').get('name');
-			let spaceNameTyped = this.get('deleteSpaceName');
-
-			if (spaceNameTyped !== spaceName || spaceNameTyped === '' || spaceName === '') {
-				$("#delete-space-name").addClass("is-invalid").focus();
-				return;
-			}
-
-			this.set('deleteSpaceName', '');
-			$("#delete-space-name").removeClass("is-invalid");
-
-			let cb = this.get('onDeleteSpace');
-			cb(this.get('space.id'));
-
-			this.modalClose('#space-delete-modal');
-		},
-
 		onShowEmptyDocModal() {
 			this.modalOpen("#empty-doc-modal", {"show": true}, '#empty-doc-name');
 		},

gui/app/pods/customize/archive/controller.js

@@ -1,17 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// This software (Documize Community Edition) is licensed under
-// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
-//
-// You can operate outside the AGPL restrictions by purchasing
-// Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>.
-//
-// https://documize.com
-
-import Controller from '@ember/controller';
-
-export default Controller.extend({
-	actions: {
-	}
-});

gui/app/pods/customize/archive/route.js

@@ -1,25 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// This software (Documize Community Edition) is licensed under
-// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
-//
-// You can operate outside the AGPL restrictions by purchasing
-// Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>.
-//
-// https://documize.com
-
-import Route from '@ember/routing/route';
-import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
-
-export default Route.extend(AuthenticatedRouteMixin, {
-	beforeModel() {
-		if (!this.session.isAdmin) {
-			this.transitionTo('auth.login');
-		}
-	},
-
-	activate() {
-		this.get('browser').setTitle('Archive');
-	}
-});

gui/app/pods/customize/archive/template.hbs

@@ -1 +0,0 @@
-{{customize/archive-admin}}

gui/app/pods/customize/template.hbs

@@ -37,9 +37,6 @@
 						{{#link-to 'customize.audit' activeClass='selected' class="tab tab-vertical" tagName="li" }}Audit{{/link-to}}
 					{{/if}}
 				{{/if}}
-				{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
-					{{#link-to 'customize.archive' activeClass='selected' class="tab tab-vertical" tagName="li" }}Archive{{/link-to}}
-				{{/if}}
 			</ul>
 
 			<div class="mt-4" />

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

@@ -25,13 +25,6 @@ export default Controller.extend(NotifierMixin, {
 	filteredDocs: null,
 
 	actions: {
-		onDeleteSpace(id) {
-			this.get('folderService').delete(id).then(() => { /* jshint ignore:line */
-				this.get('localStorage').clearSessionItem('folder');
-				this.transitionToRoute('folders');
-			});
-		},
-
 		onRefresh() {
 			this.get('target._routerMicrolib').refresh();
 		},

gui/app/pods/folder/index/template.hbs

@@ -16,8 +16,7 @@
 			category=category
 			categories=model.categories
 			documents=filteredDocs
-			onRefresh=(action 'onRefresh')
+			onRefresh=(action 'onRefresh')}}
-			onDeleteSpace=(action 'onDeleteSpace')}}
 
 		{{folder/documents-list
 			documents=filteredDocs

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

@@ -17,6 +17,7 @@ export default Controller.extend(NotifierMixin, {
 	router: service(),
 	folderService: service('folder'),
 	localStorage: service('localStorage'),
+	appMeta: service(),
 	queryParams: ['tab'],
 	tab: 'general',
 

gui/app/pods/folder/settings/route.js

@@ -10,7 +10,6 @@
 // https://documize.com
 
 import { hash } from 'rsvp';
-// import { inject as service } from '@ember/service';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import Route from '@ember/routing/route';
 

gui/app/pods/folder/settings/template.hbs

@@ -29,20 +29,48 @@
 			{{folder/settings-blocks permissions=model.permissions space=model.folder}}
 		{{/if}}
 
+		{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
+			{{#if (eq tab 'archived')}}
+				{{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}}
+			{{/if}}
+		{{/if}}
+
 		{{#if (eq tab 'categories')}}
 			{{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}}
 		{{/if}}
+
+		{{#if (eq tab 'deletion')}}
+			{{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}}
+		{{/if}}
 	{{/layout/middle-zone-content}}
 
 	{{#layout/middle-zone-sidebar}}
 		<div id="sidebar" class="sidebar">
 			<ul class="tabnav-control tabnav-control-centered w-75">
-				<li class="tab tab-vertical {{if (eq tab 'general') 'selected'}}" {{action 'onTab' 'general'}}>Options</li>
+				<li class="tab tab-vertical {{if (eq tab 'general') 'selected'}}" {{action 'onTab' 'general'}}>General</li>
 				<li class="tab tab-vertical {{if (eq tab 'permissions') 'selected'}}" {{action 'onTab' 'permissions'}}>User Permissions</li>
-				<li class="tab tab-vertical {{if (eq tab 'templates') 'selected'}}" {{action 'onTab' 'templates'}}>Document Templates</li>
+			</ul>
-				<li class="tab tab-vertical {{if (eq tab 'blocks') 'selected'}}" {{action 'onTab' 'blocks'}}>Content Blocks</li>
+
+			<div class="mt-4" />
+			<ul class="tabnav-control tabnav-control-centered w-75">
 				<li class="tab tab-vertical {{if (eq tab 'categories') 'selected'}}" {{action 'onTab' 'categories'}}>Categories</li>
 			</ul>
+
+			<div class="mt-4" />
+			<ul class="tabnav-control tabnav-control-centered w-75">
+				<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>
+				{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
+					<li class="tab tab-vertical {{if (eq tab 'archived') 'selected'}}" {{action 'onTab' 'archived'}}>Archived</li>
+				{{/if}}
+			</ul>
+
+			{{#if model.permissions.spaceOwner}}
+				<div class="mt-4" />
+				<ul class="tabnav-control tabnav-control-centered w-75">
+					<li class="tab tab-vertical {{if (eq tab 'deletion') 'selected'}}" {{action 'onTab' 'deletion'}}>Delete</li>
+				</ul>
+			{{/if}}
 		</div>
 	{{/layout/middle-zone-sidebar}}
 {{/layout/middle-zone}}

gui/app/router.js

@@ -89,9 +89,6 @@ export default Router.map(function () {
 			this.route('audit', {
 				path: 'audit'
 			});
-			this.route('archive', {
-				path: 'archive'
-			});
 			this.route('search', {
 				path: 'search'
 			});

gui/app/styles/view/customize.scss

@@ -141,7 +141,7 @@
 		> .list {
 			> .item {
 				margin: 15px 0;
-				padding: 15px;
+				padding: 15px 0;
 				@include ease-in();
 				font-size: 1.2rem;
 				color: $color-primary;

gui/app/templates/components/customize/archive-admin.hbs

@@ -1,25 +0,0 @@
-<div class="row">
-	<div class="col">
-		<div class="view-customize">
-			<h1 class="admin-heading">Archive</h1>
-			<h2 class="sub-heading">Mark as live documents currently marked as archived</h2>
-
-			<div class="archive-admin my-5">
-				<ul class="list">
-					{{#each docs as |doc|}}
-						<li class="item row">
-							<div class="col-12 col-sm-10">{{doc.name}}</div>
-							<div class="col-12 col-sm-2 float-right">
-								<button class="btn btn-success" {{action 'onMarkLive' doc.id}}>Unarchive</button>
-							</div>
-						</li>
-					{{/each}}
-				</ul>
-				{{#if (eq docs.length 0)}}
-					<p>Nothing found</p>
-				{{/if}}
-			</div>
-
-		</div>
-	</div>
-</div>

gui/app/templates/components/folder/settings-delete.hbs

@@ -0,0 +1,11 @@
+<div class="content-zone">
+	<div class="explainer-header explainer-gap">Delete this space and all documents</div>
+	<form>
+		<div class="form-group">
+			<label>Please type space name to confirm</label>
+			{{focus-input id="delete-space-name" type="text" value=deleteSpaceName class="form-control mousetrap" placeholder="Space name" autocomplete="off"}}
+			<small class="form-text text-muted">This will delete all documents and templates within this space!</small>
+		</div>
+	</form>
+	<button type="button" class="btn btn-danger mt-3" onclick={{action 'onDelete'}}>Delete Space</button>
+</div>

gui/app/templates/components/toolbar/for-space.hbs

@@ -94,62 +94,34 @@
 	</div>
 
 	<div class="col-6 text-right">
-		{{#if (or permissions.spaceOwner permissions.spaceManage)}}
-			{{#link-to 'folder.settings' space.id space.slug class="button-icon-gray align-middle"}}
-				<i class="material-icons" data-toggle="tooltip" data-placement="top" title="Settings, users, permissions, templates">settings</i>
-			{{/link-to}}
-			<div class="button-icon-gap" />
-		{{/if}}
-
 		{{#if hasDocuments}}
 			<div id="space-export-button" class="button-icon-danger align-middle" data-toggle="tooltip" data-placement="top" title="Export as HTML" {{action 'onShowExport'}}>
 				<i class="material-icons">import_export</i>
 			</div>
-			<div class="button-icon-gap" />
-		{{/if}}
-
-		{{#if permissions.spaceOwner}}
-			<div id="space-delete-button" class="button-icon-danger align-middle" data-toggle="tooltip" data-placement="top" title="Delete space">
-				<i class="material-icons" data-toggle="modal" data-target="#space-delete-modal" data-backdrop="static">delete</i>
-			</div>
-			<div class="button-icon-gap" />
 		{{/if}}
 
 		{{#if pinState.isPinned}}
+			<div class="button-icon-gap" />
 			<div id="space-pin-button" class="button-icon-gold align-middle" data-toggle="tooltip" data-placement="top" title="Remove favorite" {{action 'onUnpin'}}>
 				<i class="material-icons">star</i>
 			</div>
 		{{else if session.authenticated}}
+			<div class="button-icon-gap" />
 			<div id="space-pin-button" class="button-icon-gray align-middle" data-toggle="tooltip" data-placement="top" title="Save favorite" {{action 'onPin'}}>
 				<i class="material-icons">star</i>
 			</div>
 		{{/if}}
+
+		{{#if (or permissions.spaceOwner permissions.spaceManage)}}
+			<div class="button-icon-gap" />
+			{{#link-to 'folder.settings' space.id space.slug class="button-icon-gray align-middle"}}
+				<i class="material-icons" data-toggle="tooltip" data-placement="top" title="Settings, users, permissions, templates">settings</i>
+			{{/link-to}}
+		{{/if}}
 	</div>
 
 </div>
 
-<div id="space-delete-modal" class="modal" tabindex="-1" role="dialog">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">Space Deletion</div>
-			<div class="modal-body">
-				<form onsubmit={{action 'onSpaceDelete'}}>
-					<p>Are you sure you want to delete this space and all documents?</p>
-					<div class="form-group">
-						<label for="delete-space-name">Please type space name to confirm</label>
-						{{input type='text' id="delete-space-name" class="form-control mousetrap" placeholder="Space name" value=deleteSpaceName}}
-						<small class="form-text text-muted">This will delete all documents and templates within this space!</small>
-					</div>
-				</form>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-				<button type="button" class="btn btn-danger" onclick={{action 'onSpaceDelete'}}>Delete</button>
-			</div>
-		</div>
-	</div>
-</div>
-
 <div id="space-export-modal" class="modal" tabindex="-1" role="dialog">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">