Skip to content

Improve behavior when no Source Control class is enabled #817

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

Merged
merged 1 commit into from
Dec 29, 2021
Merged

Improve behavior when no Source Control class is enabled #817

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
52 changes: 46 additions & 6 deletions src/commands/studio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,11 @@ class StudioActions {
.then(() => resolve())
.catch((err) => {
outputChannel.appendLine(
`Executing Studio Action "${action.label}" on ${this.api.config.host}:${this.api.config.port}[${
this.api.config.ns
}] failed${err.errorText && err.errorText !== "" ? " with the following error:" : "."}`
`Executing Studio Action "${action.label}" on ${this.api.config.host}:${this.api.config.port}${
this.api.config.pathPrefix
}[${this.api.config.ns}] failed${
err.errorText && err.errorText !== "" ? " with the following error:" : "."
}`
);
if (err.errorText && err.errorText !== "") {
outputChannel.appendLine("\n" + err.errorText);
Expand Down Expand Up @@ -443,6 +445,20 @@ class StudioActions {
}
}
}

public async isSourceControlEnabled(): Promise<boolean> {
return this.api
.actionQuery("SELECT %Atelier_v1_Utils.Extension_ExtensionEnabled() AS Enabled", [])
.then((data) => data.result.content)
.then((content) => (content && content.length ? content[0].Enabled : false));
}

public getServerInfo() {
return {
server: `${this.api.config.host}:${this.api.config.port}${this.api.config.pathPrefix}`,
namespace: this.api.config.ns,
};
}
}

export async function mainCommandMenu(uri?: vscode.Uri): Promise<void> {
Expand All @@ -459,7 +475,17 @@ async function _mainMenu(sourceControl: boolean, uri?: vscode.Uri): Promise<void
return;
}
const studioActions = new StudioActions(uri);
return studioActions && studioActions.getMenu(StudioMenuType.Main, sourceControl);
if (studioActions) {
if (await studioActions.isSourceControlEnabled()) {
return studioActions.getMenu(StudioMenuType.Main, sourceControl);
} else {
const serverInfo = studioActions.getServerInfo();
vscode.window.showInformationMessage(
`No source control class is configured for namespace "${serverInfo.namespace}" on server ${serverInfo.server}.`,
"Dismiss"
);
}
}
}

export async function contextCommandMenu(node: PackageNode | ClassNode | RoutineNode): Promise<void> {
Expand All @@ -476,7 +502,17 @@ export async function _contextMenu(sourceControl: boolean, node: PackageNode | C
return;
}
const studioActions = new StudioActions(nodeOrUri);
return studioActions && studioActions.getMenu(StudioMenuType.Context, sourceControl);
if (studioActions) {
if (await studioActions.isSourceControlEnabled()) {
return studioActions.getMenu(StudioMenuType.Context, sourceControl);
} else {
const serverInfo = studioActions.getServerInfo();
vscode.window.showInformationMessage(
`No source control class is configured for namespace "${serverInfo.namespace}" on server ${serverInfo.server}.`,
"Dismiss"
);
}
}
}

// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
Expand All @@ -485,5 +521,9 @@ export async function fireOtherStudioAction(action: OtherStudioAction, uri?: vsc
return;
}
const studioActions = new StudioActions(uri);
return studioActions && studioActions.fireOtherStudioAction(action, userAction);
return (
studioActions &&
(await studioActions.isSourceControlEnabled()) &&
studioActions.fireOtherStudioAction(action, userAction)
);
}