Fix Snippets bug on jupyterlab

minjk-bl · minjk-bl · commit 06b14f2b5f7f · 2023-04-04T19:42:04.000+09:00
diff --git a/visualpython/css/m_apps/snippets.css b/visualpython/css/m_apps/snippets.css
@@ -69,11 +69,13 @@
     float: right;
     cursor: pointer;
     position: relative;
+    height: 25px;
 }
 .vp-sn-menu-more {
     /* LAB: img to background-image */
     background: top / contain no-repeat url(../../img/snippets/more.svg);
     height: 100%;
+    width: 25px;
 }
 .vp-sn-menu-box {
     display: none;
@@ -129,7 +131,8 @@
     cursor: pointer;
     /* LAB: img to background-image */
     background: top / contain no-repeat url(../../img/snippets/sort.svg);
-    height: 100%;
+    height: 22px;
+    width: 22px;
 }
 .vp-sn-sort-menu-box {
     display: none;
diff --git a/visualpython/js/com/com_Kernel.js b/visualpython/js/com/com_Kernel.js
@@ -914,7 +914,7 @@ define([
          * @param {String} configType vpudf, vpcfg 
          * @returns 
          */
-        setLabConfig(content, configType='vpudf') {
+        setLabConfig(content={}, configType='vpudf') {
             var that = this;
             var configFile = '';
             switch (configType) {
@@ -930,7 +930,7 @@ define([
             }
             // write file
             var sbfileSaveCmd = new com_String();
-            sbfileSaveCmd.appendFormat("_vp_set_lab_vpcfg('{0}', '{1}')", configFile, content);
+            sbfileSaveCmd.appendFormat("_vp_set_lab_vpcfg('{0}', {1})", configFile, content);
             return new Promise(function(resolve, reject) {
                 that.execute(sbfileSaveCmd.toString())
                 .then(function(resultObj) {
diff --git a/visualpython/js/m_apps/Snippets.js b/visualpython/js/m_apps/Snippets.js
@@ -126,7 +126,41 @@ define([
                             filesPath.forEach(fileObj => {
                                 var fileName = fileObj.file;
                                 var selectedPath = fileObj.path;
-                                fetch(selectedPath).then(function(file) {
+                                if (vpConfig.extensionType === 'lab') {
+                                    vpKernel.readFile(selectedPath).then(function(resultObj) {
+                                        try {
+                                            var snippetData = JSON.parse(resultObj.result);
+                                            var timestamp = new Date().getTime();
+        
+                                            var keys = Object.keys(snippetData);
+                                            var importKeys = [];
+                                            var newSnippet = {};
+                                            keys.forEach(key => {
+                                                var importKey = key;
+                                                var importNo = 1;
+                                                var titleList = Object.keys(that.codemirrorList);
+                                                // set duplicate title
+                                                while(titleList.includes(importKey)) {
+                                                    importKey = key + '_imported' + importNo;
+                                                    importNo += 1;
+                                                }
+                                                newSnippet = { ...newSnippet, [importKey]: { code: snippetData[key], timestamp: timestamp } };
+        
+                                                importKeys.push(importKey);
+                                            });
+                                            vpConfig.setData(newSnippet).then(function() {
+                                                that.importedList = [ ...importKeys ];
+                                                that.loadUdfList();
+                                                com_util.renderSuccessMessage(fileName + ' imported ');
+                                            });
+                                        } catch (ex) {
+                                            com_util.renderAlertModal('Not applicable file contents with vp format! (JSON)');
+                                        }
+                                    }).catch(function(err) {
+                                        vpLog.display(VP_LOG_TYPE.ERROR, err);
+                                    });
+                                } else {
+                                    fetch(selectedPath).then(function(file) {
                                     if (file.status != 200) {
                                         alert("The file format is not valid.");
                                         return;
@@ -159,6 +193,8 @@ define([
                                         com_util.renderSuccessMessage(fileName + ' imported ');
                                     });
                                 });
+                                }
+                                
                             });
                             
                         }
diff --git a/visualpython/python/fileNaviCommand.py b/visualpython/python/fileNaviCommand.py
@@ -5,6 +5,7 @@
 import os as _vp_os 
 import stat as _vp_stat
 import ctypes as _vp_ctypes
+import json as _vp_json
 
 def _vp_get_userprofile_path():
     """
@@ -197,7 +198,7 @@ def _vp_get_lab_vpcfg_path():
         return _vpcfg_path
     return ''
 
-def _vp_set_lab_vpcfg(configFile, content):
+def _vp_set_lab_vpcfg(configFile, content={}):
     if _vp_os.name == 'nt':
         # windows
         _user_path = _vp_get_userprofile_path()
@@ -207,7 +208,7 @@ def _vp_set_lab_vpcfg(configFile, content):
     _vpcfg_path = _vp_os.path.join(_user_path, '.visualpython')
     _vp_os.makedirs(_vpcfg_path, exist_ok=True)
     with open(_vp_os.path.join(_vpcfg_path, configFile), "w") as f:
-        f.write(content)
+        f.write(_vp_json.dumps(content))
     return True
 
 def _vp_read_file(filePath):
