From 24e1402a3bac878844636545f639b430c5bb67b5 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:52:59 -0400 Subject: [PATCH] fix imports for build Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../src/ZoweExplorerFtpMvsApi.ts | 8 +++----- .../src/ZoweExplorerFtpUssApi.ts | 7 +++++-- packages/zowe-explorer/src/shared/utils.ts | 3 +-- packages/zowe-explorer/src/uss/actions.ts | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts b/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts index dc53694561..18c6e7fc91 100644 --- a/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts +++ b/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts @@ -15,8 +15,6 @@ import * as tmp from "tmp"; import * as zowe from "@zowe/cli"; import * as path from "path"; -import { CreateDataSetTypeEnum, IUploadOptions } from "@zowe/zos-files-for-zowe-sdk"; - import { Gui, MessageSeverity, ZoweExplorerApi } from "@zowe/zowe-explorer-api"; import { DataSetUtils, TRANSFER_TYPE_ASCII, TRANSFER_TYPE_BINARY } from "@zowe/zos-ftp-for-zowe-cli"; import { AbstractFtpApi } from "./ZoweExplorerAbstractFtpApi"; @@ -111,7 +109,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs { } } - public async putContents(inputFilePath: string, dataSetName: string, options: IUploadOptions): Promise { + public async putContents(inputFilePath: string, dataSetName: string, options: zowe.IUploadOptions): Promise { const file = path.basename(inputFilePath).replace(/[^a-z0-9]+/gi, ""); const member = file.substr(0, MAX_MEMBER_NAME_LEN); let targetDataset: string; @@ -200,7 +198,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs { } public async createDataSet( - dataSetType: CreateDataSetTypeEnum, + dataSetType: zowe.CreateDataSetTypeEnum, dataSetName: string, options?: Partial ): Promise { @@ -252,7 +250,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs { } } - public async createDataSetMember(dataSetName: string, options?: IUploadOptions): Promise { + public async createDataSetMember(dataSetName: string, options?: zowe.IUploadOptions): Promise { const profile = this.checkedProfile(); const transferOptions = { transferType: options.binary ? TRANSFER_TYPE_BINARY : TRANSFER_TYPE_ASCII, diff --git a/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts b/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts index 17ed061fb7..9016fc8c7a 100644 --- a/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts +++ b/packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts @@ -14,7 +14,6 @@ import * as path from "path"; import * as crypto from "crypto"; import * as tmp from "tmp"; import * as zowe from "@zowe/cli"; -import { IUploadOptions } from "@zowe/zos-files-for-zowe-sdk"; import { ZoweExplorerApi } from "@zowe/zowe-explorer-api"; import { CoreUtils, UssUtils, TRANSFER_TYPE_ASCII, TRANSFER_TYPE_BINARY } from "@zowe/zos-ftp-for-zowe-cli"; @@ -160,7 +159,11 @@ export class FtpUssApi extends AbstractFtpApi implements ZoweExplorerApi.IUss { } } - public async uploadDirectory(inputDirectoryPath: string, ussDirectoryPath: string, _options: IUploadOptions): Promise { + public async uploadDirectory( + inputDirectoryPath: string, + ussDirectoryPath: string, + _options: zowe.IUploadOptions + ): Promise { let result = this.getDefaultResponse(); try { // Check if inputDirectory is directory diff --git a/packages/zowe-explorer/src/shared/utils.ts b/packages/zowe-explorer/src/shared/utils.ts index ca1e3e5eaf..e1ba2a0ccf 100644 --- a/packages/zowe-explorer/src/shared/utils.ts +++ b/packages/zowe-explorer/src/shared/utils.ts @@ -28,8 +28,7 @@ import { } from "@zowe/zowe-explorer-api"; import { ZoweExplorerApiRegister } from "../ZoweExplorerApiRegister"; import * as nls from "vscode-nls"; -import { IZosFilesResponse, imperative } from "@zowe/cli"; -import { IUploadOptions } from "@zowe/zos-files-for-zowe-sdk"; +import { IZosFilesResponse, imperative, IUploadOptions } from "@zowe/cli"; import { ZoweLogger } from "../utils/LoggerUtils"; import { isTypeUssTreeNode } from "./context"; import { markDocumentUnsaved } from "../utils/workspace"; diff --git a/packages/zowe-explorer/src/uss/actions.ts b/packages/zowe-explorer/src/uss/actions.ts index 9ec3accdce..dd87421699 100644 --- a/packages/zowe-explorer/src/uss/actions.ts +++ b/packages/zowe-explorer/src/uss/actions.ts @@ -10,7 +10,7 @@ */ import * as vscode from "vscode"; -import { imperative, IZosFilesResponse } from "@zowe/cli"; +import { imperative, IZosFilesResponse, IUploadOptions } from "@zowe/cli"; import * as fs from "fs"; import * as globals from "../globals"; import * as path from "path"; @@ -24,7 +24,6 @@ import * as contextually from "../shared/context"; import { markDocumentUnsaved, setFileSaved } from "../utils/workspace"; import * as nls from "vscode-nls"; import { refreshAll } from "../shared/refresh"; -import { IUploadOptions } from "@zowe/zos-files-for-zowe-sdk"; import { autoDetectEncoding, fileExistsCaseSensitiveSync } from "./utils"; import { UssFileTree, UssFileType } from "./FileStructure"; import { ZoweLogger } from "../utils/LoggerUtils";