update support ticket to support categories, project, and target options #6689
There are no files selected for viewing
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
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
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
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
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,4 +1,10 @@ | ||
| import { | ||
| Select, | ||
| SelectContent, | ||
| SelectItem, | ||
| SelectTrigger, | ||
| SelectValue, | ||
| } from '@/components/ui/select'; | ||
| import { FragmentType, graphql, useFragment } from '@/gql'; | ||
| import { Link, useRouter } from '@tanstack/react-router'; | ||
|
|
||
|
|
@@ -27,10 +33,19 @@ export function TargetSelector(props: { | |
| currentOrganizationSlug: string; | ||
| currentProjectSlug: string; | ||
| currentTargetSlug: string; | ||
| optional?: boolean; | ||
| showOrganization?: boolean; | ||
| showProject?: boolean; | ||
| onValueChange?: Function; | ||
| organizations: FragmentType<typeof TargetSelector_OrganizationConnectionFragment> | null; | ||
| }) { | ||
| const router = useRouter(); | ||
|
|
||
| const showOrganization = | ||
| typeof props.showOrganization !== 'undefined' ? props.showOrganization : true; | ||
| const showProject = typeof props.showProject !== 'undefined' ? props.showProject : true; | ||
| const isOptional = typeof props.optional !== undefined ? props.optional : false; | ||
|
|
||
| const organizations = useFragment( | ||
| TargetSelector_OrganizationConnectionFragment, | ||
| props.organizations, | ||
|
|
@@ -43,70 +58,102 @@ export function TargetSelector(props: { | |
| const projects = currentOrganization?.projects.nodes; | ||
| const currentProject = projects?.find(node => node.slug === props.currentProjectSlug); | ||
|
|
||
| const targets = currentProject?.targets?.nodes; | ||
| const currentTarget = targets?.find(node => node.slug === props.currentTargetSlug); | ||
| const onValueChangeFunc = | ||
| typeof props.onValueChange !== undefined ? props.onValueChange : () => {}; | ||
|
|
||
| return ( | ||
| <> | ||
| {showOrganization ? ( | ||
| currentOrganization ? ( | ||
| <Link | ||
| to="/$organizationSlug" | ||
| params={{ | ||
| organizationSlug: currentOrganization.slug, | ||
| }} | ||
| className="max-w-[200px] shrink-0 truncate font-medium" | ||
| > | ||
| {currentOrganization.slug} | ||
| </Link> | ||
| ) : ( | ||
| <div className="h-5 w-48 max-w-[200px] animate-pulse rounded-full bg-gray-800" /> | ||
| ) | ||
| ) : ( | ||
| <></> | ||
jdolle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| )} | ||
| {showOrganization ? <div className="italic text-gray-500">/</div> : <></>} | ||
| {showProject ? ( | ||
| currentOrganization && currentProject ? ( | ||
| <Link | ||
| to="/$organizationSlug/$projectSlug" | ||
| params={{ | ||
| organizationSlug: props.currentOrganizationSlug, | ||
| projectSlug: props.currentProjectSlug, | ||
| }} | ||
| className="max-w-[200px] shrink-0 truncate font-medium" | ||
| > | ||
| {currentProject.slug} | ||
| </Link> | ||
| ) : ( | ||
| <div className="h-5 w-48 max-w-[200px] animate-pulse rounded-full bg-gray-800" /> | ||
| ) | ||
| ) : ( | ||
| <></> | ||
jdolle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| )} | ||
| {showProject ? <div className="italic text-gray-500">/</div> : <></>} | ||
jdolle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {(targets?.length && currentOrganization && currentProject && currentTarget) || isOptional ? ( | ||
| <> | ||
| <Select | ||
| value={props.currentTargetSlug} | ||
| onValueChange={ | ||
| onValueChangeFunc | ||
| ? id => { | ||
| onValueChangeFunc(id); | ||
| } | ||
| : id => { | ||
| void router.navigate({ | ||
| to: '/$organizationSlug/$projectSlug/$targetSlug', | ||
| params: { | ||
| organizationSlug: props.currentOrganizationSlug, | ||
| projectSlug: props.currentProjectSlug, | ||
| targetSlug: id, | ||
| }, | ||
| }); | ||
| } | ||
| } | ||
| > | ||
| <SelectTrigger variant="default" data-cy="target-picker-trigger"> | ||
| <div className="font-medium" data-cy="target-picker-current"> | ||
| {isOptional ? <SelectValue placeholder="Pick an option" /> : ''} | ||
| {currentTarget && !isOptional ? currentTarget.slug : ''}{' '} | ||
jdolle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </div> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| {isOptional ? ( | ||
| <SelectItem | ||
| key={'empty'} | ||
| value={'empty'} | ||
| data-cy={`project-picker-option-Unassigned`} | ||
| > | ||
| Unassigned | ||
| </SelectItem> | ||
| ) : ( | ||
| <></> | ||
| )} | ||
| {targets ? ( | ||
| targets.map(target => ( | ||
| <SelectItem | ||
| key={target.slug} | ||
| value={target.slug} | ||
| data-cy={`target-picker-option-${target.slug}`} | ||
| > | ||
| {target.slug} | ||
| </SelectItem> | ||
| )) | ||
| ) : ( | ||
| <></> | ||
| )} | ||
| </SelectContent> | ||
| </Select> | ||
| </> | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.