Skip to content

Commit 92cdafc

Browse files
authored
Merge pull request #344 from codefori/fix/api_change_release
Cleanup API changes and fix ASP info
2 parents 859933d + d190962 commit 92cdafc

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

src/base.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { CodeForIBMi } from "@halcyontech/vscode-ibmi-types";
2-
import Instance from "@halcyontech/vscode-ibmi-types/api/Instance";
3-
import {CustomUI} from "@halcyontech/vscode-ibmi-types/api/CustomUI";
2+
import Instance from "@halcyontech/vscode-ibmi-types/Instance";
43
import { Extension, ExtensionContext, extensions } from "vscode";
54
import { SQLStatementChecker } from "./connection/syntaxChecker";
65

src/connection/syntaxChecker/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
2-
import { ComponentIdentification, ComponentState, IBMiComponent } from "@halcyontech/vscode-ibmi-types/components/component";
2+
import { ComponentIdentification, ComponentState, IBMiComponent } from "@halcyontech/vscode-ibmi-types/api/components/component";
33
import { posix } from "path";
44
import { getValidatorSource, VALIDATOR_NAME, WRAPPER_NAME } from "./checker";
55
import { JobManager } from "../../config";

src/views/jobManager/editJob/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getBase } from "../../../base";
22
import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
3-
import { ComplexTab } from "@halcyontech/vscode-ibmi-types/api/CustomUI";
3+
import { ComplexTab } from "@halcyontech/vscode-ibmi-types/webviews/CustomUI";
44

55
import getPerfTab from "./perfTab";
66
import getFormatTab from "./formatTab";

src/views/jobManager/editJob/systemTab.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
22
import { getBase, getInstance, loadBase } from "../../../base";
33
import { formatDescription } from ".";
44

5-
const autoCommitText = `
6-
Specifies the cursor sensitivity to request from the database. The behavior depends on the resultSetType:
7-
- ResultSet.TYPE_FORWARD_ONLY or ResultSet.TYPE_SCROLL_SENSITIVE means that the value of this property
8-
controls what cursor sensitivity the Java program requests from the database.
9-
- ResultSet.TYPE_SCROLL_INSENSITIVE causes this property to be ignored.
10-
`;
11-
125
const dbNameText = `
136
147
Specifies the database to use for a connection to an independent auxiliary storage pool (ASP). When you specify
@@ -129,7 +122,7 @@ export default function getSystemTab(options: JDBCOptions) {
129122
// )
130123
.addSelect(`database name`, `Database name`, [
131124
{text: `System Base`, description: `*SYSBAS`, value: ``, selected: options["database name"] === ``},
132-
...Object.values(connection.aspInfo).map(asp => ({text: asp, description: asp, value: asp, selected: options["database name"] === asp}))
125+
...Object.values(connection.getAllIAsps()).map(asp => ({text: asp.name, description: asp.name, value: asp.rdbName, selected: options["database name"] === asp.rdbName}))
133126
], formatDescription(dbNameText))
134127
.addSelect(
135128
`decfloat rounding mode`,

0 commit comments

Comments
 (0)