Skip to content

Commit

Permalink
Remove sharding_column_name and sharding_column_type from vtctld2 (vi…
Browse files Browse the repository at this point in the history
…tessio#10459)

* Remove sharding_column_name and sharding_column_type

Signed-off-by: notfelineit <[email protected]>

* Run make web_build to compile production files

Signed-off-by: notfelineit <[email protected]>

* Remove vars from test

Signed-off-by: notfelineit <[email protected]>

* Remove sharding column type select box test from web test

Signed-off-by: notfelineit <[email protected]>
  • Loading branch information
notfelineit authored and timvaillancourt committed Aug 28, 2023
1 parent 292fbfc commit 88a811e
Show file tree
Hide file tree
Showing 13 changed files with 120 additions and 326 deletions.
19 changes: 2 additions & 17 deletions go/test/endtoend/vtctldweb/vtctld_web_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,25 +121,10 @@ func TestCreateKs(t *testing.T) {
err := ele.SendKeys("test_keyspace3")
require.Nil(t, err)
assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-force=false", "test_keyspace3"})

case 1:
err := ele.SendKeys("test_id")
require.Nil(t, err)
assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-sharding_column_name=test_id", "-sharding_column_type=UINT64", "-force=false", "test_keyspace3"})
}
}

dropdown, err := dialog.FindElement(selenium.ByTagName, "p-dropdown")
require.Nil(t, err)

click(t, dropdown)

options, err := dropdown.FindElements(selenium.ByTagName, "li")
require.Nil(t, err)

click(t, options[1])

assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-sharding_column_name=test_id", "-sharding_column_type=BYTES", "-force=false", "test_keyspace3"})
assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-force=false", "test_keyspace3"})

create, err := dialog.FindElement(selenium.ByID, "vt-action")
require.Nil(t, err)
Expand All @@ -159,7 +144,7 @@ func TestCreateKs(t *testing.T) {
require.Nil(t, err)
click(t, menu)

options, err = testKs[2].FindElements(selenium.ByTagName, "li")
options, err := testKs[2].FindElements(selenium.ByTagName, "li")
require.Nil(t, err)
for _, v := range options {
if text(t, v) == "Delete" {
Expand Down
72 changes: 36 additions & 36 deletions go/vt/vtctld/rice-box.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/vtctld2/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
</head>
<body class="flex-column">
<vt-app-root class="flex-column flex-grow">Loading...</vt-app-root>
<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.4f05e5457c6dec67dde5.bundle.js"></script></body>
<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.bbd046af7028149e10ca.bundle.js"></script></body>
</html>
2 changes: 1 addition & 1 deletion web/vtctld2/app/inline.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
4 changes: 2 additions & 2 deletions web/vtctld2/app/styles.38b88af69dfd283498eb.bundle.js

Large diffs are not rendered by default.

Binary file modified web/vtctld2/app/styles.38b88af69dfd283498eb.bundle.js.gz
Binary file not shown.
Loading

0 comments on commit 88a811e

Please sign in to comment.