General quality of life improvements (#161)

* General quality of life improvements * Fix review comments * Change default wight config * Lint * Adds default config for commits --------- Co-authored-by: Gabriel Ferraz <[email protected]>
armitage-labs · May 17, 2024 · 17a99d3 · 17a99d3
1 parent 65040b8
commit 17a99d3
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 37 deletions.
diff --git a/cred-manager/src/sourcecred/service/weightConfig.service.ts b/cred-manager/src/sourcecred/service/weightConfig.service.ts
@@ -8,7 +8,7 @@ import {
 
 @Injectable()
 export class WeightConfigService {
-  constructor(private readonly prismaService: PrismaService) {}
+  constructor(private readonly prismaService: PrismaService) { }
 
   async getTeamWeightConfigs(teamId: string): Promise<WeightConfigDto[]> {
     const teamWeightConfigs =
@@ -42,7 +42,7 @@ export class WeightConfigService {
         'N\u0000sourcecred\u0000github\u0000COMMENT\u0000':
           nodeWeightsMap.get('NODE_COMMENT') || 0,
         'N\u0000sourcecred\u0000github\u0000COMMIT\u0000':
-          nodeWeightsMap.get('NODE_COMMIT') || 0,
+          nodeWeightsMap.get('NODE_COMMIT') || 0.0625,
         'N\u0000sourcecred\u0000github\u0000ISSUE\u0000':
           nodeWeightsMap.get('NODE_ISSUE') || 0,
         'N\u0000sourcecred\u0000github\u0000PULL\u0000':

diff --git a/src/app/(dashboard)/projects/new/page.tsx b/src/app/(dashboard)/projects/new/page.tsx
@@ -53,11 +53,14 @@ export default function CreateNewProjectPage() {
 
   const handleCreateTeam = async () => {
     nextStep();
-    const { data } = await axios.post("/api/teams", { name: createTeamName });
+    const { data } = await axios.post("/api/projects", {
+      name: createTeamName,
+      repoCount: selectedGithubRepos.length,
+    });
     if (data.success) {
-      setProject(data.createdTeam);
-      await handleRegisterRepos(data.createdTeam.id);
-      handleGenerateReport(data.createdTeam.id);
+      setProject(data.createdProject);
+      await handleRegisterRepos(data.createdProject.id);
+      handleGenerateReport(data.createdProject.id);
     } else {
       previousStep();
     }

diff --git a/src/app/api/configuration/weightConfig.dto.ts b/src/app/api/configuration/weightConfig.dto.ts
@@ -34,7 +34,7 @@ export const defaultConfigResponse: WeightConfig = {
     title: "Commit Weight",
     description:
       "This slider adjusts the relevance and weight you would like to assign for commits that were successfully merged.",
-    value: 0, // default value
+    value: 1, // default value
     min: 0,
     max: 10,
     step: 1,

diff --git a/src/app/api/projects/route.ts b/src/app/api/projects/route.ts
@@ -3,6 +3,8 @@ import { NextRequest, NextResponse } from "next/server";
 import { options } from "../auth/[...nextauth]/options";
 import { fetchUserTeam } from "../teams/fetchTeam";
 import { fetchUserTeams } from "../teams/fetchUserTeams";
+import { ProjectRegisterDto } from "./types/project.dto";
+import { registerUserTeam } from "../teams/registerUserTeam";
 
 export async function GET(req: NextRequest) {
   const session = await getServerSession(options);
@@ -23,3 +25,25 @@ export async function GET(req: NextRequest) {
     }
   }
 }
+
+export async function POST(req: NextRequest) {
+  try {
+    const session = await getServerSession(options);
+    const registerProjectDto = (await req.json()) as ProjectRegisterDto;
+    if (session?.userId) {
+      const createdProject = await registerUserTeam(
+        session.userId,
+        registerProjectDto.name,
+        registerProjectDto.repoCount == 1,
+      );
+      return NextResponse.json({
+        success: true,
+        createdProject: createdProject,
+      });
+    }
+    return NextResponse.json({ success: true, createdProject: null });
+  } catch (error) {
+    console.log(error);
+    return NextResponse.json({ success: false, createdProject: null });
+  }
+}
diff --git a/src/app/api/projects/types/project.dto.ts b/src/app/api/projects/types/project.dto.ts
@@ -0,0 +1,4 @@
+export type ProjectRegisterDto = {
+  name: string;
+  repoCount: number;
+};
diff --git a/src/components/payments/paymentView.tsx b/src/components/payments/paymentView.tsx
@@ -8,6 +8,9 @@ import { truncateString } from "@/app/(dashboard)/utils/stringUtils";
 import { SplitsBalance } from "./splits/splitsBalance";
 import { Button } from "../ui/button";
 import { toast } from "sonner";
+import { Alert, AlertTitle } from "../ui/alert";
+import { Icons } from "../icons";
+import { useState } from "react";
 
 interface PaymentsViewProps {
   projectId: string;
@@ -35,6 +38,7 @@ export default function PaymentsView({
   projectId,
   paymentAddress,
 }: PaymentsViewProps) {
+  const [loadedSuccessfully, setLoadedSuccessfully] = useState(true);
   return (
     <div className="flex-1 space-y-4  p-4 md:p-8 pt-6">
       <div className="flex items-start">
@@ -65,11 +69,26 @@ export default function PaymentsView({
           </div>
         </div>
       </div>
+      {!loadedSuccessfully ? (
+        <div>
+          <Alert className="flex items-center bg-blue-500">
+            <Icons.warning className="mr-2 h-4 w-4" />
+            <AlertTitle>
+              You payment address has not been indexed yet, wait for a moment
+              until we are able to fetch it from onchain data and refresh this
+              page.
+            </AlertTitle>
+          </Alert>
+        </div>
+      ) : (
+        <></>
+      )}
       <div className="grid grid-cols-2 gap-4">
         <div>
           <SplitsBalance
             projectId={projectId}
             paymentAddress={paymentAddress}
+            setLoadedSuccessfully={setLoadedSuccessfully}
           ></SplitsBalance>
         </div>
         <div>
@@ -85,6 +104,7 @@ export default function PaymentsView({
               <SplitsRecipients
                 paymentAddress={paymentAddress.wallet_address}
                 chainId={parseInt(paymentAddress.chain_id)}
+                setLoadedSuccessfully={setLoadedSuccessfully}
               ></SplitsRecipients>
             </CardContent>
           </Card>

diff --git a/src/components/payments/splits/splitsBalance.tsx b/src/components/payments/splits/splitsBalance.tsx
@@ -12,21 +12,26 @@ import {
   useDistributeToken,
   useSplitEarnings,
 } from "@0xsplits/splits-sdk-react";
-import { Split, Wallet2 } from "lucide-react";
+import { Split, SwitchCamera, Wallet2 } from "lucide-react";
 import { useEffect, useState } from "react";
-import { useAccount } from "wagmi";
+import { useAccount, useChainId } from "wagmi";
+import { useSwitchChain } from "wagmi";
 
 interface SplitsBalanceProps {
   projectId: string;
   paymentAddress: PaymentAddressDto;
+  setLoadedSuccessfully: (isSuccessfully: boolean) => void;
 }
 
 export function SplitsBalance({
   projectId,
   paymentAddress,
+  setLoadedSuccessfully,
 }: SplitsBalanceProps) {
   const account = useAccount();
+  const chainId = useChainId();
   const [isLoading, setIsLoading] = useState(true);
+  const { switchChain } = useSwitchChain();
   const { splitEarnings, status, error } = useSplitEarnings(
     parseInt(paymentAddress.chain_id),
     paymentAddress.wallet_address,
@@ -53,6 +58,9 @@ export function SplitsBalance({
       }
       setIsLoading(false);
     }
+    if (error) {
+      setLoadedSuccessfully(false);
+    }
   }, [splitEarnings, status, error, isLoading]);
 
   useEffect(() => {
@@ -79,32 +87,45 @@ export function SplitsBalance({
             </div>
           </CardContent>
           <CardFooter>
-            <Button
-              className="w-full text-md flex justify-between items-center"
-              disabled={
-                !(
-                  account.isConnected &&
-                  (distributeStatus == null ||
-                    distributeStatus == "error" ||
-                    distributeStatus == "complete")
-                )
-              }
-              onClick={() =>
-                distributeToken({
-                  splitAddress: paymentAddress.wallet_address,
-                  token: "0x0000000000000000000000000000000000000000",
-                })
-              }
-            >
-              {distributeStatus == "pendingApproval" ? (
-                <>Waiting for approval</>
-              ) : distributeStatus == "txInProgress" ? (
-                <>In progress</>
-              ) : (
-                <>Distribute Balances</>
-              )}
-              <Split className="mr-2 h-5 w-5 transform rotate-90" />
-            </Button>
+            {account.isConnected &&
+            chainId != parseInt(paymentAddress.chain_id) ? (
+              <Button
+                className="w-full text-md flex justify-between items-center"
+                onClick={() =>
+                  switchChain({ chainId: parseInt(paymentAddress.chain_id) })
+                }
+              >
+                Switch Chains
+                <SwitchCamera className="mr-2 h-5 w-5" />
+              </Button>
+            ) : (
+              <Button
+                className="w-full text-md flex justify-between items-center"
+                disabled={
+                  !(
+                    account.isConnected &&
+                    (distributeStatus == null ||
+                      distributeStatus == "error" ||
+                      distributeStatus == "complete")
+                  )
+                }
+                onClick={() =>
+                  distributeToken({
+                    splitAddress: paymentAddress.wallet_address,
+                    token: "0x0000000000000000000000000000000000000000",
+                  })
+                }
+              >
+                {distributeStatus == "pendingApproval" ? (
+                  <>Waiting for approval</>
+                ) : distributeStatus == "txInProgress" ? (
+                  <>In progress</>
+                ) : (
+                  <>Distribute Balances</>
+                )}
+                <Split className="mr-2 h-5 w-5 transform rotate-90" />
+              </Button>
+            )}
           </CardFooter>
         </Card>
       )}

diff --git a/src/components/payments/splits/splitsRecipients.tsx b/src/components/payments/splits/splitsRecipients.tsx
@@ -9,6 +9,7 @@ import axios from "axios";
 interface SplitsRecipientsProps {
   paymentAddress: string;
   chainId: number;
+  setLoadedSuccessfully: (isSuccessfully: boolean) => void;
 }
 
 export interface SplitRecipient {
@@ -21,10 +22,14 @@ export interface SplitRecipient {
 export default function SplitsRecipients({
   paymentAddress,
   chainId,
+  setLoadedSuccessfully,
 }: SplitsRecipientsProps) {
   const [recipient, setRecipient] = useState<SplitRecipient[]>([]);
   const [isLoading, setIsLoading] = useState(true);
-  const { splitMetadata, status } = useSplitMetadata(chainId, paymentAddress);
+  const { splitMetadata, status, error } = useSplitMetadata(
+    chainId,
+    paymentAddress,
+  );
 
   const handleSplitMetadata = async (splitRecipient: SplitRecipient[]) => {
     const { data } = await axios.post(`/api/wallet/search`, splitRecipient);
@@ -42,7 +47,10 @@ export default function SplitsRecipients({
       }));
       handleSplitMetadata(mappedRecipient);
     }
-  }, [status]);
+    if (error) {
+      setLoadedSuccessfully(false);
+    }
+  }, [status, error]);
 
   return (
     <SplitsDataTable

diff --git a/src/components/projects/projectRepoNameForm.tsx b/src/components/projects/projectRepoNameForm.tsx
@@ -11,6 +11,7 @@ import { Button } from "../ui/button";
 import { Input } from "../ui/input";
 import { GithubRepoDto } from "@/app/api/github/repo/types/githubRepo.dto";
 import ProjectGithubRepositoriesBadge from "../repo/projectGithubRepositoriesBadge";
+import { useEffect } from "react";
 
 interface ProjectTeamNameFormProps {
   createTeamName: string;
@@ -27,6 +28,11 @@ export default function ProjectTeamNameForm({
   selectedGithubRepos,
   onSelectRepo,
 }: ProjectTeamNameFormProps) {
+  useEffect(() => {
+    if (selectedGithubRepos.length == 1) {
+      setCreateTeamName(selectedGithubRepos[0].full_name);
+    }
+  }, []);
   return (
     <>
       <div className="pt-36">