vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-25 15:47:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge develop remote

Browse Source
This commit is contained in:
Ezequiel-Vega 2022-03-30 16:50:18 -03:00
commit 6b8f61a67f
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mindplot/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@wisemapping/mindplot", "name": "@wisemapping/mindplot",
"version": "5.0.9", "version": "5.0.10",
"description": "WiseMapping - Mindplot Canvas Library", "description": "WiseMapping - Mindplot Canvas Library",
"homepage": "http://www.wisemapping.org/", "homepage": "http://www.wisemapping.org/",
"directories": { "directories": {
@ -26,7 +26,7 @@
"lint": "eslint src --ext js,ts", "lint": "eslint src --ext js,ts",
"playground": "webpack serve --config webpack.playground.js", "playground": "webpack serve --config webpack.playground.js",
"cy:run": "cypress run", "cy:run": "cypress run",
"test:unit": "jest ./test/unit/export/*.ts ./test/unit/import/*.ts ./test/unit/layout/*.js --verbose --detectOpenHandles", "test:unit": "jest ./test/unit/export/*.ts ./test/unit/import/*.ts ./test/unit/layout/*.js --verbose --silent --detectOpenHandles",
"test:integration": "start-server-and-test playground http-get://localhost:8083 cy:run", "test:integration": "start-server-and-test playground http-get://localhost:8083 cy:run",
"test": "yarn test:unit && yarn test:integration" "test": "yarn test:unit && yarn test:integration"
}, },

4
packages/mindplot/src/components/import/FreemindImporter.ts
View File

@ -146,6 +146,7 @@ export default class FreemindImporter extends Importer {
private convertNodeProperties(freeNode: FreemindNode, wiseTopic: NodeModel, centralTopic: boolean): void { private convertNodeProperties(freeNode: FreemindNode, wiseTopic: NodeModel, centralTopic: boolean): void {
const text: string = freeNode.getText(); const text: string = freeNode.getText();
<<<<<<< HEAD
if (text) { if (text) {
if (!centralTopic && text.length > 100) { if (!centralTopic && text.length > 100) {
wiseTopic.setText(text.replace(/([^\n]{1,100})\s/g, '$1\n')); wiseTopic.setText(text.replace(/([^\n]{1,100})\s/g, '$1\n'));
@ -153,6 +154,9 @@ export default class FreemindImporter extends Importer {
wiseTopic.setText(text); wiseTopic.setText(text);
} }
} }
=======
if (text) wiseTopic.setText(text);
>>>>>>> 5901b660deddff72765594a2aadd5045e7061043
const bgColor: string = freeNode.getBackgorundColor(); const bgColor: string = freeNode.getBackgorundColor();
if (bgColor) wiseTopic.setBackgroundColor(bgColor); if (bgColor) wiseTopic.setBackgroundColor(bgColor);

2
packages/webapp/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@wisemapping/webapp", "name": "@wisemapping/webapp",
"version": "5.0.9", "version": "5.0.11",
"main": "app.jsx", "main": "app.jsx",
"scripts": { "scripts": {
"start": "webpack serve --config webpack.dev.js ", "start": "webpack serve --config webpack.dev.js ",

3
packages/webapp/src/components/maps-page/action-chooser/index.tsx
View File

@ -9,6 +9,7 @@ import PublicOutlinedIcon from '@mui/icons-material/PublicOutlined';
import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined'; import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
import ShareOutlinedIcon from '@mui/icons-material/ShareOutlined'; import ShareOutlinedIcon from '@mui/icons-material/ShareOutlined';
import LabelOutlined from '@mui/icons-material/LabelOutlined'; import LabelOutlined from '@mui/icons-material/LabelOutlined';
import HistoryOutlined from '@mui/icons-material/HistoryOutlined';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { fetchMapById } from '../../../redux/clientSlice'; import { fetchMapById } from '../../../redux/clientSlice';
@ -143,7 +144,7 @@ const ActionChooser = (props: ActionProps): React.ReactElement => {
{role != 'viewer' && ( {role != 'viewer' && (
<MenuItem onClick={handleOnClose('history')}> <MenuItem onClick={handleOnClose('history')}>
<ListItemIcon> <ListItemIcon>
<DeleteOutlinedIcon /> <HistoryOutlined/>
</ListItemIcon> </ListItemIcon>
<FormattedMessage id="action.history" defaultMessage="History" /> <FormattedMessage id="action.history" defaultMessage="History" />
</MenuItem> </MenuItem>