Skip to content

Added "Create and replace" SPF action #3513

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

Open
sebjulliand wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added "Create and replace" SPF action #3513

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
15 changes: 15 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,6 +1466,12 @@
"category": "IBM i",
"icon": "$(new-file)"
},
{
"command": "code-for-ibmi.createAndUploadMember",
"enablement": "code-for-ibmi:connected && !code-for-ibmi:isReadonly",
"title": "Upload New Member...",
"category": "IBM i"
},
{
"command": "code-for-ibmi.copyMember",
"enablement": "code-for-ibmi:connected && !code-for-ibmi:isReadonly",
Expand Down Expand Up @@ -2674,6 +2680,10 @@
"command": "code-for-ibmi.createMember",
"when": "never"
},
{
"command": "code-for-ibmi.createAndUploadMember",
"when": "never"
},
{
"command": "code-for-ibmi.copyMember",
"when": "never"
Expand Down Expand Up @@ -3338,6 +3348,11 @@
"when": "view == objectBrowser && !listMultiSelection && viewItem == SPF",
"group": "3_sourceFileStuff@1"
},
{
"command": "code-for-ibmi.createAndUploadMember",
"when": "view == objectBrowser && !listMultiSelection && viewItem == SPF",
"group": "3_sourceFileStuff@2"
},
{
"command": "code-for-ibmi.searchSourceFile",
"when": "view == objectBrowser && viewItem =~ /^SPF.*$/",
Expand Down
13 changes: 13 additions & 0 deletions src/api/IBMiContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,4 +1219,17 @@ export default class IBMiContent {
async deleteOVRDBFile(overFile: string) {
await this.ibmi.runSQL(`@QSYS/DLTOVR FILE(${overFile}) LVL(*JOB)`);
}

async deleteMember(path: string) {
const { library, file, name } = this.ibmi.parserMemberPath(path);

const removeResult = await this.ibmi.runCommand({
command: `QSYS/RMVM FILE(${library}/${file}) MBR(${name})`,
noLibList: true
});

if (removeResult.code !== 0) {
throw new Error(removeResult.stderr);
}
}
}
63 changes: 42 additions & 21 deletions src/ui/views/objectBrowser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,19 +423,14 @@ class ObjectBrowserMemberItem extends ObjectBrowserItem implements MemberItem {
}

async delete() {
const connection = getConnection();
const { library, file, name } = connection.parserMemberPath(this.path);

const removeResult = await connection.runCommand({
command: `QSYS/RMVM FILE(${library}/${file}) MBR(${name})`,
noLibList: true
});

if (removeResult.code !== 0) {
vscode.window.showErrorMessage(vscode.l10n.t(`Error deleting member! {0}`, removeResult.stderr));
try {
await getContent().deleteMember(this.path);
return true;
}
catch (e: any) {
vscode.window.showErrorMessage(vscode.l10n.t(`Error deleting member! {0}`, e));
return false;
}

return removeResult.code === 0;
}
}

Expand Down Expand Up @@ -764,7 +759,26 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
});
}),

vscode.commands.registerCommand(`code-for-ibmi.createMember`, async (node: ObjectBrowserSourcePhysicalFileItem, fullName?: string) => {
vscode.commands.registerCommand(`code-for-ibmi.createAndUploadMember`, async (node: ObjectBrowserSourcePhysicalFileItem) => {
const newMember = await vscode.commands.executeCommand<string | undefined>(`code-for-ibmi.createMember`, node, undefined, true);
if (newMember) {
if (await vscode.commands.executeCommand(`code-for-ibmi.uploadAndReplaceMemberAsFile`, newMember)) {
if (IBMi.connectionManager.get(`autoOpenFile`)) {
vscode.commands.executeCommand(`code-for-ibmi.openEditable`, newMember);
}
}
else {
try {
await getContent().deleteMember(newMember);
objectBrowser.refresh(node);
}
catch (e: any) {
vscode.window.showErrorMessage(vscode.l10n.t(`Error deleting member! {0}`, e));
}
}
}
}),
vscode.commands.registerCommand(`code-for-ibmi.createMember`, async (node: ObjectBrowserSourcePhysicalFileItem, fullName?: string, skipOpen?: boolean) => {
if (checkProtected(node)) {
return;
}
Expand Down Expand Up @@ -792,7 +806,7 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
})

if (addResult.code === 0) {
if (IBMi.connectionManager.get(`autoOpenFile`)) {
if (!skipOpen && IBMi.connectionManager.get(`autoOpenFile`)) {
vscode.commands.executeCommand(`code-for-ibmi.openEditable`, fullPath);
}

Expand All @@ -804,9 +818,15 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
});

if (error) {
if (await vscode.window.showErrorMessage(vscode.l10n.t(`Error creating member {0}: {1}`, fullPath, error), vscode.l10n.t("Retry"))) {
vscode.commands.executeCommand(`code-for-ibmi.createMember`, node, fullName);
}
return vscode.window.showErrorMessage(vscode.l10n.t(`Error creating member {0}: {1}`, fullPath, error), vscode.l10n.t("Retry"))
.then((retry) => {
if (retry) {
return vscode.commands.executeCommand<string | undefined>(`code-for-ibmi.createMember`, node, fullName);
}
});
}
else {
return fullPath;
}
}
}),
Expand Down Expand Up @@ -1038,24 +1058,25 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
}
}),

vscode.commands.registerCommand(`code-for-ibmi.uploadAndReplaceMemberAsFile`, async (node: MemberItem) => {
vscode.commands.registerCommand(`code-for-ibmi.uploadAndReplaceMemberAsFile`, async (target: MemberItem | string) => {
const contentApi = getContent();

const originPath = await vscode.window.showOpenDialog({ defaultUri: vscode.Uri.file(os.homedir()) });

if (originPath) {
const connection = getConnection();
const { asp, library, file, name } = connection.parserMemberPath(node.path);
const { asp, library, file, name } = connection.parserMemberPath(typeof target === "string" ? target : target.path);
const data = fs.readFileSync(originPath[0].fsPath, `utf8`);

try {
contentApi.uploadMemberContent(library, file, name, data);
await contentApi.uploadMemberContent(library, file, name, data);
vscode.window.showInformationMessage(vscode.l10n.t(`Member was uploaded.`));
return true
} catch (e: any) {
vscode.window.showErrorMessage(vscode.l10n.t(`Error uploading content to member! {0}`, e));
}
}

return false;
}),

vscode.commands.registerCommand(`code-for-ibmi.downloadMemberAsFile`, async (node: ObjectItem | MemberItem, nodes?: (ObjectItem | MemberItem)[]) => {
Expand Down
Loading