Fix Instance app's bug - not able to access subset button

minjk-bl · minjk-bl · commit 047dd1bad235 · 2023-04-26T18:03:25.000+09:00
diff --git a/visualpython/html/m_apps/instance.html b/visualpython/html/m_apps/instance.html
@@ -2,7 +2,7 @@
     <div class="vp-instance-body">
         <div class="vp-instance-left-box vp-instance-base cm-s-ipython">
             <div class="vp-instance-target-box vp-grid-col-110">
-                <label for="vp_instanceTarget" class="vp-instance-label variable">Target variable</label>
+                <label for="vp_instanceTarget" class="vp-instance-label variable vp-orange-text">Target variable</label>
                 <input type="text" id="vp_instanceTarget" placeholder="Select variable"/>
             </div>
             <div class="vp-instance-box variable">
diff --git a/visualpython/js/com/component/InstanceEditor.js b/visualpython/js/com/component/InstanceEditor.js
@@ -523,20 +523,23 @@ define([
                         $(that.wrapSelector('.' + VP_INS_PARAMETER)).prop('disabled', true);
                     }
                 }
+
+                // callback
+                if (callback) {
+                    callback(varObj);
+                }
             }).catch(function(resultObj) {
                 let { result } = resultObj;
                 // show alert if this is visible
                 if (that.pageThis.isHidden() == false && that.config.showAlert == true) {
                     com_util.renderAlertModal(result.ename + ': ' + result.evalue);
                 }
-            }).finally(function() {
                 // callback
                 if (callback) {
-                    callback('');
+                    callback({});
                 }
             });
 
-
         }
         show() {
             $(this.wrapSelector()).show();
diff --git a/visualpython/js/m_apps/Instance.js b/visualpython/js/m_apps/Instance.js
@@ -33,7 +33,7 @@ define([
             super._init();
             /** Write codes executed before rendering */
             this.config.dataview = false;
-            this.config.size = { width: 1064, height: 550 };
+            this.config.sizeLevel = 4;
             this.config.checkModules = ['pd'];
 
             this.state = {
@@ -197,11 +197,13 @@ define([
                 allowModule: true,
                 finish: function(value, dtype) {
                     $(that.wrapSelector('#vp_instanceTarget')).trigger({type: 'change', value: value});
+                    that.updateValue(value);
+                    that.reloadInsEditor();
                 },
                 select: function(value, dtype) {
                     $(that.wrapSelector('#vp_instanceTarget')).trigger({type: 'change', value: value});
-                    // that.updateValue(value);
-                    // that.reloadInsEditor();
+                    that.updateValue(value);
+                    that.reloadInsEditor();
                 }
             });
             $(page).find('#vp_instanceTarget').replaceWith(targetSelector.toTagString());
@@ -211,7 +213,6 @@ define([
             });
             $(page).find('#vp_instanceAllocate').replaceWith(allocateSelector.toTagString());
 
-
             return page;
         }
 
@@ -373,6 +374,7 @@ define([
         reloadInsEditor() {
             var that = this;
             var tempPointer = this.pointer;
+            this.subsetEditor.disableButton();
             var callbackFunction = function (varObj) {
                 var varType = varObj.type;
     
@@ -382,8 +384,6 @@ define([
                     let nowCode = (cmObj && cmObj.cm)?cmObj.cm.getValue():'';
                     that.subsetEditor.state.pandasObject = nowCode;
                     that.subsetEditor.enableButton();
-                } else {
-                    that.subsetEditor.disableButton();
                 }
             };
     

Original file line number	Diff line number	Diff line change
`@@ -523,20 +523,23 @@ define([`
`523`	`523`	`$(that.wrapSelector('.' + VP_INS_PARAMETER)).prop('disabled', true);`
`524`	`524`	`}`
`525`	`525`	`}`
	`526`	`+`
	`527`	`+ // callback`
	`528`	`+ if (callback) {`
	`529`	`+ callback(varObj);`
	`530`	`+ }`
`526`	`531`	`}).catch(function(resultObj) {`
`527`	`532`	`let { result } = resultObj;`
`528`	`533`	`// show alert if this is visible`
`529`	`534`	`if (that.pageThis.isHidden() == false && that.config.showAlert == true) {`
`530`	`535`	`com_util.renderAlertModal(result.ename + ': ' + result.evalue);`
`531`	`536`	`}`
`532`		`- }).finally(function() {`
`533`	`537`	`// callback`
`534`	`538`	`if (callback) {`
`535`		`- callback('');`
	`539`	`+ callback({});`
`536`	`540`	`}`
`537`	`541`	`});`
`538`	`542`
`539`		`-`
`540`	`543`	`}`
`541`	`544`	`show() {`
`542`	`545`	`$(this.wrapSelector()).show();`