Merge pull request #148 from documize/draw

Draw.io integration

Author: sauls8t

README.md

@@ -1,4 +1,3 @@
-# Documize - author, track and deliver documentation
 
 ## The mission
 
@@ -52,9 +51,9 @@ Space view.
 
 ## Latest version
 
-[Community edition: v1.63.1](https://github.com/documize/community/releases)
+[Community edition: v1.64.0](https://github.com/documize/community/releases)
 
-[Enterprise edition: v1.65.1](https://documize.com/downloads)
+[Enterprise edition: v1.66.0](https://documize.com/downloads)
 
 ## OS support
 

build.bat

@@ -13,11 +13,11 @@ cd ..
 rd /s /q embed\bindata\public
 mkdir embed\bindata\public
 echo "Copying Ember assets folder"
-robocopy /e /NFL /NDL /NJH gui\dist-prod\assets embed\bindata\public\assets 
+robocopy /e /NFL /NDL /NJH gui\dist-prod\assets embed\bindata\public\assets
 echo "Copying Ember codemirror folder"
 robocopy /e /NFL /NDL /NJH gui\dist-prod\codemirror embed\bindata\public\codemirror
 echo "Copying Ember tinymce folder"
-robocopy /e /NFL /NDL /NJH gui\dist-prod\tinymce embed\bindata\public\tinymce 
+robocopy /e /NFL /NDL /NJH gui\dist-prod\tinymce embed\bindata\public\tinymce
 echo "Copying Ember sections folder"
 robocopy /e /NFL /NDL /NJH gui\dist-prod\sections embed\bindata\public\sections
 
@@ -40,7 +40,7 @@ echo "Generating in-memory static assets..."
 go get -u github.com/jteeuwen/go-bindata/...
 go get -u github.com/elazarl/go-bindata-assetfs/...
 cd embed
-go generate 
+go generate
 cd ..
 
 echo "Compiling Windows"
@@ -53,4 +53,4 @@ go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documiz
 
 echo "Compiling Darwin"
 set GOOS=darwin
-go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-darwin-amd64 edition/community.go
+go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-darwin-amd64 edition/community.go

build.sh

@@ -54,4 +54,4 @@ echo "Finished."
 
 # CGO_ENABLED=0 GOOS=linux go build -a -ldflags="-s -w" -installsuffix cgo
 # go build -ldflags '-d -s -w' -a -tags netgo -installsuffix netgo test.go
-# ldd test 
+# ldd test

core/stringutil/initials.go

@@ -23,11 +23,11 @@ func MakeInitials(firstname, lastname string) string {
 	b := ""
 
 	if len(firstname) > 0 {
-		a = firstname[:1]
+		a = string([]rune(firstname)[:1])
 	}
 
 	if len(lastname) > 0 {
-		b = lastname[:1]
+		b = string([]rune(lastname)[:1])
 	}
 
 	return strings.ToUpper(a + b)

core/stringutil/initials_test.go

@@ -13,11 +13,13 @@ package stringutil
 
 import "testing"
 
+// go test github.com/documize/community/core/stringutil -run TestInitials
 func TestInitials(t *testing.T) {
 	in(t, "Harvey", "Kandola", "HK")
 	in(t, "Harvey", "", "H")
 	in(t, "", "Kandola", "K")
 	in(t, "", "", "")
+	in(t, "Иванов", "Иванов", "ИИ")
 }
 
 func in(t *testing.T, firstname, lastname, expecting string) {

domain/mail/document.go

@@ -20,19 +20,21 @@ import (
 )
 
 // DocumentApprover notifies user who has just been granted document approval rights.
-func (m *Mailer) DocumentApprover(recipient, inviter, url, document string) {
+func (m *Mailer) DocumentApprover(recipient, inviterName, inviterEmail, url, document string) {
 	method := "DocumentApprover"
 	m.Initialize()
 
 	// check inviter name
-	if inviter == "Hello You" || len(inviter) == 0 {
-		inviter = "Your colleague"
+	if inviterName == "Hello You" || len(inviterName) == 0 {
+		inviterName = "Your colleague"
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has granted you document approval", inviter)
+	em.Subject = fmt.Sprintf("%s has granted you document approval", inviterName)
 	em.ToEmail = recipient
 	em.ToName = recipient
+	em.ReplyTo = inviterEmail
+	em.ReplyName = inviterName
 
 	parameters := struct {
 		Subject  string
@@ -41,7 +43,7 @@ func (m *Mailer) DocumentApprover(recipient, inviter, url, document string) {
 		Document string
 	}{
 		em.Subject,
-		inviter,
+		inviterName,
 		url,
 		document,
 	}

domain/mail/space.go

@@ -18,19 +18,21 @@ import (
 )
 
 // ShareSpaceExistingUser provides an existing user with a link to a newly shared space.
-func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro string) {
+func (m *Mailer) ShareSpaceExistingUser(recipient, inviterName, inviterEmail, url, folder, intro string) {
 	method := "ShareSpaceExistingUser"
 	m.Initialize()
 
 	// check inviter name
-	if inviter == "Hello You" || len(inviter) == 0 {
-		inviter = "Your colleague"
+	if inviterName == "Hello You" || len(inviterName) == 0 {
+		inviterName = "Your colleague"
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has shared %s with you", inviter, folder)
+	em.Subject = fmt.Sprintf("%s has shared %s with you", inviterName, folder)
 	em.ToEmail = recipient
 	em.ToName = recipient
+	em.ReplyTo = inviterEmail
+	em.ReplyName = inviterName
 
 	parameters := struct {
 		Subject string
@@ -40,7 +42,7 @@ func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro s
 		Intro   string
 	}{
 		em.Subject,
-		inviter,
+		inviterName,
 		url,
 		folder,
 		intro,
@@ -63,19 +65,21 @@ func (m *Mailer) ShareSpaceExistingUser(recipient, inviter, url, folder, intro s
 }
 
 // ShareSpaceNewUser invites new user providing Credentials, explaining the product and stating who is inviting them.
-func (m *Mailer) ShareSpaceNewUser(recipient, inviter, url, space, invitationMessage string) {
+func (m *Mailer) ShareSpaceNewUser(recipient, inviterName, inviterEmail, url, space, invitationMessage string) {
 	method := "ShareSpaceNewUser"
 	m.Initialize()
 
 	// check inviter name
-	if inviter == "Hello You" || len(inviter) == 0 {
-		inviter = "Your colleague"
+	if inviterName == "Hello You" || len(inviterName) == 0 {
+		inviterName = "Your colleague"
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has shared %s with you on Documize", inviter, space)
+	em.Subject = fmt.Sprintf("%s has shared %s with you on Documize", inviterName, space)
 	em.ToEmail = recipient
 	em.ToName = recipient
+	em.ReplyTo = inviterEmail
+	em.ReplyName = inviterName
 
 	parameters := struct {
 		Subject    string
@@ -85,7 +89,7 @@ func (m *Mailer) ShareSpaceNewUser(recipient, inviter, url, space, invitationMes
 		Folder     string
 	}{
 		em.Subject,
-		inviter,
+		inviterName,
 		url,
 		invitationMessage,
 		space,

domain/mail/user.go

@@ -18,19 +18,21 @@ import (
 )
 
 // InviteNewUser invites someone new providing credentials, explaining the product and stating who is inviting them.
-func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password string) {
+func (m *Mailer) InviteNewUser(recipient, inviterName, inviterEmail, url, username, password string) {
 	method := "InviteNewUser"
 	m.Initialize()
 
 	// check inviter name
-	if inviter == "Hello You" || len(inviter) == 0 {
-		inviter = "Your colleague"
+	if inviterName == "Hello You" || len(inviterName) == 0 {
+		inviterName = "Your colleague"
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has invited you to Documize", inviter)
+	em.Subject = fmt.Sprintf("%s has invited you to Documize", inviterName)
 	em.ToEmail = recipient
 	em.ToName = recipient
+	em.ReplyTo = inviterEmail
+	em.ReplyName = inviterName
 
 	parameters := struct {
 		Subject  string
@@ -40,7 +42,7 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
 		Password string
 	}{
 		em.Subject,
-		inviter,
+		inviterName,
 		url,
 		recipient,
 		password,
@@ -63,27 +65,29 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
 }
 
 // InviteExistingUser invites a known user to an organization.
-func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
+func (m *Mailer) InviteExistingUser(recipient, inviterName, inviterEmail, url string) {
 	method := "InviteExistingUser"
 	m.Initialize()
 
 	// check inviter name
-	if inviter == "Hello You" || len(inviter) == 0 {
-		inviter = "Your colleague"
+	if inviterName == "Hello You" || len(inviterName) == 0 {
+		inviterName = "Your colleague"
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has invited you to their Documize account", inviter)
+	em.Subject = fmt.Sprintf("%s has invited you to their Documize account", inviterName)
 	em.ToEmail = recipient
 	em.ToName = recipient
+	em.ReplyTo = inviterEmail
+	em.ReplyName = inviterName
 
 	parameters := struct {
 		Subject string
 		Inviter string
 		URL     string
 	}{
 		em.Subject,
-		inviter,
+		inviterName,
 		url,
 	}
 

domain/permission/endpoint.go

@@ -200,7 +200,7 @@ func (h *Handler) SetSpacePermissions(w http.ResponseWriter, r *http.Request) {
 						}
 
 						mailer := mail.Mailer{Runtime: h.Runtime, Store: h.Store, Context: ctx}
-						go mailer.ShareSpaceExistingUser(existingUser.Email, inviter.Fullname(), url, sp.Name, model.Message)
+						go mailer.ShareSpaceExistingUser(existingUser.Email, inviter.Fullname(), inviter.Email, url, sp.Name, model.Message)
 						h.Runtime.Log.Info(fmt.Sprintf("%s is sharing space %s with existing user %s", inviter.Email, sp.Name, existingUser.Email))
 					}
 				}
@@ -701,7 +701,7 @@ func (h *Handler) SetDocumentPermissions(w http.ResponseWriter, r *http.Request)
 						}
 
 						mailer := mail.Mailer{Runtime: h.Runtime, Store: h.Store, Context: ctx}
-						go mailer.DocumentApprover(existingUser.Email, inviter.Fullname(), url, doc.Title)
+						go mailer.DocumentApprover(existingUser.Email, inviter.Fullname(), inviter.Email, url, doc.Title)
 						h.Runtime.Log.Info(fmt.Sprintf("%s has made %s document approver for: %s", inviter.Email, existingUser.Email, doc.Title))
 					}
 				}

domain/section/flowchart/flowchart.go

@@ -0,0 +1,54 @@
+// Copyright 2016 Documize Inc. <[email protected]>. 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 <[email protected]>.
+//
+// https://documize.com
+
+package flowchart
+
+import (
+	"net/http"
+
+	"github.com/documize/community/core/env"
+	"github.com/documize/community/domain"
+	"github.com/documize/community/domain/section/provider"
+)
+
+// Provider represents Draw.io
+type Provider struct {
+	Runtime *env.Runtime
+	Store   *domain.Store
+}
+
+// Meta describes us
+func (*Provider) Meta() provider.TypeMeta {
+	section := provider.TypeMeta{}
+
+	section.ID = "d46a18f6-49fb-11e8-842f-0ed5f89f718b"
+	section.Title = "Draw.io Diagram"
+	section.Description = "Draw.io powered flowcharts and diagrams"
+	section.ContentType = "flowchart"
+	section.PageType = "tab"
+	section.Order = 9991
+
+	return section
+}
+
+// Command stub.
+func (p *Provider) Command(ctx *provider.Context, w http.ResponseWriter, r *http.Request) {
+}
+
+// Render returns data as-is (HTML).
+func (p *Provider) Render(ctx *provider.Context, config, data string) string {
+	return data
+}
+
+// Refresh just sends back data as-is.
+func (*Provider) Refresh(ctx *provider.Context, config, data string) string {
+	return data
+}

domain/section/plantuml/plantuml.go

@@ -25,7 +25,7 @@ import (
 	"github.com/documize/community/domain/section/provider"
 )
 
-// Provider represents Mermaid Diagram
+// Provider represents PlantUML Text Diagram
 type Provider struct {
 	Runtime *env.Runtime
 	Store   *domain.Store

domain/section/register.go

@@ -18,6 +18,7 @@ import (
 	"github.com/documize/community/domain"
 	"github.com/documize/community/domain/section/airtable"
 	"github.com/documize/community/domain/section/code"
+	"github.com/documize/community/domain/section/flowchart"
 	"github.com/documize/community/domain/section/gemini"
 	"github.com/documize/community/domain/section/markdown"
 	"github.com/documize/community/domain/section/papertrail"
@@ -41,6 +42,7 @@ func Register(rt *env.Runtime, s *domain.Store) {
 	provider.Register("wysiwyg", &wysiwyg.Provider{Runtime: rt, Store: s})
 	provider.Register("airtable", &airtable.Provider{Runtime: rt, Store: s})
 	provider.Register("plantuml", &plantuml.Provider{Runtime: rt, Store: s})
+	provider.Register("flowchart", &flowchart.Provider{Runtime: rt, Store: s})
 
 	p := provider.List()
 	rt.Log.Info(fmt.Sprintf("Registered %d sections", len(p)))

domain/smtp/send.go

@@ -88,10 +88,12 @@ func Connect(c Config) (d *mail.Dialer, err error) {
 
 // EmailMessage represents email to be sent.
 type EmailMessage struct {
-	ToEmail  string
-	ToName   string
-	Subject  string
-	BodyHTML string
+	ToEmail   string
+	ToName    string
+	Subject   string
+	BodyHTML  string
+	ReplyTo   string
+	ReplyName string
 }
 
 // SendMessage sends email using specified SMTP connection
@@ -102,6 +104,17 @@ func SendMessage(d *mail.Dialer, c Config, em EmailMessage) (b bool, err error)
 	m.SetHeader("From", m.FormatAddress(c.SenderEmail, c.SenderName))
 	m.SetHeader("To", m.FormatAddress(em.ToEmail, em.ToName))
 
+	// Where do replies go?
+	reply := c.SenderEmail
+	replyName := c.SenderName
+	if len(em.ReplyTo) > 0 {
+		reply = em.ReplyTo
+	}
+	if len(em.ReplyName) > 0 {
+		replyName = em.ReplyName
+	}
+	m.SetAddressHeader("Reply-To", reply, replyName)
+
 	// content
 	m.SetHeader("Subject", em.Subject)
 	m.SetBody("text/html", em.BodyHTML)

domain/space/endpoint.go

@@ -868,7 +868,7 @@ func (h *Handler) Invite(w http.ResponseWriter, r *http.Request) {
 
 			url := ctx.GetAppURL(fmt.Sprintf("s/%s/%s", sp.RefID, stringutil.MakeSlug(sp.Name)))
 			mailer := mail.Mailer{Runtime: h.Runtime, Store: h.Store, Context: ctx}
-			go mailer.ShareSpaceExistingUser(email, inviter.Fullname(), url, sp.Name, model.Message)
+			go mailer.ShareSpaceExistingUser(email, inviter.Fullname(), inviter.Email, url, sp.Name, model.Message)
 
 			h.Runtime.Log.Info(fmt.Sprintf("%s is sharing space %s with existing user %s", inviter.Email, sp.Name, email))
 		} else {