Show in-progress state in method modeling panel (#2979)

github · Oct 16, 2023 · b87dfa4 · b87dfa4
1 parent b1a4586
commit b87dfa4
Show file tree

Hide file tree

Showing 14 changed files with 169 additions and 6 deletions.
diff --git a/extensions/ql-vscode/src/common/interface-types.ts b/extensions/ql-vscode/src/common/interface-types.ts
@@ -583,6 +583,11 @@ interface SetInModelingModeMessage {
   inModelingMode: boolean;
 }
 
+interface SetInProgressMessage {
+  t: "setInProgress";
+  inProgress: boolean;
+}
+
 interface RevealMethodMessage {
   t: "revealMethod";
   methodSignature: string;
@@ -646,6 +651,7 @@ interface SetSelectedMethodMessage {
   method: Method;
   modeledMethods: ModeledMethod[];
   isModified: boolean;
+  isInProgress: boolean;
 }
 
 export type ToMethodModelingMessage =
@@ -654,4 +660,5 @@ export type ToMethodModelingMessage =
   | SetMultipleModeledMethodsMessage
   | SetMethodModifiedMessage
   | SetSelectedMethodMessage
-  | SetInModelingModeMessage;
+  | SetInModelingModeMessage
+  | SetInProgressMessage;
diff --git a/extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts b/extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts
@@ -14,6 +14,7 @@ import { assertNever } from "../../common/helpers-pure";
 import { ModelEditorViewTracker } from "../model-editor-view-tracker";
 import { ModelConfigListener } from "../../config";
 import { DatabaseItem } from "../../databases/local-databases";
+import { hasInProgressMethodSignature } from "../shared/in-progress-methods";
 
 export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
   ToMethodModelingMessage,
@@ -75,6 +76,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
           method: selectedMethod.method,
           modeledMethods: selectedMethod.modeledMethods,
           isModified: selectedMethod.isModified,
+          isInProgress: selectedMethod.isInProgress,
         });
       }
 
@@ -188,6 +190,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
             method: e.method,
             modeledMethods: e.modeledMethods,
             isModified: e.isModified,
+            isInProgress: e.isInProgress,
           });
         }
       }),
@@ -216,6 +219,24 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
         }
       }),
     );
+
+    this.push(
+      this.modelingStore.onInProgressMethodsChanged(async (e) => {
+        if (this.method && this.databaseItem) {
+          const dbUri = this.databaseItem.databaseUri.toString();
+          if (e.dbUri === dbUri) {
+            const inProgress = hasInProgressMethodSignature(
+              e.methods,
+              this.method.signature,
+            );
+            await this.postMessage({
+              t: "setInProgress",
+              inProgress,
+            });
+          }
+        }
+      }),
+    );
   }
 
   private registerToModelConfigEvents(): void {

diff --git a/extensions/ql-vscode/src/model-editor/modeling-store.ts b/extensions/ql-vscode/src/model-editor/modeling-store.ts
@@ -5,7 +5,10 @@ import { DatabaseItem } from "../databases/local-databases";
 import { Method, Usage } from "./method";
 import { ModeledMethod } from "./modeled-method";
 import { INITIAL_HIDE_MODELED_METHODS_VALUE } from "./shared/hide-modeled-methods";
-import { InProgressMethods } from "./shared/in-progress-methods";
+import {
+  InProgressMethods,
+  hasInProgressMethodSignature,
+} from "./shared/in-progress-methods";
 import { INITIAL_MODE, Mode } from "./shared/mode";
 
 interface InternalDbModelingState {
@@ -37,6 +40,7 @@ interface SelectedMethodDetails {
   readonly usage: Usage | undefined;
   readonly modeledMethods: readonly ModeledMethod[];
   readonly isModified: boolean;
+  readonly isInProgress: boolean;
 }
 
 interface MethodsChangedEvent {
@@ -73,6 +77,7 @@ interface SelectedMethodChangedEvent {
   readonly usage: Usage;
   readonly modeledMethods: readonly ModeledMethod[];
   readonly isModified: boolean;
+  readonly isInProgress: boolean;
 }
 
 interface InProgressMethodsChangedEvent {
@@ -420,6 +425,10 @@ export class ModelingStore extends DisposableObject {
       usage,
       modeledMethods: dbState.modeledMethods[method.signature] ?? [],
       isModified: dbState.modifiedMethodSignatures.has(method.signature),
+      isInProgress: hasInProgressMethodSignature(
+        dbState.inProgressMethods,
+        method.signature,
+      ),
     });
   }
 
@@ -460,6 +469,10 @@ export class ModelingStore extends DisposableObject {
       isModified: dbState.modifiedMethodSignatures.has(
         selectedMethod.signature,
       ),
+      isInProgress: hasInProgressMethodSignature(
+        dbState.inProgressMethods,
+        selectedMethod.signature,
+      ),
     };
   }
 

diff --git a/extensions/ql-vscode/src/model-editor/shared/in-progress-methods.ts b/extensions/ql-vscode/src/model-editor/shared/in-progress-methods.ts
@@ -15,3 +15,16 @@ export function hasInProgressMethod(
 
   return false;
 }
+
+export function hasInProgressMethodSignature(
+  inProgressMethods: InProgressMethods,
+  signature: string,
+): boolean {
+  for (const methods of Object.values(inProgressMethods)) {
+    if (methods.includes(signature)) {
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/extensions/ql-vscode/src/stories/method-modeling/MethodModelingInputs.stories.tsx b/extensions/ql-vscode/src/stories/method-modeling/MethodModelingInputs.stories.tsx
@@ -51,3 +51,10 @@ FullyModeledMethod.args = {
   method,
   modeledMethod,
 };
+
+export const ModelingInProgress = Template.bind({});
+ModelingInProgress.args = {
+  method,
+  modeledMethod,
+  isModelingInProgress: true,
+};
diff --git a/extensions/ql-vscode/src/view/method-modeling/MethodModeling.tsx b/extensions/ql-vscode/src/view/method-modeling/MethodModeling.tsx
@@ -52,6 +52,7 @@ export type MethodModelingProps = {
   modelingStatus: ModelingStatus;
   method: Method;
   modeledMethods: ModeledMethod[];
+  isModelingInProgress: boolean;
   showMultipleModels?: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
@@ -60,6 +61,7 @@ export const MethodModeling = ({
   modelingStatus,
   modeledMethods,
   method,
+  isModelingInProgress,
   showMultipleModels = false,
   onChange,
 }: MethodModelingProps): JSX.Element => {
@@ -78,6 +80,7 @@ export const MethodModeling = ({
         method={method}
         modeledMethods={modeledMethods}
         showMultipleModels={showMultipleModels}
+        isModelingInProgress={isModelingInProgress}
         onChange={onChange}
       />
       <ReviewInEditorButton method={method} />

diff --git a/extensions/ql-vscode/src/view/method-modeling/MethodModelingInputs.tsx b/extensions/ql-vscode/src/view/method-modeling/MethodModelingInputs.tsx
@@ -6,6 +6,7 @@ import { ModelTypeDropdown } from "../model-editor/ModelTypeDropdown";
 import { ModelInputDropdown } from "../model-editor/ModelInputDropdown";
 import { ModelOutputDropdown } from "../model-editor/ModelOutputDropdown";
 import { ModelKindDropdown } from "../model-editor/ModelKindDropdown";
+import { InProgressDropdown } from "../model-editor/InProgressDropdown";
 
 const Container = styled.div`
   padding-top: 0.5rem;
@@ -24,12 +25,14 @@ const Name = styled.span`
 export type MethodModelingInputsProps = {
   method: Method;
   modeledMethod: ModeledMethod | undefined;
+  isModelingInProgress: boolean;
   onChange: (modeledMethod: ModeledMethod) => void;
 };
 
 export const MethodModelingInputs = ({
   method,
   modeledMethod,
+  isModelingInProgress,
   onChange,
 }: MethodModelingInputsProps): JSX.Element => {
   const inputProps = {
@@ -43,25 +46,41 @@ export const MethodModelingInputs = ({
       <Container>
         <Input>
           <Name>Model Type</Name>
-          <ModelTypeDropdown {...inputProps} />
+          {isModelingInProgress ? (
+            <InProgressDropdown />
+          ) : (
+            <ModelTypeDropdown {...inputProps} />
+          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Input</Name>
-          <ModelInputDropdown {...inputProps} />
+          {isModelingInProgress ? (
+            <InProgressDropdown />
+          ) : (
+            <ModelInputDropdown {...inputProps} />
+          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Output</Name>
-          <ModelOutputDropdown {...inputProps} />
+          {isModelingInProgress ? (
+            <InProgressDropdown />
+          ) : (
+            <ModelOutputDropdown {...inputProps} />
+          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Kind</Name>
-          <ModelKindDropdown {...inputProps} />
+          {isModelingInProgress ? (
+            <InProgressDropdown />
+          ) : (
+            <ModelKindDropdown {...inputProps} />
+          )}
         </Input>
       </Container>
     </>

diff --git a/extensions/ql-vscode/src/view/method-modeling/MethodModelingView.tsx b/extensions/ql-vscode/src/view/method-modeling/MethodModelingView.tsx
@@ -28,6 +28,9 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
 
   const [isMethodModified, setIsMethodModified] = useState<boolean>(false);
 
+  const [isModelingInProgress, setIsModelingInProgress] =
+    useState<boolean>(false);
+
   const modelingStatus = useMemo(
     () => getModelingStatus(modeledMethods, isMethodModified),
     [modeledMethods, isMethodModified],
@@ -58,6 +61,9 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
             setModeledMethods(msg.modeledMethods);
             setIsMethodModified(msg.isModified);
             break;
+          case "setInProgress":
+            setIsModelingInProgress(msg.inProgress);
+            break;
           default:
             assertNever(msg);
         }
@@ -102,6 +108,7 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
       modelingStatus={modelingStatus}
       method={method}
       modeledMethods={modeledMethods}
+      isModelingInProgress={isModelingInProgress}
       showMultipleModels={viewState?.showMultipleModels}
       onChange={onChange}
     />

diff --git a/extensions/ql-vscode/src/view/method-modeling/ModeledMethodsPanel.tsx b/extensions/ql-vscode/src/view/method-modeling/ModeledMethodsPanel.tsx
@@ -10,6 +10,7 @@ import { convertToLegacyModeledMethod } from "../../model-editor/shared/modeled-
 export type ModeledMethodsPanelProps = {
   method: Method;
   modeledMethods: ModeledMethod[];
+  isModelingInProgress: boolean;
   showMultipleModels: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
@@ -21,6 +22,7 @@ const SingleMethodModelingInputs = styled(MethodModelingInputs)`
 export const ModeledMethodsPanel = ({
   method,
   modeledMethods,
+  isModelingInProgress,
   showMultipleModels,
   onChange,
 }: ModeledMethodsPanelProps) => {
@@ -36,6 +38,7 @@ export const ModeledMethodsPanel = ({
       <SingleMethodModelingInputs
         method={method}
         modeledMethod={convertToLegacyModeledMethod(modeledMethods)}
+        isModelingInProgress={isModelingInProgress}
         onChange={handleSingleChange}
       />
     );
@@ -45,6 +48,7 @@ export const ModeledMethodsPanel = ({
     <MultipleModeledMethodsPanel
       method={method}
       modeledMethods={modeledMethods}
+      isModelingInProgress={isModelingInProgress}
       onChange={onChange}
     />
   );

diff --git a/extensions/ql-vscode/src/view/method-modeling/MultipleModeledMethodsPanel.tsx b/extensions/ql-vscode/src/view/method-modeling/MultipleModeledMethodsPanel.tsx
@@ -16,6 +16,7 @@ import { ModeledMethodAlert } from "./ModeledMethodAlert";
 export type MultipleModeledMethodsPanelProps = {
   method: Method;
   modeledMethods: ModeledMethod[];
+  isModelingInProgress: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
 
@@ -54,6 +55,7 @@ const ModificationActions = styled.div`
 export const MultipleModeledMethodsPanel = ({
   method,
   modeledMethods,
+  isModelingInProgress,
   onChange,
 }: MultipleModeledMethodsPanelProps) => {
   const [selectedIndex, setSelectedIndex] = useState<number>(0);
@@ -134,12 +136,14 @@ export const MultipleModeledMethodsPanel = ({
         <MethodModelingInputs
           method={method}
           modeledMethod={modeledMethods[selectedIndex]}
+          isModelingInProgress={isModelingInProgress}
           onChange={handleChange}
         />
       ) : (
         <MethodModelingInputs
           method={method}
           modeledMethod={undefined}
+          isModelingInProgress={isModelingInProgress}
           onChange={handleChange}
         />
       )}

diff --git a/extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModeling.spec.tsx b/extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModeling.spec.tsx
@@ -11,12 +11,14 @@ describe(MethodModeling.name, () => {
   it("renders method modeling panel", () => {
     const method = createMethod();
     const modeledMethod = createModeledMethod();
+    const isModelingInProgress = false;
     const onChange = jest.fn();
 
     render({
       modelingStatus: "saved",
       method,
       modeledMethods: [modeledMethod],
+      isModelingInProgress,
       onChange,
     });