OpusCapita#126 OpusCapita#127 Show initial file name within "setName…

…Dialog" (OpusCapita#130)
alcacoop · Dec 26, 2017 · 924079e · 924079e
1 parent 4d764b2
commit 924079e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/packages/client-react/src/client/components/SetNameDialog/SetNameDialog.react.js b/packages/client-react/src/client/components/SetNameDialog/SetNameDialog.react.js
@@ -4,31 +4,32 @@ import './SetNameDialog.less';
 import Dialog from '../Dialog';
 
 const propTypes = {
-  headerText: PropTypes.string,
   cancelButtonText: PropTypes.string,
-  submitButtonText: PropTypes.string,
-  onValidate: PropTypes.func,
-  onHide: PropTypes.func,
+  headerText: PropTypes.string,
+  initialValue: PropTypes.string,
   onChange: PropTypes.func,
-  onSubmit: PropTypes.func
+  onHide: PropTypes.func,
+  onSubmit: PropTypes.func,
+  onValidate: PropTypes.func,
+  submitButtonText: PropTypes.string
 };
 const defaultProps = {
-  headerText: 'Set name',
   cancelButtonText: 'Cancel',
-  submitButtonText: 'Create',
-  autofocus: false,
-  onValidate: () => {},
-  onHide: () => {},
+  headerText: 'Set name',
+  initialValue: '',
   onChange: () => {},
-  onSubmit: () => {}
+  onHide: () => {},
+  onSubmit: () => {},
+  onValidate: () => {},
+  submitButtonText: 'Create'
 };
 
 export default
 class SetNameDialog extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      value: '',
+      value: props.initialValue,
       validationError: null,
       valid: false
     };
@@ -42,14 +43,14 @@ class SetNameDialog extends Component {
 
   handleKeyDown = async (e) => {
     if (e.which === 13) { // Enter key
-      if (!this.props.validationError && this.state.value) {
+      if (!this.state.validationError && this.state.value) {
         this.handleSubmit(this.state.value);
       }
     }
   }
 
   handleSubmitButtonClick = async (e) => {
-    if (!this.props.validationError && this.state.value) {
+    if (!this.state.validationError && this.state.value) {
       this.handleSubmit(this.state.value);
     }
   }
@@ -62,6 +63,12 @@ class SetNameDialog extends Component {
     }
   }
 
+  moveCaretAtEnd = (e) => {
+    let tmpValue = e.target.value;
+    e.target.value = '';
+    e.target.value = tmpValue;
+  }
+
   render() {
     let { onHide, headerText, submitButtonText, cancelButtonText } = this.props;
     let { value, validationError, valid } = this.state;
@@ -95,6 +102,7 @@ class SetNameDialog extends Component {
             `}
             value={value}
             onChange={this.handleChange}
+            onFocus={this.moveCaretAtEnd}
           />
 
           <div className="oc-fm--dialog__horizontal-group oc-fm--dialog__horizontal-group--to-right">

diff --git a/packages/connector-google-drive-v2/src/capabilities/rename.js b/packages/connector-google-drive-v2/src/capabilities/rename.js
@@ -20,6 +20,7 @@ function handler(apiOptions, {
   let rawDialogElement = {
     elementType: 'SetNameDialog',
     elementProps: {
+      initialValue: getSelectedResources()[0].title,
       onHide: hideDialog,
       onSubmit: async (name) => {
         let selectedResources = getSelectedResources();

diff --git a/packages/connector-node-v1/src/capabilities/rename.js b/packages/connector-node-v1/src/capabilities/rename.js
@@ -29,6 +29,7 @@ function handler(apiOptions, {
   let rawDialogElement = {
     elementType: 'SetNameDialog',
     elementProps: {
+      initialValue: getSelectedResources()[0].name,
       onHide: hideDialog,
       onSubmit: async (name) => {
         let selectedResources = getSelectedResources();