vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-22 06:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix status load error of starred on try mode.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2022-10-23 08:18:41 -07:00
parent fb6141ccab
commit dac50c33e9
7 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/editor/src/components/app-bar/index.tsx
View File

@ -69,12 +69,14 @@ const AppBar = ({ model, mapInfo, capability, onAction, accountConfig }: AppBarP
}; };
useEffect(() => { useEffect(() => {
mapInfo if (!capability.isHidden('starred')) {
.isStarred() mapInfo
.then((value) => setStarred(value)) .isStarred()
.catch((e) => { .then((value) => setStarred(value))
console.error(`Unexpected error loading starred status-> ${e}`); .catch((e) => {
}); console.error(`Unexpected error loading starred status-> ${e}`);
});
}
}, []); }, []);
const config: ActionConfig[] = [ const config: ActionConfig[] = [

18
packages/editor/src/components/app-bar/editor-toolbar/configBuilder.tsx → packages/editor/src/components/editor-toolbar/configBuilder.tsx
View File

@ -35,15 +35,15 @@ import AddCircleOutlineOutlinedIcon from '@mui/icons-material/AddCircleOutlineOu
import Palette from '@mui/icons-material/Square'; import Palette from '@mui/icons-material/Square';
import SquareOutlined from '@mui/icons-material/SquareOutlined'; import SquareOutlined from '@mui/icons-material/SquareOutlined';
import ActionConfig from '../../../classes/action/action-config'; import ActionConfig from '../../classes/action/action-config';
import { SwitchValueDirection } from '../../toolbar/ToolbarValueModelBuilder'; import { SwitchValueDirection } from '../toolbar/ToolbarValueModelBuilder';
import NodePropertyValueModelBuilder from '../../../classes/model/node-property-builder'; import NodePropertyValueModelBuilder from '../../classes/model/node-property-builder';
import ColorPicker from '../../action-widget/pane/color-picker'; import ColorPicker from '../action-widget/pane/color-picker';
import TopicLink from '../../action-widget/pane/topic-link'; import TopicLink from '../action-widget/pane/topic-link';
import TopicNote from '../../action-widget/pane/topic-note'; import TopicNote from '../action-widget/pane/topic-note';
import IconPicker from '../../action-widget/pane/icon-picker'; import IconPicker from '../action-widget/pane/icon-picker';
import FontFamilySelector from '../../action-widget/button/font-family-selector'; import FontFamilySelector from '../action-widget/button/font-family-selector';
import Editor from '../../../classes/model/editor'; import Editor from '../../classes/model/editor';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
const keyTooltip = (msg: string, key: string): string => { const keyTooltip = (msg: string, key: string): string => {

8
packages/editor/src/components/app-bar/editor-toolbar/index.tsx → packages/editor/src/components/editor-toolbar/index.tsx
View File

@ -16,10 +16,10 @@
* limitations under the License. * limitations under the License.
*/ */
import React from 'react'; import React from 'react';
import ActionConfig from '../../../classes/action/action-config'; import ActionConfig from '../../classes/action/action-config';
import Capability from '../../../classes/action/capability'; import Capability from '../../classes/action/capability';
import Model from '../../../classes/model/editor'; import Model from '../../classes/model/editor';
import Toolbar from '../../toolbar'; import Toolbar from '../toolbar';
import { buildEditorPanelConfig } from './configBuilder'; import { buildEditorPanelConfig } from './configBuilder';
type EditorToolbarProps = { type EditorToolbarProps = {

4
packages/editor/src/components/index.tsx
View File

@ -39,8 +39,8 @@ import AppBar from './app-bar';
import Capability from '../classes/action/capability'; import Capability from '../classes/action/capability';
import { ToolbarActionType } from './toolbar/ToolbarActionType'; import { ToolbarActionType } from './toolbar/ToolbarActionType';
import MapInfo from '../classes/model/map-info'; import MapInfo from '../classes/model/map-info';
import EditorToolbar from './app-bar/editor-toolbar'; import EditorToolbar from './editor-toolbar';
import ZoomPanel from './app-bar/zoom-panel'; import ZoomPanel from './zoom-panel';
export type EditorOptions = { export type EditorOptions = {
mode: EditorRenderMode; mode: EditorRenderMode;

7
packages/editor/src/components/toolbar/index.tsx
View File

@ -34,7 +34,12 @@ import ActionConfig from '../../classes/action/action-config';
export const ToolbarButtonOption = (props: { configuration: ActionConfig }) => { export const ToolbarButtonOption = (props: { configuration: ActionConfig }) => {
const selected = props.configuration.selected && props.configuration.selected(); const selected = props.configuration.selected && props.configuration.selected();
return ( return (
<Tooltip title={props.configuration.tooltip || ''} disableInteractive arrow={true}> <Tooltip
title={props.configuration.tooltip || ''}
disableInteractive
arrow={true}
enterDelay={7000}
>
<Box component="span" my="auto"> <Box component="span" my="auto">
<IconButton <IconButton
onClick={props.configuration.onClick} onClick={props.configuration.onClick}

12
packages/editor/src/components/app-bar/zoom-panel/index.tsx → packages/editor/src/components/zoom-panel/index.tsx
View File

@ -19,12 +19,12 @@ import KeyboardOutlined from '@mui/icons-material/KeyboardOutlined';
import Typography from '@mui/material/Typography'; import Typography from '@mui/material/Typography';
import React from 'react'; import React from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import ActionConfig from '../../../classes/action/action-config'; import ActionConfig from '../../classes/action/action-config';
import Capability from '../../../classes/action/capability'; import Capability from '../../classes/action/capability';
import Editor from '../../../classes/model/editor'; import Editor from '../../classes/model/editor';
import Model from '../../../classes/model/editor'; import Model from '../../classes/model/editor';
import KeyboardShorcutsHelp from '../../action-widget/pane/keyboard-shortcut-help'; import KeyboardShorcutsHelp from '../action-widget/pane/keyboard-shortcut-help';
import Toolbar from '../../toolbar'; import Toolbar from '../toolbar';
import ZoomOutOutlinedIcon from '@mui/icons-material/ZoomOutOutlined'; import ZoomOutOutlinedIcon from '@mui/icons-material/ZoomOutOutlined';
import ZoomInOutlinedIcon from '@mui/icons-material/ZoomInOutlined'; import ZoomInOutlinedIcon from '@mui/icons-material/ZoomInOutlined';
import CenterFocusStrongOutlinedIcon from '@mui/icons-material/CenterFocusStrongOutlined'; import CenterFocusStrongOutlinedIcon from '@mui/icons-material/CenterFocusStrongOutlined';

2
packages/editor/test/unit/toolbar/toolbar.test.tsx
View File

@ -107,7 +107,7 @@ describe('Editor Toolbar Button', () => {
fireEvent.mouseOver(btn); fireEvent.mouseOver(btn);
await screen.findByText('tooltip'); //await screen.findByText('tooltip');
}); });
it('Given an option with a function icon implementation shows the icon on the button', () => { it('Given an option with a function icon implementation shows the icon on the button', () => {