Skip to content

Commit

Permalink
Merge pull request #187 from MOV-AI/dev
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
diasnad authored Aug 30, 2023
2 parents a6881ad + 64fb882 commit d2dd936
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 1.0.0 --installs on--> 2.4 IDE-EE / 3.1 IDE-CE

- [FP-2539 - Reset bookmarks when we change active tab](https://movai.atlassian.net/browse/FP-2539)
- [FP-2527 - Preventing the reload of a new doc when it's closed](https://movai.atlassian.net/browse/FP-2527)
- [FP-2216 - IDE- black screen after changing resolution](https://movai.atlassian.net/browse/FP-2216)
- [FP-2542 - Removed code that prevented flow validations from running](https://movai.atlassian.net/browse/FP-2542)
Expand Down
32 changes: 9 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
"name": "@mov-ai/mov-fe-lib-ide",
"version": "1.0.0-57",
"main": "./dist/index.js",
"publishConfig": {
"registry": "https://npm.pkg.github.com/mov-ai"
},
"repository": {
"type": "git",
"url": "https://github.com/MOV-AI/frontend-npm-lib-ide.git"
Expand Down Expand Up @@ -53,7 +50,7 @@
"@material-ui/icons": ">=4.11.2",
"@material-ui/lab": ">=4.0.0-alpha.60",
"@material-ui/styles": ">=4.11.4",
"@mov-ai/mov-fe-lib-core": "^1.1.2-9",
"@mov-ai/mov-fe-lib-core": "^1.1.2-26",
"@mov-ai/mov-fe-lib-react": "^1.1.2-23",
"@tty-pt/styles": "^0.0.3-11",
"react": ">=16.14.0",
Expand All @@ -74,7 +71,7 @@
"@material-ui/icons": ">=4.11.2",
"@material-ui/lab": ">=4.0.0-alpha.60",
"@material-ui/styles": ">=4.11.4",
"@mov-ai/mov-fe-lib-core": "^1.1.2-9",
"@mov-ai/mov-fe-lib-core": "^1.1.2-26",
"@mov-ai/mov-fe-lib-react": "^1.1.2-24",
"@storybook/addon-actions": "^6.5.12",
"@storybook/addon-essentials": "^6.5.12",
Expand Down
2 changes: 2 additions & 0 deletions src/editors/_shared/hooks/DataTypes/types/BooleanType.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class BooleanType extends DataType {
default = false;

editComponent = (props, mode = "row") => {
this.label = props.label ?? this.label;
let pyValue = this.toString(props.rowData.value).toLowerCase();
const editor = {
row: () => this.booleanEditComponent(props, pyValue),
Expand Down Expand Up @@ -82,6 +83,7 @@ class BooleanType extends DataType {

return (
<Checkbox
data-testid={"Type=boolean-" + this.label}
color={"primary"}
style={{ width: "fit-content" }}
checked={parsedValue}
Expand Down
18 changes: 16 additions & 2 deletions src/engine/ReactPlugin/EditorReactPlugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { forwardRef, useCallback, useEffect, useRef } from "react";
import { Utils } from "@mov-ai/mov-fe-lib-core";
import PluginManagerIDE from "../PluginManagerIDE/PluginManagerIDE";
import withAlerts from "../../decorators/withAlerts";
import withKeyBinds from "../../decorators/withKeyBinds";
import withMenuHandler from "../../decorators/withMenuHandler";
Expand Down Expand Up @@ -76,7 +77,7 @@ export function withEditorPlugin(ReactComponent, methods = []) {
if (data.id !== id || instance?.id !== Utils.getNameFromURL(id))
deactivateEditor();
},
[id, activateEditor]
[id, deactivateEditor]
);

/**
Expand All @@ -93,6 +94,8 @@ export function withEditorPlugin(ReactComponent, methods = []) {
);

if (validTab && data.id === id) {
// We should reset bookmarks when changing tabs. Right? And Left too :D
PluginManagerIDE.resetBookmarks();
updateRightMenu();
activateEditor();
}
Expand All @@ -110,7 +113,18 @@ export function withEditorPlugin(ReactComponent, methods = []) {
off(PLUGINS.TABS.NAME, PLUGINS.TABS.ON.ACTIVE_TAB_CHANGE);
off(PLUGINS.DOC_MANAGER.NAME, PLUGINS.DOC_MANAGER.ON.UPDATE_DOC_DIRTY);
};
}, [id, addKeyBind, removeKeyBind, on, off, save, activateThisEditor]);
}, [
id,
addKeyBind,
removeKeyBind,
on,
off,
save,
call,
updateRightMenu,
activateThisEditor,
activateEditor
]);

return (
<div
Expand Down

0 comments on commit d2dd936

Please sign in to comment.