improved setup process and space view rendering

build.sh

@@ -1,5 +1,8 @@
 #! /bin/bash
 
+# ember s apiHost=https://demo1.dev:5001
+# go run edition/community.go -port=5001 -forcesslport=5002 -cert selfcert/cert.pem -key selfcert/key.pem -salt=tsu3Acndky8cdTNx3
+
 NOW=$(date)
 echo "Build process started $NOW"
 

core/database/endpoint.go

@@ -173,7 +173,7 @@ func setupAccount(rt *env.Runtime, completion onboardRequest, serial string) (er
 	// assign permissions to space
 	perms := []string{"view", "manage", "own", "doc-add", "doc-edit", "doc-delete", "doc-move", "doc-copy", "doc-template"}
 	for _, p := range perms {
-		sql = fmt.Sprintf("insert into permissions (orgid, who, whoid, action, scope, location, refid) values (\"%s\", 'who', \"%s\", \"%s\", 'object', 'space', \"%s\")", orgID, userID, p, labelID)
+		sql = fmt.Sprintf("insert into permission (orgid, who, whoid, action, scope, location, refid) values (\"%s\", 'user', \"%s\", \"%s\", 'object', 'space', \"%s\")", orgID, userID, p, labelID)
 		_, err = runSQL(rt, sql)
 		if err != nil {
 			rt.Log.Error("insert into permission failed", err)

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

@@ -158,8 +158,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
 					this.set('spaceSelected', false);
 					break;
 
-				case 'space':
-					this.set('spaceSelected', true);
+				case 'uncategorized':
+					this.set('uncategorizedSelected', true);
 					allowed = _.pluck(categoryMembers, 'documentId');
 					docs.forEach((d) => {
 						if (!_.contains(allowed, d.get('id'))) {
@@ -167,6 +167,14 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
 						}
 					});
 					break;
+
+				case 'space':
+					this.set('spaceSelected', true);
+					allowed = _.pluck(categoryMembers, 'documentId');
+					docs.forEach((d) => {
+						filtered.pushObject(d);
+					});
+					break;
 			}
 
 			categories.forEach((cat)=> {

gui/app/styles/base.scss

@@ -18,7 +18,7 @@
 }
 
 .cursor-auto {
-	cursor: auto;
+	cursor: auto !important;
 }
 
 .vertical-top {

gui/app/templates/components/document/space-category.hbs

@@ -12,7 +12,7 @@
 	<div class="caption">Category</div>
 
 	{{#each selectedCategories as |cat|}}
-		<div class="regular-button button-blue">{{cat.category}}</div>
+		<div class="regular-button button-blue cursor-auto">{{cat.category}}</div>
 	{{else}}
 		{{#if canAddCategory}}
 			{{#unless canSelectCategory}}

gui/app/templates/components/document/tag-editor.hbs

@@ -1,7 +1,7 @@
 <div class="document-tags">
 	<div class="caption">Tag</div>
     {{#each tagz as |t index|}}
-		<div class="regular-button button-gray" id="{{concat 'delete-tag-' index}}">{{concat '#' t}}</div>
+		<div class="regular-button button-gray {{unless permissions.documentEdit 'cursor-auto'}}" id="{{concat 'delete-tag-' index}}">{{concat '#' t}}</div>
     {{/each}}
     {{#if canAdd}}
 		<div class="regular-button button-white" id="document-tag-button">

gui/app/templates/components/documize-setup.hbs

@@ -1,34 +1,36 @@
 <div class="col-lg-9 col-md-9 col-sm-9">
-	<div class="form-bordered">
-		<div class="form-header">
-			<div class="title">Let's setup Documize</div>
-			<div class="tip">Database: <b>{{model.dbname}}</b></div>
+	<form {{action "save" on="submit"}}>
+		<div class="form-bordered">
+			<div class="form-header">
+				<div class="title">Let's setup Documize</div>
+				<div class="tip">Database: <b>{{model.dbname}}</b></div>
+			</div>
+			<div class="input-control input-transparent">
+				<label>Team</label>
+				<div class="tip">What's your tribe called?</div>
+				{{focus-input id="siteTitle" type="text" value=model.title class=(if hasEmptyTitleError 'error')}}
+			</div>
+			<div class="input-control input-transparent">
+				<label>Firstname</label>
+				<div class="tip">What do people call you?</div>
+				{{input id="adminFirstname" type="text" value=model.firstname class=(if hasEmptyFirstnameError 'error')}}
+			</div>
+			<div class="input-control input-transparent">
+				<label>Lastname</label>
+				<div class="tip">How the government refers to you</div>
+				{{input id="adminLastname" type="text" value=model.lastname class=(if hasEmptyLastnameError 'error')}}
+			</div>
+			<div class="input-control input-transparent">
+				<label>Email</label>
+				<div class="tip">No spam. Ever!</div>
+				{{input id="adminEmail" type="email" value=model.email class=(if hasEmptyEmailError 'error')}}
+			</div>
+			<div class="input-control input-transparent">
+				<label>Password</label>
+				<div class="tip">Something you can remember without writing it down.</div>
+				{{input id="adminPassword" type="text" value=model.password class=(if hasEmptyPasswordError 'error')}}
+			</div>
+			<button type="submit" class="regular-button button-green" {{action 'save'}}>Setup</button>
 		</div>
-		<div class="input-control input-transparent">
-			<label>Team</label>
-			<div class="tip">What's your tribe called?</div>
-			{{focus-input id="siteTitle" type="text" value=model.title class=(if hasEmptyTitleError 'error')}}
-		</div>
-		<div class="input-control input-transparent">
-			<label>Firstname</label>
-			<div class="tip">What do people call you?</div>
-			{{input id="adminFirstname" type="text" value=model.firstname class=(if hasEmptyFirstnameError 'error')}}
-		</div>
-		<div class="input-control input-transparent">
-			<label>Lastname</label>
-			<div class="tip">How the government refers to you</div>
-			{{input id="adminLastname" type="text" value=model.lastname class=(if hasEmptyLastnameError 'error')}}
-		</div>
-		<div class="input-control input-transparent">
-			<label>Email</label>
-			<div class="tip">No spam. Ever!</div>
-			{{input id="adminEmail" type="email" value=model.email class=(if hasEmptyEmailError 'error')}}
-		</div>
-		<div class="input-control input-transparent">
-			<label>Password</label>
-			<div class="tip">Something you can remember without writing it down.</div>
-			{{input id="adminPassword" type="text" value=model.password class=(if hasEmptyPasswordError 'error')}}
-		</div>
-		<div class="regular-button button-green" {{ action 'save' }}>Setup</div>
-	</div>
+	</form>
 </div>

gui/app/templates/components/folder/space-view.hbs

@@ -9,22 +9,29 @@
 <div class="clearfix" />
 
 {{#if showStartDocument}}
+
 	{{folder/start-document folder=folder templates=templates permissions=permissions
 		onImport=(action 'onImport') onHideStartDocument=(action 'onHideStartDocument')}}
+
 {{else}}
 
 	{{#if hasCategories}}
-		{{#if (gt rootDocCount 0)}}
+		{{#if (gt categories.length 0)}}
 			<div class="space-filter">
 				<div class="caption">Space</div>
-				<div class="regular-button button-nav {{if spaceSelected 'selected'}}" {{action 'onDocumentFilter' 'space' folder.id}} id="uncategorized-button" data-tooltip="Documents without category" data-tooltip-position="top center">
-					<div class="name">{{folder.name}} ({{rootDocCount}})</div>
+				<div class="regular-button button-nav {{if spaceSelected 'selected'}}" {{action 'onDocumentFilter' 'space' folder.id}}>
+					<div class="name">all ({{documents.length}})</div>
 				</div>
 			</div>
-		{{/if}}
-		{{#if (gt categories.length 0)}}
+
 			<div class="category-filter">
 				<div class="caption">Category</div>
+				{{#if (gt rootDocCount 0)}}
+					<div class="regular-button button-blue {{if uncategorizedSelected 'selected'}}" {{action 'onDocumentFilter' 'uncategorized' folder.id}}>
+						<div class="name">uncategorized ({{rootDocCount}})</div>
+					</div>
+					<div class="button-gap"/>
+				{{/if}}
 				{{#each categories as |cat index|}}
 					<div class="regular-button button-blue {{if cat.selected 'selected'}}" {{action 'onDocumentFilter' 'category' cat.id}}>
 						{{cat.category}} ({{cat.docCount}})

gui/ember-cli-build.js

@@ -41,27 +41,29 @@ module.exports = function (defaults) {
 		}
 	});
 
+	// dropdown/popup/dialog
+	app.import('vendor/tether.js');
+	app.import('vendor/drop.js');
+
+	app.import('vendor/bootstrap.css');
+	app.import('vendor/datetimepicker.min.js');
 	app.import('vendor/documize.js');
 	app.import('vendor/dropzone.js');
+	app.import('vendor/hoverIntent.js');
 	app.import('vendor/is.js');
+	app.import('vendor/keycloak.js');
+	app.import('vendor/markdown-it.min.js');
 	app.import('vendor/md5.js');
 	app.import('vendor/moment.js');
 	app.import('vendor/mousetrap.js');
-	app.import('vendor/table-editor.min.js');
-	app.import('vendor/underscore.js');
-	app.import('vendor/bootstrap.css');
-	app.import('vendor/tether.js');
-	app.import('vendor/drop.js');
-	app.import('vendor/tooltip.js');
-	app.import('vendor/markdown-it.min.js');
+	app.import('vendor/slug.js');
 	app.import('vendor/sortable.js');
-	app.import('vendor/datetimepicker.min.js');
-	app.import('vendor/hoverIntent.js');
-	app.import('vendor/waypoints.js');
+	app.import('vendor/table-editor.min.js');
+	app.import('vendor/tooltip.js');
+	app.import('vendor/underscore.js');
 	app.import('vendor/velocity.js');
 	app.import('vendor/velocity.ui.js');
-	app.import('vendor/keycloak.js');
-	app.import('vendor/slug.js');
+	app.import('vendor/waypoints.js');
 
 	return app.toTree();
 };