Merge pull request #2060 from makeplane/develop

Promote: Develop to Stage Release
This commit is contained in:
sriram veeraghanta 2023-09-01 20:56:31 +05:30 committed by GitHub
commit 674347c99e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 34 deletions

View File

@ -124,7 +124,7 @@ export const SidebarBlockedSelect: React.FC<Props> = ({
</div> </div>
<button <button
type="button" type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 ${ className={`bg-custom-background-80 text-xs text-custom-text-200 rounded px-2.5 py-0.5 ${
disabled ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80" disabled ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
}`} }`}
onClick={() => setIsBlockedModalOpen(true)} onClick={() => setIsBlockedModalOpen(true)}

View File

@ -126,7 +126,7 @@ export const SidebarBlockerSelect: React.FC<Props> = ({
</div> </div>
<button <button
type="button" type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 ${ className={`bg-custom-background-80 text-xs text-custom-text-200 rounded px-2.5 py-0.5 ${
disabled ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80" disabled ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
}`} }`}
onClick={() => setIsBlockerModalOpen(true)} onClick={() => setIsBlockerModalOpen(true)}

View File

@ -62,23 +62,27 @@ export const SidebarCycleSelect: React.FC<Props> = ({
return ( return (
<CustomSelect <CustomSelect
customButton={ customButton={
<Tooltip <div>
position="left" <Tooltip
tooltipContent={`${issueCycle ? issueCycle.cycle_detail.name : "No cycle"}`} position="left"
> tooltipContent={`${issueCycle ? issueCycle.cycle_detail.name : "No cycle"}`}
<button
type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
disabled ? "cursor-not-allowed" : ""
}`}
> >
<span <button
className={`truncate ${issueCycle ? "text-custom-text-100" : "text-custom-text-200"}`} type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
disabled ? "cursor-not-allowed" : ""
}`}
> >
{issueCycle ? issueCycle.cycle_detail.name : "No cycle"} <span
</span> className={`truncate ${
</button> issueCycle ? "text-custom-text-100" : "text-custom-text-200"
</Tooltip> }`}
>
{issueCycle ? issueCycle.cycle_detail.name : "No cycle"}
</span>
</button>
</Tooltip>
</div>
} }
value={issueCycle ? issueCycle.cycle_detail.id : null} value={issueCycle ? issueCycle.cycle_detail.id : null}
onChange={(value: any) => { onChange={(value: any) => {

View File

@ -56,27 +56,29 @@ export const SidebarModuleSelect: React.FC<Props> = ({
return ( return (
<CustomSelect <CustomSelect
customButton={ customButton={
<Tooltip <div>
position="left" <Tooltip
tooltipContent={`${ position="left"
modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module" tooltipContent={`${
}`} modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module"
>
<button
type="button"
className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
disabled ? "cursor-not-allowed" : ""
}`} }`}
> >
<span <button
className={`truncate ${ type="button"
issueModule ? "text-custom-text-100" : "text-custom-text-200" className={`bg-custom-background-80 text-xs rounded px-2.5 py-0.5 w-full flex ${
disabled ? "cursor-not-allowed" : ""
}`} }`}
> >
{modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module"} <span
</span> className={`truncate ${
</button> issueModule ? "text-custom-text-100" : "text-custom-text-200"
</Tooltip> }`}
>
{modules?.find((m) => m.id === issueModule?.module)?.name ?? "No module"}
</span>
</button>
</Tooltip>
</div>
} }
value={issueModule ? issueModule.module_detail?.id : null} value={issueModule ? issueModule.module_detail?.id : null}
onChange={(value: any) => { onChange={(value: any) => {