+
diff --git a/generators/js/transform_select.js b/generators/js/transform_select.js
index 7b9f05de7..54e30d172 100644
--- a/generators/js/transform_select.js
+++ b/generators/js/transform_select.js
@@ -10,5 +10,5 @@ Blockly.JavaScript['transform_select'] = (block) => {
.join(',')
const descending = (block.getFieldValue('DESCENDING') === 'FALSE')
- return `.sort(${block.tbId}, [${columns}], ${descending})`
-}
\ No newline at end of file
+ return `.select(${block.tbId}, [${columns}], ${descending})`
+}
diff --git a/generators/js/transform_sort.js b/generators/js/transform_sort.js
index c9ed3c806..f85fe5ad8 100644
--- a/generators/js/transform_sort.js
+++ b/generators/js/transform_sort.js
@@ -1,16 +1,10 @@
Blockly.JavaScript['transform_sort'] = (block) => {
-
-
-const columns = block.getFieldValue('MULTIPLE_COLUMNS')
+ const columns = block.getFieldValue('MULTIPLE_COLUMNS')
.split(',')
.map(c => c.trim())
.filter(c => (c.length > 0))
.map(c => Blockly.JavaScript.quote_(c))
.join(',')
-
-if (block.getFieldValue('DESCENDING') == 'FALSE') {
- return `.sort(${block.tbId}, [${columns}], false)`
- } else {
- return `.sort(${block.tbId}, [${columns}], true)`
- }
+ const descending = (block.getFieldValue('DESCENDING') === 'TRUE')
+ return `.sort(${block.tbId}, [${columns}], ${descending})`
}