Merge remote-tracking branch 'origin/master' into n8n-6403-update-and…

…-fix-storybook # Conflicts: # pnpm-lock.yaml
n8n-io · May 4, 2023 · ebe7e20 · ebe7e20
2 parents 29dd81c + d381578
commit ebe7e20
Show file tree

Hide file tree

Showing 6 changed files with 809 additions and 2,221 deletions.
diff --git a/package.json b/package.json
@@ -79,6 +79,7 @@
       "tslib": "^2.5.0",
       "ts-node": "^10.9.1",
       "typescript": "^5.0.3",
+      "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz",
       "xml2js": "^0.5.0",
       "cpy@8>globby": "^11.1.0",
       "qqjs>globby": "^11.1.0"

diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -30,6 +30,7 @@ const { registerKeyHook } = useKeyboardNavigation();
 const { workflowId } = useWorkflowsStore();
 
 const activeItemId = computed(() => useKeyboardNavigation()?.activeItemId);
+const actionCount = computed(() => props.elements.filter(({ type }) => type === 'action').length);
 const expanded = ref(props.expanded ?? false);
 
 function toggleExpanded() {
@@ -94,7 +95,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 			:name="category"
 			:disabled="disabled"
 			:active="activeItemId === category"
-			:count="elements.length"
+			:count="actionCount"
 			:expanded="expanded"
 			:isTrigger="isTriggerCategory"
 			data-keyboard-nav-type="category"
@@ -110,7 +111,7 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 				</n8n-tooltip>
 			</span>
 		</CategoryItem>
-		<div :class="$style.contentSlot" v-if="expanded && elements.length > 0 && $slots.default">
+		<div :class="$style.contentSlot" v-if="expanded && actionCount > 0 && $slots.default">
 			<slot />
 		</div>
 		<!-- Pass through listeners & empty slot to ItemsRenderer -->

diff --git a/packages/nodes-base/credentials/SshPrivateKey.credentials.ts b/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
@@ -35,7 +35,6 @@ export class SshPrivateKey implements ICredentialType {
 			type: 'string',
 			typeOptions: {
 				rows: 4,
-				password: true,
 			},
 			default: '',
 		},
@@ -45,6 +44,7 @@ export class SshPrivateKey implements ICredentialType {
 			type: 'string',
 			default: '',
 			description: 'Passphase used to create the key, if no passphase was used leave empty',
+			typeOptions: { password: true },
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -87,9 +87,9 @@ describe('Execute Spreadsheet File Node', () => {
 										mimeType: 'text/csv',
 										fileType: 'text',
 										fileExtension: 'csv',
-										data: '77u/QSxCLEMKMSwyLDMKNCw1LDYK',
+										data: '77u/QSxCLEMKMSwyLDMKNCw1LDY=',
 										fileName: 'spreadsheet.csv',
-										fileSize: '21 B',
+										fileSize: '20 B',
 									},
 								},
 							},

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
@@ -902,7 +902,7 @@
     "tmp-promise": "^3.0.2",
     "uuid": "^8.3.2",
     "vm2": "~3.9.17",
-    "xlsx": "^0.17.0",
+    "xlsx": "^0.19.3",
     "xml2js": "^0.5.0"
   }
 }