fixing change to make sure test passes + lint

Author: yyassi-heartex

label_studio/tests/data_import/test_api.py

@@ -13,27 +13,27 @@ def test_file_upload_list_empty_ids_returns_empty_for_non_draft_project(business
     """GET file-uploads with ids=[] and non-draft project returns empty list (reopened import modal)."""
     # Create project and ensure it is not draft
     r = business_client.post(
-        "/api/projects/",
-        data=json.dumps({"title": "Test", "label_config": "<View></View>"}),
-        content_type="application/json",
+        '/api/projects/',
+        data=json.dumps({'title': 'Test', 'label_config': '<View></View>'}),
+        content_type='application/json',
     )
     assert r.status_code == 201
-    project_id = r.json()["id"]
+    project_id = r.json()['id']
     project = Project.objects.get(id=project_id)
     project.is_draft = False
-    project.save(update_fields=["is_draft"])
+    project.save(update_fields=['is_draft'])
 
     # Create a file upload that would appear if we returned "all"
     FileUpload.objects.create(
         user=business_client.admin,
         project=project,
-        file=ContentFile(b"x", name="upload/test.txt"),
+        file=ContentFile(b'x', name='upload/test.txt'),
     )
 
     # Request with explicit empty ids: must return empty list (no previously imported files)
     r = business_client.get(
-        f"/api/projects/{project_id}/file-uploads",
-        data={"ids": "[]"},
+        f'/api/projects/{project_id}/file-uploads',
+        data={'ids': '[]'},
     )
     assert r.status_code == 200
     assert r.json() == []
@@ -43,19 +43,19 @@ def test_file_upload_list_empty_ids_returns_empty_for_non_draft_project(business
 def test_file_upload_list_get_sends_cache_control_no_store(business_client):
     """GET file-uploads response includes Cache-Control: no-store so list is not cached."""
     r = business_client.post(
-        "/api/projects/",
-        data=json.dumps({"title": "Test", "label_config": "<View></View>"}),
-        content_type="application/json",
+        '/api/projects/',
+        data=json.dumps({'title': 'Test', 'label_config': '<View></View>'}),
+        content_type='application/json',
     )
     assert r.status_code == 201
-    project_id = r.json()["id"]
+    project_id = r.json()['id']
     project = Project.objects.get(id=project_id)
     project.is_draft = False
-    project.save(update_fields=["is_draft"])
+    project.save(update_fields=['is_draft'])
 
     r = business_client.get(
-        f"/api/projects/{project_id}/file-uploads",
-        data={"ids": "[]"},
+        f'/api/projects/{project_id}/file-uploads',
+        data={'ids': '[]'},
     )
     assert r.status_code == 200
-    assert r.get("Cache-Control") == "no-store"
+    assert r.get('Cache-Control') == 'no-store'

web/apps/labelstudio/src/pages/CreateProject/Import/Import.jsx

@@ -166,6 +166,13 @@ export const ImportPage = ({
     }
     if (action.setList !== undefined) {
       const list = action.setList ?? [];
+      if (action.merge) {
+        return {
+          ...state,
+          uploaded: unique([...state.uploaded, ...list], (a, b) => a.id === b.id),
+          ids: unique([...state.ids, ...list.map((f) => f.id)]),
+        };
+      }
       return {
         ...state,
         uploaded: list,
@@ -214,7 +221,8 @@ export const ImportPage = ({
         params: { pk: project.id, ...query },
       });
 
-      dispatch({ setList: files ?? [] });
+      const merge = Boolean(file_upload_ids?.length);
+      dispatch({ setList: files ?? [], merge });
       return files;
     },
     [project?.id],