From 7fb3d08ccbf1fba0bfeca48c8254c9821f58cf73 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 20 May 2024 03:38:27 +0900
Subject: [PATCH] =?UTF-8?q?=E7=B4=B0=E9=83=A8=E3=81=AE=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/VariableList.vue | 4 +++-
 frontend/src/types/Conditions.ts         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/VariableList.vue b/frontend/src/components/VariableList.vue
index f967b86..d790203 100644
--- a/frontend/src/components/VariableList.vue
+++ b/frontend/src/components/VariableList.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="q-pa-md">
-    <q-table flat bordered row-key="name" :selection="type" :selected="modelValue"
+    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue"
       @update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
   </div>
 </template>
 <script lang="ts">
 import { PropType, reactive } from 'vue';
 import { IActionVariable } from '../types/ActionTypes';
+import { v4 as uuidv4 } from 'uuid';
 
 export default {
   name: 'VariableList',
@@ -39,6 +40,7 @@ export default {
         return v.name.vars
           .filter(o => o.vName && o.logicalOperator && o.field)
           .map(o => ({
+            id: uuidv4(),
             objectType: 'variable',
             name: { name: `${v.name.name}.${o.vName}` },
             actionName: v.name.actionName,
diff --git a/frontend/src/types/Conditions.ts b/frontend/src/types/Conditions.ts
index a99c3a4..5aecfff 100644
--- a/frontend/src/types/Conditions.ts
+++ b/frontend/src/types/Conditions.ts
@@ -198,7 +198,7 @@ export class ConditionTree {
         if(value && typeof value ==='object' && ('label' in value)){
             value =condNode.value.label;
         }
-        return `${condNode.object.name} ${condNode.operator} '${value}'`;
+        return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${condNode.operator} '${value}'`;
       } else {
         return '';
       }