Merge pull request #2467 from entrylabs/issue/5899_2

Issue/5899 2

Author: leunge

src/playground/workspace.js

@@ -204,6 +204,8 @@ Entry.Workspace = class Workspace {
                                 Entry.hwLite.banClassAllHardwareLite();
                                 Entry.playground.dataTable.removeAllBlocks();
                                 Entry.aiLearning.removeAllBlocks();
+                                Util.removeNotSupportedBlock();
+                                Entry.playground.blockMenu.banClass('python_disable');
                                 // 블럭 삭제되고 처리
                                 requestAnimationFrame(() => {
                                     changeToPythonMode();
@@ -237,6 +239,7 @@ Entry.Workspace = class Workspace {
                 try {
                     this.board.show();
                     blockMenu.unbanClass('functionInit', true);
+                    Entry.playground.blockMenu.unbanClass('python_disable');
                     this.set({ selectedBoard: this.board });
                     this.textToCode(this.oldMode, this.oldTextType);
                     if (this.overlayBoard) {

src/textcoding/parser/core/block/blockToPy.js

@@ -64,10 +64,17 @@ Entry.BlockToPyParser = class {
             let contentResult = '';
 
             blocks.forEach((block, index) => {
-                if (index === 0 && Entry.TextCodingUtil.isEventBlock(block)) {
-                    rootResult = `${this.Block(block)}\n`;
-                } else {
-                    contentResult += `${this.Block(block)}\n`;
+                try {
+                    if (index === 0 && Entry.TextCodingUtil.isEventBlock(block)) {
+                        rootResult = `${this.Block(block)}\n`;
+                    } else {
+                        contentResult += `${this.Block(block)}\n`;
+                    }
+                } catch (e) {
+                    Entry.toast.alert(
+                        Lang.TextCoding.title_converting,
+                        Lang.TextCoding.alert_legacy_no_support
+                    );
                 }
             });
 
@@ -350,7 +357,7 @@ Entry.BlockToPyParser = class {
             schema = datum;
         }
 
-        if (schema && schema.syntax) {
+        if (schema && schema.syntax && schema.syntax.py && schema.syntax.py.length > 0) {
             const syntaxes = schema.syntax.py.concat();
             while (syntaxes.length) {
                 let isFail = false;

src/textcoding/util/textCodingUtil.js

@@ -508,12 +508,16 @@ class TextCodingUtil {
         const isNotPythonSupportFunciton = Object.keys(functions).some(
             (key) => functions[key].useLocalVariables || functions[key].type === 'value'
         );
+        const isNotSupportedUsed = this.getNotSupportedBlocks().some((name) =>
+            Entry.Utils.isUsedBlockType(name)
+        );
         if (
             activatedExpansionBlocks.length > 0 ||
             activatedUtilizeBlock.length > 0 ||
             Entry.aiLearning.isLoaded ||
             isNotPythonSupportFunciton ||
-            tables.length > 0
+            tables.length > 0 ||
+            isNotSupportedUsed
         ) {
             return {
                 message: Lang.TextCoding[Entry.TextCodingError.ALERT_API_NO_SUPPORT],
@@ -522,6 +526,22 @@ class TextCodingUtil {
         }
     }
 
+    getNotSupportedBlocks() {
+        if (EntryStatic.pythonDisabled) {
+            return EntryStatic.pythonDisabled;
+        }
+        EntryStatic.pythonDisabled = Object.keys(Entry.block).filter(
+            (key) => Entry.block[key]?.isNotFor.indexOf('python_disable') >= 0
+        );
+        return EntryStatic.pythonDisabled;
+    }
+
+    removeNotSupportedBlock(names = []) {
+        this.getNotSupportedBlocks().forEach((blockType) => {
+            Entry.Utils.removeBlockByType(blockType);
+        });
+    }
+
     /**
      * 현재 코드 내 변수, 리스트에 대해 공백/특수문자/예약어/숫자시작 여부를 검사한다.
      * @return {Object} 에러오브젝트