remove suggestions feature

NixOS · Jul 24, 2020 · 9842752 · 9842752
1 parent 3bf4907
commit 9842752
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 715 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9
+10
diff --git a/elm-srcs.nix b/elm-srcs.nix
@@ -10,11 +10,6 @@
         version = "1.1.3";
       };
 
-      "ohanhi/keyboard" = {
-        sha256 = "10sbq8v2kydnc3lkydl367g36q2b0xizxl031xyakrgl4zlh07ic";
-        version = "2.0.1";
-      };
-
       "truqu/elm-base64" = {
         sha256 = "12w68b4idbs2vn0gm0lj354pm745jb7n0fj69408mpvh5r1z4m1b";
         version = "2.0.4";
@@ -35,16 +30,6 @@
         version = "1.0.2";
       };
 
-      "Gizra/elm-debouncer" = {
-        sha256 = "009yw0rb418ar2a458ilr25m8gxrxsv5nvs3ld3l6sy12v12n0yn";
-        version = "2.0.0";
-      };
-
-      "Skinney/keyboard-events" = {
-        sha256 = "10qjlpa4byk78sra071w4ghc7b9p2brnppx7aqyy9cmbrmp5nf86";
-        version = "2.0.1";
-      };
-
       "elm/core" = {
         sha256 = "0gyk7lx3b6vx2jlfbxdsb4xffn0wdvg5yxldq50jr2kk5dzc2prj";
         version = "1.0.4";
@@ -90,11 +75,6 @@
         version = "1.1.0";
       };
 
-      "elm-community/list-extra" = {
-        sha256 = "1rvr1c8cfb3dwf3li17l9ziax6d1fshkliasspnw6rviva38lw34";
-        version = "8.2.4";
-      };
-
       "elm/time" = {
         sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
         version = "1.0.0";

diff --git a/elm.json b/elm.json
@@ -1,43 +1,39 @@
 {
-    "type": "application",
-    "source-directories": [
-        "src"
-    ],
-    "elm-version": "0.19.1",
-    "dependencies": {
-        "direct": {
-            "Gizra/elm-debouncer": "2.0.0",
-            "NoRedInk/elm-json-decode-pipeline": "1.0.0",
-            "Skinney/keyboard-events": "2.0.1",
-            "elm/browser": "1.0.2",
-            "elm/core": "1.0.4",
-            "elm/html": "1.0.0",
-            "elm/http": "2.0.0",
-            "elm/json": "1.1.3",
-            "elm/regex": "1.0.0",
-            "elm/url": "1.0.0",
-            "hecrj/html-parser": "2.3.4",
-            "krisajenkins/remotedata": "6.0.1",
-            "ohanhi/keyboard": "2.0.1",
-            "truqu/elm-base64": "2.0.4"
-        },
-        "indirect": {
-            "elm/bytes": "1.0.8",
-            "elm/file": "1.0.5",
-            "elm/parser": "1.1.0",
-            "elm/time": "1.0.0",
-            "elm/virtual-dom": "1.0.2",
-            "elm-community/list-extra": "8.2.4",
-            "rtfeldman/elm-hex": "1.0.0"
-        }
+  "type": "application",
+  "source-directories": [
+    "src"
+  ],
+  "elm-version": "0.19.1",
+  "dependencies": {
+    "direct": {
+      "NoRedInk/elm-json-decode-pipeline": "1.0.0",
+      "elm/browser": "1.0.2",
+      "elm/core": "1.0.4",
+      "elm/html": "1.0.0",
+      "elm/http": "2.0.0",
+      "elm/json": "1.1.3",
+      "elm/regex": "1.0.0",
+      "elm/url": "1.0.0",
+      "hecrj/html-parser": "2.3.4",
+      "krisajenkins/remotedata": "6.0.1",
+      "truqu/elm-base64": "2.0.4"
     },
-    "test-dependencies": {
-        "direct": {
-            "elm-explorations/test": "1.2.2"
-        },
-        "indirect": {
-            "elm/random": "1.0.0",
-            "elm/svg": "1.0.1"
-        }
+    "indirect": {
+      "elm/bytes": "1.0.8",
+      "elm/file": "1.0.5",
+      "elm/parser": "1.1.0",
+      "elm/time": "1.0.0",
+      "elm/virtual-dom": "1.0.2",
+      "rtfeldman/elm-hex": "1.0.0"
     }
+  },
+  "test-dependencies": {
+    "direct": {
+      "elm-explorations/test": "1.2.2"
+    },
+    "indirect": {
+      "elm/random": "1.0.0",
+      "elm/svg": "1.0.1"
+    }
+  }
 }
diff --git a/flake.lock b/flake.lock
diff --git a/import-scripts/import_scripts/channel.py b/import-scripts/import_scripts/channel.py
@@ -16,7 +16,6 @@
 import subprocess
 import sys
 import tqdm  # type: ignore
-import typing
 import xml.etree.ElementTree
 
 logger = logging.getLogger("import-channel")
@@ -47,12 +46,6 @@
     "properties": {
         "type": {"type": "keyword"},
         # Package fields
-        "package_suggestions": {
-            "type": "completion",
-            "analyzer": "lowercase",
-            "search_analyzer": "lowercase",
-            "preserve_position_increments": False,
-        },
         "package_hydra_build": {
             "type": "nested",
             "properties": {
@@ -96,12 +89,6 @@
         "package_homepage": {"type": "keyword"},
         "package_system": {"type": "keyword"},
         # Options fields
-        "option_suggestions": {
-            "type": "completion",
-            "analyzer": "lowercase",
-            "search_analyzer": "lowercase",
-            "preserve_position_increments": False,
-        },
         "option_name": {"type": "keyword", "normalizer": "lowercase"},
         "option_name_query": {"type": "keyword", "normalizer": "lowercase"},
         "option_description": {"type": "text"},
@@ -113,28 +100,6 @@
 }
 
 
-def parse_suggestions(text: str) -> typing.List[typing.Dict[str, object]]:
-    """Tokenize option_name
-
-    Example:
-
-    services.nginx.extraConfig
-     - services.nginx.extraConfig
-     - services.nginx.
-     - services.
-    """
-    results: typing.List[typing.Dict[str, object]] = [
-        {"input": text, "weight": 1000 - (((len(text.split(".")) - 1) * 10))},
-    ]
-    for i in range(len(text.split(".")) - 1):
-        result = {
-            "input": ".".join(text.split(".")[: -(i + 1)]) + ".",
-            "weight": 1000 - ((len(text.split(".")) - 2 - i) * 10) + 1,
-        }
-        results.append(result)
-    return results
-
-
 def parse_query(text):
     """Tokenize package attr_name
 
@@ -371,7 +336,6 @@ def gen():
 
             yield dict(
                 type="package",
-                package_suggestions=parse_suggestions(attr_name),
                 package_hydra=hydra,
                 package_attr_name=attr_name,
                 package_attr_name_query=list(parse_query(attr_name)),
@@ -438,7 +402,6 @@ def gen():
 
             yield dict(
                 type="option",
-                option_suggestions=parse_suggestions(name),
                 option_name=name,
                 option_name_query=parse_query(name),
                 option_description=description,

diff --git a/import-scripts/tests/Example.elm b/import-scripts/tests/Example.elm
diff --git a/import-scripts/tests/test_channel.py b/import-scripts/tests/test_channel.py
@@ -1,42 +1,6 @@
 import pytest  # type: ignore
 
 
-@pytest.mark.parametrize(
-    "text,expected",
-    [
-        (
-            "services.grafana.analytics.reporting.enable",
-            [
-                {"input": "services.grafana.analytics.reporting.enable", "weight": 960},
-                {"input": "services.grafana.analytics.reporting.", "weight": 971},
-                {"input": "services.grafana.analytics.", "weight": 981},
-                {"input": "services.grafana.", "weight": 991},
-                {"input": "services.", "weight": 1001},
-            ],
-        ),
-        (
-            "services.nginx.extraConfig",
-            [
-                {"input": "services.nginx.extraConfig", "weight": 980},
-                {"input": "services.nginx.", "weight": 991},
-                {"input": "services.", "weight": 1001},
-            ],
-        ),
-        (
-            "python37Packages.test1_name-test2",
-            [
-                {"input": "python37Packages.test1_name-test2", "weight": 990},
-                {"input": "python37Packages.", "weight": 1001},
-            ],
-        ),
-    ],
-)
-def test_parse_suggestions(text, expected):
-    import import_scripts.channel
-
-    assert import_scripts.channel.parse_suggestions(text) == expected
-
-
 @pytest.mark.parametrize(
     "text,expected",
     [

diff --git a/src/Main.elm b/src/Main.elm
@@ -240,11 +240,11 @@ update msg model =
                 |> updateWith Home HomeMsg model
 
         ( PackagesMsg subMsg, Packages subModel ) ->
-            Page.Packages.update model.navKey model.elasticsearch subMsg subModel
+            Page.Packages.update model.navKey subMsg subModel
                 |> updateWith Packages PackagesMsg model
 
         ( OptionsMsg subMsg, Options subModel ) ->
-            Page.Options.update model.navKey model.elasticsearch subMsg subModel
+            Page.Options.update model.navKey subMsg subModel
                 |> updateWith Options OptionsMsg model
 
         ( _, _ ) ->

diff --git a/src/Page/Home.elm b/src/Page/Home.elm
@@ -26,13 +26,15 @@ type Msg
 
 update : Msg -> Model -> ( Model, Cmd Msg )
 update msg model =
-    ( model, Cmd.none )
+    case msg of
+        NoOp ->
+            ( model, Cmd.none )
 
 
 
 -- VIEW
 
 
 view : Model -> Html Msg
-view model =
+view _ =
     div [] [ text "Home" ]