Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flip param values in updateItemResource so they are passed correctly #119

Merged
merged 1 commit into from
Feb 22, 2018
+30 −29
Merged

Flip param values in updateItemResource so they are passed correctly #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions packages/arcgis-rest-items/src/items.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ export function addItemJsonData(
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;

const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/update`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/update`;

// Portal API requires that the 'data' be stringified and POSTed in
// a `text` form field. It can also be sent with the `.create` call by sending
Expand Down Expand Up @@ -240,8 +240,9 @@ export function getItemData(
* @returns A Promise that resolves with the status of the operation.
*/
export function updateItem(requestOptions: IItemRequestOptions): Promise<any> {
const url = `${getPortalUrl(requestOptions)}/content/users/${requestOptions
.item.owner}/items/${requestOptions.item.id}/update`;
const url = `${getPortalUrl(requestOptions)}/content/users/${
requestOptions.item.owner
}/items/${requestOptions.item.id}/update`;

// serialize the item into something Portal will accept
requestOptions.params = serializeItem(requestOptions.item);
Expand All @@ -259,9 +260,9 @@ export function removeItem(
requestOptions: IItemIdRequestOptions
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;
const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/delete`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/delete`;
return request(url, requestOptions);
}

Expand All @@ -275,9 +276,9 @@ export function protectItem(
requestOptions: IItemIdRequestOptions
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;
const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/protect`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/protect`;
return request(url, requestOptions);
}

Expand All @@ -291,9 +292,9 @@ export function unprotectItem(
requestOptions: IItemIdRequestOptions
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;
const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/unprotect`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/unprotect`;
return request(url, requestOptions);
}

Expand All @@ -306,9 +307,9 @@ export function unprotectItem(
export function getItemResources(
requestOptions: IItemIdRequestOptions
): Promise<any> {
const url = `${getPortalUrl(
requestOptions
)}/content/items/${requestOptions.id}/resources`;
const url = `${getPortalUrl(requestOptions)}/content/items/${
requestOptions.id
}/resources`;

requestOptions.params = { num: 1000 };

Expand All @@ -325,13 +326,13 @@ export function updateItemResource(
requestOptions: IItemResourceRequestOptions
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;
const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/updateResources`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/updateResources`;

requestOptions.params = {
fileName: requestOptions.content,
text: requestOptions.name
fileName: requestOptions.name,
text: requestOptions.content
};

return request(url, requestOptions);
Expand All @@ -347,9 +348,9 @@ export function removeItemResource(
requestOptions: IItemResourceRequestOptions
): Promise<any> {
const owner = requestOptions.owner || requestOptions.authentication.username;
const url = `${getPortalUrl(
requestOptions
)}/content/users/${owner}/items/${requestOptions.id}/removeResources`;
const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/items/${
requestOptions.id
}/removeResources`;

requestOptions.params = { resource: requestOptions.resource };
return request(url, requestOptions);
Expand Down
8 changes: 4 additions & 4 deletions packages/arcgis-rest-items/test/items.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,8 @@ describe("search", () => {
updateItemResource({
id: "3ef",
owner: "dbouwman",
content: "image/banner.png",
name: "jumbotron",
name: "image/banner.png",
content: "jumbotron",
...MOCK_USER_REQOPTS
})
.then(response => {
Expand All @@ -620,8 +620,8 @@ describe("search", () => {
fetchMock.once("*", UpdateItemResourceResponse);
updateItemResource({
id: "3ef",
content: "image/banner.png",
name: "jumbotron",
name: "image/banner.png",
content: "jumbotron",
...MOCK_USER_REQOPTS
})
.then(response => {
Expand Down