Skip to content

Commit 3c7e1fc

Browse files
authored
Remove codeQL.dataExtensions.frameworkMode setting (#2753)
1 parent 0433f89 commit 3c7e1fc

6 files changed

Lines changed: 16 additions & 29 deletions

File tree

extensions/ql-vscode/src/config.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ export function showQueriesPanel(): boolean {
704704

705705
const DATA_EXTENSIONS = new Setting("dataExtensions", ROOT_SETTING);
706706
const LLM_GENERATION = new Setting("llmGeneration", DATA_EXTENSIONS);
707-
const FRAMEWORK_MODE = new Setting("frameworkMode", DATA_EXTENSIONS);
708707
const DISABLE_AUTO_NAME_EXTENSION_PACK = new Setting(
709708
"disableAutoNameExtensionPack",
710709
DATA_EXTENSIONS,
@@ -718,10 +717,6 @@ export function showLlmGeneration(): boolean {
718717
return !!LLM_GENERATION.getValue<boolean>();
719718
}
720719

721-
export function enableFrameworkMode(): boolean {
722-
return !!FRAMEWORK_MODE.getValue<boolean>();
723-
}
724-
725720
export function disableAutoNameExtensionPack(): boolean {
726721
return !!DISABLE_AUTO_NAME_EXTENSION_PACK.getValue<boolean>();
727722
}

extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { runExternalApiQueries } from "./external-api-usage-queries";
3131
import { ExternalApiUsage, Usage } from "./external-api-usage";
3232
import { ModeledMethod } from "./modeled-method";
3333
import { ExtensionPack } from "./shared/extension-pack";
34-
import { enableFrameworkMode, showLlmGeneration } from "../config";
34+
import { showLlmGeneration } from "../config";
3535
import { Mode } from "./shared/mode";
3636
import { loadModeledMethods, saveModeledMethods } from "./modeled-method-fs";
3737
import { join } from "path";
@@ -267,7 +267,6 @@ export class DataExtensionsEditorView extends AbstractWebview<
267267
t: "setDataExtensionEditorViewState",
268268
viewState: {
269269
extensionPack: this.extensionPack,
270-
enableFrameworkMode: enableFrameworkMode(),
271270
showLlmButton,
272271
mode: this.mode,
273272
},

extensions/ql-vscode/src/data-extensions-editor/shared/view-state.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Mode } from "./mode";
33

44
export interface DataExtensionEditorViewState {
55
extensionPack: ExtensionPack;
6-
enableFrameworkMode: boolean;
76
showLlmButton: boolean;
87
mode: Mode;
98
}

extensions/ql-vscode/src/stories/data-extensions-editor/DataExtensionsEditor.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ DataExtensionsEditor.args = {
2828
extensionTargets: {},
2929
dataExtensions: [],
3030
},
31-
enableFrameworkMode: true,
3231
showLlmButton: true,
3332
mode: Mode.Application,
3433
},

extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,12 @@ export function DataExtensionsEditor({
320320
<span slot="start" className="codicon codicon-package"></span>
321321
Open extension pack
322322
</LinkIconButton>
323-
{viewState.enableFrameworkMode && (
324-
<LinkIconButton onClick={onSwitchModeClick}>
325-
<span slot="start" className="codicon codicon-library"></span>
326-
{viewState.mode === Mode.Framework
327-
? "Model as application"
328-
: "Model as dependency"}
329-
</LinkIconButton>
330-
)}
323+
<LinkIconButton onClick={onSwitchModeClick}>
324+
<span slot="start" className="codicon codicon-library"></span>
325+
{viewState.mode === Mode.Framework
326+
? "Model as application"
327+
: "Model as dependency"}
328+
</LinkIconButton>
331329
</HeaderRow>
332330
</HeaderColumn>
333331
<HeaderSpacer />
@@ -349,11 +347,9 @@ export function DataExtensionsEditor({
349347
>
350348
Save all
351349
</VSCodeButton>
352-
{viewState.enableFrameworkMode && (
353-
<VSCodeButton appearance="secondary" onClick={onRefreshClick}>
354-
Refresh
355-
</VSCodeButton>
356-
)}
350+
<VSCodeButton appearance="secondary" onClick={onRefreshClick}>
351+
Refresh
352+
</VSCodeButton>
357353
{viewState.mode === Mode.Framework && (
358354
<VSCodeButton onClick={onGenerateFromSourceClick}>
359355
Generate

extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,12 @@ export const LibraryRow = ({
221221
&nbsp;Model from source
222222
</VSCodeButton>
223223
)}
224-
{viewState.enableFrameworkMode &&
225-
viewState.mode === Mode.Application && (
226-
<VSCodeButton appearance="icon" onClick={handleModelDependency}>
227-
<Codicon name="references" label="Model dependency" />
228-
&nbsp;Model dependency
229-
</VSCodeButton>
230-
)}
224+
{viewState.mode === Mode.Application && (
225+
<VSCodeButton appearance="icon" onClick={handleModelDependency}>
226+
<Codicon name="references" label="Model dependency" />
227+
&nbsp;Model dependency
228+
</VSCodeButton>
229+
)}
231230
</TitleContainer>
232231
{isExpanded && (
233232
<>

0 commit comments

Comments
 (0)