Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

Consistent filtering #149

Merged
merged 3 commits into from
Jan 13, 2022
Merged

Consistent filtering #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ca9307
Add filter util function
JeffinSiby Jan 10, 2022
2d4fce7
Use filter util function
JeffinSiby Jan 10, 2022
e38d00f
Add license
JeffinSiby Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 5 additions & 44 deletions src/commands/filterAllProgramsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,59 +9,20 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterAllProgramsCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterAllPrograms",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Program Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getProgramSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});

if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Program", persistentStorage.getProgramSearchHistory());
if (!pattern) {
return;
}
await persistentStorage.addProgramSearchHistory(pattern!);
node.setFilter(pattern!);
Expand Down
49 changes: 5 additions & 44 deletions src/commands/filterAllTransactionsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,59 +9,20 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterAllTransactionsCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterAllTransactions",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Transaction Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getTransactionSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});

if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Transaction", persistentStorage.getTransactionSearchHistory());
if (!pattern) {
return;
}
await persistentStorage.addTransactionSearchHistory(pattern!);
node.setFilter(pattern!);
Expand Down
48 changes: 5 additions & 43 deletions src/commands/filterLocalFileCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,58 +9,20 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterLocalFilesCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterLocalFiles",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Local File Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getLocalFileSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});
if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Local File", persistentStorage.getLocalFileSearchHistory());
if (!pattern) {
return;
}
await persistentStorage.addLocalFileSearchHistory(pattern!);
node.setFilter(pattern!);
Expand Down
49 changes: 5 additions & 44 deletions src/commands/filterProgramsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,59 +9,20 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterProgramsCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterPrograms",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Program Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getProgramSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});

if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Program", persistentStorage.getProgramSearchHistory());
if (!pattern) {
return;
}
await persistentStorage.addProgramSearchHistory(pattern!);
node.setFilter(pattern!);
Expand Down
50 changes: 5 additions & 45 deletions src/commands/filterTransactionCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,61 +9,21 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterTransactionCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterTransactions",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Transaction Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getTransactionSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});

if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Transaction", persistentStorage.getTransactionSearchHistory());
if (!pattern) {
return;
}

await persistentStorage.addTransactionSearchHistory(pattern!);
node.setFilter(pattern!);
await node.loadContents();
Expand Down
49 changes: 5 additions & 44 deletions src/commands/getFilterAllLocalFilesCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,59 +9,20 @@
*
*/

import { commands, window } from "vscode";
import { commands } from "vscode";
import { CICSTree } from "../trees/CICSTree";
import { FilterDescriptor, resolveQuickPickHelper } from "../utils/FilterUtils";
import { getPatternFromFilter } from "../utils/FilterUtils";
import { PersistentStorage } from "../utils/PersistentStorage";
import { isTheia } from "../utils/theiaCheck";

export function getFilterAllLocalFilesCommand(tree: CICSTree) {
return commands.registerCommand(
"cics-extension-for-zowe.filterAllLocalFiles",
async (node) => {
if (node) {
const persistentStorage = new PersistentStorage("Zowe.CICS.Persistent");
let pattern: string;
const desc = new FilterDescriptor("\uFF0B Create New Local File Filter (use a comma to separate multiple patterns e.g. LG*,I*)");
const items = persistentStorage.getLocalFileSearchHistory().map(loadedFilter => {
return { label: loadedFilter };
});

if (isTheia()) {
const choice = await window.showQuickPick([desc, ...items]);
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}

if (choice === desc) {
pattern = await window.showInputBox() || "";
if (!pattern) {
window.showInformationMessage( "You must enter a pattern.");
return;
}
} else {
pattern = choice.label;
}
} else {
const quickpick = window.createQuickPick();
quickpick.items = [desc, ...items];
quickpick.placeholder = "Select past filter or create new...";
quickpick.ignoreFocusOut = true;
quickpick.show();
const choice = await resolveQuickPickHelper(quickpick);
quickpick.hide();
if (!choice) {
window.showInformationMessage("No Selection Made");
return;
}
if (choice instanceof FilterDescriptor) {
if (quickpick.value) {
pattern = quickpick.value.replace(/\s/g, '');
}
} else {
pattern = choice.label.replace(/\s/g, '');
}
const pattern = await getPatternFromFilter("Local File", persistentStorage.getLocalFileSearchHistory());
if (!pattern) {
return;
}
await persistentStorage.addLocalFileSearchHistory(pattern!);
node.setFilter(pattern!);
Expand Down