mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2913 from github/robertbrignull/SaveModeledMethods

Browse Source 
Remove method and modeledMethods from SaveModeledMethods message
This commit is contained in:
Robert
2023-10-09 14:16:30 +01:00
committed by GitHub
parent e4a290fe37 c3e18910fc
commit c620939895
6 changed files with 97 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/ql-vscode/src/common/interface-types.ts
View File

@@ -546,8 +546,7 @@ interface RefreshMethods {
interface SaveModeledMethods {
t: "saveModeledMethods";
methods: Method[];
modeledMethods: Record<string, ModeledMethod>;
methodSignatures?: string[];
}
interface GenerateMethodMessage {

87
extensions/ql-vscode/src/model-editor/model-editor-view.ts
View File

@@ -205,47 +205,58 @@ export class ModelEditorView extends AbstractWebview<
break;
case "saveModeledMethods":
await withProgress(
async (progress) => {
progress({
step: 1,
maxStep: 500 + externalApiQueriesProgressMaxStep,
message: "Writing model files",
});
await saveModeledMethods(
this.extensionPack,
this.databaseItem.language,
msg.methods,
convertFromLegacyModeledMethods(msg.modeledMethods),
this.mode,
this.cliServer,
this.app.logger,
);
{
const methods = this.modelingStore.getMethods(
this.databaseItem,
msg.methodSignatures,
);
const modeledMethods = this.modelingStore.getModeledMethods(
this.databaseItem,
msg.methodSignatures,
);
await Promise.all([
this.setViewState(),
this.loadMethods((update) =>
progress({
...update,
step: update.step + 500,
maxStep: 500 + externalApiQueriesProgressMaxStep,
}),
),
]);
},
{
cancellable: false,
},
);
await withProgress(
async (progress) => {
progress({
step: 1,
maxStep: 500 + externalApiQueriesProgressMaxStep,
message: "Writing model files",
});
await saveModeledMethods(
this.extensionPack,
this.databaseItem.language,
methods,
convertFromLegacyModeledMethods(modeledMethods),
this.mode,
this.cliServer,
this.app.logger,
);
this.modelingStore.removeModifiedMethods(
this.databaseItem,
Object.keys(msg.modeledMethods),
);
await Promise.all([
this.setViewState(),
this.loadMethods((update) =>
progress({
...update,
step: update.step + 500,
maxStep: 500 + externalApiQueriesProgressMaxStep,
}),
),
]);
},
{
cancellable: false,
},
);
void telemetryListener?.sendUIInteraction(
"model-editor-save-modeled-methods",
);
this.modelingStore.removeModifiedMethods(
this.databaseItem,
Object.keys(modeledMethods),
);
void telemetryListener?.sendUIInteraction(
"model-editor-save-modeled-methods",
);
}
break;
case "generateMethod":

36
extensions/ql-vscode/src/model-editor/modeling-store.ts
View File

@@ -169,6 +169,23 @@ export class ModelingStore extends DisposableObject {
return this.state.size > 0;
}
/**
* Returns the methods for the given database item and method signatures.
* If the `methodSignatures` argument is not provided or is undefined, returns all methods.
*/
public getMethods(
dbItem: DatabaseItem,
methodSignatures?: string[],
): Method[] {
const methods = this.getState(dbItem).methods;
if (!methodSignatures) {
return methods;
}
return methods.filter((method) =>
methodSignatures.includes(method.signature),
);
}
public setMethods(dbItem: DatabaseItem, methods: Method[]) {
const dbState = this.getState(dbItem);
const dbUri = dbItem.databaseUri.toString();
@@ -197,6 +214,25 @@ export class ModelingStore extends DisposableObject {
});
}
/**
* Returns the modeled methods for the given database item and method signatures.
* If the `methodSignatures` argument is not provided or is undefined, returns all modeled methods.
*/
public getModeledMethods(
dbItem: DatabaseItem,
methodSignatures?: string[],
): Record<string, ModeledMethod> {
const modeledMethods = this.getState(dbItem).modeledMethods;
if (!methodSignatures) {
return modeledMethods;
}
return Object.fromEntries(
Object.entries(modeledMethods).filter(([key]) =>
methodSignatures.includes(key),
),
);
}
public addModeledMethods(
dbItem: DatabaseItem,
methods: Record<string, ModeledMethod>,

9
extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx
View File

@@ -78,10 +78,7 @@ export type LibraryRowProps = {
hideModeledMethods: boolean;
revealedMethodSignature: string | null;
onChange: (modeledMethod: ModeledMethod) => void;
onSaveModelClick: (
methods: Method[],
modeledMethods: Record<string, ModeledMethod>,
) => void;
onSaveModelClick: (methodSignatures: string[]) => void;
onGenerateFromLlmClick: (
dependencyName: string,
methods: Method[],
@@ -165,11 +162,11 @@ export const LibraryRow = ({
const handleSave = useCallback(
async (e: React.MouseEvent) => {
onSaveModelClick(methods, modeledMethods);
onSaveModelClick(methods.map((m) => m.signature));
e.stopPropagation();
e.preventDefault();
},
[methods, modeledMethods, onSaveModelClick],
[methods, onSaveModelClick],
);
const hasUnsavedChanges = useMemo(() => {

20
extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx
View File

@@ -196,21 +196,15 @@ export function ModelEditor({
const onSaveAllClick = useCallback(() => {
vscode.postMessage({
t: "saveModeledMethods",
methods,
modeledMethods,
});
}, [methods, modeledMethods]);
}, []);
const onSaveModelClick = useCallback(
(methods: Method[], modeledMethods: Record<string, ModeledMethod>) => {
vscode.postMessage({
t: "saveModeledMethods",
methods,
modeledMethods,
});
},
[],
);
const onSaveModelClick = useCallback((methodSignatures: string[]) => {
vscode.postMessage({
t: "saveModeledMethods",
methodSignatures,
});
}, []);
const onGenerateFromSourceClick = useCallback(() => {
vscode.postMessage({

5
extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx
View File

@@ -20,10 +20,7 @@ export type ModeledMethodsListProps = {
viewState: ModelEditorViewState;
hideModeledMethods: boolean;
onChange: (modeledMethod: ModeledMethod) => void;
onSaveModelClick: (
methods: Method[],
modeledMethods: Record<string, ModeledMethod>,
) => void;
onSaveModelClick: (methodSignatures: string[]) => void;
onGenerateFromLlmClick: (
packageName: string,
methods: Method[],