fix: infinite loading on workflowlist table

cloud-barista · Nov 25, 2024 · f1a1586 · f1a1586
1 parent 1c6a600
commit f1a1586
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/front/src/features/workflow/workflowEditor/ui/WorkflowEditor.vue b/front/src/features/workflow/workflowEditor/ui/WorkflowEditor.vue
@@ -90,7 +90,7 @@ function mapTargetModelToTaskComponent(
   taskComponentList: Array<ITaskComponentInfoResponse>,
 ) {
   const taskComponent = taskComponentList.find(
-    taskComponent => taskComponent.name === 'tumblebug_mci_dynamic',
+    taskComponent => taskComponent.name === 'beetle_task_infra_migration',
   );
 
   if (!taskComponent) {
@@ -102,10 +102,11 @@ function mapTargetModelToTaskComponent(
     .defineTaskGroupStep(getRandomId(), 'TaskGroup', 'MCI', { model: {} });
 
   const parseString = parseRequestBody(taskComponent.data.options.request_body);
-
-  parseString['vm'] = Array(targetModel.cloudInfraModel.vm?.length)
-    .fill(undefined)
-    .map(_ => JSON.parse(JSON.stringify(parseString['vm'][0])));
+  if (parseString && parseString['vm']) {
+    parseString['vm'] = Array(targetModel.cloudInfraModel.vm?.length)
+      .fill(undefined)
+      .map(_ => JSON.parse(JSON.stringify(parseString['vm'][0])));
+  }
 
   if (targetModel.cloudInfraModel.vm) {
     targetModel.cloudInfraModel.vm.forEach((targetVm, index) => {
@@ -116,12 +117,12 @@ function mapTargetModelToTaskComponent(
 
   const task: ITaskResponse = {
     dependencies: [],
-    name: 'tumblebug_mci_dynamic',
+    name: 'beetle_task_infra_migration',
     path_params: null,
     query_params: null,
     request_body: JSON.stringify(parseString),
     id: '',
-    task_component: 'tumblebug_mci_dynamic',
+    task_component: 'beetle_task_infra_migration',
   };
 
   const step = workflowToolModel.convertToDesignerTask(task, task.request_body);

diff --git a/front/src/widgets/workflow/workflows/workflowList/ui/WorkflowList.vue b/front/src/widgets/workflow/workflows/workflowList/ui/WorkflowList.vue
@@ -172,7 +172,11 @@ watch(
           :query-tag="tableModel.querySearchState.queryTag"
           :select-index.sync="tableModel.tableState.selectIndex"
           :page-size="tableModel.tableOptions.pageSize"
-          :loading="isRunLoading"
+          :loading="
+            runWorkflow.isLoading.value ||
+            getWorkflowList.isLoading.value ||
+            tableModel.tableState.loading
+          "
           @change="tableModel.handleChange"
           @refresh="handleRefreshTable"
           @select="handleSelectedIndex"