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

Fixed quick filter creation for listing libraries #1945

Merged
merged 8 commits into from
Mar 20, 2024
+167 −109
Merged

Fixed quick filter creation for listing libraries #1945

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8aaf70e
Fixed quick filter creation for listing libraries
sebjulliand Mar 19, 2024
7e28d9b
Uppercase quick filter regexs with upperCaseName
sebjulliand Mar 20, 2024
25b9e65
Replace all toUpperCase whit IBMi.upperCaseName where relevant
sebjulliand Mar 19, 2024
b3fb808
Fixed "runCommand (ILE)" test being localized
sebjulliand Mar 19, 2024
d939dcf
Added upperCaseName for funky CCSIDs
sebjulliand Mar 19, 2024
21baac0
Remove dupe test
worksofliam Mar 20, 2024
d5958c3
Write test case for reading members with tabs using SQL
worksofliam Mar 20, 2024
0427d12
Fix error opening recent member with variant characters
chrjorgensen Mar 20, 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
17 changes: 9 additions & 8 deletions src/views/objectBrowser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {

vscode.commands.registerCommand(`code-for-ibmi.createQuickFilter`, async () => {
const config = getConfig();
const connection = getConnection();
const objectFilters = config.objectFilters;

const LIBRARY_REGEX = /^(?<lib>[^/.() ]+)\*$/;
Expand All @@ -481,29 +482,29 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
prompt: `Enter filter as LIB* or LIB/OBJ/MBR.MBRTYPE (OBJTYPE) where each parameter is optional except the library`,
value: ``,
validateInput: newFilter => {
const libraryRegex = LIBRARY_REGEX.exec(newFilter.toUpperCase());
const filterRegex = FILTER_REGEX.exec(newFilter.toUpperCase());
const libraryRegex = LIBRARY_REGEX.exec(connection.upperCaseName(newFilter));
const filterRegex = FILTER_REGEX.exec(connection.upperCaseName(newFilter));
if (!libraryRegex && !filterRegex) return `Invalid filter: ${newFilter}. Use format LIB* or LIB/OBJ/MBR.MBRTYPE (OBJTYPE) where each parameter is optional except the library`;
}
});

if (newFilter) {
let regex = LIBRARY_REGEX.exec(newFilter.toUpperCase());
let regex = LIBRARY_REGEX.exec(connection.upperCaseName(newFilter));
const parsedFilter = regex?.groups;
if (regex && parsedFilter) {
const filter = {
name: `Filter ${objectFilters.length + 1}`,
filterType: 'simple',
library: `QSYS`,
object: `${parsedFilter.lib}*`,
types: [`*LIB`],
library: `${parsedFilter.lib}*`,
object: `*`,
types: [`*ALL`],
member: `*`,
memberType: `*`,
protected: false
} as ConnectionConfiguration.ObjectFilters;
objectFilters.push(filter);
} else {
regex = FILTER_REGEX.exec(newFilter.toUpperCase());
regex = FILTER_REGEX.exec(connection.upperCaseName(newFilter));
const parsedFilter = regex?.groups;
if (regex && parsedFilter) {
const filter = {
Expand Down Expand Up @@ -1426,4 +1427,4 @@ async function deleteObject(object: IBMiObject) {
}

return deleteResult.code === 0;
}
}