Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9842752

Browse files
garbasgarbas
committedJul 24, 2020
remove suggestions feature
1 parent 3bf4907 commit 9842752

14 files changed

+78
-715
lines changed
 

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9
1+
10

‎elm-srcs.nix

-20
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
version = "1.1.3";
1111
};
1212

13-
"ohanhi/keyboard" = {
14-
sha256 = "10sbq8v2kydnc3lkydl367g36q2b0xizxl031xyakrgl4zlh07ic";
15-
version = "2.0.1";
16-
};
17-
1813
"truqu/elm-base64" = {
1914
sha256 = "12w68b4idbs2vn0gm0lj354pm745jb7n0fj69408mpvh5r1z4m1b";
2015
version = "2.0.4";
@@ -35,16 +30,6 @@
3530
version = "1.0.2";
3631
};
3732

38-
"Gizra/elm-debouncer" = {
39-
sha256 = "009yw0rb418ar2a458ilr25m8gxrxsv5nvs3ld3l6sy12v12n0yn";
40-
version = "2.0.0";
41-
};
42-
43-
"Skinney/keyboard-events" = {
44-
sha256 = "10qjlpa4byk78sra071w4ghc7b9p2brnppx7aqyy9cmbrmp5nf86";
45-
version = "2.0.1";
46-
};
47-
4833
"elm/core" = {
4934
sha256 = "0gyk7lx3b6vx2jlfbxdsb4xffn0wdvg5yxldq50jr2kk5dzc2prj";
5035
version = "1.0.4";
@@ -90,11 +75,6 @@
9075
version = "1.1.0";
9176
};
9277

93-
"elm-community/list-extra" = {
94-
sha256 = "1rvr1c8cfb3dwf3li17l9ziax6d1fshkliasspnw6rviva38lw34";
95-
version = "8.2.4";
96-
};
97-
9878
"elm/time" = {
9979
sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
10080
version = "1.0.0";

‎elm.json

+35-39
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
{
2-
"type": "application",
3-
"source-directories": [
4-
"src"
5-
],
6-
"elm-version": "0.19.1",
7-
"dependencies": {
8-
"direct": {
9-
"Gizra/elm-debouncer": "2.0.0",
10-
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
11-
"Skinney/keyboard-events": "2.0.1",
12-
"elm/browser": "1.0.2",
13-
"elm/core": "1.0.4",
14-
"elm/html": "1.0.0",
15-
"elm/http": "2.0.0",
16-
"elm/json": "1.1.3",
17-
"elm/regex": "1.0.0",
18-
"elm/url": "1.0.0",
19-
"hecrj/html-parser": "2.3.4",
20-
"krisajenkins/remotedata": "6.0.1",
21-
"ohanhi/keyboard": "2.0.1",
22-
"truqu/elm-base64": "2.0.4"
23-
},
24-
"indirect": {
25-
"elm/bytes": "1.0.8",
26-
"elm/file": "1.0.5",
27-
"elm/parser": "1.1.0",
28-
"elm/time": "1.0.0",
29-
"elm/virtual-dom": "1.0.2",
30-
"elm-community/list-extra": "8.2.4",
31-
"rtfeldman/elm-hex": "1.0.0"
32-
}
2+
"type": "application",
3+
"source-directories": [
4+
"src"
5+
],
6+
"elm-version": "0.19.1",
7+
"dependencies": {
8+
"direct": {
9+
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
10+
"elm/browser": "1.0.2",
11+
"elm/core": "1.0.4",
12+
"elm/html": "1.0.0",
13+
"elm/http": "2.0.0",
14+
"elm/json": "1.1.3",
15+
"elm/regex": "1.0.0",
16+
"elm/url": "1.0.0",
17+
"hecrj/html-parser": "2.3.4",
18+
"krisajenkins/remotedata": "6.0.1",
19+
"truqu/elm-base64": "2.0.4"
3320
},
34-
"test-dependencies": {
35-
"direct": {
36-
"elm-explorations/test": "1.2.2"
37-
},
38-
"indirect": {
39-
"elm/random": "1.0.0",
40-
"elm/svg": "1.0.1"
41-
}
21+
"indirect": {
22+
"elm/bytes": "1.0.8",
23+
"elm/file": "1.0.5",
24+
"elm/parser": "1.1.0",
25+
"elm/time": "1.0.0",
26+
"elm/virtual-dom": "1.0.2",
27+
"rtfeldman/elm-hex": "1.0.0"
4228
}
29+
},
30+
"test-dependencies": {
31+
"direct": {
32+
"elm-explorations/test": "1.2.2"
33+
},
34+
"indirect": {
35+
"elm/random": "1.0.0",
36+
"elm/svg": "1.0.1"
37+
}
38+
}
4339
}

‎flake.lock

+10-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎import-scripts/import_scripts/channel.py

-37
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import subprocess
1717
import sys
1818
import tqdm # type: ignore
19-
import typing
2019
import xml.etree.ElementTree
2120

2221
logger = logging.getLogger("import-channel")
@@ -47,12 +46,6 @@
4746
"properties": {
4847
"type": {"type": "keyword"},
4948
# Package fields
50-
"package_suggestions": {
51-
"type": "completion",
52-
"analyzer": "lowercase",
53-
"search_analyzer": "lowercase",
54-
"preserve_position_increments": False,
55-
},
5649
"package_hydra_build": {
5750
"type": "nested",
5851
"properties": {
@@ -96,12 +89,6 @@
9689
"package_homepage": {"type": "keyword"},
9790
"package_system": {"type": "keyword"},
9891
# Options fields
99-
"option_suggestions": {
100-
"type": "completion",
101-
"analyzer": "lowercase",
102-
"search_analyzer": "lowercase",
103-
"preserve_position_increments": False,
104-
},
10592
"option_name": {"type": "keyword", "normalizer": "lowercase"},
10693
"option_name_query": {"type": "keyword", "normalizer": "lowercase"},
10794
"option_description": {"type": "text"},
@@ -113,28 +100,6 @@
113100
}
114101

115102

116-
def parse_suggestions(text: str) -> typing.List[typing.Dict[str, object]]:
117-
"""Tokenize option_name
118-
119-
Example:
120-
121-
services.nginx.extraConfig
122-
- services.nginx.extraConfig
123-
- services.nginx.
124-
- services.
125-
"""
126-
results: typing.List[typing.Dict[str, object]] = [
127-
{"input": text, "weight": 1000 - (((len(text.split(".")) - 1) * 10))},
128-
]
129-
for i in range(len(text.split(".")) - 1):
130-
result = {
131-
"input": ".".join(text.split(".")[: -(i + 1)]) + ".",
132-
"weight": 1000 - ((len(text.split(".")) - 2 - i) * 10) + 1,
133-
}
134-
results.append(result)
135-
return results
136-
137-
138103
def parse_query(text):
139104
"""Tokenize package attr_name
140105
@@ -371,7 +336,6 @@ def gen():
371336

372337
yield dict(
373338
type="package",
374-
package_suggestions=parse_suggestions(attr_name),
375339
package_hydra=hydra,
376340
package_attr_name=attr_name,
377341
package_attr_name_query=list(parse_query(attr_name)),
@@ -438,7 +402,6 @@ def gen():
438402

439403
yield dict(
440404
type="option",
441-
option_suggestions=parse_suggestions(name),
442405
option_name=name,
443406
option_name_query=parse_query(name),
444407
option_description=description,

‎import-scripts/tests/Example.elm

-52
This file was deleted.

‎import-scripts/tests/test_channel.py

-36
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
11
import pytest # type: ignore
22

33

4-
@pytest.mark.parametrize(
5-
"text,expected",
6-
[
7-
(
8-
"services.grafana.analytics.reporting.enable",
9-
[
10-
{"input": "services.grafana.analytics.reporting.enable", "weight": 960},
11-
{"input": "services.grafana.analytics.reporting.", "weight": 971},
12-
{"input": "services.grafana.analytics.", "weight": 981},
13-
{"input": "services.grafana.", "weight": 991},
14-
{"input": "services.", "weight": 1001},
15-
],
16-
),
17-
(
18-
"services.nginx.extraConfig",
19-
[
20-
{"input": "services.nginx.extraConfig", "weight": 980},
21-
{"input": "services.nginx.", "weight": 991},
22-
{"input": "services.", "weight": 1001},
23-
],
24-
),
25-
(
26-
"python37Packages.test1_name-test2",
27-
[
28-
{"input": "python37Packages.test1_name-test2", "weight": 990},
29-
{"input": "python37Packages.", "weight": 1001},
30-
],
31-
),
32-
],
33-
)
34-
def test_parse_suggestions(text, expected):
35-
import import_scripts.channel
36-
37-
assert import_scripts.channel.parse_suggestions(text) == expected
38-
39-
404
@pytest.mark.parametrize(
415
"text,expected",
426
[

‎src/Main.elm

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,11 @@ update msg model =
240240
|> updateWith Home HomeMsg model
241241

242242
( PackagesMsg subMsg, Packages subModel ) ->
243-
Page.Packages.update model.navKey model.elasticsearch subMsg subModel
243+
Page.Packages.update model.navKey subMsg subModel
244244
|> updateWith Packages PackagesMsg model
245245

246246
( OptionsMsg subMsg, Options subModel ) ->
247-
Page.Options.update model.navKey model.elasticsearch subMsg subModel
247+
Page.Options.update model.navKey subMsg subModel
248248
|> updateWith Options OptionsMsg model
249249

250250
( _, _ ) ->

‎src/Page/Home.elm

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ type Msg
2626

2727
update : Msg -> Model -> ( Model, Cmd Msg )
2828
update msg model =
29-
( model, Cmd.none )
29+
case msg of
30+
NoOp ->
31+
( model, Cmd.none )
3032

3133

3234

3335
-- VIEW
3436

3537

3638
view : Model -> Html Msg
37-
view model =
39+
view _ =
3840
div [] [ text "Home" ]

0 commit comments

Comments
 (0)
Please sign in to comment.