From 55fd7d954c650390328fc0a1e0edfc122beccc00 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Wed, 27 Oct 2021 12:07:52 +0200
Subject: [PATCH] implement new states

---
 .../src/styleguide/border.stories.mdx         |  2 +-
 packages/editor-ui/src/components/Node.vue    | 69 ++++++++++++-------
 .../editor-ui/src/components/NodeIcon.vue     | 19 ++---
 .../src/components/mixins/nodeBase.ts         |  9 ---
 4 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/packages/design-system/src/styleguide/border.stories.mdx b/packages/design-system/src/styleguide/border.stories.mdx
index d5a83e064d..05ffec4339 100644
--- a/packages/design-system/src/styleguide/border.stories.mdx
+++ b/packages/design-system/src/styleguide/border.stories.mdx
@@ -16,7 +16,7 @@ import VariableTable from './VariableTable.vue';
 <Canvas>
 	<Story name="border-radius">
 		{{
-			template: `<variable-table :variables="['--border-radius-small','--border-radius-base']" />`,
+			template: `<variable-table :variables="['--border-radius-small','--border-radius-base', '--border-radius-large']" />`,
 			components: {
 				VariableTable,
 			},
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 8f41c77f31..9b767d2201 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -7,9 +7,12 @@
 					<font-awesome-icon icon="exclamation-triangle" />
 				</n8n-tooltip>
 			</div>
-			<el-badge v-else :hidden="workflowDataItems === 0" class="node-info-icon data-count" :value="workflowDataItems"></el-badge>
+			<span v-else-if="workflowDataItems && !data.disabled" class="node-info-icon data-count">
+				<font-awesome-icon icon="check" />
+				<span v-if="workflowDataItems > 1">{{ workflowDataItems }}</span>
+			</span>
 
-			<div v-if="waiting" class="node-info-icon waiting">
+			<div v-if="waiting" class="waiting">
 				<n8n-tooltip placement="top">
 					<div slot="content" v-html="waiting"></div>
 					<font-awesome-icon icon="clock" />
@@ -37,7 +40,7 @@
 				</div>
 			</div>
 
-			<NodeIcon class="node-icon" :nodeType="nodeType" size="60" :circle="true" :shrink="true" :disabled="this.data.disabled"/>
+			<NodeIcon class="node-icon" :nodeType="nodeType" :size="40" :shrink="false" :disabled="this.data.disabled"/>
 		</div>
 		<div class="node-description">
 			<div class="node-name" :title="data.name">
@@ -70,6 +73,7 @@ import NodeIcon from '@/components/NodeIcon.vue';
 import mixins from 'vue-typed-mixins';
 
 import { get } from 'lodash';
+import { getStyleTokenValue } from './helpers';
 
 export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).extend({
 	name: 'Node',
@@ -158,6 +162,25 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 		workflowRunning (): boolean {
 			return this.$store.getters.isActionActive('workflowRunning');
 		},
+		nodeStyle (): object {
+			let borderColor = getStyleTokenValue('--color-foreground-xdark');
+
+			if (this.hasIssues && this.workflowDataItems) {
+				// todo
+				borderColor = getStyleTokenValue('--color-danger');
+			}
+			else if (this.workflowDataItems && !this.isExecuting) {
+				borderColor = getStyleTokenValue('--color-success');
+			}
+
+			const returnStyles: {
+				[key: string]: string;
+			} = {
+				'border-color': borderColor,
+			};
+
+			return returnStyles;
+		},
 	},
 	watch: {
 		isActive(newValue, oldValue) {
@@ -261,12 +284,12 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 		width: 100%;
 		height: 100%;
 		background-color: #fff;
-		border-radius: 25px;
+		border-radius: var(--border-radius-large);
 		text-align: center;
 		z-index: 24;
 		cursor: pointer;
 		color: #444;
-		border: 1px dashed grey;
+		border: 2px solid var(--color-foreground-xdark);
 
 		&.has-data {
 			border-style: solid;
@@ -315,39 +338,35 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 
 		.node-icon {
 			position: absolute;
-			top: calc(50% - 30px);
-			left: calc(50% - 30px);
+			top: calc(50% - 20px);
+			left: calc(50% - 20px);
 		}
 
 		.node-info-icon {
 			position: absolute;
-			top: -14px;
-			right: 12px;
-			z-index: 11;
+			bottom: 8px;
+			right: 8px;
 
 			&.data-count {
 				font-weight: 600;
-				top: -12px;
+				color: var(--color-success);
+
+				* {
+					margin-left: 2px;
+				}
 			}
 
-			&.waiting {
-				left: 10px;
-				top: -12px;
+			&.node-issues {
+				color: var(--color-danger);
 			}
 		}
 
-		.node-issues {
-			width: 25px;
-			height: 25px;
-			font-size: 20px;
-			color: #ff0000;
-		}
-
 		.waiting {
-			width: 25px;
-			height: 25px;
-			font-size: 20px;
-			color: #5e5efa;
+			color: var(--color-secondary);
+
+			position: absolute;
+			left: 8px;
+			bottom: 8px;
 		}
 
 		.node-options {
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/editor-ui/src/components/NodeIcon.vue
index 9bdc8fb4e6..7f259aa773 100644
--- a/packages/editor-ui/src/components/NodeIcon.vue
+++ b/packages/editor-ui/src/components/NodeIcon.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="node-icon-wrapper" :style="iconStyleData" :class="{shrink: isSvgIcon && shrink, full: !shrink}">
+	<div class="node-icon-wrapper" :style="iconStyleData">
 		<div v-if="nodeIconData !== null" class="icon">
 			<img v-if="nodeIconData.type === 'file'" :src="nodeIconData.fileBuffer || nodeIconData.path" style="max-width: 100%; max-height: 100%;" />
 			<font-awesome-icon v-else :icon="nodeIconData.icon || nodeIconData.path" />
@@ -25,7 +25,6 @@ export default Vue.extend({
 	props: [
 		'nodeType',
 		'size',
-		'shrink',
 		'disabled',
 		'circle',
 	],
@@ -36,14 +35,12 @@ export default Vue.extend({
 				return {color};
 			}
 
-			const size = parseInt(this.size, 10);
-
 			return {
 				color,
-				width: size + 'px',
-				height: size + 'px',
-				'font-size': Math.floor(parseInt(this.size, 10) * 0.6) + 'px',
-				'line-height': size + 'px',
+				width: this.size + 'px',
+				height: this.size + 'px',
+				'font-size': this.size + 'px',
+				'line-height': this.size + 'px',
 				'border-radius': this.circle ? '50%': '4px',
 			};
 		},
@@ -99,7 +96,7 @@ export default Vue.extend({
 	font-weight: bold;
 	font-size: 20px;
 
-	&.full .icon {
+	&.icon {
 		height: 100%;
 		width: 100%;
 
@@ -108,10 +105,6 @@ export default Vue.extend({
 		align-items: center;
 	}
 
-	&.shrink .icon {
-		margin: 0.24em;
-	}
-
 	.node-icon-placeholder {
 		text-align: center;
 	}
diff --git a/packages/editor-ui/src/components/mixins/nodeBase.ts b/packages/editor-ui/src/components/mixins/nodeBase.ts
index 8bb71b6cb3..d2bb0e7e1d 100644
--- a/packages/editor-ui/src/components/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/components/mixins/nodeBase.ts
@@ -42,15 +42,6 @@ export const nodeBase = mixins(
 				top: node.position[1] + 'px',
 			};
 
-			return returnStyles;
-		},
-		nodeStyle (): object {
-			const returnStyles: {
-				[key: string]: string;
-			} = {
-				'border-color': this.data.color as string,
-			};
-
 			return returnStyles;
 		},
 	},