Merge pull request #1932 from cvisionai/dev/fix-ms-upload-check

Dev/fix ms upload check
cvisionai · Dec 26, 2024 · 59be668 · 59be668
2 parents a3369a0 + 4da4a8a
commit 59be668
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/api/main/tests.py b/api/main/tests.py
@@ -6442,7 +6442,7 @@ def test_adv_sections(self):
         section_spec = {
             "name": "Test",
             "path": "Foo.Test",
-            "dtype": "playlist",
+            "dtype": "folder",
             "media": [media.pk],
         }
         url = f"/rest/Sections/{self.project.pk}"
@@ -6474,7 +6474,7 @@ def check_it(section, section_spec):
         section_spec = {
             "name": "Test",
             "path": "Foo.Test",
-            "dtype": "playlist",
+            "dtype": "folder",
             "media": [],
             "attributes": {"abcdef": False},
         }
@@ -6819,14 +6819,14 @@ def setUp(self):
         self.public_section = Section.objects.create(
             name="Public",
             path="Public",
-            dtype="playlist",
+            dtype="folder",
             project=self.project,
         )
 
         self.private_section = Section.objects.create(
             name="Private",
             path="Private",
-            dtype="playlist",
+            dtype="folder",
             project=self.project,
         )
 
@@ -7287,7 +7287,7 @@ def test_crud(self):
             # Create a section
             resp = self.client.post(
                 f"/rest/Sections/{self.project.pk}",
-                {"name": "Bridge", "path": "Bridge", "dtype": "playlist"},
+                {"name": "Bridge", "path": "Bridge", "dtype": "folder"},
                 format="json",
             )
             assertResponse(self, resp, status.HTTP_201_CREATED)
@@ -7325,7 +7325,7 @@ def test_crud(self):
             # Create a second section
             resp = self.client.post(
                 f"/rest/Sections/{self.project.pk}",
-                {"name": "Engineering", "path": "Engineering", "dtype": "playlist"},
+                {"name": "Engineering", "path": "Engineering", "dtype": "folder"},
                 format="json",
             )
             assertResponse(self, resp, status.HTTP_201_CREATED)

diff --git a/containers/tator/Dockerfile b/containers/tator/Dockerfile
@@ -24,6 +24,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     wget \
     xdot \
     xmlsec1 \
+    postgresql-client-14 \
+    redis-tools \
  && rm -rf /var/lib/apt/lists/*
 
 # Install pip packages

diff --git a/scripts/packages/tator-js b/scripts/packages/tator-js
diff --git a/scripts/packages/tator-py b/scripts/packages/tator-py
diff --git a/ui/src/js/components/inputs/feature/single-upload.js b/ui/src/js/components/inputs/feature/single-upload.js
@@ -51,7 +51,7 @@ export class SingleUpload {
   uploadSingle(info) {
     let headers = {};
     let url = new URL(info.urls[0]);
-    if (url.host.endsWith(".blob.core.windows.net")) {
+    if (url.searchParams.has("sig")) {
       headers = {
         "x-ms-blob-type": "BlockBlob",
       };