Skip to content

Commit 551fc64

Browse files
waleedlatif1waleedlatif1
committed
Merge branch 'wip/fix-server' into improvement/org-view
2 parents c723877 + 5ddab8a commit 551fc64

118 files changed

Lines changed: 606 additions & 455 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/sim/app/extension/o/[organizationId]/organization.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { generateId } from '@sim/utils/id'
55
import { useQueryState } from 'nuqs'
66
import { isApiClientError } from '@/lib/api/client/errors'
77
import { organizationRoutes } from '@/lib/navigation/paths'
8+
import { OrganizationProvider } from '@/lib/organizations/provider'
89
import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
910
import { ExtensionHeader } from '@/app/extension/[workspaceId]/header'
1011
import { extensionChatParam } from '@/app/extension/[workspaceId]/search-params'
@@ -13,7 +14,6 @@ import ExtensionLoading from '@/app/extension/loading'
1314
import { PanelConversation } from '@/app/extension/o/[organizationId]/panel-conversation'
1415
import { ExtensionSessionExpired } from '@/app/extension/providers'
1516
import { ExtensionUnavailable } from '@/app/extension/unavailable'
16-
import { OrganizationProvider } from '@/app/o/[organizationId]/providers/organization-provider'
1717
import { resourceParam, resourceUrlKeys } from '@/app/workspace/[workspaceId]/home/search-params'
1818
import type { ChatRequestMode } from '@/app/workspace/[workspaceId]/home/types'
1919
import { SettingsLoader } from '@/app/workspace/[workspaceId]/providers/settings-loader'

‎apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import type { Metadata } from 'next'
33
import { notFound, redirect } from 'next/navigation'
44
import { getAccessibleCopilotChatAuth } from '@/lib/mothership/chat/lifecycle'
55
import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
6-
import OrganizationChatLoading from '@/app/o/[organizationId]/chat/[chatId]/loading'
76
import {
87
canUseOrganizationChat,
98
getOrganizationBuildRedirect,
10-
} from '@/app/o/[organizationId]/home/home-redirect'
9+
} from '@/lib/organizations/home-redirect'
10+
import OrganizationChatLoading from '@/app/o/[organizationId]/chat/[chatId]/loading'
1111
import { requireOrganizationViewer } from '@/app/o/[organizationId]/viewer'
1212
import { PageConversation } from '@/platform/app/(shell)/_components/conversation/page-conversation'
1313
import { ConversationSkeleton } from '@/platform/app/(shell)/_components/conversation/skeletons'

‎apps/sim/app/o/[organizationId]/components/organization-conversation-landing.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ vi.mock(
4848
() => chatResourcePanelMock
4949
)
5050
vi.mock('@/lib/auth/client', () => authClientMock)
51-
vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
51+
vi.mock('@/lib/organizations/provider', () => organizationProviderMock)
5252
vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-chat', () => useChatMock)
5353
vi.mock('@/hooks/queries/mothership-chats', () => mothershipChatsQueriesMock)
5454
vi.mock('@/platform/app/(shell)/_components/conversation/page-composer', () => ({
@@ -89,7 +89,7 @@ beforeEach(() => {
8989
reactQueryMockFns.mockUseMutation.mockReturnValue(createMutationResultMock())
9090
nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization-a/home')
9191
authClientMockFns.mockUseSession.mockReturnValue({ data: { user: { id: 'reader' } } })
92-
organizationProviderMockFns.mockUseOrganizationContext.mockReturnValue({
92+
organizationProviderMockFns.mockUseOrganization.mockReturnValue({
9393
organization: { id: 'organization-a', name: 'Acme' },
9494
searchAccess: { memberScoped: true },
9595
mothershipAvailable: true,

‎apps/sim/app/o/[organizationId]/components/organization-conversation-queued-edit.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ vi.mock('@/lib/auth/client', () => authClientMock)
4646
vi.mock('@/lib/core/config/deployment-shape', () => deploymentShapeMock)
4747
vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
4848
vi.mock('next/navigation', () => nextNavigationMock)
49-
vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
49+
vi.mock('@/lib/organizations/provider', () => organizationProviderMock)
5050
vi.mock(
5151
'@/app/workspace/[workspaceId]/providers/feature-flags-provider',
5252
() => featureFlagsProviderMock
@@ -127,7 +127,7 @@ beforeEach(async () => {
127127
deploymentShapeMockFns.mockGetDeploymentShape.mockImplementation(deploymentShape)
128128
nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization-a/chat/chat-a')
129129
authClientMockFns.mockUseSession.mockReturnValue({ data: { user: { id: 'reader' } } })
130-
organizationProviderMockFns.mockUseOrganizationContext.mockReturnValue({
130+
organizationProviderMockFns.mockUseOrganization.mockReturnValue({
131131
organization: { id: 'organization-a', name: 'Acme' },
132132
searchAccess: { memberScoped: true },
133133
mothershipAvailable: true,

‎apps/sim/app/o/[organizationId]/components/organization-conversation.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ vi.mock(
6666
)
6767
vi.mock('@/lib/auth/client', () => authClientMock)
6868
vi.mock('@/lib/uploads/client/session-upload', () => ({ uploadInternalFileSession: mocks.upload }))
69-
vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
69+
vi.mock('@/lib/organizations/provider', () => organizationProviderMock)
7070
vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-chat', () => useChatMock)
7171
vi.mock('@/hooks/queries/mothership-chats', () => mothershipChatsQueriesMock)
7272
vi.mock('@/platform/app/(shell)/_components/conversation/page-composer', () => ({
@@ -88,7 +88,7 @@ const {
8888
} = organizationConversationMockFns
8989

9090
const mockSession = authClientMockFns.mockUseSession
91-
const mockContext = organizationProviderMockFns.mockUseOrganizationContext
91+
const mockContext = organizationProviderMockFns.mockUseOrganization
9292
const deploymentShape = () => createMockDeploymentShape()
9393
deploymentShapeMockFns.mockUseDeploymentShape.mockImplementation(deploymentShape)
9494
deploymentShapeMockFns.mockGetDeploymentShape.mockImplementation(deploymentShape)

‎apps/sim/app/o/[organizationId]/components/use-organization-conversation.ts‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ import {
1717
} from '@/lib/mothership/chat/attachment-preview'
1818
import { organizationRoutes } from '@/lib/navigation/paths'
1919
import { organizationDraftKey, SEARCH_ASSISTANT_DRAFT_SLOT } from '@/lib/organizations/draft-key'
20+
import { useOrganization } from '@/lib/organizations/provider'
21+
import {
22+
type OrganizationSummaryRequest,
23+
organizationSearchParsers,
24+
organizationSearchUrlKeys,
25+
} from '@/lib/organizations/search-params'
2026
import { isWorkspaceResourceKind, workspaceResourcePath } from '@/lib/resources'
2127
import { assertMultiFileUploadAdmission } from '@/lib/uploads/client/admission'
2228
import {
@@ -26,11 +32,6 @@ import {
2632
isAssistantImageType,
2733
} from '@/lib/uploads/shared/assistant-images'
2834
import type { ConversationComposerProps } from '@/app/o/[organizationId]/home/components/composer'
29-
import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
30-
import {
31-
organizationSearchParsers,
32-
organizationSearchUrlKeys,
33-
} from '@/app/o/[organizationId]/search/search-params'
3435
import { useSearchHistoryActions } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-history-context'
3536
import {
3637
getMothershipUseChatOptions,
@@ -62,12 +63,6 @@ import { useHydrated } from '@/hooks/use-hydrated'
6263
import { readDraft, useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
6364
import type { ChatContext } from '@/stores/panel'
6465

65-
export interface OrganizationSummaryRequest {
66-
id: string
67-
message: string
68-
assistantSearch: WorkspaceSearchFilters
69-
}
70-
7166
/** Search's Assistant always runs its retrieval at this level. */
7267
const ASSISTANT_SEARCH_LEVEL = 'fast' as const
7368

@@ -130,7 +125,7 @@ interface UseConversationGateOptions {
130125

131126
/** Whether the surface may mount, and for which identity. Its key remounts on any change to one. */
132127
export function useConversationGate({ chatId, requestMode }: UseConversationGateOptions) {
133-
const { organization, searchAccess, canBuild, mothershipAvailable } = useOrganizationContext()
128+
const { organization, searchAccess, canBuild, mothershipAvailable } = useOrganization()
134129
const { data: session } = useSession()
135130
const isClient = useHydrated()
136131
const isRestoredChatEntry = useRestoredChatEntry({ chatId })
@@ -170,7 +165,7 @@ export function useOrganizationConversation({
170165
summaryRequest,
171166
onSummaryConsumed,
172167
}: UseOrganizationConversationOptions) {
173-
const { organization, canBuild } = useOrganizationContext()
168+
const { organization, canBuild } = useOrganization()
174169
const panelSurface = surface.kind === 'panel' ? surface : null
175170
const { data: session } = useSession()
176171
const userId = session?.user?.id

‎apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ vi.mock('@/hooks/use-speech-to-text', () => ({ useSpeechToText: mocks.speech }))
9696
vi.mock('@/lib/uploads/client/session-upload', () => ({ uploadInternalFileSession: mocks.upload }))
9797
vi.mock('@/hooks/use-animated-placeholder', () => ({ useAnimatedPlaceholder: () => 'Ask Sim to' }))
9898
vi.mock('@/hooks/use-chat-input-focus', () => ({ useChatInputFocus: vi.fn() }))
99-
vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
99+
vi.mock('@/lib/organizations/provider', () => organizationProviderMock)
100100

101101
import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
102102
import { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
@@ -112,7 +112,7 @@ const writeDraft = (text: string) =>
112112
const deploymentShape = () => createMockDeploymentShape()
113113
deploymentShapeMockFns.mockUseDeploymentShape.mockImplementation(deploymentShape)
114114
deploymentShapeMockFns.mockGetDeploymentShape.mockImplementation(deploymentShape)
115-
organizationProviderMockFns.mockUseOrganizationContext.mockReturnValue({
115+
organizationProviderMockFns.mockUseOrganization.mockReturnValue({
116116
organization: { id: 'organization-a' },
117117
})
118118

‎apps/sim/app/o/[organizationId]/home/components/composer/use-composer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { toast } from '@sim/emcn'
55
import { useQueries, useQueryClient } from '@tanstack/react-query'
66
import { flushSync } from 'react-dom'
77
import { UNAVAILABLE_CONTEXT_NOTICE } from '@/lib/mothership/chat/context'
8-
import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
8+
import { useOrganization } from '@/lib/organizations/provider'
99
import { usePromptEditor } from '@/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor'
1010
import { organizationSkillOptions } from '@/app/workspace/[workspaceId]/home/components/user-input/components/skills-menu-dropdown/organization-skill-options'
1111
import { usePromptHistory } from '@/app/workspace/[workspaceId]/home/components/user-input/hooks/use-prompt-history'
@@ -95,7 +95,7 @@ export function useComposer({
9595
const [draftKey] = draftKeys
9696
const value = useMothershipDraftsStore((state) => readDraft(state.drafts, draftKeys)?.text ?? '')
9797
const imagesOnly = requestMode === 'assistant'
98-
const { organization } = useOrganizationContext()
98+
const { organization } = useOrganization()
9999
const queryClient = useQueryClient()
100100
const { data: allWorkspaces = [], isPending: workspacesPending } = useWorkspacesQuery(!imagesOnly)
101101
const waitsForLists = waitsForFullLists && !imagesOnly

‎apps/sim/app/o/[organizationId]/home/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { Suspense } from 'react'
22
import type { Metadata } from 'next'
33
import { redirect } from 'next/navigation'
44
import { organizationRoutes } from '@/lib/navigation/paths'
5-
import { Hydrated } from '@/app/o/[organizationId]/_redesign/hydrated'
6-
import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
5+
import { getOrganizationHomeRedirect } from '@/lib/organizations/home-redirect'
76
import { requireOrganizationViewer } from '@/app/o/[organizationId]/viewer'
87
import { HomeConversation } from '@/platform/app/(shell)/home/_components/home-conversation/home-conversation'
98
import { HomeDashboardSkeleton } from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton'
9+
import { Hydrated } from '@/platform/design-system/components/surface/hydrated'
1010
import { prefetchHome } from '@/platform/lib/data/prefetch-member-inventory'
1111

1212
export const metadata: Metadata = {

‎apps/sim/app/o/[organizationId]/integrations/[provider]/loading.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
21
import { IntegrationsRouteFallback } from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-route'
2+
import { PageSurface } from '@/platform/design-system/components/surface/surface'
33

44
export default function IntegrationDetailLoading() {
55
return (
6-
<RedesignPageSurface>
6+
<PageSurface>
77
<IntegrationsRouteFallback detail />
8-
</RedesignPageSurface>
8+
</PageSurface>
99
)
1010
}

0 commit comments

Comments
 (0)