This repository has been archived by the owner on Jul 2, 2024. It is now read-only.
EVG-19950: Add host settings page #2014
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Passing run #12560 ↗︎
Details:
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. |
|||||||||||||||
minnakt
reviewed
Sep 1, 2023
Comment on lines
70
to
73
| sshKey: { | ||
| type: "string" as "string", | ||
| title: "SSH Key", | ||
| }, |
There was a problem hiding this comment.
One thing I'm unsure about is that the Legacy UI and the designs have this value as a dropdown 🤔 But I'm not sure if that's a mistake, or if they actually get the keys from somewhere in the backend
There was a problem hiding this comment.
Whoops thank you! I opened evergreen-ci/evergreen#6993 to expose this field.
Comment on lines
15
to
16
| describe("provider tab", () => { | ||
| describe("static provider", () => { |
There was a problem hiding this comment.
nit. update test descriptions
| }) satisfies GqlToFormFunction<Tab>; | ||
|
|
||
| export const formToGql = (({ allocation, setup, sshConfig }, distro) => { | ||
| const { bootstrapMethod } = setup; |
There was a problem hiding this comment.
any reason this one is destuctured in particular? :o
Comment on lines
77
to
86
| hostAllocatorSettings: { | ||
| acceptableHostIdleTime: allocation.acceptableHostIdleTime, | ||
| feedbackRule: allocation.feedbackRule, | ||
| futureHostFraction: allocation.futureHostFraction, | ||
| hostsOverallocatedRule: allocation.hostsOverallocatedRule, | ||
| maximumHosts: allocation.maximumHosts, | ||
| minimumHosts: allocation.minimumHosts, | ||
| roundingRule: allocation.roundingRule, | ||
| version: allocation.version, | ||
| }, |
There was a problem hiding this comment.
I think you could also just write
Suggested change
| hostAllocatorSettings: { | |
| acceptableHostIdleTime: allocation.acceptableHostIdleTime, | |
| feedbackRule: allocation.feedbackRule, | |
| futureHostFraction: allocation.futureHostFraction, | |
| hostsOverallocatedRule: allocation.hostsOverallocatedRule, | |
| maximumHosts: allocation.maximumHosts, | |
| minimumHosts: allocation.minimumHosts, | |
| roundingRule: allocation.roundingRule, | |
| version: allocation.version, | |
| }, | |
| hostAllocatorSettings: allocation |
Comment on lines
37
to
46
| allocation: { | ||
| version: hostAllocatorSettings.version, | ||
| roundingRule: hostAllocatorSettings.roundingRule, | ||
| feedbackRule: hostAllocatorSettings.feedbackRule, | ||
| hostsOverallocatedRule: hostAllocatorSettings.hostsOverallocatedRule, | ||
| minimumHosts: hostAllocatorSettings.minimumHosts, | ||
| maximumHosts: hostAllocatorSettings.maximumHosts, | ||
| acceptableHostIdleTime: hostAllocatorSettings.acceptableHostIdleTime, | ||
| futureHostFraction: hostAllocatorSettings.futureHostFraction, | ||
| }, |
There was a problem hiding this comment.
same here, but if you prefer to write them out, that's okay with me too 🙂
Comment on lines
160
to
163
| sshOptions: { | ||
| "ui:addButtonText": "Add SSH option", | ||
| "ui:orderable": false, | ||
| }, |
There was a problem hiding this comment.
is there a way to make these full length? not sure if that might be difficult 🥹
SupaJoon
reviewed
Sep 5, 2023
| it("errors when selecting an incompatible host communication method", () => { | ||
| cy.selectLGOption("Host Communication Method", "RPC"); | ||
| save(); | ||
| cy.validateToast("error"); |
There was a problem hiding this comment.
nit: does it make sense to populate the second parameter for description assertion
| const formSchema = useMemo(() => getFormSchema({ provider }), [provider]); | ||
|
|
||
| return ( | ||
| <BaseTab formSchema={formSchema} initialFormState={initialFormState} /> |
There was a problem hiding this comment.
Suggested change
| <BaseTab formSchema={formSchema} initialFormState={initialFormState} /> | |
| <BaseTab formSchema={formSchema} initialFormState={distroData} /> |
| import { TabProps } from "./types"; | ||
|
|
||
| export const HostTab: React.FC<TabProps> = ({ distroData, provider }) => { | ||
| const initialFormState = distroData; |
There was a problem hiding this comment.
Suggested change
| const initialFormState = distroData; |
Comment on lines
21
to
22
| const hasStaticProvider = provider === Provider.Static; | ||
| const hasDockerProvider = provider === Provider.Docker; |
There was a problem hiding this comment.
Suggested change
| const hasStaticProvider = provider === Provider.Static; | |
| const hasDockerProvider = provider === Provider.Docker; | |
| const hideWidget = provider === Provider.Static || provider === Provider.Docker; |
Comment on lines
180
to
199
| "ui:data-cy": "minimum-hosts-input", | ||
| ...((hasStaticProvider || hasDockerProvider) && { | ||
| "ui:widget": "hidden", | ||
| }), | ||
| }, | ||
| maximumHosts: { | ||
| "ui:data-cy": "maximum-hosts-input", | ||
| ...((hasStaticProvider || hasDockerProvider) && { | ||
| "ui:widget": "hidden", | ||
| }), | ||
| }, | ||
| acceptableHostIdleTime: { | ||
| "ui:data-cy": "idle-time-input", | ||
| ...((hasStaticProvider || hasDockerProvider) && { | ||
| "ui:widget": "hidden", | ||
| }), | ||
| }, | ||
| futureHostFraction: { | ||
| "ui:data-cy": "future-fraction-input", | ||
| ...((hasStaticProvider || hasDockerProvider) && { |
There was a problem hiding this comment.
Suggested change
| "ui:data-cy": "minimum-hosts-input", | |
| ...((hasStaticProvider || hasDockerProvider) && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| maximumHosts: { | |
| "ui:data-cy": "maximum-hosts-input", | |
| ...((hasStaticProvider || hasDockerProvider) && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| acceptableHostIdleTime: { | |
| "ui:data-cy": "idle-time-input", | |
| ...((hasStaticProvider || hasDockerProvider) && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| futureHostFraction: { | |
| "ui:data-cy": "future-fraction-input", | |
| ...((hasStaticProvider || hasDockerProvider) && { | |
| "ui:data-cy": "minimum-hosts-input", | |
| ...(hideWidget && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| maximumHosts: { | |
| "ui:data-cy": "maximum-hosts-input", | |
| ...(hideWidget && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| acceptableHostIdleTime: { | |
| "ui:data-cy": "idle-time-input", | |
| ...(hideWidget && { | |
| "ui:widget": "hidden", | |
| }), | |
| }, | |
| futureHostFraction: { | |
| "ui:data-cy": "future-fraction-input", | |
| ...(hideWidget && { |
Comment on lines
209
to
212
| Object.entries(enumObject).map(([value, title]) => ({ | ||
| type: "string" as "string", | ||
| title, | ||
| enum: [value], |
There was a problem hiding this comment.
nit: this reads a little better without aliasing the object key with "value"
Suggested change
| Object.entries(enumObject).map(([value, title]) => ({ | |
| type: "string" as "string", | |
| title, | |
| enum: [value], | |
| Object.entries(enumObject).map(([key, title]) => ({ | |
| type: "string" as "string", | |
| title, | |
| enum: [key], |
| ...(!hasStaticProvider && { "ui:widget": "hidden" }), | ||
| }, | ||
| sshOptions: { | ||
| "ui:addButtonText": "Add SSH option", |
There was a problem hiding this comment.
Is there any guidance we can give the user for a valid SSH option? I'm not sure what to submit here.
SupaJoon
approved these changes
Sep 5, 2023
minnakt
approved these changes
Sep 8, 2023
Comment on lines
181
to
188
| "ui:fullWidth": true, | ||
| "ui:orderable": false, | ||
| items: { | ||
| "ui:elementWrapperCSS": css` | ||
| max-width: unset; | ||
| `, | ||
| "ui:placeholder": "ConnectTimeout=10", | ||
| }, |
There was a problem hiding this comment.
oops my bad for not specifying! I think I meant something more like this, like in the designs!
Suggested change
| "ui:fullWidth": true, | |
| "ui:orderable": false, | |
| items: { | |
| "ui:elementWrapperCSS": css` | |
| max-width: unset; | |
| `, | |
| "ui:placeholder": "ConnectTimeout=10", | |
| }, | |
| "ui:orderable": false, | |
| items: { | |
| "ui:placeholder": "ConnectTimeout=10", | |
| }, |
| @@ -50,4 +50,5 @@ const DefaultFieldContainer = styled.div<{ border?: "top" | "bottom" }>` | |||
| ${({ border }) => | |||
| border && | |||
| `border-${border}: 1px solid ${gray.light1}; padding-${border}: ${size.s};`} | |||
| width: 100%; | |||
There was a problem hiding this comment.
I noticed this might be causing a slight glitch with the variables input
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EVG-19950
Description
Screenshots
Testing
Evergreen PR
evergreen-ci/evergreen#6993