From b41a8db0f81b28d22b1e9a07c1f04cba74447881 Mon Sep 17 00:00:00 2001
From: Andrew <ajmacdonald@users.noreply.github.com>
Date: Fri, 31 May 2019 15:45:51 -0400
Subject: [PATCH] fix: separate user and repo in save form, update splash

---
 src/FileUpload.js   |   1 +
 src/Save.js         | 145 +++++++++++++++++++++++---------------------
 src/SaveToPath.js   |  42 ++++++++-----
 src/Splash.js       |  42 +++++++------
 src/VerifyRepo.js   |  30 ++++-----
 src/authenticate.js |   2 +-
 src/index.js        |  13 +++-
 7 files changed, 156 insertions(+), 119 deletions(-)

diff --git a/src/FileUpload.js b/src/FileUpload.js
index 55c8b3b..7508fa8 100644
--- a/src/FileUpload.js
+++ b/src/FileUpload.js
@@ -79,6 +79,7 @@ class FileUpload extends Component {
 									<ControlLabel></ControlLabel>
 										<FormControl
 											componentClass="textarea"
+											style={{height: '100px'}}
 											value={this.state.xmlText}
 											placeholder="Paste your XML here"
 											onChange={this.handleTextChange}
diff --git a/src/Save.js b/src/Save.js
index 51b5464..6349878 100644
--- a/src/Save.js
+++ b/src/Save.js
@@ -11,68 +11,17 @@ if ($ === undefined) {
 }
 
 import React, {Fragment, Component} from 'react'
-import { Modal, Button, Form, HelpBlock, FormControl, FormGroup, ControlLabel } from 'react-bootstrap';
+import { Modal, Grid, Row, Col, Button, Form, HelpBlock, FormControl, FormGroup, ControlLabel } from 'react-bootstrap';
 
 import VerifyRepo from './VerifyRepo.js'
 import SaveToPath from './SaveToPath.js'
 
-const SavedDialog = ({closedCB}) => {
-	return (
-		<Fragment>
-			<Modal.Header>Document Saved</Modal.Header>
-			<Modal.Body>Your document has been saved.</Modal.Body>
-			<Modal.Footer>
-				<Button onClick={closedCB} bsStyle="success">Ok</Button>
-			</Modal.Footer>
-		</Fragment>
-	)
-}
-
-const SaveForm = ({handleRepoChangeCB, handlePathChangeCB, saveFileCB, saveFileAsPullRequestCB, cancelCB, repo, path}) => {
-	return (
-		<Fragment>
-			<Modal.Header>Save to Repository</Modal.Header>
-			<Modal.Body>
-				<Form>
-					<FormGroup controlId="repo" validationState={null}>
-						<ControlLabel>Repository Path</ControlLabel>
-						<FormControl
-							type="text"
-							value={repo}
-							onChange={handleRepoChangeCB}/>
-						<HelpBlock>[GitHub-user-ID]/[GitHub-repository] (e.g., jchartrand/cheeses)</HelpBlock>
-					</FormGroup>
-					<FormGroup controlId="path" validationState={null}>
-						<ControlLabel>File Path</ControlLabel>
-						<FormControl
-							type="text"
-							value={path}
-							onChange={handlePathChangeCB} />
-						<HelpBlock>The repository path to which to save (e.g., french/basque/SaintSauveur.xml)</HelpBlock>
-					</FormGroup>
-				</Form>
-			</Modal.Body>
-			<Modal.Footer>
-				<Button onClick={cancelCB}>
-					Cancel
-				</Button>
-				<Button
-					onClick={saveFileCB}
-					bsStyle="success"
-				>Save</Button>
-				<Button
-					onClick={saveFileAsPullRequestCB}
-					bsStyle="success"
-				>Save As Pull Request</Button>
-			</Modal.Footer>
-		</Fragment>
-	)
-}
-
 class SaveCmp extends Component {
 	constructor(props) {
 		super(props);
 		this.handleChange = this.handleChange.bind(this);
+		this.saveFile = this.saveFile.bind(this);
+		this.saveFileAsPR = this.saveFileAsPR.bind(this);
 	}
 
 	componentWillMount() {
@@ -81,6 +30,7 @@ class SaveCmp extends Component {
 
 	resetState() {
 		this.setState({
+			user: this.props.user,
 			repo: this.props.repo,
 			path: this.props.path,
 			usePR: false,
@@ -94,6 +44,17 @@ class SaveCmp extends Component {
 	// handles changes passed up from the form
 	handleChange(name, value) {
 		this.setState({[name]: value});
+		switch(name) {
+			case 'path':
+				this.props.handlePathChange(value);
+				break;
+			case 'user':
+				this.props.handleRepoChange(value+'/'+this.state.repo);
+				break;
+			case 'repo':
+				this.props.handleRepoChange(this.state.user+'/'+value);
+				break;
+		}
 	}
 
 	// action on button click in form
@@ -107,7 +68,8 @@ class SaveCmp extends Component {
 	}
 
 	saved() {
-		this.setState({saved: true})
+		this.props.handleSaved(this.state.user+'/'+this.state.repo, this.state.path);
+		this.setState({saved: true});
 	}
 
 	// callback passed to VerifyRepo
@@ -121,30 +83,76 @@ class SaveCmp extends Component {
 	}
 
 	render() {
-		const {repo, path, usePR, message, submitted, repoVerified, saved} = this.state;
+		const {user, repo, path, usePR, message, submitted, repoVerified, saved} = this.state;
 		const handleClose = this.props.handleClose;
-		const handleRepoChange = this.props.handleRepoChange;
-		const handlePathChange = this.props.handlePathChange;
 		const getDocument = this.props.getDocument;
 		if (saved) {
 			return (
-				<SavedDialog closedCB={handleClose}/>
+				<Fragment>
+					<Modal.Header>Save to Repository</Modal.Header>
+					<Modal.Body>
+						<h4>Document Saved</h4>
+						<p>Your document has been saved.</p>
+					</Modal.Body>
+					<Modal.Footer>
+						<Button onClick={handleClose} bsStyle="success">Ok</Button>
+					</Modal.Footer>
+				</Fragment>
 			)
 		} else if (!submitted) {
 			return (
-				<SaveForm
-					handleRepoChangeCB={(e)=>{let val = e.target.value; this.handleChange('repo', val); handleRepoChange(val);}}
-					handlePathChangeCB={(e)=>{let val = e.target.value; this.handleChange('path', val); handlePathChange(val);}}
-					repo={repo}
-					path={path}
-					saveFileCB={this.saveFile.bind(this)}
-					saveFileAsPullRequestCB={this.saveFileAsPR.bind(this)}
-					cancelCB={handleClose}
-				/>
+				<Fragment>
+					<Modal.Header>Save to Repository</Modal.Header>
+					<Modal.Body>
+						<Form>
+							<Grid fluid>
+								<Row>
+									<h4>Repository Path</h4>
+									<Col sm={6}>
+										<FormGroup controlId="user" validationState={null}>
+											<ControlLabel>GitHub User</ControlLabel>
+											<FormControl
+												type="text"
+												value={user}
+												onChange={(e)=>{this.handleChange('user', e.target.value)}}/>
+										</FormGroup>
+									</Col>
+									<Col sm={6}>
+										<FormGroup controlId="repo" validationState={null}>
+											<ControlLabel>Repository Name</ControlLabel>
+											<FormControl
+												type="text"
+												value={repo}
+												onChange={(e)=>{this.handleChange('repo', e.target.value)}}/>
+										</FormGroup>
+									</Col>
+								</Row>
+								<Row>
+									<h4>File Path</h4>
+									<Col sm={12}>
+										<FormGroup controlId="path" validationState={null}>
+											<FormControl
+												type="text"
+												value={path}
+												onChange={(e)=>{this.handleChange('path', e.target.value)}}/>
+											<HelpBlock>The file (and folder) path to which to save (e.g., french/basque/SaintSauveur.xml)</HelpBlock>
+										</FormGroup>
+									</Col>
+								</Row>
+							</Grid>
+						</Form>
+					</Modal.Body>
+					<Modal.Footer>
+						<Button onClick={handleClose}>Cancel</Button>
+						<Button onClick={this.saveFile} bsStyle="success">Save</Button>
+						<Button onClick={this.saveFileAsPR} bsStyle="success">Save As Pull Request</Button>
+					</Modal.Footer>
+				</Fragment>
 			)
 		} else if (submitted && !repoVerified) {
 			return (
 				<VerifyRepo
+					user={user}
 					repo={repo}
 					path={path}
 					verifiedCB={this.repoVerified.bind(this)}
@@ -154,6 +162,7 @@ class SaveCmp extends Component {
 		} else if (submitted) {
 			return (
 				<SaveToPath
+					user={user}
 					repo={repo}
 					path={path}
 					getDocument={getDocument}
diff --git a/src/SaveToPath.js b/src/SaveToPath.js
index 0da8c85..112e163 100644
--- a/src/SaveToPath.js
+++ b/src/SaveToPath.js
@@ -4,8 +4,9 @@ import { Modal, Button } from 'react-bootstrap';
 
 const ErrorModal = ({cancel, error}) => (
 	<Fragment>
-		<Modal.Header>An error occurred</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
+			<h4>An error occurred</h4>
 			<p>{error}</p>
 		</Modal.Body>
 		<Modal.Footer>
@@ -19,12 +20,13 @@ const ErrorModal = ({cancel, error}) => (
 
 const ConfirmModal = ({cancel, title, body, ok}) => (
 	<Fragment>
-		<Modal.Header>{title}</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
+			<h4>{title}</h4>
 			<p>{body}</p>
 		</Modal.Body>
 		<Modal.Footer>
-			<Button onClick={cancel} bsStyle="danger">
+			<Button onClick={cancel}>
 				Cancel
 			</Button>
 			<Button
@@ -35,11 +37,11 @@ const ConfirmModal = ({cancel, title, body, ok}) => (
 	</Fragment>
 )
 
-const CheckingModal = () => (
+const StatusModal = ({status}) => (
 	<Fragment>
-		<Modal.Header>Checking your file...</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
-			<p></p>
+			<p>{status}</p>
 		</Modal.Body>
 	</Fragment>
 )
@@ -56,6 +58,7 @@ class SaveToPath extends Component {
 		error: null,
 		checkingPath: null,
 		pathHasBeenChecked: null,
+		saving: null,
 		branch: 'master',
 		commitMessage: 'Saved by CWRC-Writer',
 		prTitle: 'Request made from CWRC-Writer',
@@ -64,12 +67,13 @@ class SaveToPath extends Component {
 
 	componentDidMount() {
 		this.setState({checkingPath: true})
-		cwrcGit.getDoc(this.props.repo, 'master', this.props.path).then(
+		cwrcGit.getDoc(this.getFullRepoPath, 'master', this.props.path).then(
 			(result)=>{
 				this.setState({
 					checkingPath: false,
 					doesPathExist: true,
-					pathHasBeenChecked: true
+					pathHasBeenChecked: true,
+					saving: false
 				})
 				return result;
 			},
@@ -77,32 +81,36 @@ class SaveToPath extends Component {
 				error.status === 404 ? this.setState({
 					checkingPath: false,
 					doesPathExist: false,
-					pathHasBeenChecked: true
+					pathHasBeenChecked: true,
+					saving: false
 				}): this.displayError(error)
 				return error
 			})
 	}
 
+	getFullRepoPath() {
+		return this.props.user+'/'+this.props.repo;
+	}
+
 	complete = () => {
 		this.resetComponent()
 		this.props.savedCB()
-		//this.props.promiseResolve()
 	}
 
 	cancel = () => {
 		this.resetComponent()
 		this.props.cancelCB()
-		//this.props.promiseReject()
 	}
 
 	displayError = (error) => {
-		this.setState({error: error.statusText})
+		this.setState({error: error.statusText, saving: false})
 	}
 
 	save = () => {
+		this.setState({saving: true});
 		const document = this.props.getDocument();
 		this.props.usePR ?
-			cwrcGit.saveAsPullRequest(this.props.repo, this.props.path, document, this.state.prBranch, this.state.commitMessage, this.state.prTitle).then(
+			cwrcGit.saveAsPullRequest(this.getFullRepoPath(), this.props.path, document, this.state.prBranch, this.state.commitMessage, this.state.prTitle).then(
 				(result) => this.complete(),
 				(error) => {
 					if (error.statusText === 'Internal Server Error') {
@@ -111,7 +119,7 @@ class SaveToPath extends Component {
 					this.displayError(error)
 				}
 			) :
-			cwrcGit.saveDoc(this.props.repo, this.props.path, document, this.state.branch, this.state.commitMessage).then(
+			cwrcGit.saveDoc(this.getFullRepoPath(), this.props.path, document, this.state.branch, this.state.commitMessage).then(
 				(result) => this.complete(),
 				(error) => {
 					if (error.statusText === 'Not Found') {
@@ -124,14 +132,16 @@ class SaveToPath extends Component {
 	}
 
 	render() {
-		const {pathHasBeenChecked, doesPathExist, error, checkingPath} = this.state
+		const {pathHasBeenChecked, doesPathExist, error, checkingPath, saving} = this.state
 
 		if (error) {
 			return <ErrorModal
 				error = {error}
 				cancel = {this.cancel.bind(this)}/>
+		} else if (saving) {
+			return <StatusModal status='Saving your file...' />
 		} else if (checkingPath) {
-			return <CheckingModal/>
+			return <StatusModal status='Checking your file...' />
 		} else if (doesPathExist) {
 			return <ConfirmModal
 				title='File Exists'
diff --git a/src/Splash.js b/src/Splash.js
index 5fb5ee5..8051ac0 100644
--- a/src/Splash.js
+++ b/src/Splash.js
@@ -9,28 +9,36 @@ if ($ === undefined) {
 }
 
 import React, {Fragment} from 'react'
-import { Modal, Button } from 'react-bootstrap';
+import { Modal, Button, PageHeader } from 'react-bootstrap';
 
 const Splash = (props) => {
     return (
         <Fragment>
-            <Modal.Header closeButton={false}>Welcome to CWRC-Writer</Modal.Header>
-			<Modal.Body>
-                <h4>Welcome to CWRC-Writer, the XML & RDF online editor developed by the <a href="https://cwrc.ca" target="_blank">Canadian Writing Research Collaboratory</a></h4>
-                <p>Git-Writer provides light-weight WYSIWYG editing of XML documents and converts, upon request, xml named entities (persons, organization, places, titles) and document annotations (notes, citations, corrections, links) to xml rdf or Json-ld annotations fully compatible with the Web Annotation Data Model.</p>
-                <p>You can use CWRC-Writer to lightly edit your XML document, add linked open data capability to it to increase the interoperability of your document, or both.</p>
-                <p>Your documents are stored in GitHub, so you will need to login to your GitHub account in order to use CWRC-Writer.</p>
-                <p>To learn more about how to use CWRC-Writer, please go to <a href="https://cwrc-writer.cwrc.ca/documentation" target="_blank">cwrc-writer.cwrc.ca/documentation</a>. We recommend that you start with the video tutorial and the quick start guide.</p>
-                <p>CWRC-Writer is still under development, so if you run into an issue or there is a feature you would like to see added, please submit a ticket to <a href="https://github.com/cwrc/CWRC-WriterBase/issues" target="_blank">github.com/cwrc/CWRC-WriterBase/issues</a>.</p>
-                <p>If you are a developer interested in adopting/adapting the Writer in a different environment, please consult <a href="https://github.com/cwrc/tech_documentation/blob/master/Tools-reference.md#cwrc-writer" target="_blank">this reference</a>. You can also contact us through a GitHub ticket on any of the CWRC-Writer code repositories.</p>
+			<Modal.Body style={{lineHeight: '1.35em', margin: '0px 15px'}}>
+                <PageHeader>Welcome to CWRC-Writer<br/><small>The XML & RDF online editor developed by the <a href="https://cwrc.ca" target="_blank">Canadian Writing Research Collaboratory</a></small></PageHeader>
+                <p>CWRC-Writer provides:</p>
+                <ul>
+                    <li>schema-aware document editing, including validation, against web-accessible schemas</li>
+                    <li>support for cascading stylesheets (CSS) to provide a WYSIWYG view of documents, as well as a view showing tags</li>
+                    <li>ability to look up and select identifiers for named entity tags (persons, organization, places, or titles) from a range of Linked Open Data authorities</li>
+                    <li>generation (if desired) of Linked Data annotations corresponding to tags for named entities and document annotations (notes, citations, corrections, links) in XML-RDF or JSON-LD conforming to the Web Annotation Data Model, for both pre-existing and newly added tags</li>
+                    <li>ability to detect candidate named entities (persons, places, or organizations) within a document for tagging and/or Web Annotation, to evaluate and refine those suggestions, and to associate the entities with LOD identifiers</li>
+                </ul>
+                <p>This version of CWRC-Writer, <em>Git-Writer</em>, uses the GitHub repository for document storage, versioning, and sharing. You need to be logged into a GitHub account to use it.</p>
+                <p>Git-Writer is designed to work with customizations of the Text Encoding Initiative (TEI) schema provided by the TEI Consortium. (Schemas/CSS must be available at an https:// location and have CORS enabled.)</p>
+                <p>You can use CWRC-Writer to edit XML documents or produce new documents from templates. There are templates and sample documents here for getting started. Producing Linked Open Data annotations is optional.</p>
+                <p>To learn more about how to use CWRC-Writer, see <a href="https://cwrc-writer.cwrc.ca/documentation" target="_blank">cwrc-writer.cwrc.ca/documentation</a>. We recommend starting with the <em>video tutorial</em> and the <em>quick start guide</em>.</p>
+                <p>If you run into a bug or there is a feature you would like to see added, please submit a ticket to <a href="https://github.com/cwrc/CWRC-WriterBase/issues" target="_blank">github.com/cwrc/CWRC-WriterBase/issues</a>.</p>
+                <p>If you are interested in adopting/adapting the Writer to a different environment, please consult <a href="https://github.com/cwrc/tech_documentation/blob/master/Tools-reference.md#cwrc-writer" target="_blank">this reference</a>. You can contact us through a GitHub ticket on any of the CWRC-Writer code repositories.</p>
+                <p>Finally, if you have found CWRC-Writer useful for your research or teaching, please let us know! We'd love to hear it.</p>
                 <hr/>
-                <h4>Development Team</h4>
-                <p>Andrew MacDonald, 2013-present</p>
-                <p>James Chartrand, 2013-2018</p>
-                <h4>Management, Q/A Team</h4>
-                <p>Susan Brown, 2013-present</p>
-                <p>Mihaela Ilovan, 2014-present</p>
-                <p>Megan Sellmer, 2013-2016</p>
+                <h4>Core Team</h4>
+                <p>Susan Brown, <small>2011 - present (project director)</small></p>
+                <p>James Chartrand, <small>2011 - 2018 (lead developer)</small></p>
+                <p>Mihaela Ilovan, <small>2014 - present (project manager)</small></p>
+                <p>Andrew MacDonald, <small>2013 - present (2018 - lead developer)</small></p>
+                <p>Geoffrey Rockwell, <small>2011 - 2014 (scoping and direction)</small></p>
+                <p>Megan Sellmer, <small>2011 - 2016 (testing and documentation)</small></p>
             </Modal.Body>
             <Modal.Footer>
                 <Button onClick={props.onContinue} bsStyle="success">Continue</Button>
diff --git a/src/VerifyRepo.js b/src/VerifyRepo.js
index a5df852..ac5e970 100644
--- a/src/VerifyRepo.js
+++ b/src/VerifyRepo.js
@@ -12,19 +12,20 @@ const ErrorModal = ({cancel, error}) => (
 			<Button
 				onClick={cancel}
 				bsStyle="success"
-			>OK</Button>
+			>Ok</Button>
 		</Modal.Footer>
 	</Fragment>
 )
 
 const ConfirmModal = ({cancel, title, body, ok, buttonText}) => (
 	<Fragment>
-		<Modal.Header>{title}</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
+			<h4>{title}</h4>
 			<p>{body}</p>
 		</Modal.Body>
 		<Modal.Footer>
-			<Button onClick={cancel} bsStyle="danger">
+			<Button onClick={cancel}>
 				Cancel
 			</Button>
 			<Button
@@ -37,8 +38,9 @@ const ConfirmModal = ({cancel, title, body, ok, buttonText}) => (
 
 const CreateModal = ({cancel,ok, repoDesc, isPrivate, handlePrivateChange, handleDescriptionChange}) => (
 	<Fragment>
-		<Modal.Header>Create Repository</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
+			<h4>Create Repository</h4>
 			<p>This repository doesn't yet exist, would you like to create it?</p>
 			<FormGroup controlId='repoDesc'>
 				<ControlLabel>Description</ControlLabel>
@@ -48,15 +50,14 @@ const CreateModal = ({cancel,ok, repoDesc, isPrivate, handlePrivateChange, handl
 					value={repoDesc}
 					onChange={handleDescriptionChange}
 				/>
-				<HelpBlock>The description will appear in the Github page for your new repository.</HelpBlock>
+				<HelpBlock>The description will appear in the GitHub page for your new repository.</HelpBlock>
 			</FormGroup>
 			<Checkbox checked={isPrivate} onChange={handlePrivateChange}>
 				Make Private
-				<HelpBlock>You must have a paid Github account to create private repositories.</HelpBlock>
 			</Checkbox>
 		</Modal.Body>
 		<Modal.Footer>
-			<Button onClick={cancel} bsStyle="danger">
+			<Button onClick={cancel}>
 				Cancel
 			</Button>
 			<Button
@@ -69,9 +70,9 @@ const CreateModal = ({cancel,ok, repoDesc, isPrivate, handlePrivateChange, handl
 
 const CheckingModal = () => (
 	<Fragment>
-		<Modal.Header>Checking your respository...</Modal.Header>
+		<Modal.Header>Save to Repository</Modal.Header>
 		<Modal.Body>
-			<p></p>
+			<p>Checking your respository...</p>
 		</Modal.Body>
 	</Fragment>
 )
@@ -93,7 +94,7 @@ class VerifyRepo extends Component {
 
 	componentDidMount() {
 		this.setState({checkingRepo: true})
-		cwrcGit.getRepoContents(this.props.repo).then(
+		cwrcGit.getRepoContents(this.getFullRepoPath()).then(
 			(result)=>{
 				this.setState({
 					checkingRepo: false,
@@ -111,16 +112,18 @@ class VerifyRepo extends Component {
 			})
 	}
 
+	getFullRepoPath() {
+		return this.props.user+'/'+this.props.repo;
+	}
+
 	complete = () => {
 		this.resetComponent()
 		this.props.verifiedCB()
-		//this.props.promiseResolve()
 	}
 
 	cancel = () => {
 		this.resetComponent()
 		this.props.cancelCB()
-		//this.props.promiseReject()
 	}
 
 	displayError = (error) => {
@@ -128,8 +131,7 @@ class VerifyRepo extends Component {
 	}
 
 	createRepo = () => {
-		let repoNameWithoutUserName = this.props.repo.split('/')[1]
-		cwrcGit.createRepo(repoNameWithoutUserName, this.state.repoDesc, this.state.isPrivate).then(
+		cwrcGit.createRepo(this.props.repo, this.state.repoDesc, this.state.isPrivate).then(
 			(result) => this.complete(),
 			(error) => this.displayError(error)
 		)
diff --git a/src/authenticate.js b/src/authenticate.js
index f207d96..f51e2ba 100644
--- a/src/authenticate.js
+++ b/src/authenticate.js
@@ -118,7 +118,7 @@ class AuthenticateDialog extends Component {
                 <Fragment>
                     <Modal.Header>Authenticate with GitHub</Modal.Header>
                     <Modal.Body>
-                        <p>You must first authenticate through GitHub to allow the CWRC-GitWriter to make calls on your behalf.</p>
+                        <p>You must first authenticate through GitHub to allow CWRC-Writer to make calls on your behalf.</p>
                         <p>CWRC does not keep any of your GitHub information. The GitHub token issued by GitHub is not stored on a CWRC server, but is only submitted as a <a href="https://jwt.io/" rel="noopener noreferrer" target="_blank">JSON Web Token</a> for each request you make.</p>
                         {error ? <h4><Label bsStyle="danger">{error}</Label></h4> : ''}
                     </Modal.Body>
diff --git a/src/index.js b/src/index.js
index 2fd648c..d2258cc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -73,7 +73,7 @@ function loadWrap(writer, shouldOverwrite = false) {
     $('#'+dialogId).addClass('cwrc');
 }
 
-function getUserInfoWrap() {
+function getUserInfo() {
     return _userInfo;
 }
 
@@ -133,6 +133,7 @@ class GitDialog extends Component {
         this.handleAuthentication = this.handleAuthentication.bind(this);
         this.handleFileSelect = this.handleFileSelect.bind(this);
         this.handleFileUpload = this.handleFileUpload.bind(this);
+        this.handleSaved = this.handleSaved.bind(this);
         this.handleClose = this.handleClose.bind(this);
         this.handleConfirmLoad = this.handleConfirmLoad.bind(this);
         this.state = {
@@ -178,6 +179,11 @@ class GitDialog extends Component {
         }, 50)
     }
 
+    handleSaved(repo, path) {
+        setDocumentInfo(repo, path);
+        _writer.event('documentSaved').publish();
+    }
+
     handleClose() {
         this.setState({show: false});
     }
@@ -273,9 +279,10 @@ class GitDialog extends Component {
                         )
                     }
                 case 'save':
+                    let [userId, repoName] = repo.split('/');
                     return (
                         <Modal id={dialogId} show={true} animation={false}>
-                            <SaveCmp path={path} repo={repo} handleClose={this.handleClose} getDocument={getDocument} handleRepoChange={setRepo} handlePathChange={setPath} />
+                            <SaveCmp user={userId} repo={repoName} path={path} handleClose={this.handleClose} getDocument={getDocument} handleRepoChange={setRepo} handlePathChange={setPath} handleSaved={this.handleSaved} />
                         </Modal>
                     )
             }
@@ -287,6 +294,6 @@ export {
 	saveWrap as save,
     loadWrap as load,
     authenticate,
-    getUserInfoWrap as getUserInfo,
+    getUserInfo,
     getDocumentURI
 }