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

Adjust imports to main #3036

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Adjust imports to main #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1715cbd
fix imports for build
JillieBeanSim Aug 1, 2024
79d4f6f
Merge branch 'main' into fix-imports
JillieBeanSim Aug 1, 2024
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
8 changes: 3 additions & 5 deletions packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -111,7 +109,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs {
}
}

public async putContents(inputFilePath: string, dataSetName: string, options: IUploadOptions): Promise<zowe.IZosFilesResponse> {
public async putContents(inputFilePath: string, dataSetName: string, options: zowe.IUploadOptions): Promise<zowe.IZosFilesResponse> {
const file = path.basename(inputFilePath).replace(/[^a-z0-9]+/gi, "");
const member = file.substr(0, MAX_MEMBER_NAME_LEN);
let targetDataset: string;
Expand Down Expand Up @@ -200,7 +198,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs {
}

public async createDataSet(
dataSetType: CreateDataSetTypeEnum,
dataSetType: zowe.CreateDataSetTypeEnum,
dataSetName: string,
options?: Partial<zowe.ICreateDataSetOptions>
): Promise<zowe.IZosFilesResponse> {
Expand Down Expand Up @@ -252,7 +250,7 @@ export class FtpMvsApi extends AbstractFtpApi implements ZoweExplorerApi.IMvs {
}
}

public async createDataSetMember(dataSetName: string, options?: IUploadOptions): Promise<zowe.IZosFilesResponse> {
public async createDataSetMember(dataSetName: string, options?: zowe.IUploadOptions): Promise<zowe.IZosFilesResponse> {
const profile = this.checkedProfile();
const transferOptions = {
transferType: options.binary ? TRANSFER_TYPE_BINARY : TRANSFER_TYPE_ASCII,
Expand Down
7 changes: 5 additions & 2 deletions packages/zowe-explorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -160,7 +159,11 @@ export class FtpUssApi extends AbstractFtpApi implements ZoweExplorerApi.IUss {
}
}

public async uploadDirectory(inputDirectoryPath: string, ussDirectoryPath: string, _options: IUploadOptions): Promise<zowe.IZosFilesResponse> {
public async uploadDirectory(
inputDirectoryPath: string,
ussDirectoryPath: string,
_options: zowe.IUploadOptions
): Promise<zowe.IZosFilesResponse> {
let result = this.getDefaultResponse();
try {
// Check if inputDirectory is directory
Expand Down
3 changes: 1 addition & 2 deletions packages/zowe-explorer/src/shared/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions packages/zowe-explorer/src/uss/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down
Loading