Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ orion = { path = "orion" }
orion-client = { path = "clients/orion-client" }
orion-scheduler-client = { path = "clients/orion-scheduler-client" }

git-internal = "0.8.3"
git-internal = "0.8.4"
libvault-core = "0.1.0"

#====
Expand Down Expand Up @@ -109,7 +109,7 @@ utoipa-swagger-ui = { version = "9.0.2", features = ["vendored"] }
tempfile = "3.27.0"
dashmap = "6.2.1"
once_cell = "1.21.4"
serial_test = "3.5.0"
serial_test = "4.0.1"
sysinfo = "0.39.6"
http = "1.4.2"
url = "2.5.8"
Expand Down
1 change: 1 addition & 0 deletions moon/apps/sync-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"devDependencies": {
"@flydotio/dockerfile": "catalog:",
"@gitmono/tsconfig": "workspace:*",
"@types/node": "catalog:",
"tsup": "catalog:",
"typescript": "catalog:"
}
Expand Down
3 changes: 2 additions & 1 deletion moon/apps/sync-server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"outDir": "./dist",
"sourceMap": true,
"inlineSources": true,
"sourceRoot": "/"
"sourceRoot": "/",
"types": ["node"]
}
}
2 changes: 1 addition & 1 deletion moon/apps/web/components/CanvasComments/CanvasComment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ function InnerCanvasComment({
{...ANIMATION_CONSTANTS}
className={cn(
'bg-elevated flex w-full flex-col rounded-xl shadow-lg ring-1 shadow-black/20 ring-black/[0.04] dark:shadow-[inset_0px_1px_0px_rgba(255,255,255,0.04),_0px_2px_12px_rgba(0,0,0,0.4),_0px_0px_0px_1px_rgba(0,0,0,0.8)] dark:ring-white/[0.02]',
'origin-[--radix-popover-content-transform-origin]'
'origin-[var(--radix-popover-content-transform-origin)]'
)}
data-zoom-wheel-disabled
>
Expand Down
1 change: 1 addition & 0 deletions moon/apps/web/components/ClView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default function CLView() {
const authorHandle = useCallback(
(author: string) => {
const member = members.find((m) => m.user.username === author || m.user.github_login === author)

return megaUserHandle(member?.user, author)
},
[members]
Expand Down
1 change: 1 addition & 0 deletions moon/apps/web/components/ClView/useReviewerSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type MegaAvatar = ReturnType<typeof useAvatars>[number] & { username?: string }
function avatarApiIdentity(item: ItemInput): string | undefined {
const mega = item as MegaAvatar
// Prefer Campsite username for API identity; SelectPanel text may be github_login.

if (typeof mega.username === 'string' && mega.username) return mega.username
if (typeof item.text === 'string' && item.text) return item.text
return undefined
Expand Down
2 changes: 1 addition & 1 deletion moon/apps/web/components/CodeView/TreeView/CloneTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const CloneTabs = () => {
{open && (
<PopoverContent
className={cn(
'animate-scale-fade shadow-popover dark:border-primary-opaque bg-primary relative flex h-[130px] w-[400px] flex-1 origin-[--radix-hover-card-content-transform-origin] flex-col overflow-hidden rounded-lg border border-transparent dark:shadow-[0px_2px_16px_rgba(0,0,0,1)]'
'animate-scale-fade shadow-popover dark:border-primary-opaque bg-primary relative flex h-[130px] w-[400px] flex-1 origin-[var(--radix-hover-card-content-transform-origin)] flex-col overflow-hidden rounded-lg border border-transparent dark:shadow-[0px_2px_16px_rgba(0,0,0,1)]'
)}
sideOffset={4}
align='start'
Expand Down
4 changes: 2 additions & 2 deletions moon/apps/web/components/CodeView/TreeView/RepoTree.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import { useCallback, useEffect, useRef, useState } from 'react'
import { Box, Skeleton } from '@mui/material'
import { useTreeViewApiRef } from '@mui/x-tree-view'
import { useRichTreeViewApiRef } from '@mui/x-tree-view'
import { RichTreeView } from '@mui/x-tree-view/RichTreeView'
import { useAtom } from 'jotai'
import { usePathname } from 'next/navigation'
Expand Down Expand Up @@ -35,7 +35,7 @@ const RepoTree = ({ onCommitInfoChange }: { onCommitInfoChange?: Function }) =>
basePath = basePath.substring(`/${version}`.length) || '/'
}

const apiRef = useTreeViewApiRef()
const apiRef = useRichTreeViewApiRef<MuiTreeNode>()

const [treeAllData, setTreeAllData] = useAtom(treeAllDataAtom)
const [expandedNodes, setExpandedNodes] = useAtom(expandedNodesAtom)
Expand Down
2 changes: 1 addition & 1 deletion moon/apps/web/components/CompactPost/ComfyCompactPost.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function Attachments({ post }: { post: Post }) {
return (
<div
key={attachment.id}
className='bg-elevated pointer-events-none relative max-h-22 max-w-30 flex-1 self-center rounded-lg ring-1 ring-[--border-primary] ring-inset'
className='bg-elevated pointer-events-none relative max-h-22 max-w-30 flex-1 self-center rounded-lg ring-1 ring-[var(--border-primary)] ring-inset'
style={{ aspectRatio }}
>
<div className='flex h-full w-full items-center justify-center overflow-hidden rounded-lg'>
Expand Down
6 changes: 3 additions & 3 deletions moon/apps/web/components/DiffView/TreeView/FileTree.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import * as React from 'react'
import { useCallback, useEffect } from 'react'
import { Box, Skeleton } from '@mui/material'
import { useTreeViewApiRef } from '@mui/x-tree-view'
import { useRichTreeViewApiRef } from '@mui/x-tree-view'
import { RichTreeView } from '@mui/x-tree-view/RichTreeView'
import { useAtom } from 'jotai'

import { CommonResultVecMuiTreeNode } from '@gitmono/types'

import { expandedNodesAtom, treeAllDataAtom } from './codeTreeAtom'
import { CustomTreeItem } from './CustomTreeItem'
import { convertToTreeData, getDescendantIds } from './TreeUtils'
import { convertToTreeData, getDescendantIds, MuiTreeNode } from './TreeUtils'

interface FileTreeProps {
treeData: CommonResultVecMuiTreeNode['data']
Expand All @@ -18,7 +18,7 @@ interface FileTreeProps {
}

const FileTree = ({ treeData, treeDataLoading, onFileClick }: FileTreeProps) => {
const apiRef = useTreeViewApiRef()
const apiRef = useRichTreeViewApiRef<MuiTreeNode>()

const [treeAllData, setTreeAllData] = useAtom(treeAllDataAtom)
const [expandedNodes, setExpandedNodes] = useAtom(expandedNodesAtom)
Expand Down
1 change: 1 addition & 0 deletions moon/apps/web/components/DiffView/comment/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export function extractLinesFromHunks(fileDiff: FileDiffMetadata, side: 'deletio
for (const content of hunk.hunkContent) {
if (content.type === 'context') {
const start = side === 'deletions' ? content.deletionLineIndex : content.additionLineIndex

lines.push(...sourceLines.slice(start, start + content.lines))
} else if (content.type === 'change') {
if (side === 'deletions') {
Expand Down
4 changes: 2 additions & 2 deletions moon/apps/web/components/Feed/ComfortableFeed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ export function ComfortableFeed({ getPosts, isWriteableForViewer = true, hidePro

if (!hasPosts) {
return (
<div className='isolate mx-auto flex w-full max-w-[--feed-width] flex-1 flex-col transition-opacity lg:px-0'>
<div className='isolate mx-auto flex w-full max-w-[var(--feed-width)] flex-1 flex-col transition-opacity lg:px-0'>
{isWriteableForViewer && !currentOrganization?.viewer_can_post && <ViewerRoleInlineComposerUpsell />}
<PostsIndexEmptyState isWriteableForViewer={isWriteableForViewer} />
</div>
)
}

return (
<div className='isolate mx-auto flex w-full max-w-[--feed-width] flex-1 flex-col transition-opacity lg:px-0'>
<div className='isolate mx-auto flex w-full max-w-[var(--feed-width)] flex-1 flex-col transition-opacity lg:px-0'>
{isWriteableForViewer && currentOrganization?.viewer_can_post && <NewPostButton className='mb-8' />}

{isWriteableForViewer && !currentOrganization?.viewer_can_post && <ViewerRoleInlineComposerUpsell />}
Expand Down
2 changes: 1 addition & 1 deletion moon/apps/web/components/Gifs/GifPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function GifPicker({
>
<div className='relative isolate flex h-full flex-col overflow-hidden focus:outline-0'>
{!isPopover && (
<div className='mx-auto mt-2 h-1 w-8 shrink-0 rounded-full bg-[--text-primary] opacity-20' />
<div className='mx-auto mt-2 h-1 w-8 shrink-0 rounded-full bg-[var(--text-primary)] opacity-20' />
)}
<div className='bg-elevated z-20 px-2 py-2'>
<TextField
Expand Down
9 changes: 7 additions & 2 deletions moon/apps/web/components/Home/HomeSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ function SearchInput({ query, setQuery }: { query: string; setQuery: (query: str
<div className='text-quaternary relative'>
<SearchIcon className='absolute top-1/2 left-3 -translate-y-1/2' />
<TextField
additionalClasses='bg-transparent pl-10 h-[--navbar-height] focus:ring-0 pr-10 dark:bg-transparent rounded-none border-0'
additionalClasses='bg-transparent pl-10 h-[var(--navbar-height)] focus:ring-0 pr-10 dark:bg-transparent rounded-none border-0'
placeholder='Search people...'
value={query}
onChange={setQuery}
Expand All @@ -355,7 +355,12 @@ function needsGithubRelogin(user: { github_login?: string | null; integration?:

function GithubReloginHint() {
return (
<Tooltip label='Sign out and sign in with GitHub again to sync your GitHub login for permissions'>
<Tooltip
label='Sign out and sign in with GitHub again to sync your GitHub login for permissions'
side='left'
align='center'
alignOffset={0}
>
<span className='relative z-10'>
<UIText className='line-clamp-1 text-[13px] leading-snug text-amber-600 dark:text-amber-400'>
Re-login required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ function InnerAutoBlockquoteReply({
<PopoverContent align='center' collisionBoundary={closestScrollParent} forceMount>
<m.div {...ANIMATION_CONSTANTS}>
<div
className='bg-elevated flex w-[500px] max-w-[--radix-popover-content-available-width] origin-[--radix-popover-content-transform-origin] flex-col rounded-xl shadow-lg ring-1 shadow-black/20 ring-black/[0.04] dark:shadow-[inset_0px_1px_0px_rgba(255,255,255,0.04),_0px_2px_12px_rgba(0,0,0,0.4),_0px_0px_0px_1px_rgba(0,0,0,0.8)] dark:ring-white/[0.02]'
className='bg-elevated flex w-[500px] max-w-[var(--radix-popover-content-available-width)] origin-[var(--radix-popover-content-transform-origin)] flex-col rounded-xl shadow-lg ring-1 shadow-black/20 ring-black/[0.04] dark:shadow-[inset_0px_1px_0px_rgba(255,255,255,0.04),_0px_2px_12px_rgba(0,0,0,0.4),_0px_0px_0px_1px_rgba(0,0,0,0.8)] dark:ring-white/[0.02]'
ref={composerRef}
>
<PostCommentComposer
Expand Down
2 changes: 1 addition & 1 deletion moon/apps/web/components/InlinePost/MemberHovercard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function MemberHovercard({
>
<m.div
{...ANIMATION_CONSTANTS}
className='border-primary-opaque bg-elevated w-[312px] origin-[--radix-hover-card-content-transform-origin] overflow-hidden rounded-lg border shadow max-md:hidden dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]'
className='border-primary-opaque bg-elevated w-[312px] origin-[var(--radix-hover-card-content-transform-origin)] overflow-hidden rounded-lg border shadow max-md:hidden dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]'
>
{member && (
<div className='flex flex-col'>
Expand Down
2 changes: 1 addition & 1 deletion moon/apps/web/components/InlinePost/ProjectHovercard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function ProjectHovercard({
sideOffset={sideOffset}
collisionPadding={8}
className={cn(
'border-primary-opaque bg-elevated w-[312px] origin-[--radix-hover-card-content-transform-origin] overflow-hidden rounded-lg border p-3 shadow max-md:hidden dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]',
'border-primary-opaque bg-elevated w-[312px] origin-[var(--radix-hover-card-content-transform-origin)] overflow-hidden rounded-lg border p-3 shadow max-md:hidden dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]',
CONTAINER_STYLES.animation
)}
>
Expand Down
Loading
Loading