@esri/solution-web-tool 5.8.3 → 5.8.5

package/dist/cjs/web-tool-processor.d.ts

@@ -48,3 +48,31 @@ export declare function createItemFromTemplate(template: common.IItemTemplate, t
  * @returns List of http and https helper urls
  */
 export declare function createWebTool(template: common.IItemTemplate, templateDictionary: any, destinationAuthentication: common.UserSession): Promise<any>;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export declare function getNotebookServerCreateServiceURL(portalBaseUrl: string, authentication: common.UserSession, templateDictionary: any): Promise<string>;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export declare function getNotebookEnterpriseServerRootURL(portalBaseUrl: string, authentication: common.UserSession): Promise<string>;
+/**
+ * Move the web tool to the solution folder on enterprise.
+ * This will happen automatically for Online.
+ *
+ * @param {string} itemId The webtools item id
+ * @param {any} templateDictionary The template dictionary
+ * @param {UserSession} destinationAuthentication The destination user session info
+ * @returns a promise that will resolve when the move is complete
+ */
+export declare function moveToFolder(itemId: string, templateDictionary: any, destinationAuthentication: common.UserSession): Promise<void>;

package/dist/cjs/web-tool-processor.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebTool = exports.createItemFromTemplate = exports.convertItemToTemplate = void 0;
+exports.moveToFolder = exports.getNotebookEnterpriseServerRootURL = exports.getNotebookServerCreateServiceURL = exports.createWebTool = exports.createItemFromTemplate = exports.convertItemToTemplate = void 0;
 const tslib_1 = require("tslib");
 /**
  * Manages the creation and deployment of web-experience item types.
@@ -79,52 +79,59 @@ function createItemFromTemplate(template, templateDictionary, destinationAuthent
                     newItemTemplate.item.id = createResponse.itemId;
                     newItemTemplate.data = {};
                     delete newItemTemplate.item.thumbnail;
-                    // get the GPServer url from the webtoolService.json resource
-                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    common.getItemResourcesFiles(createResponse.itemId, destinationAuthentication).then((resourcesResponse) => {
-                        let webtoolServicePromise = Promise.resolve();
-                        resourcesResponse.some((v) => {
-                            if (v.name === "webtoolService.json") {
-                                webtoolServicePromise = common.blobToJson(v);
-                                return true;
-                            }
-                        });
+                    moveToFolder(newItemTemplate.itemId, templateDictionary, destinationAuthentication).then(() => {
+                        // get the GPServer url from the webtoolService.json resource
                         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                        webtoolServicePromise.then((webtoolServiceResponse) => {
-                            templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
-                            // Update the template again now that we have the new item id
-                            newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
-                            // Update the item with snippet, description, popupInfo, etc.
-                            common
-                                .updateItemExtended({
-                                ...newItemTemplate.item,
-                            }, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
-                                .then(() => {
-                                // Interrupt process if progress callback returns `false`
-                                if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
-                                    itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
-                                    common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                        common
+                            .getItemResourcesFiles(createResponse.itemId, destinationAuthentication)
+                            .then((resourcesResponse) => {
+                            let webtoolServicePromise = Promise.resolve();
+                            resourcesResponse.some((v) => {
+                                if (v.name === "webtoolService.json") {
+                                    webtoolServicePromise = common.blobToJson(v);
+                                    return true;
                                 }
-                                else {
-                                    // Update the template to match what we've stored in AGO
-                                    common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
-                                        newItemTemplate.item = updatedItem;
-                                        resolve({
-                                            item: newItemTemplate,
-                                            id: createResponse.itemId,
-                                            type: newItemTemplate.type,
-                                            postProcess: false,
-                                        });
-                                    }, () => {
-                                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                            });
+                            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                            webtoolServicePromise.then((webtoolServiceResponse) => {
+                                templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
+                                // Update the template again now that we have the new item id
+                                newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
+                                // Update the item with snippet, description, popupInfo, etc.
+                                common
+                                    .updateItemExtended({
+                                    ...newItemTemplate.item,
+                                }, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
+                                    .then(() => {
+                                    // Interrupt process if progress callback returns `false`
+                                    if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
+                                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
                                         common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
-                                    });
-                                }
-                            }, () => {
-                                itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
-                                common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                    }
+                                    else {
+                                        // Update the template to match what we've stored in AGO
+                                        common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
+                                            newItemTemplate.item = updatedItem;
+                                            resolve({
+                                                item: newItemTemplate,
+                                                id: createResponse.itemId,
+                                                type: newItemTemplate.type,
+                                                postProcess: false,
+                                            });
+                                        }, () => {
+                                            itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                                            common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                        });
+                                    }
+                                }, () => {
+                                    itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                                    common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                });
                             });
                         });
+                    }, () => {
+                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                        common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
                     });
                 }
             }, () => {
@@ -145,48 +152,110 @@ exports.createItemFromTemplate = createItemFromTemplate;
  */
 function createWebTool(template, templateDictionary, destinationAuthentication) {
     return new Promise((resolve, reject) => {
-        if (templateDictionary?.portalUrls?.notebooks.https.length > 0) {
-            const notebookUrl = templateDictionary.portalUrls.notebooks.https[0];
-            const url = `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`;
-            const params = {
-                serviceProperties: {
-                    description: template.item.description,
-                    provider: "notebooks",
-                    type: "GPServer",
-                    jsonProperties: {
-                        timeoutInMinutes: template.data.timeoutInMinutes,
-                        title: template.item.title,
-                        notebookId: template.data.notebookId,
-                        tasks: [
-                            {
-                                type: "notebook",
-                                name: template.data.name,
-                            },
-                        ],
+        getNotebookServerCreateServiceURL(templateDictionary.portalBaseUrl, destinationAuthentication, templateDictionary).then((url) => {
+            if (url) {
+                const params = {
+                    serviceProperties: {
+                        description: template.item.description,
+                        provider: "notebooks",
+                        type: "GPServer",
+                        jsonProperties: {
+                            timeoutInMinutes: template.data.timeoutInMinutes,
+                            title: template.item.title,
+                            notebookId: template.data.notebookId,
+                            tasks: [
+                                {
+                                    type: "notebook",
+                                    name: template.data.name,
+                                },
+                            ],
+                        },
                     },
-                },
-            };
-            const requestOptions = {
-                httpMethod: "POST",
-                authentication: destinationAuthentication,
-                params,
-                headers: {
-                    "Accept": "application/json",
-                    "Authorization": `Bearer ${destinationAuthentication.token}`,
-                    "Content-Type": "application/json",
-                    "X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
-                },
-            };
-            common.request(url, requestOptions).then((response) => {
-                resolve(response);
-            }, (e) => {
-                reject(e);
-            });
-        }
-        else {
-            reject();
-        }
+                };
+                const requestOptions = {
+                    httpMethod: "POST",
+                    authentication: destinationAuthentication,
+                    params,
+                    headers: {
+                        "Accept": "application/json",
+                        "Authorization": `Bearer ${destinationAuthentication.token}`,
+                        "Content-Type": "application/json",
+                        "X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
+                    },
+                };
+                common.request(url, requestOptions).then((response) => {
+                    resolve(response);
+                }, (e) => {
+                    reject(e);
+                });
+            }
+            else {
+                reject();
+            }
+        }, (e) => {
+            reject(e);
+        });
     });
 }
 exports.createWebTool = createWebTool;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+async function getNotebookServerCreateServiceURL(portalBaseUrl, authentication, templateDictionary) {
+    const notebookUrl = templateDictionary.isPortal
+        ? await getNotebookEnterpriseServerRootURL(portalBaseUrl, authentication)
+        : templateDictionary.portalUrls?.notebooks.https.length > 0
+            ? templateDictionary.portalUrls.notebooks.https[0]
+            : "";
+    return notebookUrl && templateDictionary.isPortal
+        ? `${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`
+        : notebookUrl
+            ? `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`
+            : "";
+}
+exports.getNotebookServerCreateServiceURL = getNotebookServerCreateServiceURL;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+async function getNotebookEnterpriseServerRootURL(portalBaseUrl, authentication) {
+    // Get the servers
+    const servers = await common.getEnterpriseServers(`${portalBaseUrl}/sharing/rest`, authentication);
+    // Find the Notebook server
+    const notebookServer = servers.find((s) => s.serverFunction.indexOf("NotebookServer") > -1);
+    if (!notebookServer) {
+        return "";
+    }
+    return notebookServer.url;
+}
+exports.getNotebookEnterpriseServerRootURL = getNotebookEnterpriseServerRootURL;
+/**
+ * Move the web tool to the solution folder on enterprise.
+ * This will happen automatically for Online.
+ *
+ * @param {string} itemId The webtools item id
+ * @param {any} templateDictionary The template dictionary
+ * @param {UserSession} destinationAuthentication The destination user session info
+ * @returns a promise that will resolve when the move is complete
+ */
+async function moveToFolder(itemId, templateDictionary, destinationAuthentication) {
+    if (templateDictionary.isPortal) {
+        const moveResult = await common.moveItemToFolder(itemId, templateDictionary.folderId, destinationAuthentication);
+        const hasFailure = !moveResult.success;
+        if (hasFailure) {
+            return Promise.reject("Failed to move webTool item");
+        }
+    }
+    return Promise.resolve();
+}
+exports.moveToFolder = moveToFolder;
 //# sourceMappingURL=web-tool-processor.js.map

package/dist/cjs/web-tool-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}

package/dist/esm/web-tool-processor.d.ts

@@ -48,3 +48,31 @@ export declare function createItemFromTemplate(template: common.IItemTemplate, t
  * @returns List of http and https helper urls
  */
 export declare function createWebTool(template: common.IItemTemplate, templateDictionary: any, destinationAuthentication: common.UserSession): Promise<any>;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export declare function getNotebookServerCreateServiceURL(portalBaseUrl: string, authentication: common.UserSession, templateDictionary: any): Promise<string>;
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export declare function getNotebookEnterpriseServerRootURL(portalBaseUrl: string, authentication: common.UserSession): Promise<string>;
+/**
+ * Move the web tool to the solution folder on enterprise.
+ * This will happen automatically for Online.
+ *
+ * @param {string} itemId The webtools item id
+ * @param {any} templateDictionary The template dictionary
+ * @param {UserSession} destinationAuthentication The destination user session info
+ * @returns a promise that will resolve when the move is complete
+ */
+export declare function moveToFolder(itemId: string, templateDictionary: any, destinationAuthentication: common.UserSession): Promise<void>;

package/dist/esm/web-tool-processor.js

@@ -74,52 +74,59 @@ export function createItemFromTemplate(template, templateDictionary, destination
                     newItemTemplate.item.id = createResponse.itemId;
                     newItemTemplate.data = {};
                     delete newItemTemplate.item.thumbnail;
-                    // get the GPServer url from the webtoolService.json resource
-                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    common.getItemResourcesFiles(createResponse.itemId, destinationAuthentication).then((resourcesResponse) => {
-                        let webtoolServicePromise = Promise.resolve();
-                        resourcesResponse.some((v) => {
-                            if (v.name === "webtoolService.json") {
-                                webtoolServicePromise = common.blobToJson(v);
-                                return true;
-                            }
-                        });
+                    moveToFolder(newItemTemplate.itemId, templateDictionary, destinationAuthentication).then(() => {
+                        // get the GPServer url from the webtoolService.json resource
                         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                        webtoolServicePromise.then((webtoolServiceResponse) => {
-                            templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
-                            // Update the template again now that we have the new item id
-                            newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
-                            // Update the item with snippet, description, popupInfo, etc.
-                            common
-                                .updateItemExtended({
-                                ...newItemTemplate.item,
-                            }, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
-                                .then(() => {
-                                // Interrupt process if progress callback returns `false`
-                                if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
-                                    itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
-                                    common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                        common
+                            .getItemResourcesFiles(createResponse.itemId, destinationAuthentication)
+                            .then((resourcesResponse) => {
+                            let webtoolServicePromise = Promise.resolve();
+                            resourcesResponse.some((v) => {
+                                if (v.name === "webtoolService.json") {
+                                    webtoolServicePromise = common.blobToJson(v);
+                                    return true;
                                 }
-                                else {
-                                    // Update the template to match what we've stored in AGO
-                                    common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
-                                        newItemTemplate.item = updatedItem;
-                                        resolve({
-                                            item: newItemTemplate,
-                                            id: createResponse.itemId,
-                                            type: newItemTemplate.type,
-                                            postProcess: false,
-                                        });
-                                    }, () => {
-                                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                            });
+                            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                            webtoolServicePromise.then((webtoolServiceResponse) => {
+                                templateDictionary[template.itemId].url = webtoolServiceResponse?.serviceUrl;
+                                // Update the template again now that we have the new item id
+                                newItemTemplate = common.replaceInTemplate(newItemTemplate, templateDictionary);
+                                // Update the item with snippet, description, popupInfo, etc.
+                                common
+                                    .updateItemExtended({
+                                    ...newItemTemplate.item,
+                                }, newItemTemplate.data, destinationAuthentication, template.item.thumbnail, undefined, templateDictionary)
+                                    .then(() => {
+                                    // Interrupt process if progress callback returns `false`
+                                    if (!itemProgressCallback(template.itemId, common.EItemProgressStatus.Finished, template.estimatedDeploymentCostFactor / 2, createResponse.itemId)) {
+                                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Cancelled, 0);
                                         common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
-                                    });
-                                }
-                            }, () => {
-                                itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
-                                common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                    }
+                                    else {
+                                        // Update the template to match what we've stored in AGO
+                                        common.getItemBase(newItemTemplate.itemId, destinationAuthentication).then((updatedItem) => {
+                                            newItemTemplate.item = updatedItem;
+                                            resolve({
+                                                item: newItemTemplate,
+                                                id: createResponse.itemId,
+                                                type: newItemTemplate.type,
+                                                postProcess: false,
+                                            });
+                                        }, () => {
+                                            itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                                            common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                        });
+                                    }
+                                }, () => {
+                                    itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                                    common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
+                                });
                             });
                         });
+                    }, () => {
+                        itemProgressCallback(template.itemId, common.EItemProgressStatus.Failed, 0);
+                        common.removeItem(createResponse.itemId, destinationAuthentication).then(() => resolve(common.generateEmptyCreationResponse(template.type)), () => resolve(common.generateEmptyCreationResponse(template.type)));
                     });
                 }
             }, () => {
@@ -139,47 +146,106 @@ export function createItemFromTemplate(template, templateDictionary, destination
  */
 export function createWebTool(template, templateDictionary, destinationAuthentication) {
     return new Promise((resolve, reject) => {
-        if (templateDictionary?.portalUrls?.notebooks.https.length > 0) {
-            const notebookUrl = templateDictionary.portalUrls.notebooks.https[0];
-            const url = `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`;
-            const params = {
-                serviceProperties: {
-                    description: template.item.description,
-                    provider: "notebooks",
-                    type: "GPServer",
-                    jsonProperties: {
-                        timeoutInMinutes: template.data.timeoutInMinutes,
-                        title: template.item.title,
-                        notebookId: template.data.notebookId,
-                        tasks: [
-                            {
-                                type: "notebook",
-                                name: template.data.name,
-                            },
-                        ],
+        getNotebookServerCreateServiceURL(templateDictionary.portalBaseUrl, destinationAuthentication, templateDictionary).then((url) => {
+            if (url) {
+                const params = {
+                    serviceProperties: {
+                        description: template.item.description,
+                        provider: "notebooks",
+                        type: "GPServer",
+                        jsonProperties: {
+                            timeoutInMinutes: template.data.timeoutInMinutes,
+                            title: template.item.title,
+                            notebookId: template.data.notebookId,
+                            tasks: [
+                                {
+                                    type: "notebook",
+                                    name: template.data.name,
+                                },
+                            ],
+                        },
                     },
-                },
-            };
-            const requestOptions = {
-                httpMethod: "POST",
-                authentication: destinationAuthentication,
-                params,
-                headers: {
-                    "Accept": "application/json",
-                    "Authorization": `Bearer ${destinationAuthentication.token}`,
-                    "Content-Type": "application/json",
-                    "X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
-                },
-            };
-            common.request(url, requestOptions).then((response) => {
-                resolve(response);
-            }, (e) => {
-                reject(e);
-            });
-        }
-        else {
-            reject();
-        }
+                };
+                const requestOptions = {
+                    httpMethod: "POST",
+                    authentication: destinationAuthentication,
+                    params,
+                    headers: {
+                        "Accept": "application/json",
+                        "Authorization": `Bearer ${destinationAuthentication.token}`,
+                        "Content-Type": "application/json",
+                        "X-Esri-Authorization": `Bearer ${destinationAuthentication.token}`,
+                    },
+                };
+                common.request(url, requestOptions).then((response) => {
+                    resolve(response);
+                }, (e) => {
+                    reject(e);
+                });
+            }
+            else {
+                reject();
+            }
+        }, (e) => {
+            reject(e);
+        });
     });
 }
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export async function getNotebookServerCreateServiceURL(portalBaseUrl, authentication, templateDictionary) {
+    const notebookUrl = templateDictionary.isPortal
+        ? await getNotebookEnterpriseServerRootURL(portalBaseUrl, authentication)
+        : templateDictionary.portalUrls?.notebooks.https.length > 0
+            ? templateDictionary.portalUrls.notebooks.https[0]
+            : "";
+    return notebookUrl && templateDictionary.isPortal
+        ? `${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`
+        : notebookUrl
+            ? `https://${notebookUrl}/admin/services/createService?f=json&request.preventCache=${Date.now()}`
+            : "";
+}
+/**
+ * Get the URL for the Notebook server in Enterprise.
+ *
+ * @param portalBaseUrl URL of the portal endpoint, e.g., "https://gisserver.domain.com/server"
+ * @param authentication Credentials for the request to AGO
+ * @returns URL for the Notebook server Enterprise application (e.g., "https://abc123.esri.com:6443/gis"),
+ * or an empty string if Notebook server is not installed
+ */
+export async function getNotebookEnterpriseServerRootURL(portalBaseUrl, authentication) {
+    // Get the servers
+    const servers = await common.getEnterpriseServers(`${portalBaseUrl}/sharing/rest`, authentication);
+    // Find the Notebook server
+    const notebookServer = servers.find((s) => s.serverFunction.indexOf("NotebookServer") > -1);
+    if (!notebookServer) {
+        return "";
+    }
+    return notebookServer.url;
+}
+/**
+ * Move the web tool to the solution folder on enterprise.
+ * This will happen automatically for Online.
+ *
+ * @param {string} itemId The webtools item id
+ * @param {any} templateDictionary The template dictionary
+ * @param {UserSession} destinationAuthentication The destination user session info
+ * @returns a promise that will resolve when the move is complete
+ */
+export async function moveToFolder(itemId, templateDictionary, destinationAuthentication) {
+    if (templateDictionary.isPortal) {
+        const moveResult = await common.moveItemToFolder(itemId, templateDictionary.folderId, destinationAuthentication);
+        const hasFailure = !moveResult.success;
+        if (hasFailure) {
+            return Promise.reject("Failed to move webTool item");
+        }
+    }
+    return Promise.resolve();
+}
 //# sourceMappingURL=web-tool-processor.js.map

package/dist/esm/web-tool-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-tool-processor.js","sourceRoot":"","sources":["../../src/web-tool-processor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-web-tool",
-  "version": "5.8.3",
+  "version": "5.8.5",
   "description": "Manages the creation and deployment of web tool geoprocessing service item type for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -24,8 +24,8 @@
     "@esri/arcgis-rest-auth": "^3.7.0",
     "@esri/arcgis-rest-portal": "^3.7.0",
     "@esri/arcgis-rest-request": "^3.7.0",
-    "@esri/solution-common": "^5.8.3",
-    "@esri/solution-simple-types": "^5.8.3",
+    "@esri/solution-common": "^5.8.5",
+    "@esri/solution-simple-types": "^5.8.5",
     "tslib": "1.14.1"
   },
   "scripts": {
@@ -72,5 +72,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "1274985f378417379d9ffb843b4b62386a0dc67b"
+  "gitHead": "7cc40ee84ca961dddff7bc41af18c4facb55083b"
 }