mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-06 02:30:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

refactor: create workspace in one click

Browse source
This commit is contained in:
Lin Onetwo 2020-06-26 23:56:11 +08:00
parent 5aa8ca95a0
commit 04f4991948
5 changed files with 149 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,5 @@
{
"cSpell.words": [
"subwiki"
]
}

4
public/libs/create-wiki.js
View file

@ -16,10 +16,9 @@ async function createWiki(newFolderPath, folderName) {
}
// Start copying wiki template to destination
await fs.copy(TIDDLYWIKI_FOLDER_PATH, newWikiPath);
return newWikiPath;
}
async function createSubWiki(newFolderPath, folderName) {
async function createSubWiki(newFolderPath, folderName, mainWikiToLink) {
const newWikiPath = path.join(newFolderPath, folderName);
if (!(await fs.pathExists(newFolderPath))) {
throw new Error(`该目录不存在 "${newFolderPath}"`);
@ -28,7 +27,6 @@ async function createSubWiki(newFolderPath, folderName) {
throw new Error(`Wiki已经存在于该位置 "${newWikiPath}"`);
}
await fs.mkdirs(path.join(newFolderPath, folderName));
return newWikiPath;
}
module.exports = { createWiki, createSubWiki };

21
public/listeners/index.js
View file

@ -10,6 +10,7 @@ const { getPreference, getPreferences, resetPreferences, setPreference } = requi
const { getSystemPreference, getSystemPreferences, setSystemPreference } = require('../libs/system-preferences');
const {
countWorkspaces,
getActiveWorkspace,
getWorkspace,
getWorkspaces,
@ -55,21 +56,21 @@ const proxyWindow = require('../windows/proxy');
const spellcheckLanguagesWindow = require('../windows/spellcheck-languages');
const loadListeners = () => {
ipcMain.on('copy-wiki-template', async (event, newFolderPath, folderName) => {
ipcMain.handle('copy-wiki-template', async (event, newFolderPath, folderName) => {
try {
const createdWikiPath = await createWiki(newFolderPath, folderName);
await createWiki(newFolderPath, folderName);
// eslint-disable-next-line sonarjs/no-duplicate-string
event.reply('create-wiki-result', `Wiki 已成功创建到 ${createdWikiPath}`);
return true;
} catch (error) {
event.reply('create-wiki-result', String(error));
return String(error);
}
});
ipcMain.on('create-sub-wiki', async (event, newFolderPath, folderName) => {
ipcMain.handle('create-sub-wiki', async (event, newFolderPath, folderName, mainWikiToLink) => {
try {
const createdWikiPath = await createSubWiki(newFolderPath, folderName);
event.reply('create-wiki-result', `Wiki 已成功创建到 ${createdWikiPath}`);
await createSubWiki(newFolderPath, folderName, mainWikiToLink);
return true;
} catch (error) {
event.reply('create-wiki-result', String(error));
return String(error);
}
});
ipcMain.on('request-start-tiddlywiki', (wikiPath) => {
@ -239,6 +240,10 @@ const loadListeners = () => {
});
// Workspaces
ipcMain.on('count-workspace', (e) => {
e.returnValue = countWorkspaces();
});
ipcMain.on('get-workspace', (e, id) => {
const val = getWorkspace(id);
e.returnValue = val;

183
src/components/dialog-add-workspace/index.js
View file

@ -2,7 +2,6 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import is from 'styled-is';
import Paper from '@material-ui/core/Paper';
import FormControlLabel from '@material-ui/core/FormControlLabel';
@ -18,9 +17,15 @@ import FolderIcon from '@material-ui/icons/Folder';
import GithubIcon from '@material-ui/icons/GitHub';
import connectComponent from '../../helpers/connect-component';
import { updateForm, save } from '../../state/dialog-add-workspace/actions';
import { updateForm, save, wikiCreationResult } from '../../state/dialog-add-workspace/actions';
import { requestCopyWikiTemplate, requestCreateSubWiki, getIconPath, getWorkspaces } from '../../senders';
import {
requestCopyWikiTemplate,
requestCreateSubWiki,
getIconPath,
getWorkspaces,
countWorkspace,
} from '../../senders';
const Container = styled.main`
height: 100vh;
@ -39,14 +44,6 @@ const LocationPickerButton = styled(Button)`
white-space: nowrap;
width: 100%;
`;
const CreatorButton = styled(Button)`
white-space: nowrap;
width: 100%;
${is('disabled')`
display: none;
`}
border-radius: 0;
`;
const SyncToGithubButton = styled(Button)`
white-space: nowrap;
width: 100%;
@ -60,17 +57,15 @@ const CloseButton = styled(Button)`
position: absolute;
bottom: 0;
`;
const SoftLinkContainer = styled(Paper)`
margin-top: 5px;
padding-top: 5px;
`;
const SoftLinkToMainWikiSelect = styled(Select)`
width: 100%;
`;
const AddSoftLinkButton = styled(CloseButton)``;
const SoftLinkToMainWikiSelectInputLabel = styled(InputLabel)`
margin-top: 5px;
`;
function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave }) {
const [isCreateMainWorkspace, isCreateMainWorkspaceSetter] = useState(true);
function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave, onWikiCreationResult }) {
const [isCreateMainWorkspace, isCreateMainWorkspaceSetter] = useState(countWorkspace() === 0);
const [parentFolderLocation, parentFolderLocationSetter] = useState('');
const [wikiFolderLocation, wikiFolderLocationSetter] = useState('');
@ -84,9 +79,6 @@ function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave }) {
useEffect(() => {
wikiFolderLocationSetter(`${parentFolderLocation}/${wikiFolderName}`);
}, [parentFolderLocation, wikiFolderName]);
const messageHasError = wikiCreationMessage.startsWith('Error: ');
const message = wikiCreationMessage.replace('Error: ', '');
const creationSucceed = !messageHasError && wikiCreationMessage.length > 0;
const workspaceFormData = {
name: wikiFolderLocation,
isSubWiki: !isCreateMainWorkspace,
@ -139,55 +131,24 @@ function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave }) {
</Typography>
</LocationPickerButton>
<LocationPickerInput
error={messageHasError}
helperText={message}
error={wikiCreationMessage}
helperText={wikiCreationMessage}
fullWidth
onChange={event => parentFolderLocationSetter(event.target.value)}
label="知识库的父文件夹"
value={parentFolderLocation}
disabled={creationSucceed}
/>
<LocationPickerInput
fullWidth
onChange={event => wikiFolderNameSetter(event.target.value)}
label="知识库文件夹名"
value={wikiFolderName}
disabled={creationSucceed}
/>
<CreatorButton
variant="contained"
color="primary"
disabled={parentFolderLocation.length === 0 || creationSucceed}
onClick={() => {
if (isCreateMainWorkspace) {
requestCopyWikiTemplate(parentFolderLocation, wikiFolderName);
} else {
requestCreateSubWiki(parentFolderLocation, wikiFolderName);
}
onUpdateForm(workspaceFormData);
}}
>
<Typography variant="body1" display="inline">
在
</Typography>
<Typography
variant="body2"
noWrap
display="inline-block"
align="center"
style={{ direction: 'rtl', textTransform: 'none' }}
>
{wikiFolderLocation}
</Typography>
<Typography variant="body1" display="inline">
创建WIKI
</Typography>
</CreatorButton>
</CreateContainer>
{!isCreateMainWorkspace && (
<SoftLinkContainer elevation={2} square>
<InputLabel id="main-wiki-select-label">主知识库位置</InputLabel>
<>
<SoftLinkToMainWikiSelectInputLabel id="main-wiki-select-label">
主知识库位置
</SoftLinkToMainWikiSelectInputLabel>
<SoftLinkToMainWikiSelect
labelId="main-wiki-select-label"
id="main-wiki-select"
@ -216,34 +177,9 @@ function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave }) {
</Typography>
</FormHelperText>
)}
</SoftLinkContainer>
)}
{isCreateMainWorkspace ? (
<CloseButton
variant="contained"
color="secondary"
disabled={!creationSucceed}
onClick={() => {
onUpdateForm(workspaceFormData);
onSave();
}}
>
启动WIKI
</CloseButton>
) : (
<AddSoftLinkButton
variant="contained"
color="secondary"
disabled={!creationSucceed || !mainWikiToLink}
onClick={() => {
onUpdateForm(workspaceFormData);
onSave();
}}
>
链接到主知识库
</AddSoftLinkButton>
</>
)}
</CreateContainer>
<SyncContainer elevation={2} square>
<Typography variant="subtitle1" align="center">
@ -253,6 +189,81 @@ function AddWorkspace({ wikiCreationMessage, onUpdateForm, onSave }) {
登录Github账号
</SyncToGithubButton>
</SyncContainer>
{isCreateMainWorkspace ? (
<CloseButton
variant="contained"
color="secondary"
disabled={!parentFolderLocation}
onClick={async () => {
onUpdateForm(workspaceFormData);
const creationResult = await requestCopyWikiTemplate(parentFolderLocation, wikiFolderName);
if (creationResult) {
onSave();
} else {
onWikiCreationResult(creationResult);
}
}}
>
{parentFolderLocation && (
<>
<Typography variant="body1" display="inline">
在
</Typography>
<Typography
variant="body2"
noWrap
display="inline-block"
align="center"
style={{ direction: 'rtl', textTransform: 'none' }}
>
{wikiFolderLocation}
</Typography>
</>
)}
<Typography variant="body1" display="inline">
创建WIKI
</Typography>
</CloseButton>
) : (
<CloseButton
variant="contained"
color="secondary"
disabled={!parentFolderLocation || !mainWikiToLink}
onClick={async () => {
onUpdateForm(workspaceFormData);
const creationResult = await requestCreateSubWiki(parentFolderLocation, wikiFolderName, mainWikiToLink);
if (creationResult) {
onSave();
} else {
onWikiCreationResult(creationResult);
}
}}
>
{parentFolderLocation && (
<>
<Typography variant="body1" display="inline">
在
</Typography>
<Typography
variant="body2"
noWrap
display="inline-block"
align="center"
style={{ direction: 'rtl', textTransform: 'none' }}
>
{wikiFolderLocation}
</Typography>
</>
)}
<Typography variant="body1" display="inline">
创建WIKI
</Typography>
<Typography variant="body1" display="inline">
并链接到主知识库
</Typography>
</CloseButton>
)}
</Container>
);
}
@ -265,6 +276,7 @@ AddWorkspace.propTypes = {
wikiCreationMessage: PropTypes.string,
onUpdateForm: PropTypes.func.isRequired,
onSave: PropTypes.func.isRequired,
onWikiCreationResult: PropTypes.func.isRequired,
};
const mapStateToProps = state => ({
@ -274,6 +286,7 @@ const mapStateToProps = state => ({
const actionCreators = {
updateForm,
save,
wikiCreationResult,
};
export default connectComponent(AddWorkspace, mapStateToProps, actionCreators);

5
src/senders/index.js
View file

@ -1,7 +1,7 @@
const { ipcRenderer } = window.require('electron');
export const requestCopyWikiTemplate = (newFolderPath, folderName) => ipcRenderer.send('copy-wiki-template', newFolderPath, folderName);
export const requestCreateSubWiki = (newFolderPath, folderName) => ipcRenderer.send('create-sub-wiki', newFolderPath, folderName);
export const requestCopyWikiTemplate = (newFolderPath, folderName) => ipcRenderer.invoke('copy-wiki-template', newFolderPath, folderName);
export const requestCreateSubWiki = (newFolderPath, folderName, mainWikiToLink) => ipcRenderer.invoke('create-sub-wiki', newFolderPath, folderName, mainWikiToLink);
export const requestStartTiddlyWiki = (wikiPath) => ipcRenderer.send('request-start-tiddlywiki', wikiPath);
export const requestOpenInBrowser = (url) => ipcRenderer.send('request-open-in-browser', url);
export const requestShowMessageBox = (message, type) => ipcRenderer.send('request-show-message-box', message, type);
@ -45,6 +45,7 @@ export const requestSetSystemPreference = (name, value) =>
ipcRenderer.send('request-set-system-preference', name, value);
// Workspace
export const countWorkspace = () => ipcRenderer.sendSync('count-workspace');
export const getWorkspace = (id) => ipcRenderer.sendSync('get-workspace', id);
export const getWorkspaces = () => ipcRenderer.sendSync('get-workspaces');
export const requestClearBrowsingData = () => ipcRenderer.send('request-clear-browsing-data');