From 7d41cd7ae6e7efb6ab62376c22385b49ec11e8cb Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Tue, 16 May 2023 10:23:21 +0200
Subject: [PATCH] Rename `editor-manual` to `manual`

There is a defined list of of valid origin values for the provenance.
This does not include `editor`, so to make sure all values are valid we
use `manual` instead.

See https://github.com/github/codeql/blob/ac1df4de91438904c86e6e3ce5d01f9e6ba2468a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll#L221-L229
---
 .../ql-vscode/src/data-extensions-editor/modeled-method.ts    | 2 +-
 .../data-extensions-editor/DataExtensionsEditor.stories.tsx   | 2 +-
 .../src/stories/data-extensions-editor/MethodRow.stories.tsx  | 2 +-
 .../ql-vscode/src/view/data-extensions-editor/MethodRow.tsx   | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extensions/ql-vscode/src/data-extensions-editor/modeled-method.ts b/extensions/ql-vscode/src/data-extensions-editor/modeled-method.ts
index 2f5478174..95b19c3c0 100644
--- a/extensions/ql-vscode/src/data-extensions-editor/modeled-method.ts
+++ b/extensions/ql-vscode/src/data-extensions-editor/modeled-method.ts
@@ -11,7 +11,7 @@ export type Provenance =
   // Generated by the dataflow model and manually edited
   | "df-manual"
   // Entered by the user in the editor manually
-  | "editor-manual";
+  | "manual";
 
 export type ModeledMethod = {
   type: ModeledMethodType;
diff --git a/extensions/ql-vscode/src/stories/data-extensions-editor/DataExtensionsEditor.stories.tsx b/extensions/ql-vscode/src/stories/data-extensions-editor/DataExtensionsEditor.stories.tsx
index 7871c4f1c..736e4dc92 100644
--- a/extensions/ql-vscode/src/stories/data-extensions-editor/DataExtensionsEditor.stories.tsx
+++ b/extensions/ql-vscode/src/stories/data-extensions-editor/DataExtensionsEditor.stories.tsx
@@ -224,7 +224,7 @@ DataExtensionsEditor.args = {
       input: "Argument[this]",
       output: "ReturnValue",
       kind: "taint",
-      provenance: "editor-manual",
+      provenance: "manual",
     },
     "org.sql2o.Query#executeScalar(Class)": {
       type: "neutral",
diff --git a/extensions/ql-vscode/src/stories/data-extensions-editor/MethodRow.stories.tsx b/extensions/ql-vscode/src/stories/data-extensions-editor/MethodRow.stories.tsx
index 605b17798..b0aa7e804 100644
--- a/extensions/ql-vscode/src/stories/data-extensions-editor/MethodRow.stories.tsx
+++ b/extensions/ql-vscode/src/stories/data-extensions-editor/MethodRow.stories.tsx
@@ -50,6 +50,6 @@ MethodRow.args = {
     input: "Argument[this]",
     output: "ReturnValue",
     kind: "taint",
-    provenance: "editor-manual",
+    provenance: "manual",
   },
 };
diff --git a/extensions/ql-vscode/src/view/data-extensions-editor/MethodRow.tsx b/extensions/ql-vscode/src/view/data-extensions-editor/MethodRow.tsx
index a4ce82ccf..f022c5605 100644
--- a/extensions/ql-vscode/src/view/data-extensions-editor/MethodRow.tsx
+++ b/extensions/ql-vscode/src/view/data-extensions-editor/MethodRow.tsx
@@ -71,9 +71,7 @@ export const MethodRow = ({
         ...modeledMethod,
         type: target.value as ModeledMethodType,
         provenance:
-          modeledMethod?.provenance === "df-generated"
-            ? "df-manual"
-            : "editor-manual",
+          modeledMethod?.provenance === "df-generated" ? "df-manual" : "manual",
       });
     },
     [onChange, externalApiUsage, modeledMethod, argumentsList],