Allow editing the close time
This commit is contained in:
		
							parent
							
								
									7c18f4b96b
								
							
						
					
					
						commit
						561a7e2c75
					
				|  | @ -25,7 +25,7 @@ service cloud.firestore { | ||||||
|     match /contracts/{contractId} { |     match /contracts/{contractId} { | ||||||
|       allow read; |       allow read; | ||||||
|       allow update: if request.resource.data.diff(resource.data).affectedKeys() |       allow update: if request.resource.data.diff(resource.data).affectedKeys() | ||||||
|         .hasOnly(['description', 'tags', 'lowercaseTags']); |         .hasOnly(['description', 'closeTime', 'tags', 'lowercaseTags']); | ||||||
|       allow update: if isAdmin(); |       allow update: if isAdmin(); | ||||||
|       allow delete: if resource.data.creatorId == request.auth.uid; |       allow delete: if resource.data.creatorId == request.auth.uid; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,7 @@ | ||||||
| import clsx from 'clsx' | import clsx from 'clsx' | ||||||
| import Link from 'next/link' | import Link from 'next/link' | ||||||
|  | import { ClockIcon, DatabaseIcon, PencilIcon } from '@heroicons/react/outline' | ||||||
|  | import { TrendingUpIcon } from '@heroicons/react/solid' | ||||||
| import { Row } from '../components/layout/row' | import { Row } from '../components/layout/row' | ||||||
| import { formatMoney } from '../../common/util/format' | import { formatMoney } from '../../common/util/format' | ||||||
| import { UserLink } from './user-page' | import { UserLink } from './user-page' | ||||||
|  | @ -8,15 +10,15 @@ import { | ||||||
|   contractMetrics, |   contractMetrics, | ||||||
|   contractPath, |   contractPath, | ||||||
|   getBinaryProbPercent, |   getBinaryProbPercent, | ||||||
|  |   updateContract, | ||||||
| } from '../lib/firebase/contracts' | } from '../lib/firebase/contracts' | ||||||
| import { Col } from './layout/col' | import { Col } from './layout/col' | ||||||
| import dayjs from 'dayjs' | import dayjs from 'dayjs' | ||||||
| import { TrendingUpIcon } from '@heroicons/react/solid' |  | ||||||
| import { DateTimeTooltip } from './datetime-tooltip' | import { DateTimeTooltip } from './datetime-tooltip' | ||||||
| import { ClockIcon, DatabaseIcon } from '@heroicons/react/outline' |  | ||||||
| import { fromNow } from '../lib/util/time' | import { fromNow } from '../lib/util/time' | ||||||
| import { Avatar } from './avatar' | import { Avatar } from './avatar' | ||||||
| import { Spacer } from './layout/spacer' | import { Spacer } from './layout/spacer' | ||||||
|  | import { useState } from 'react' | ||||||
| 
 | 
 | ||||||
| export function ContractCard(props: { | export function ContractCard(props: { | ||||||
|   contract: Contract |   contract: Contract | ||||||
|  | @ -160,8 +162,11 @@ function AbbrContractDetails(props: { | ||||||
|   ) |   ) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| export function ContractDetails(props: { contract: Contract }) { | export function ContractDetails(props: { | ||||||
|   const { contract } = props |   contract: Contract | ||||||
|  |   isCreator?: boolean | ||||||
|  | }) { | ||||||
|  |   const { contract, isCreator } = props | ||||||
|   const { closeTime, creatorName, creatorUsername } = contract |   const { closeTime, creatorName, creatorUsername } = contract | ||||||
|   const { truePool, createdDate, resolvedDate } = contractMetrics(contract) |   const { truePool, createdDate, resolvedDate } = contractMetrics(contract) | ||||||
| 
 | 
 | ||||||
|  | @ -202,15 +207,12 @@ export function ContractDetails(props: { contract: Contract }) { | ||||||
| 
 | 
 | ||||||
|           {!resolvedDate && closeTime && ( |           {!resolvedDate && closeTime && ( | ||||||
|             <> |             <> | ||||||
|               {' - '} |               {' - '}{' '} | ||||||
|               <DateTimeTooltip |               <EditableCloseDate | ||||||
|                 text={ |                 closeTime={closeTime} | ||||||
|                   closeTime > Date.now() ? 'Trading ends:' : 'Trading ended:' |                 contract={contract} | ||||||
|                 } |                 isCreator={isCreator ?? false} | ||||||
|                 time={closeTime} |               /> | ||||||
|               > |  | ||||||
|                 {dayjs(closeTime).format('MMM D')} ({fromNow(closeTime)}) |  | ||||||
|               </DateTimeTooltip> |  | ||||||
|             </> |             </> | ||||||
|           )} |           )} | ||||||
|         </Row> |         </Row> | ||||||
|  | @ -243,3 +245,71 @@ export function contractTextDetails(contract: Contract) { | ||||||
|     (hashtags.length > 0 ? ` • ${hashtags.join(' ')}` : '') |     (hashtags.length > 0 ? ` • ${hashtags.join(' ')}` : '') | ||||||
|   ) |   ) | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | function EditableCloseDate(props: { | ||||||
|  |   closeTime: number | ||||||
|  |   contract: Contract | ||||||
|  |   isCreator: boolean | ||||||
|  | }) { | ||||||
|  |   const { closeTime, contract, isCreator } = props | ||||||
|  | 
 | ||||||
|  |   const [isEditingCloseTime, setIsEditingCloseTime] = useState(false) | ||||||
|  |   const [closeDate, setCloseDate] = useState( | ||||||
|  |     closeTime && dayjs(closeTime).format('YYYY-MM-DDT23:59') | ||||||
|  |   ) | ||||||
|  | 
 | ||||||
|  |   const onSave = () => { | ||||||
|  |     const newCloseTime = dayjs(closeDate).valueOf() | ||||||
|  |     if (newCloseTime === closeTime) setIsEditingCloseTime(false) | ||||||
|  |     else if (newCloseTime > Date.now()) { | ||||||
|  |       const { description } = contract | ||||||
|  |       const formattedCloseDate = dayjs(newCloseTime).format('YYYY-MM-DD h:mm a') | ||||||
|  |       const newDescription = `${description}\n\nClose date updated to ${formattedCloseDate}` | ||||||
|  | 
 | ||||||
|  |       updateContract(contract.id, { | ||||||
|  |         closeTime: newCloseTime, | ||||||
|  |         description: newDescription, | ||||||
|  |       }) | ||||||
|  | 
 | ||||||
|  |       setIsEditingCloseTime(false) | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  | 
 | ||||||
|  |   return ( | ||||||
|  |     <> | ||||||
|  |       {isEditingCloseTime ? ( | ||||||
|  |         <div className="form-control mr-1 items-start"> | ||||||
|  |           <input | ||||||
|  |             type="datetime-local" | ||||||
|  |             className="input input-bordered" | ||||||
|  |             onClick={(e) => e.stopPropagation()} | ||||||
|  |             onChange={(e) => setCloseDate(e.target.value || '')} | ||||||
|  |             min={Date.now()} | ||||||
|  |             value={closeDate} | ||||||
|  |           /> | ||||||
|  |         </div> | ||||||
|  |       ) : ( | ||||||
|  |         <DateTimeTooltip | ||||||
|  |           text={closeTime > Date.now() ? 'Trading ends:' : 'Trading ended:'} | ||||||
|  |           time={closeTime} | ||||||
|  |         > | ||||||
|  |           {dayjs(closeTime).format('MMM D')} ({fromNow(closeTime)}) | ||||||
|  |         </DateTimeTooltip> | ||||||
|  |       )} | ||||||
|  | 
 | ||||||
|  |       {isCreator && | ||||||
|  |         (isEditingCloseTime ? ( | ||||||
|  |           <button className="btn btn-xs" onClick={onSave}> | ||||||
|  |             Done | ||||||
|  |           </button> | ||||||
|  |         ) : ( | ||||||
|  |           <button | ||||||
|  |             className="btn btn-xs btn-ghost" | ||||||
|  |             onClick={() => setIsEditingCloseTime(true)} | ||||||
|  |           > | ||||||
|  |             <PencilIcon className="inline h-4 w-4 mr-2" /> Edit | ||||||
|  |           </button> | ||||||
|  |         ))} | ||||||
|  |     </> | ||||||
|  |   ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @ -66,7 +66,7 @@ export const ContractOverview = (props: { | ||||||
|             )} |             )} | ||||||
|           </Row> |           </Row> | ||||||
| 
 | 
 | ||||||
|           <ContractDetails contract={contract} /> |           <ContractDetails contract={contract} isCreator={isCreator} /> | ||||||
|         </Col> |         </Col> | ||||||
| 
 | 
 | ||||||
|         {(isBinary || resolution) && ( |         {(isBinary || resolution) && ( | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ export function DateTimeTooltip(props: { | ||||||
|       > |       > | ||||||
|         {props.children} |         {props.children} | ||||||
|       </span> |       </span> | ||||||
|       <span className="sm:hidden">{props.children}</span> |       <span className="sm:hidden whitespace-nowrap">{props.children}</span> | ||||||
|     </> |     </> | ||||||
|   ) |   ) | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user