Skip to content

Implement saving only one model at a time #2588

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

Merged
robertbrignull merged 1 commit into from
Jul 7, 2023
+45 −7
Merged

Implement saving only one model at a time #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 24 additions & 3 deletions extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export function DataExtensionsEditor({
break;
case "setExternalApiUsages":
setExternalApiUsages(msg.externalApiUsages);
setUnsavedModels(new Set());
break;
case "showProgress":
setProgress(msg);
Expand Down Expand Up @@ -151,14 +150,35 @@ export function DataExtensionsEditor({
});
}, []);

const onApplyClick = useCallback(() => {
const onSaveAllClick = useCallback(() => {
vscode.postMessage({
t: "saveModeledMethods",
externalApiUsages,
modeledMethods,
});
setUnsavedModels(new Set());
}, [externalApiUsages, modeledMethods]);

const onSaveModelClick = useCallback(
(
modelName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
) => {
vscode.postMessage({
t: "saveModeledMethods",
externalApiUsages,
modeledMethods,
});
setUnsavedModels((oldUnsavedModels) => {
const newUnsavedModels = new Set(oldUnsavedModels);
newUnsavedModels.delete(modelName);
return newUnsavedModels;
});
},
[],
);

const onGenerateClick = useCallback(() => {
vscode.postMessage({
t: "generateExternalApi",
Expand Down Expand Up @@ -239,7 +259,7 @@ export function DataExtensionsEditor({

<EditorContainer>
<ButtonsContainer>
<VSCodeButton onClick={onApplyClick}>Apply</VSCodeButton>
<VSCodeButton onClick={onSaveAllClick}>Apply</VSCodeButton>
{viewState?.enableFrameworkMode && (
<VSCodeButton appearance="secondary" onClick={onRefreshClick}>
Refresh
Expand All @@ -264,6 +284,7 @@ export function DataExtensionsEditor({
modeledMethods={modeledMethods}
mode={viewState?.mode ?? Mode.Application}
onChange={onChange}
onSaveModelClick={onSaveModelClick}
/>
</EditorContainer>
</>
Expand Down
18 changes: 14 additions & 4 deletions extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ type Props = {
externalApiUsage: ExternalApiUsage,
modeledMethod: ModeledMethod,
) => void;
onSaveModelClick: (
modelName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
) => void;
};

export const LibraryRow = ({
Expand All @@ -96,6 +101,7 @@ export const LibraryRow = ({
mode,
hasUnsavedChanges,
onChange,
onSaveModelClick,
}: Props) => {
const modeledPercentage = useMemo(() => {
return calculateModeledPercentage(externalApiUsages);
Expand All @@ -117,10 +123,14 @@ export const LibraryRow = ({
e.preventDefault();
}, []);

const handleSave = useCallback(async (e: React.MouseEvent) => {
e.stopPropagation();
e.preventDefault();
}, []);
const handleSave = useCallback(
async (e: React.MouseEvent) => {
onSaveModelClick(title, externalApiUsages, modeledMethods);
e.stopPropagation();
e.preventDefault();
},
[title, externalApiUsages, modeledMethods, onSaveModelClick],
);

const onChangeWithModelName = useCallback(
(externalApiUsage: ExternalApiUsage, modeledMethod: ModeledMethod) => {
Expand Down
7 changes: 7 additions & 0 deletions extensions/ql-vscode/src/view/data-extensions-editor/ModeledMethodsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ type Props = {
externalApiUsage: ExternalApiUsage,
modeledMethod: ModeledMethod,
) => void;
onSaveModelClick: (
modelName: string,
externalApiUsages: ExternalApiUsage[],
modeledMethods: Record<string, ModeledMethod>,
) => void;
};

export const ModeledMethodsList = ({
Expand All @@ -27,6 +32,7 @@ export const ModeledMethodsList = ({
modeledMethods,
mode,
onChange,
onSaveModelClick,
}: Props) => {
const grouped = useMemo(
() => groupMethods(externalApiUsages, mode),
Expand All @@ -46,6 +52,7 @@ export const ModeledMethodsList = ({
modeledMethods={modeledMethods}
mode={mode}
onChange={onChange}
onSaveModelClick={onSaveModelClick}
/>
))}
</>
Expand Down