Merge branch 'hotfix-0.8.1' into dev

# Conflicts: # .ops/.gitlab-ci.yml
xtreme1-io · Feb 2, 2024 · 591ee33 · 591ee33
2 parents 6b0a553 + 5f579b9
commit 591ee33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java b/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java
@@ -1155,4 +1155,4 @@ private void getLeafNodeList(List<Tree<String>> treeNodes, List<Tree<String>> le
             }
         });
     }
-}
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - 8191:3306
     volumes:
       - mysql-data:/var/lib/mysql
-      - ./deploy/mysql/custom.cnf:/etc/mysql/conf.d
+      - ./deploy/mysql/custom.cnf:/etc/mysql/conf.d/custom.cnf
       - ./deploy/mysql/migration:/docker-entrypoint-initdb.d
     healthcheck:
       test: '/usr/bin/mysql --user=xtreme1 --password=Rc4K3L6f --execute "SHOW DATABASES;"'
@@ -96,7 +96,7 @@ services:
         condition: service_healthy
   frontend:
     # By default, Compose will pull image from Docker Hub when no local image found.
-    image: basicai/xtreme1-frontend:v0.8
+    image: basicai/xtreme1-frontend:v0.8.1
     pull_policy: always
     # Uncomment this line and comment previous line to build image locally, not pull from Docker Hub.
     # build: ./frontend

diff --git a/frontend/main/src/views/datasets/datasetContent/components/upload/UploadProgress.vue b/frontend/main/src/views/datasets/datasetContent/components/upload/UploadProgress.vue
@@ -339,6 +339,9 @@
           fileUrl: props.uploadUrl,
           datasetId: props.id as string,
           source: props.source,
+          resultType: props.resultType as string,
+          modelId: props.modelId as number,
+          dataFormat: props.dataFormat as string,
         };
         // get serialNumbers
         const serialNumbers = await uploadDatasetApi(uploadParams, fileItem.controller.signal);
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             });
         }
-    }
+    }