diff --git a/docker-compose.snapshots.update.yml b/docker-compose.snapshots.update.yml
index 557899d4..2200bd15 100644
--- a/docker-compose.snapshots.update.yml
+++ b/docker-compose.snapshots.update.yml
@@ -3,7 +3,7 @@ services:
e2e:
image: cypress/included:11.2.0
container_name: wisemapping-integration-tests
- entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn build && yarn test:integration"'
+ entrypoint: '/bin/sh -c "yarn install && yarn build && yarn test:integration"'
working_dir: /e2e
environment:
- CYPRESS_imageSnaphots=true
diff --git a/docker-compose.snapshots.yml b/docker-compose.snapshots.yml
index f914ab4c..ff90ab9f 100644
--- a/docker-compose.snapshots.yml
+++ b/docker-compose.snapshots.yml
@@ -3,7 +3,7 @@ services:
e2e:
image: cypress/included:11.2.0
container_name: wisemapping-integration-tests
- entrypoint: '/bin/sh -c "yarn bootstrap && yarn build && yarn test:integration"'
+ entrypoint: '/bin/sh -c "yarn build && yarn test:integration"'
working_dir: /e2e
environment:
- CYPRESS_imageSnaphots=true
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png
index 9d6974e0..0812b842 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png
index f362e0d8..8800b861 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png
index 66df2446..2de1892a 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png
index 26795fb3..f3806174 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png
index e8e3740a..774a9598 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png
index ad93dbf1..d41ec58d 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png
index 34298192..f84009e6 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png
index 27d323ed..9dc86297 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png differ
diff --git a/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx b/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
index b142bbd1..e22479e7 100644
--- a/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
+++ b/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
@@ -54,13 +54,6 @@ const IconPicker = ({ triggerClose, iconModel }: IconPickerProp): ReactElement =
return (
-
- }
- control={}
- />
-
-
{checked && (
)}
-
{!checked && }
+
+ }
+ control={}
+ />
+
);
};
diff --git a/packages/editor/test/playground/map-render/js/MapInfoImpl.ts b/packages/editor/test/playground/map-render/js/MapInfoImpl.ts
index 1181c22e..a3a1bdc3 100644
--- a/packages/editor/test/playground/map-render/js/MapInfoImpl.ts
+++ b/packages/editor/test/playground/map-render/js/MapInfoImpl.ts
@@ -22,11 +22,13 @@ class MapInfoImpl implements MapInfo {
private title: string;
private locked: boolean;
private starred: boolean;
+ private lockedMsg: string | undefined;
- constructor(id: string, title: string, locked: boolean) {
+ constructor(id: string, title: string, locked: boolean, lockedMsg?: string) {
this.id = id;
this.title = title;
this.locked = locked;
+ this.lockedMsg = lockedMsg;
this.starred = true;
}
@@ -44,7 +46,7 @@ class MapInfoImpl implements MapInfo {
}
setTitle(value: string): void {
- throw this.title;
+ throw (this.title = value);
}
isLocked(): boolean {
diff --git a/packages/editor/test/playground/map-render/js/editorlocked.tsx b/packages/editor/test/playground/map-render/js/editorlocked.tsx
index 03b3ceda..4c503b4b 100644
--- a/packages/editor/test/playground/map-render/js/editorlocked.tsx
+++ b/packages/editor/test/playground/map-render/js/editorlocked.tsx
@@ -37,15 +37,16 @@ const options: EditorOptions = {
enableKeyboardEvents: true,
};
-const mapInfo = new MapInfoImpl('welcome', 'Develop WiseMapping', true);
+const mapInfo = new MapInfoImpl('welcome', 'Develop WiseMapping', true, "It's locked !");
const container = document.getElementById('root');
const root = createRoot(container!);
-root.render( console.log('action called:', action)}
onLoad={initialization}
- />
+ />,
);
diff --git a/packages/editor/test/playground/map-render/js/showcase.tsx b/packages/editor/test/playground/map-render/js/showcase.tsx
index df95056f..e6d3c964 100644
--- a/packages/editor/test/playground/map-render/js/showcase.tsx
+++ b/packages/editor/test/playground/map-render/js/showcase.tsx
@@ -31,7 +31,6 @@ const initialization = (designer: Designer) => {
};
const persistence = new LocalStorageManager('samples/{id}.wxml', false, false);
-const mapId = 'welcome';
const options: EditorOptions = {
mode: 'showcase',
locale: 'en',
diff --git a/packages/webapp/cypress/e2e/maps.cy.ts b/packages/webapp/cypress/e2e/maps.cy.ts
index 934cac93..a09c2184 100644
--- a/packages/webapp/cypress/e2e/maps.cy.ts
+++ b/packages/webapp/cypress/e2e/maps.cy.ts
@@ -1,6 +1,7 @@
context('Maps Page', () => {
beforeEach(() => {
cy.visit('/c/maps');
+ cy.get('.MuiCard-root').should('have.length', 3);
});
it('should match the snapshot', () => {
@@ -11,11 +12,8 @@ context('Maps Page', () => {
context('iphone-5 resolution', () => {
beforeEach(() => {
cy.viewport('iphone-5');
- cy.visit('/c/maps', {
- onLoad: (win) => {
- win.onerror = null;
- },
- });
+ cy.visit('/c/maps');
+ cy.get('.MuiCard-root').should('have.length', 3);
});
it('Displays mobile menu button', () => {
@@ -41,6 +39,7 @@ context('720p resolution', () => {
beforeEach(() => {
cy.viewport(1280, 720);
cy.visit('/c/maps');
+ cy.get('.MuiCard-root').should('have.length', 3);
});
it('Displays mobile menu button', () => {
diff --git a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png
index 78b8a16d..72fa15a1 100644
Binary files a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png and b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png differ
diff --git a/packages/webapp/cypress/snapshots/maps.cy.ts/maps-720p-resolution.snap.png b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-720p-resolution.snap.png
index e5ecc16f..8cbf3d61 100644
Binary files a/packages/webapp/cypress/snapshots/maps.cy.ts/maps-720p-resolution.snap.png and b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-720p-resolution.snap.png differ
diff --git a/packages/webapp/cypress/snapshots/maps.cy.ts/maps-iphone-5.snap.png b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-iphone-5.snap.png
index 096acac9..a4846365 100644
Binary files a/packages/webapp/cypress/snapshots/maps.cy.ts/maps-iphone-5.snap.png and b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-iphone-5.snap.png differ
diff --git a/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png b/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png
index 8f2d685a..005b969d 100644
Binary files a/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png and b/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png differ
diff --git a/packages/webapp/src/classes/editor-map-info/index.ts b/packages/webapp/src/classes/editor-map-info/index.ts
index dfd09d56..8ed75bb2 100644
--- a/packages/webapp/src/classes/editor-map-info/index.ts
+++ b/packages/webapp/src/classes/editor-map-info/index.ts
@@ -24,14 +24,14 @@ class MapInfoImpl implements MapInfo {
private title: string;
private zoom: number;
private locked: boolean;
- private lockedMsg: string;
+ private lockedMsg: string | undefined;
constructor(
id: number,
client: Client,
title: string,
locked: boolean,
- lockedMsg: string,
+ lockedMsg: string | undefined,
zoom: number,
) {
this.id = id;
@@ -62,7 +62,7 @@ class MapInfoImpl implements MapInfo {
return this.locked;
}
- getLockedMessage(): string {
+ getLockedMessage(): string | undefined {
return this.lockedMsg;
}
diff --git a/packages/webapp/src/components/editor-page/index.tsx b/packages/webapp/src/components/editor-page/index.tsx
index 7f5be4c3..51944000 100644
--- a/packages/webapp/src/components/editor-page/index.tsx
+++ b/packages/webapp/src/components/editor-page/index.tsx
@@ -16,7 +16,7 @@
* limitations under the License.
*/
import React, { useEffect } from 'react';
-import Editor from '@wisemapping/editor';
+import Editor, { EditorOptions } from '@wisemapping/editor';
import {
EditorRenderMode,
PersistenceManager,
@@ -136,7 +136,7 @@ const EditorPage = ({ isTryMode }: EditorPropsType): React.ReactElement => {
const isAccountLoaded = mode === 'showcase' || useFetchAccount;
const loadCompleted = mode && isAccountLoaded;
- let options, persistence: PersistenceManager;
+ let options: EditorOptions, persistence: PersistenceManager;
let mapInfo: MapInfo;
if (loadCompleted) {
options = EditorOptionsBuilder.build(userLocale.code, mode, hotkey);
@@ -145,7 +145,7 @@ const EditorPage = ({ isTryMode }: EditorPropsType): React.ReactElement => {
mapId,
client,
options.mapTitle,
- options.isLocked,
+ options.locked,
options.lockedMsg,
options.zoom,
);