chore: improve supported domain initial workflow #8054
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,72 @@ | ||
| import { Popover, Transition, Combobox, RadioGroup } from '@headlessui/react' | ||
| import { CustomIcon } from '@src/components/CustomIcon' | ||
| import { Fragment, useState } from 'react' | ||
| import { isDesktop } from '@src/lib/isDesktop' | ||
| import { ActionButton } from '@src/components/ActionButton' | ||
|
|
||
| interface Domain { | ||
| name: string | ||
| } | ||
|
|
||
| function SupportedDomainsRadioGroup({ | ||
| selected, | ||
| setSelected, | ||
| domains, | ||
| }: { | ||
| selected: string | ||
| setSelected: (environment: string) => void | ||
| domains: Domain[] | ||
| }) { | ||
| return ( | ||
| <div className="w-full py-4"> | ||
| <div className="mx-auto w-full max-w-md"> | ||
| <RadioGroup value={selected} onChange={setSelected}> | ||
| <div className="space-y-2"> | ||
| {domains.map((domain) => ( | ||
| <RadioGroup.Option | ||
| key={domain.name} | ||
| value={domain.name} | ||
| className={({ checked }) => | ||
| `${checked ? 'bg-primary' : 'text-chalkboard-70'} | ||
| relative flex cursor-pointer rounded py-1 focus:outline-none` | ||
| } | ||
| > | ||
| {({ checked }) => ( | ||
| <> | ||
| <div className="flex w-full items-center justify-between"> | ||
| <div className="flex items-center"> | ||
| <div className="text-sm"> | ||
| <RadioGroup.Label | ||
| as="p" | ||
| className={`text-xs px-1 ${ | ||
| checked | ||
| ? 'text-chalkboard-30' | ||
| : 'text-chalkboard-70 dark:text-chalkboard-30' | ||
| }`} | ||
| > | ||
| {domain.name} | ||
| </RadioGroup.Label> | ||
| </div> | ||
| </div> | ||
| {checked && ( | ||
| <div className="shrink-0 text-white"> | ||
| <CustomIcon | ||
| name="checkmark" | ||
| className="w-4 h-4 text-chalkboard-10 dark:text-chalkboard-40" | ||
| /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </> | ||
| )} | ||
| </RadioGroup.Option> | ||
| ))} | ||
| </div> | ||
| </RadioGroup> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| export const AdvancedSignInOptions = ({ | ||
| pool, | ||
|
|
@@ -14,6 +79,19 @@ | |
| selectedEnvironment: string | ||
| setSelectedEnvironment: (environment: string) => void | ||
| }) => { | ||
| const domains: Domain[] = [ | ||
| { | ||
| name: 'zoo.dev', | ||
| }, | ||
| { | ||
| name: 'zoogov.dev', | ||
| }, | ||
| { | ||
| name: 'dev.zoo.dev', | ||
| }, | ||
| ] | ||
| const [showCustomInput, setShowCustomInput] = useState(false) | ||
|
|
||
| return isDesktop() ? ( | ||
| <div className="flex flex-row items-center"> | ||
| <span className="text-xs text-chalkboard-70 dark:text-chalkboard-30 w-64 h-8"> | ||
|
|
@@ -51,41 +129,70 @@ | |
| as={Fragment} | ||
| > | ||
| <Popover.Panel | ||
| className={`z-10 flex flex-col absolute top-full left-0 mt-1 p-2 w-52 bg-chalkboard-10 dark:bg-chalkboard-90 | ||
| border border-solid border-chalkboard-20 dark:border-chalkboard-90 rounded | ||
| shadow-lg`} | ||
| > | ||
| {() => ( | ||
| <> | ||
| <span className="text-xs text-chalkboard-70 dark:text-chalkboard-30"> | ||
| Supported Domains | ||
| </span> | ||
|
Check warning on line 140 in src/routes/AdvancedSignInOptions.tsx
|
||
| <SupportedDomainsRadioGroup | ||
| selected={selectedEnvironment} | ||
| setSelected={setSelectedEnvironment} | ||
| domains={domains} | ||
| /> | ||
| <ActionButton | ||
| Element="button" | ||
| className={ | ||
| 'text-xs text-chalkboard-70 dark:text-chalkboard-30 border-none pl-0 pb-2' | ||
| } | ||
| onClick={() => setShowCustomInput((show) => !show)} | ||
| > | ||
| Advanced options | ||
| <CustomIcon | ||
| name="caretDown" | ||
| className={`w-4 h-4 ${!showCustomInput ? '' : 'ui-open:rotate-180'} `} | ||
| /> | ||
| </ActionButton> | ||
|
Check warning on line 158 in src/routes/AdvancedSignInOptions.tsx
|
||
| {showCustomInput && ( | ||
| <div className="flex flex-col items-start py-0.5"> | ||
| <span className="text-xs text-chalkboard-70 dark:text-chalkboard-30"> | ||
| Domain | ||
| </span> | ||
|
Check warning on line 163 in src/routes/AdvancedSignInOptions.tsx
|
||
| </div> | ||
| )} | ||
|
|
||
| <Combobox | ||
| value={selectedEnvironment} | ||
| onChange={setSelectedEnvironment} | ||
| > | ||
| {showCustomInput && ( | ||
| <Combobox.Input | ||
| className="gap-1 rounded h-6 border px-2 flex items-center dark:hover:bg-chalkboard-80 text-xs text-chalkboard-70 dark:text-chalkboard-30 dark:bg-chalkboard-90" | ||
| placeholder="auto" | ||
| onChange={(event) => | ||
| setSelectedEnvironment(event.target.value) | ||
| } | ||
| /> | ||
| )} | ||
|
Comment on lines
+171
to
+179
There was a problem hiding this comment. UI State Synchronization Issue There's a potential state synchronization issue between the radio group selection and the custom domain input. When a user:
The application maintains the Consider one of these approaches:
This would improve the user experience by maintaining a consistent relationship between the UI state and the underlying domain value. Spotted by Diamond |
||
| </Combobox> | ||
| {showCustomInput && ( | ||
| <div className="flex flex-col items-start py-1"> | ||
| <span className="text-xs text-chalkboard-70 dark:text-chalkboard-30"> | ||
| Connection pool | ||
| </span> | ||
|
Check warning on line 185 in src/routes/AdvancedSignInOptions.tsx
|
||
| </div> | ||
| )} | ||
| <Combobox value={pool} onChange={setPool}> | ||
| {showCustomInput && ( | ||
| <Combobox.Input | ||
| className="gap-1 rounded h-6 border px-2 flex items-center dark:hover:bg-chalkboard-80 text-xs text-chalkboard-70 dark:text-chalkboard-30 dark:bg-chalkboard-90" | ||
| placeholder="auto" | ||
| onChange={(event) => setPool(event.target.value)} | ||
| /> | ||
| )} | ||
| </Combobox> | ||
| </> | ||
| )} | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
ui-open:rotate-180class is designed for Headless UI disclosure components where theui-open:modifier is automatically applied. Since this is a standard button toggle using React state, the rotation should be directly tied to the state variable:This will ensure the caret rotates correctly when the advanced options are toggled.
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.