Accept Merge Request #13: (yangzhen/ot -> ot)

Merge Request: 拖动文件到文件树时显示高亮
Created By: @杨臻
Accepted By: @hackape
URL: https://codingcorp.coding.net/p/WebIDE-Frontend/git/merge/13

Author: hackape

app/components/Accordion/Accordion.jsx

@@ -48,7 +48,7 @@ class AccordionGroup extends Component {
       {this.props.children.reduce((acc, component, index) => {
         acc.push(component)
         if (index < sectionCount - 1) {
-          acc.push(<ResizeBar parentFlexDirection='column' />)
+          acc.push(<ResizeBar parentFlexDirection='column' key={`resize_${index}`} />)
         }
         return acc
       }, [])}

app/components/DragAndDrop.jsx

@@ -89,8 +89,15 @@ class DragAndDrop extends Component {
       x: 0,
       y: 0,
     }
+    this.unhighlightDirNode()
   }
 
+  unhighlightDirNode = debounce(() => {
+    if (this.highlightNode) {
+      FileTreeActions.unhighlightDirNode(this.highlightNode)
+    }
+  }, 350)
+
   handleDropOver = debounce((e) => {
     dnd.updateDroppables()
     const { source, droppables = [], meta } = dnd
@@ -119,7 +126,7 @@ class DragAndDrop extends Component {
 
       default:
     }
-  }, 1000)
+  }, 400)
 
   onDrop = (e) => {
     this.resetDragPos()
@@ -169,8 +176,26 @@ class DragAndDrop extends Component {
   dragTabOverFileTree (e, target) {
     const { id, DOMNode } = target
     const node = FileTreeState.entities.get(id)
-    if (node.isDir && node.isFolded) {
-      FileTreeActions.openNode(node)
+    if (node.isDir) {
+      if (node.isFolded) {
+        FileTreeActions.openNode(node)
+      }
+      if (!node.isHighlighted) {
+        if (this.highlightNode) {
+          FileTreeActions.unhighlightDirNode(this.highlightNode)
+        }
+        this.highlightNode = node
+        FileTreeActions.highlightDirNode(node)
+      }
+    } else {
+      const parentNode = node.parent
+      if (!parentNode.isHighlighted) {
+        if (this.highlightNode) {
+          FileTreeActions.unhighlightDirNode(this.highlightNode)
+        }
+        this.highlightNode = parentNode
+        FileTreeActions.highlightDirNode(parentNode)
+      }
     }
   }
 

app/components/FileTree/actions.js

@@ -47,6 +47,10 @@ export const highlightDirNode = registerAction('filetree:highlight_dir_node',
   node => node.isDir && node.highlight()
 )
 
+export const unhighlightDirNode = registerAction('filetree:unhighlight_dir_node',
+  node => node.isDir && node.unhighlight()
+)
+
 export const toggleNodeFold = registerAction('filetree:toggle_node_fold',
   (node, shouldBeFolded, deep) => ({ node, shouldBeFolded, deep }),
   ({ node, shouldBeFolded = null, deep = false }) => {

app/containers/Initialize/index.jsx

@@ -60,6 +60,18 @@ class Initialize extends Component {
               {i18n`global.requestingCollaboration`}
             </div>
           )
+        } else if (state.status === 'Expired') {
+          errorInfo = null
+          requestInfo = (
+            <div className='request-info'>
+              {i18n`global.requestCollaborationExpires`}
+            </div>
+          )
+          info = (
+            <div className='loading-info error'>
+              {i18n`global.loadingWorkspaceDenied`}
+            </div>
+          )
         } else {
           info = (
             <div className='loading-info error'>

app/i18n/en_US/global.json

@@ -4,5 +4,6 @@
    "loadingWorkspaceDenied": "Loading workspace denied",
    "requestCollaboration": "Request collaboration",
    "requestCollaborationReject": "Your request has been rejected.",
-   "requestingCollaboration": "You have requested collaboration"
+   "requestingCollaboration": "You have requested collaboration",
+   "requestCollaborationExpires": "The demo has already expired."
 }

app/i18n/zh_CN/global.json

@@ -4,5 +4,6 @@
    "loadingWorkspaceDenied": "访问工作区未授权",
    "requestCollaboration": "申请协作",
    "requestCollaborationReject": "您的申请被拒绝了",
-   "requestingCollaboration": "协作申请已经提交"
+   "requestingCollaboration": "协作申请已经提交",
+   "requestCollaborationExpires": "试用已经结束"
 }

app/initialize.js

@@ -87,7 +87,12 @@ async function initialize () {
             initializeState.errorInfo = res.msg
             return false
           }
+        } else if (res.durationStatus === 'Temporary' && res.ttl <= 0) {
+          initializeState.errorCode = 403
+          initializeState.status = 'Expired'
+          return false
         }
+
         extendObservable(config, res)
         if (config.project && config.project.name) { config.projectName = config.project.name }
         return true