Skip to content

[fix] Cannot create or edit MyQ connection #686

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
ecmel merged 1 commit into from
Nov 17, 2025
Merged

[fix] Cannot create or edit MyQ connection #686

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
21 changes: 17 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 5 additions & 20 deletions src/commands/serverCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ import { MetaContentProvider } from "../services/metaContentProvider";
import { inputVariable } from "../services/notebookProviders";
import { handleLabelsConnMap, removeConnFromLabels } from "../utils/connLabel";
import {
addLocalConnectionContexts,
checkOpenSslInstalled,
getInsights,
getKeyForServerName,
getServerName,
getServers,
offerReconnectionAfterEdit,
updateInsights,
Expand Down Expand Up @@ -117,7 +115,7 @@ export async function addInsightsConnection(
insightsData: InsightDetails,
labels?: string[],
) {
const aliasValidation = validateServerAlias(insightsData.alias, false);
const aliasValidation = validateServerAlias(insightsData.alias);
if (aliasValidation) {
notify(aliasValidation, MessageKind.ERROR, { logger });
return;
Expand Down Expand Up @@ -198,7 +196,7 @@ export async function editInsightsConnection(
const aliasValidation =
oldAlias === insightsData.alias
? undefined
: validateServerAlias(insightsData.alias, false);
: validateServerAlias(insightsData.alias);
if (aliasValidation) {
notify(aliasValidation, MessageKind.ERROR, { logger });
return;
Expand Down Expand Up @@ -422,10 +420,9 @@ export async function enableTLS(serverKey: string): Promise<void> {

export async function addKdbConnection(
kdbData: ServerDetails,
isLocal?: boolean,
labels?: string[],
): Promise<void> {
const aliasValidation = validateServerAlias(kdbData.serverAlias, isLocal!);
const aliasValidation = validateServerAlias(kdbData.serverAlias);
const hostnameValidation = validateServerName(kdbData.serverName);
const portValidation = validateServerPort(kdbData.serverPort);
if (aliasValidation) {
Expand Down Expand Up @@ -460,25 +457,17 @@ export async function addKdbConnection(
serverName: kdbData.serverName,
serverPort: kdbData.serverPort,
serverAlias: kdbData.serverAlias,
managed: kdbData.serverAlias === "local",
tls: kdbData.tls,
},
};
if (servers.key.managed) {
await addLocalConnectionContexts(getServerName(servers[0]));
}
} else {
servers[key] = {
auth: kdbData.auth,
serverName: kdbData.serverName,
serverPort: kdbData.serverPort,
serverAlias: kdbData.serverAlias,
managed: kdbData.serverAlias === "local",
tls: kdbData.tls,
};
if (servers[key].managed) {
await addLocalConnectionContexts(getServerName(servers[key]));
}
}

await updateServers(servers);
Expand Down Expand Up @@ -510,15 +499,14 @@ export async function addKdbConnection(
export async function editKdbConnection(
kdbData: ServerDetails,
oldAlias: string,
isLocal?: boolean,
editAuth?: boolean,
labels?: string[],
) {
/* c8 ignore start */
const aliasValidation =
oldAlias === kdbData.serverAlias
? undefined
: validateServerAlias(kdbData.serverAlias, isLocal!);
: validateServerAlias(kdbData.serverAlias);
const hostnameValidation = validateServerName(kdbData.serverName);
const portValidation = validateServerPort(kdbData.serverPort);
if (aliasValidation) {
Expand Down Expand Up @@ -583,7 +571,6 @@ export async function editKdbConnection(
serverName: kdbData.serverName,
serverPort: kdbData.serverPort,
serverAlias: kdbData.serverAlias,
managed: kdbData.serverAlias === "local",
tls: kdbData.tls,
};

Expand All @@ -599,7 +586,6 @@ export async function editKdbConnection(
serverName: kdbData.serverName,
serverPort: kdbData.serverPort,
serverAlias: kdbData.serverAlias,
managed: kdbData.serverAlias === "local",
tls: kdbData.tls,
};

Expand Down Expand Up @@ -767,8 +753,7 @@ export async function addImportedConnections(
counter++;
}
connection.serverAlias = alias;
const isManaged = alias === "local";
await addKdbConnection(connection, isManaged);
await addKdbConnection(connection);
}
existingAliases.add(alias);
counter = 1;
Expand Down
28 changes: 2 additions & 26 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ import {
getInsights,
getServers,
hasWorkspaceOrShowOption,
initializeLocalServers,
} from "./utils/core";
import { handleFeedbackSurvey } from "./utils/feedbackSurveyUtils";
import { getIconPath } from "./utils/iconsUtils";
Expand All @@ -129,7 +128,6 @@ export async function activate(context: vscode.ExtensionContext) {
ext.context = context;
ext.outputChannel = vscode.window.createOutputChannel("kdb");
ext.openSslVersion = await checkOpenSslInstalled();
ext.isBundleQCreated = false;

getWorkspaceLabelsConnMap();
getWorkspaceLabels();
Expand Down Expand Up @@ -181,12 +179,6 @@ export async function activate(context: vscode.ExtensionContext) {
new HelpFeedbackProvider(),
);

// initialize local servers
if (servers !== undefined) {
initializeLocalServers(servers);
ext.serverProvider.refresh(servers);
}

// initialize the secret store
AuthSettings.init(context);
ext.secretSettings = AuthSettings.instance;
Expand Down Expand Up @@ -760,13 +752,7 @@ function registerConnectionsCommands(): CommandRegistration[] {
{
command: "kdb.connections.add.kdb",
callback: async (kdbData: ServerDetails, labels: string[]) => {
await addKdbConnection(kdbData, false, labels);
},
},
{
command: "kdb.connections.add.bundleq",
callback: async (kdbData: ServerDetails, labels: string[]) => {
await addKdbConnection(kdbData, true, labels);
await addKdbConnection(kdbData, labels);
},
},
{
Expand All @@ -787,17 +773,7 @@ function registerConnectionsCommands(): CommandRegistration[] {
editAuth: boolean,
labels: string[],
) => {
await editKdbConnection(kdbData, oldAlias, false, editAuth, labels);
},
},
{
command: "kdb.connections.edit.bundleq",
callback: async (
kdbData: ServerDetails,
oldAlias: string,
labels: string[],
) => {
await editKdbConnection(kdbData, oldAlias, true, false, labels);
await editKdbConnection(kdbData, oldAlias, editAuth, labels);
},
},
{
Expand Down
7 changes: 0 additions & 7 deletions src/extensionVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { kdbAuthMap } from "./models/connectionsModels";
import { CustomAuth } from "./models/customAuth";
import { DataSourceFiles } from "./models/dataSource";
import { ConnectionLabel, LabelColors, Labels } from "./models/labels";
import { LocalProcess } from "./models/localProcess";
import { MetaObjectPayload } from "./models/meta";
import { QueryHistory } from "./models/queryHistory";
import { ScratchpadFile } from "./models/scratchpad";
Expand Down Expand Up @@ -67,7 +66,6 @@ export namespace ext {
export let openSslVersion: string | null;
export let resultPanelCSV: string;
export let isDatasourceExecution: boolean;
export let isBundleQCreated: boolean;
export const rowLimit = 150000000;

export let activeConnection: LocalConnection | InsightsConnection | undefined;
Expand Down Expand Up @@ -121,11 +119,6 @@ export namespace ext {
suggestFeature: "https://kx-features.ideas.aha.io/ideas/new",
reportBug: "https://github.com/KxSystems/kx-vscode/issues/new?labels=bug",
};
export const localProcessObjects: LocalProcess = {};
// eslint-disable-next-line prefer-const
export let localConnectionContexts: Array<string> = [];
// eslint-disable-next-line prefer-const
export let localConnectionStatus: Array<string> = [];

export const kdbLicName = "kc.lic";
export const kdbInstallUrl =
Expand Down
1 change: 0 additions & 1 deletion src/models/connectionsModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export interface ServerDetails {
serverPort: string;
auth: boolean;
serverAlias: string;
managed: boolean;
tls: boolean;
username?: string;
password?: string;
Expand Down
18 changes: 0 additions & 18 deletions src/models/localProcess.ts
View file
Open in desktop

This file was deleted.

Loading