Merge pull request #38 from KIIAREN/copilot/move-logic-to-provider-facade

Author: fentz26

apps/web/app/(app)/join/[workspaceId]/page.tsx

@@ -9,17 +9,16 @@ import VerificationInput from 'react-verification-input';
 import { toast } from 'sonner';
 
 import { Button } from '@/components/ui/button';
-import { useGetWorkspaceInfo } from '@/features/workspaces/api/use-get-workspace-info';
-import { useJoin } from '@/features/workspaces/api/use-join';
+import { useGetWorkspaceInfo, useJoinWorkspace } from '@/lib/backend';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 import { cn } from '@/lib/utils';
 
 const JoinWorkspaceIdPage = () => {
   const router = useRouter();
   const workspaceId = useWorkspaceId();
 
-  const { mutate, isPending } = useJoin();
-  const { data, isLoading } = useGetWorkspaceInfo({ id: workspaceId });
+  const { mutate, isPending } = useJoinWorkspace();
+  const { data, isLoading } = useGetWorkspaceInfo(workspaceId);
 
   const isMember = useMemo(() => data?.isMember, [data?.isMember]);
 

apps/web/app/(app)/workspace/[workspaceId]/invite-modal.tsx

@@ -5,7 +5,7 @@ import { toast } from 'sonner';
 
 import { Button } from '@/components/ui/button';
 import { Dialog, DialogClose, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
-import { useNewJoinCode } from '@/features/workspaces/api/use-new-join-code';
+import { useNewJoinCode } from '@/lib/backend';
 import { useConfirm } from '@/hooks/use-confirm';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 

apps/web/app/(app)/workspace/[workspaceId]/page.tsx

@@ -6,15 +6,15 @@ import { useEffect, useMemo } from 'react';
 
 import { useGetChannels } from '@/features/channels/api/use-get-channels';
 import { useCreateChannelModal } from '@/features/channels/store/use-create-channel-modal';
-import { useGetWorkspaceInfo } from '@/features/workspaces/api/use-get-workspace-info';
+import { useGetWorkspaceInfo } from '@/lib/backend';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 
 const WorkspaceIdPage = () => {
   const router = useRouter();
   const workspaceId = useWorkspaceId();
   const [open, setOpen] = useCreateChannelModal();
 
-  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspaceInfo({ id: workspaceId });
+  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspaceInfo(workspaceId);
   const { data: channels, isLoading: channelsLoading } = useGetChannels({ workspaceId });
 
   const channelId = useMemo(() => channels?.[0]?._id, [channels]);

apps/web/app/(app)/workspace/[workspaceId]/preferences-modal.tsx

@@ -18,8 +18,7 @@ import {
   DialogTrigger,
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
-import { useRemoveWorkspace } from '@/features/workspaces/api/use-remove-workspace';
-import { useUpdateWorkspace } from '@/features/workspaces/api/use-update-workspace';
+import { useRemoveWorkspace, useUpdateWorkspace } from '@/lib/backend';
 import { useConfirm } from '@/hooks/use-confirm';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 

apps/web/app/(app)/workspace/[workspaceId]/toolbar.tsx

@@ -17,14 +17,14 @@ import {
 } from '@/components/ui/command';
 import { useGetChannels } from '@/features/channels/api/use-get-channels';
 import { useGetMembers } from '@/features/members/api/use-get-members';
-import { useGetWorkspace } from '@/features/workspaces/api/use-get-workspace';
+import { useGetWorkspace } from '@/lib/backend';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 
 export const Toolbar = () => {
   const router = useRouter();
   const workspaceId = useWorkspaceId();
 
-  const { data } = useGetWorkspace({ id: workspaceId });
+  const { data } = useGetWorkspace(workspaceId);
   const { data: channels } = useGetChannels({ workspaceId });
   const { data: members } = useGetMembers({ workspaceId });
 

apps/web/app/(app)/workspace/[workspaceId]/workspace-header.tsx

@@ -3,7 +3,6 @@
 import { ChevronDown, ListFilter, SquarePen } from 'lucide-react';
 import { useState } from 'react';
 
-import { Doc } from '@/../convex/_generated/dataModel';
 import { Hint } from '@/components/hint';
 import { Button } from '@/components/ui/button';
 import {
@@ -13,12 +12,13 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
+import type { Workspace } from '@kiiaren/core';
 
 import { InviteModal } from './invite-modal';
 import { PreferencesModal } from './preferences-modal';
 
 interface WorkspaceHeaderProps {
-  workspace: Doc<'workspaces'>;
+  workspace: Workspace;
   isAdmin: boolean;
 }
 

apps/web/app/(app)/workspace/[workspaceId]/workspace-sidebar.tsx

@@ -6,7 +6,7 @@ import { useGetChannels } from '@/features/channels/api/use-get-channels';
 import { useCreateChannelModal } from '@/features/channels/store/use-create-channel-modal';
 import { useCurrentMember } from '@/features/members/api/use-current-member';
 import { useGetMembers } from '@/features/members/api/use-get-members';
-import { useGetWorkspace } from '@/features/workspaces/api/use-get-workspace';
+import { useGetWorkspace } from '@/lib/backend';
 import { useChannelId } from '@/hooks/use-channel-id';
 import { useMemberId } from '@/hooks/use-member-id';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
@@ -24,7 +24,7 @@ export const WorkspaceSidebar = () => {
   const [_open, setOpen] = useCreateChannelModal();
 
   const { data: member, isLoading: memberLoading } = useCurrentMember({ workspaceId });
-  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspace({ id: workspaceId });
+  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspace(workspaceId);
   const { data: channels, isLoading: channelsLoading } = useGetChannels({ workspaceId });
   const { data: members, isLoading: membersLoading } = useGetMembers({ workspaceId });
 

apps/web/app/(app)/workspace/[workspaceId]/workspace-switcher.tsx

@@ -11,8 +11,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { useGetWorkspace } from '@/features/workspaces/api/use-get-workspace';
-import { useGetWorkspaces } from '@/features/workspaces/api/use-get-workspaces';
+import { useGetWorkspace, useGetWorkspaces } from '@/lib/backend';
 import { useCreateWorkspaceModal } from '@/features/workspaces/store/use-create-workspace-modal';
 import { useWorkspaceId } from '@/hooks/use-workspace-id';
 
@@ -22,9 +21,9 @@ export const WorkspaceSwitcher = () => {
   const [_open, setOpen] = useCreateWorkspaceModal();
 
   const { data: workspaces, isLoading: workspacesLoading } = useGetWorkspaces();
-  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspace({ id: workspaceId });
+  const { data: workspace, isLoading: workspaceLoading } = useGetWorkspace(workspaceId);
 
-  const filteredWorkspaces = workspaces?.filter((workspace) => workspace?._id !== workspaceId);
+  const filteredWorkspaces = workspaces?.filter((workspace) => workspace?.id !== workspaceId);
 
   return (
     <DropdownMenu>
@@ -46,9 +45,9 @@ export const WorkspaceSwitcher = () => {
 
         {filteredWorkspaces?.map((workspace) => (
           <DropdownMenuItem
-            key={workspace._id}
+            key={workspace.id}
             className="cursor-pointer overflow-hidden capitalize"
-            onClick={() => router.push(`/workspace/${workspace._id}`)}
+            onClick={() => router.push(`/workspace/${workspace.id}`)}
           >
             <div className="relative mr-2 flex size-9 shrink-0 items-center justify-center overflow-hidden rounded-md bg-secondary text-xl font-semibold text-white">
               {workspace.name.charAt(0).toUpperCase()}

apps/web/app/(app)/workspace/page.tsx

@@ -4,15 +4,15 @@ import { Loader } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useMemo } from 'react';
 
-import { useGetWorkspaces } from '@/features/workspaces/api/use-get-workspaces';
+import { useGetWorkspaces } from '@/lib/backend';
 import { useCreateWorkspaceModal } from '@/features/workspaces/store/use-create-workspace-modal';
 
 const WorkspacePage = () => {
     const router = useRouter();
     const [open, setOpen] = useCreateWorkspaceModal();
     const { data, isLoading } = useGetWorkspaces();
 
-    const workspaceId = useMemo(() => data?.[0]?._id, [data]);
+    const workspaceId = useMemo(() => data?.[0]?.id, [data]);
 
     useEffect(() => {
         if (isLoading) return;