From f3505da306405536248cbde3f4a07b95ff018005 Mon Sep 17 00:00:00 2001
From: Augustin Husson <husson.augustin@gmail.com>
Date: Wed, 7 Apr 2021 12:34:04 +0200
Subject: [PATCH] bump cm-promql + light improvement when building the PromQL
 extension (#8700)

* bump cm-promql to v0.14.1

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

* enhancement a bit the way to build the codemirror PromQL extension

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
---
 web/ui/react-app/package.json                 |  2 +-
 .../src/pages/graph/CMExpressionInput.tsx     | 21 ++++++++++---------
 web/ui/react-app/yarn.lock                    |  8 +++----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json
index 15e2dcb519..5bc3b58f59 100644
--- a/web/ui/react-app/package.json
+++ b/web/ui/react-app/package.json
@@ -29,7 +29,7 @@
     "@types/react-resize-detector": "^5.0.0",
     "@types/sanitize-html": "^1.20.2",
     "bootstrap": "^4.2.1",
-    "codemirror-promql": "^0.14.0",
+    "codemirror-promql": "^0.14.1",
     "css.escape": "^1.5.1",
     "downshift": "^3.4.8",
     "enzyme-to-json": "^3.4.3",
diff --git a/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx b/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
index 12655dc294..662ef69d73 100644
--- a/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
+++ b/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
@@ -96,16 +96,17 @@ const CMExpressionInput: FC<CMExpressionInputProps> = ({
   // (Re)initialize editor based on settings / setting changes.
   useEffect(() => {
     // Build the dynamic part of the config.
-    promqlExtension.activateCompletion(enableAutocomplete);
-    promqlExtension.activateLinter(enableLinter);
-    promqlExtension.setComplete({
-      completeStrategy: new HistoryCompleteStrategy(
-        newCompleteStrategy({
-          remote: { url: pathPrefix },
-        }),
-        queryHistory
-      ),
-    });
+    promqlExtension
+      .activateCompletion(enableAutocomplete)
+      .activateLinter(enableLinter)
+      .setComplete({
+        completeStrategy: new HistoryCompleteStrategy(
+          newCompleteStrategy({
+            remote: { url: pathPrefix },
+          }),
+          queryHistory
+        ),
+      });
     const dynamicConfig = [enableHighlighting ? promqlHighlighter : [], promqlExtension.asExtension()];
 
     // Create or reconfigure the editor.
diff --git a/web/ui/react-app/yarn.lock b/web/ui/react-app/yarn.lock
index 8628637cda..7c27806b7f 100644
--- a/web/ui/react-app/yarn.lock
+++ b/web/ui/react-app/yarn.lock
@@ -3418,10 +3418,10 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-codemirror-promql@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.14.0.tgz#a5ad500e68a379ba6bded40ec0f9ff2940015bcd"
-  integrity sha512-CqjfzVehB1ES5fbw8cRtRXG8Ykhshctqsqn8VtHXUg+QAilGBHu6+jlC7neLHdyfsTvKNhvvzwsZgRKhQVR5qA==
+codemirror-promql@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.14.1.tgz#ea927f347effd7f28e4c1f87dcd8898d1681ea40"
+  integrity sha512-zAdvVrvehVToPBlwySVlTXCY3hzOMPgO1B0m7O6PBY5BUOYbNIDk+DSjrc7glUTwySUwkyWt/x7kDabGv4tXNg==
   dependencies:
     lezer-promql "^0.18.0"
     lru-cache "^6.0.0"