From 91250dcfa4fa5fe7d7deb3c4b4dc0ffebed0b39a Mon Sep 17 00:00:00 2001
From: tiddlygit-test <linonetwo012@gmail.com>
Date: Fri, 11 Sep 2020 22:39:07 +0800
Subject: [PATCH] feat: show wiki name in side bar

---
 localization/locales/en/translation.json    |  3 +-
 localization/locales/zh_CN/translation.json |  3 +-
 src/components/main/workspace-selector.js   | 83 ++++++++++-----------
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/localization/locales/en/translation.json b/localization/locales/en/translation.json
index 2be5488f..d93ace69 100644
--- a/localization/locales/en/translation.json
+++ b/localization/locales/en/translation.json
@@ -5,7 +5,8 @@
     "EditWorkspace": "Edit Workspace",
     "RemoveWorkspace": "Remove Workspace",
     "AreYouSure": "Are you sure you want to remove this workspace? \nRemoving the workspace will delete the workspace in this application, but will not delete the folders from the hard drive. \nBut, if you choose to delete the Wiki folder as well, all contents will be deleted.",
-    "RemoveWorkspaceAndDelete": "Remove workspace and delete Wiki folder from the disk"
+    "RemoveWorkspaceAndDelete": "Remove workspace and delete Wiki folder from the disk",
+    "BadWorkspacePath": "There are some problem in your workspace setup"
   },
   "AddWorkspace": {
     "NewWikiDoneButton": "<0><0>Use</0><1>{{wikiFolderLocation}}</1></0><1>As new Wiki folder</1>",
diff --git a/localization/locales/zh_CN/translation.json b/localization/locales/zh_CN/translation.json
index 7b8dbd75..8cfce6fe 100644
--- a/localization/locales/zh_CN/translation.json
+++ b/localization/locales/zh_CN/translation.json
@@ -5,7 +5,8 @@
     "EditWorkspace": "编辑工作区",
     "RemoveWorkspace": "移除工作区",
     "RemoveWorkspaceAndDelete": "移除工作区并删除Wiki文件夹",
-    "AreYouSure": "你确定要移除这个工作区吗？移除工作区会删除本应用中的工作区，但不会删除硬盘上的文件夹。如果你选择一并删除Wiki文件夹，则所有内容都会被被删除。"
+    "AreYouSure": "你确定要移除这个工作区吗？移除工作区会删除本应用中的工作区，但不会删除硬盘上的文件夹。如果你选择一并删除Wiki文件夹，则所有内容都会被被删除。",
+    "BadWorkspacePath": "工作区路径有问题"
   },
   "AddWorkspace": {
     "NewWikiDoneButton": "<0><0>在</0><1>{{wikiFolderLocation}}</1></0><1>创建WIKI</1>",
diff --git a/src/components/main/workspace-selector.js b/src/components/main/workspace-selector.js
index d564a76a..978b008b 100644
--- a/src/components/main/workspace-selector.js
+++ b/src/components/main/workspace-selector.js
@@ -1,7 +1,8 @@
+// @flow
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
+import { basename } from 'path';
 
 import Badge from '@material-ui/core/Badge';
 
@@ -11,8 +12,9 @@ import defaultIcon from '../../images/default-icon.png';
 
 const styles = theme => ({
   root: {
-    height: 68,
+    height: 'fit-content',
     width: 68,
+    padding: '10px 0',
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
@@ -82,6 +84,8 @@ const styles = theme => ({
     padding: 0,
     fontSize: '12px',
     fontWeight: 500,
+    display: 'inline-block',
+    wordBreak: 'break-all',
     color: theme.palette.text.primary,
   },
   badge: {
@@ -89,26 +93,44 @@ const styles = theme => ({
   },
 });
 
+type Props = {
+  active: boolean,
+  badgeCount: number,
+  classes: Object,
+  hibernated: boolean,
+  id: string,
+  onClick: Function,
+  onContextMenu: Function,
+  order: number,
+  picturePath: string,
+  sidebarShortcutHints: boolean,
+  transparentBackground: boolean,
+  workspaceName?: string,
+};
+
 function WorkspaceSelector({
-  active,
-  badgeCount,
+  active = false,
+  badgeCount = 0,
   classes,
-  hibernated,
+  hibernated = false,
   id,
-  onClick,
-  onContextMenu,
-  order,
+  onClick = () => {},
+  onContextMenu = () => {},
+  order = 0,
   picturePath,
   sidebarShortcutHints,
-  transparentBackground,
-}) {
+  transparentBackground = false,
+  workspaceName,
+}: Props) {
   const { t } = useTranslation();
+
+  const shortWorkspaceName = workspaceName ? basename(workspaceName) : t('WorkspaceSelector.BadWorkspacePath');
   return (
     <div
       role="button"
       className={classNames(classes.root, hibernated && classes.rootHibernate, active && classes.rootActive)}
       onClick={onClick}
-      onKeyDown={null}
+      onKeyDown={onClick}
       onContextMenu={onContextMenu}
       tabIndex="0"
     >
@@ -134,41 +156,18 @@ function WorkspaceSelector({
         </div>
       </Badge>
       {sidebarShortcutHints && (id === 'add' || order < 9) && (
-        <p className={classes.shortcutText}>
-          {id === 'add' ? t('WorkspaceSelector.Add') : `${window.remote.getPlatform() === 'darwin' ? '⌘' : 'Ctrl'} + ${order + 1}`}
-        </p>
+          <p className={classes.shortcutText}>{id === 'add' ? t('WorkspaceSelector.Add') : shortWorkspaceName}</p>
       )}
     </div>
   );
 }
 
-WorkspaceSelector.defaultProps = {
-  active: false,
-  badgeCount: 0,
-  hibernated: false,
-  onContextMenu: null,
-  order: 0,
-  picturePath: null,
-  transparentBackground: false,
+const mapStateToProps = (state, ownProps) => {
+  return {
+    badgeCount: state.workspaceMetas[ownProps.id] ? state.workspaceMetas[ownProps.id].badgeCount : 0,
+    workspaceName: state.workspaces?.[ownProps.id]?.name,
+    sidebarShortcutHints: state.preferences.sidebarShortcutHints,
+  };
 };
 
-WorkspaceSelector.propTypes = {
-  active: PropTypes.bool,
-  badgeCount: PropTypes.number,
-  classes: PropTypes.object.isRequired,
-  hibernated: PropTypes.bool,
-  id: PropTypes.string.isRequired,
-  onClick: PropTypes.func.isRequired,
-  onContextMenu: PropTypes.func,
-  order: PropTypes.number,
-  picturePath: PropTypes.string,
-  sidebarShortcutHints: PropTypes.bool.isRequired,
-  transparentBackground: PropTypes.bool,
-};
-
-const mapStateToProps = (state, ownProps) => ({
-  badgeCount: state.workspaceMetas[ownProps.id] ? state.workspaceMetas[ownProps.id].badgeCount : 0,
-  sidebarShortcutHints: state.preferences.sidebarShortcutHints,
-});
-
-export default connectComponent(WorkspaceSelector, mapStateToProps, null, styles);
+export default connectComponent(WorkspaceSelector, mapStateToProps, undefined, styles);