ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 01:25:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove typings and replace missing methods with vscodes (#8217)" (#8240)

Browse Source 
This reverts commit 22a427f934.
This commit is contained in:
Elliot Boschwitz
2019-11-06 11:33:55 -08:00
committed by GitHub
parent 3b1eaca58e
commit e801a04bcf
184 changed files with 43388 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/services/profiler/browser/profilerFilter.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
import { ProfilerFilterClause, ProfilerFilter, ProfilerFilterClauseOperator } from 'sql/workbench/services/profiler/browser/interfaces';
import { startsWith } from 'vs/base/common/strings';
export function FilterData(filter: ProfilerFilter, data: any[]): any[] {
@@ -68,16 +67,16 @@ function matches(item: any, clauses: ProfilerFilterClause[]): boolean {
match = actualValue !== undefined && actualValue !== null && actualValue !== '';
break;
case ProfilerFilterClauseOperator.Contains:
match = actualValueString && actualValueString.indexOf(expectedValueString) > -1;
match = actualValueString && actualValueString.includes(expectedValueString);
break;
case ProfilerFilterClauseOperator.NotContains:
match = !actualValueString || !(actualValueString.indexOf(expectedValueString) > -1);
match = !actualValueString || !actualValueString.includes(expectedValueString);
break;
case ProfilerFilterClauseOperator.StartsWith:
match = startsWith(actualValueString, expectedValueString);
match = actualValueString.startsWith(expectedValueString);
break;
case ProfilerFilterClauseOperator.NotStartsWith:
match = !actualValueString || !startsWith(actualValueString, expectedValueString);
match = !actualValueString || !actualValueString.startsWith(expectedValueString);
break;
default:
throw new Error(`Not a valid operator: ${clause.operator}`);

2
src/sql/workbench/services/profiler/browser/profilerService.ts
View File

@@ -230,7 +230,7 @@ export class ProfilerService implements IProfilerService {
// only use the templates that matches the following criteria:
// 1. the template doesn't have any engine types specified - for backward compatibility (user with custom templates) or the templates applicable to both AzureSQLDB and standalone server
// 2. the template supports the current engine type
templates = templates.filter(template => !template.engineTypes || template.engineTypes.length === 0 || template.engineTypes.some(x => x === engineType));
templates = templates.filter(template => !template.engineTypes || template.engineTypes.length === 0 || template.engineTypes.includes(engineType));
}
return this._commandService.executeCommand('profiler.openCreateSessionDialog', input.id, input.providerType, templates);
}