Edit DataInfo to show simple value_counts code for single column

minjk-bl · minjk-bl · commit 4844f881200f · 2023-08-30T13:14:07.000+09:00
diff --git a/visualpython/js/m_apps/Information.js b/visualpython/js/m_apps/Information.js
@@ -104,6 +104,7 @@ define([
 \n        _dfr = pd.concat([_dfr, pd.DataFrame({(col,'category'): _value_counts.index})], axis=1)\
 \n    _dfr = pd.concat([_dfr, pd.DataFrame({(col,'count'): _value_counts.values})], axis=1)\
 \n_dfr.replace(np.nan,'')",
+                        code2: "${data}.value_counts()",
                         dtype: ['DataFrame', 'Series'], toframe: true },
                     ]
                 },
@@ -429,6 +430,7 @@ define([
             this.state.selected = [];
             this.state.selection = { start: -1, end: -1 };
             this.renderMenu();
+            $(this.wrapSelector('.' + VP_FE_TABLE)).html('');
             this.loadCode(data);
             this.loadInfo(data, this.state.menu);
         }
@@ -534,6 +536,10 @@ define([
         }
 
         generateCode() {
+            return this.tempCode;
+        }
+
+        generateCodeForInfo() {
             let { data, dtype, menu, menuItem } = this.state;
 
             var selected = [];
@@ -600,18 +606,26 @@ define([
                     // only one method selected
                     if (menuItem.length > 0 && infoObj.child) {
                         let childObj = infoObj.child.find(obj=>obj.id === menuItem[0]);
-                        if (childObj.toframe === true) {
-                            if (dtype === 'Series') {
-                                dataVar = new com_String();
-                                dataVar.appendFormat("{0}.to_frame()", data);
-                                currentDtype = 'DataFrame';
-                            } else if (currentDtype === 'Series') {
-                                dataVar = new com_String();
-                                dataVar.appendFormat("{0}[[{1}]]", data, selected.map(col=>col.code).join(','));
-                                currentDtype = 'DataFrame';
+                        if (menuItem[0] === 'value_counts') {
+                            if (currentDtype === 'Series') {
+                                codePattern = childObj.code2;
+                            } else {
+                                codePattern = childObj.code;
+                            }
+                        } else {
+                            if (childObj.toframe === true) {
+                                if (dtype === 'Series') {
+                                    dataVar = new com_String();
+                                    dataVar.appendFormat("{0}.to_frame()", data);
+                                    currentDtype = 'DataFrame';
+                                } else if (currentDtype === 'Series') { // DataFrame with single column selected
+                                    dataVar = new com_String();
+                                    dataVar.appendFormat("{0}[[{1}]]", data, selected.map(col=>col.code).join(','));
+                                    currentDtype = 'DataFrame';
+                                }
                             }
+                            codePattern = childObj.code;
                         }
-                        codePattern = childObj.code;
                     } else {
                         codePattern = infoObj.code;
                     }
@@ -841,7 +855,8 @@ define([
             // load preview content
             let $infoPreviewTag = $(this.wrapSelector('#informationPreview'));
             $infoPreviewTag.html('');
-            let code = this.generateCode();
+            let code = this.generateCodeForInfo();
+            this.tempCode = code;
 
             // use default pandas option
             // let defaultPOCode = new com_String();
