fix: bump arcgis-rest-portal to pull in request fix for extents (#895)

* fix: bump arcgis-rest-portal to pull in request fix for extents * fix: commit call in createitemfromfile converts extent to str
Esri · Sep 27, 2022 · 3494865 · 3494865
1 parent 151ce43
commit 3494865
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 94 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
     "@esri/arcgis-rest-feature-layer": "^3.4.3",
-    "@esri/arcgis-rest-portal": "^3.4.3",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/arcgis-rest-types": "^3.1.1",
     "@types/adlib": "^3.0.1",

diff --git a/packages/common/src/items/create-item-from-file.ts b/packages/common/src/items/create-item-from-file.ts
@@ -7,6 +7,7 @@ import {
   ICreateItemResponse,
 } from "@esri/arcgis-rest-portal";
 import { IItemAdd } from "@esri/arcgis-rest-types";
+import { isBBox, bboxToString } from "../extent";
 import { batch } from "../utils";
 import { _prepareUploadRequests } from "./_internal/_prepare-upload-requests";
 
@@ -72,6 +73,10 @@ export async function createItemFromFile(
       5
     );
 
+    // update item extent to string
+    if (item.extent && isBBox(item.extent)) {
+      item.extent = bboxToString(item.extent) as unknown as number[][];
+    }
     // Commit is called once all parts are uploaded during a multipart add item or update item operation.
     await commitItemUpload({
       id: itemId,

diff --git a/packages/common/test/items/create-item-from-file.test.ts b/packages/common/test/items/create-item-from-file.test.ts
@@ -22,6 +22,10 @@ describe("createItemFromFile", () => {
         text: "This is a test",
         async: false,
         access: "private",
+        extent: [
+          [1, 2],
+          [3, 4],
+        ],
         file: new Blob(["foo"], { type: "csv" }),
       } as IItemAdd;
       // spies
@@ -47,6 +51,57 @@ describe("createItemFromFile", () => {
       expect(addItemPartSpy).toHaveBeenCalledTimes(3);
       expect(createItemSpy).toHaveBeenCalledTimes(1);
       expect(commitItemUploadSpy).toHaveBeenCalledTimes(1);
+      expect(commitItemUploadSpy.calls.argsFor(0)[0].item.extent).toEqual(
+        "1, 2, 3, 4"
+      );
+      expect(_prepareUploadRequestsSpy).toHaveBeenCalledTimes(1);
+      expect(cancelItemSpy).not.toHaveBeenCalled();
+    });
+    it("Properly creates item w/ string extent", async () => {
+      // request options
+      const ro = {
+        authentication: {
+          portal: "http://some-org.mapsqaext.arcgis.com",
+        },
+      } as IUserRequestOptions;
+      // fake item
+      const item = {
+        title: "Test.csv",
+        type: "csv",
+        owner: "test",
+        dataUrl: "https://test.com",
+        text: "This is a test",
+        async: false,
+        access: "private",
+        extent: "1, 2, 3, 4",
+        file: new Blob(["foo"], { type: "csv" }),
+      } as unknown as IItemAdd;
+      // spies
+      const createItemSpy = spyOn(portal, "createItem").and.returnValue(
+        Promise.resolve({ id: "123abc", success: true, folder: "test" })
+      );
+      const cancelItemSpy = spyOn(portal, "cancelItemUpload").and.returnValue(
+        Promise.resolve({ success: true, id: "123abc" })
+      );
+      const addItemPartSpy = spyOn(portal, "addItemPart").and.callFake(() =>
+        Promise.resolve({ success: true })
+      );
+      const commitItemUploadSpy = spyOn(
+        portal,
+        "commitItemUpload"
+      ).and.returnValue(Promise.resolve({ success: true, id: "123abc" }));
+      const _prepareUploadRequestsSpy = spyOn(
+        _prepareUploadRequestsModule,
+        "_prepareUploadRequests"
+      ).and.returnValue([{}, {}, {}]);
+      const result = await createItemFromFile(item, ro);
+      expect(result).toEqual({ id: "123abc", success: true, folder: "test" });
+      expect(addItemPartSpy).toHaveBeenCalledTimes(3);
+      expect(createItemSpy).toHaveBeenCalledTimes(1);
+      expect(commitItemUploadSpy).toHaveBeenCalledTimes(1);
+      expect(commitItemUploadSpy.calls.argsFor(0)[0].item.extent).toEqual(
+        "1, 2, 3, 4"
+      );
       expect(_prepareUploadRequestsSpy).toHaveBeenCalledTimes(1);
       expect(cancelItemSpy).not.toHaveBeenCalled();
     });

diff --git a/packages/downloads/package.json b/packages/downloads/package.json
@@ -14,14 +14,14 @@
   "peerDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.0",
     "@esri/arcgis-rest-feature-layer": "^3.1.0",
-    "@esri/arcgis-rest-portal": "^3.4.0",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.0",
     "@esri/hub-common": "11.14.0"
   },
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
     "@esri/arcgis-rest-feature-layer": "^3.1.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/hub-common": "11.14.0",
     "typescript": "^3.8.1"

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
     "@esri/arcgis-rest-feature-layer": "^3.2.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/arcgis-rest-types": "^3.1.1",
     "@esri/hub-common": "11.14.0",

diff --git a/packages/initiatives/package.json b/packages/initiatives/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/hub-common": "11.14.0",
     "blob": "0.0.4",

diff --git a/packages/search/package.json b/packages/search/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
     "@esri/arcgis-rest-feature-layer": "^3.2.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/arcgis-rest-types": "^3.1.1",
     "@esri/hub-common": "11.14.0",

diff --git a/packages/sites/package.json b/packages/sites/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/hub-common": "11.14.0",
     "@esri/hub-initiatives": "11.14.0",

diff --git a/packages/surveys/package.json b/packages/surveys/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
     "@esri/arcgis-rest-feature-layer": "^3.2.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/arcgis-rest-types": "^3.1.1",
     "@esri/hub-common": "11.14.0",

diff --git a/packages/teams/package.json b/packages/teams/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@esri/arcgis-rest-auth": "^3.1.1",
-    "@esri/arcgis-rest-portal": "^3.4.2",
+    "@esri/arcgis-rest-portal": "^3.5.0",
     "@esri/arcgis-rest-request": "^3.1.1",
     "@esri/arcgis-rest-types": "^3.1.1",
     "@esri/hub-common": "11.14.0",