added contribution status and fixed participation score contracts

Aut-Labs · Dec 9, 2024 · a6429b3 · a6429b3
1 parent 0800a35
commit a6429b3
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@aut-labs/abi-types": "^0.0.88-dev",
     "@aut-labs/connector": "^0.0.205",
     "@aut-labs/d-aut": "^1.0.206-dev",
-    "@aut-labs/sdk": "^0.0.230-dev",
+    "@aut-labs/sdk": "^0.0.231-dev",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@marker.io/browser": "^0.19.0",

diff --git a/src/pages/AutID/AutHub/AutHubContributionsTable.tsx b/src/pages/AutID/AutHub/AutHubContributionsTable.tsx
@@ -3,6 +3,7 @@ import Box from "@mui/material/Box";
 import ArrowIcon from "@assets/autos/move-right.svg?react";
 
 import {
+  Alert,
   Paper,
   Stack,
   SvgIcon,
@@ -23,12 +24,14 @@ import useQueryContributions from "@utils/hooks/GetContributions";
 import { useCommitAnyContributionMutation } from "@api/contributions.api";
 import { useWalletConnector } from "@aut-labs/connector";
 import useQueryContributionCommits, {
-  ContributionCommit
+  ContributionCommit,
+  ContributionStatus,
+  ContributionStatusMap
 } from "@utils/hooks/useQueryContributionCommits";
 import { TaskContributionNFT } from "@aut-labs/sdk";
 import { Link } from "react-router-dom";
 import { GithubCommitContribution } from "@api/models/contribution-types/github-commit.model";
-import useQueryHubPeriod from "@utils/hooks/useQueryHubPeriod";
+import OverflowTooltip from "@components/OverflowTooltip";
 
 const StyledTableCell = styled(TableCell)(({ theme }) => ({
   [`&.${tableCellClasses.head}, &.${tableCellClasses.body}`]: {
@@ -72,6 +75,25 @@ const TableListItem = memo(({ contribution, commit }: TableListItemProps) => {
     ).toString();
   }, [contribution?.properties?.endDate]);
 
+  const status = useMemo(() => {
+    if (!commit?.status) {
+      return {
+        state: "Open",
+        severity: "info"
+      };
+    }
+    let severity = "warning";
+    if (commit?.status === ContributionStatus.Rejected) {
+      severity = "error";
+    } else if (commit?.status === ContributionStatus.Complete) {
+      severity = "success";
+    }
+    return {
+      state: ContributionStatusMap[commit?.status],
+      severity
+    };
+  }, [commit?.status]);
+
   return (
     <StyledTableRow
       sx={{
@@ -101,12 +123,24 @@ const TableListItem = memo(({ contribution, commit }: TableListItemProps) => {
     >
       <StyledTableCell align="left">
         <Stack>
-          <Typography variant="subtitle2" fontWeight="normal" color="white">
-            {contribution?.name}
-          </Typography>
-          <Typography variant="caption" fontWeight="normal" color="white">
-            {contribution?.description}
-          </Typography>
+          <OverflowTooltip
+            typography={{
+              variant: "subtitle2",
+              fontWeight: "400",
+              letterSpacing: "0.66px"
+            }}
+            maxLine={1}
+            text={contribution?.name}
+          />
+          <OverflowTooltip
+            typography={{
+              variant: "caption",
+              fontWeight: "400",
+              letterSpacing: "0.66px"
+            }}
+            maxLine={2}
+            text={contribution?.description}
+          />
         </Stack>
       </StyledTableCell>
       <StyledTableCell align="left">
@@ -150,6 +184,32 @@ const TableListItem = memo(({ contribution, commit }: TableListItemProps) => {
         </Typography>
       </StyledTableCell>
 
+      <StyledTableCell align="left">
+        <Alert
+          variant="filled"
+          sx={{
+            borderRadius: "8px",
+            border: 0,
+            height: "40px",
+            width: "134px",
+            display: "flex",
+            color: "white",
+            fontFamily: "FractulRegular",
+            fontWeight: "bold",
+            alignItems: "center",
+            ".MuiAlert-message": {
+              overflow: "hidden"
+            },
+            ".MuiAlert-icon": {
+              marginRight: theme.spacing(1)
+            }
+          }}
+          severity={status?.severity as any}
+        >
+          {status?.state}
+        </Alert>
+      </StyledTableCell>
+
       <StyledTableCell align="left">
         <Box
           sx={{
@@ -177,15 +237,9 @@ const TableListItem = memo(({ contribution, commit }: TableListItemProps) => {
           ) : (
             <AutOsButton
               type="button"
-              color="success"
+              color="primary"
               variant="contained"
               sx={{
-                "&.MuiButton-root": {
-                  backgroundColor: "#12B76A"
-                },
-                "&.Mui-disabled": {
-                  color: `${theme.palette.offWhite.light} !important`
-                },
                 width: "100px"
               }}
               to={`contribution/${contribution?.properties?.id}`}
@@ -333,6 +387,15 @@ export const AutHubTasksTable = ({ header }) => {
                   End Date
                 </Typography>
               </StyledTableCell>
+              <StyledTableCell align="center">
+                <Typography
+                  variant="body"
+                  fontWeight="normal"
+                  color="offWhite.dark"
+                >
+                  Status
+                </Typography>
+              </StyledTableCell>
               <StyledTableCell align="center">
                 <Typography
                   variant="body"

diff --git a/src/pages/AutID/AutHub/AutHubEdit.tsx b/src/pages/AutID/AutHub/AutHubEdit.tsx
@@ -139,9 +139,6 @@ const AutHubEdit = () => {
 
   const { data: periodData } = useQueryHubPeriod();
 
-  const { pointsGiven, expectedPoints, endDate } = periodData || {};
-  const initialScore = 100;
-
   useEffect(() => {
     dispatch(updateAutState({ selectedHubAddress: params.hubAddress }));
     console.log(
@@ -617,7 +614,7 @@ const AutHubEdit = () => {
                               >
                                 Current Period Contribution
                               </Typography>
-                              {pointsGiven < expectedPoints ? (
+                              {periodData?.pointsGiven < periodData?.expectedPoints ? (
                                 <SvgIcon
                                   sx={{
                                     fill: "transparent",
@@ -649,7 +646,7 @@ const AutHubEdit = () => {
                                 period ends in
                               </Typography>
                               <Countdown
-                                date={endDate}
+                                date={periodData?.endDate}
                                 renderer={AutCountdown}
                               />
                             </Box>
@@ -686,7 +683,7 @@ const AutHubEdit = () => {
                               lineHeight="48px"
                               color="offWhite.main"
                             >
-                              {pointsGiven}
+                              {periodData?.pointsGiven}
                             </Typography>
                             <Typography
                               lineHeight="48px"
@@ -710,11 +707,11 @@ const AutHubEdit = () => {
                               }}
                               color="offWhite.dark"
                             >
-                              {expectedPoints}
+                              {periodData?.expectedPoints}
                             </Typography>
                           </Box>
 
-                          {pointsGiven < expectedPoints && (
+                          {periodData?.pointsGiven < periodData?.expectedPoints && (
                             <Box
                               sx={{
                                 width: "100%",
@@ -746,7 +743,7 @@ const AutHubEdit = () => {
                                   }}
                                   variant="determinate"
                                   value={
-                                    (pointsGiven / (expectedPoints || 1)) * 100
+                                    (periodData?.pointsGiven / (periodData?.expectedPoints || 1)) * 100
                                   }
                                 />
                               </Box>
@@ -761,8 +758,8 @@ const AutHubEdit = () => {
                               </Typography>
                             </Box>
                           )}
-                          {pointsGiven ===
-                            expectedPoints && (
+                          {periodData?.pointsGiven ===
+                            periodData?.expectedPoints && (
                             <Box
                               sx={{
                                 width: "100%",
@@ -811,7 +808,7 @@ const AutHubEdit = () => {
                               </Typography>
                             </Box>
                           )}
-                          {pointsGiven > expectedPoints && (
+                          {periodData?.pointsGiven > periodData?.expectedPoints && (
                             <Box
                               sx={{
                                 width: "100%",
@@ -953,7 +950,7 @@ const AutHubEdit = () => {
                           color="offWhite.main"
                           fontWeight="normal"
                         >
-                          {initialScore}
+                          {periodData?.score}
                         </Typography>
                         <SubtitleWithInfo
                           title="score"
@@ -966,7 +963,7 @@ const AutHubEdit = () => {
                           color="offWhite.main"
                           fontWeight="normal"
                         >
-                          {pointsGiven}
+                          {periodData?.pointsGiven}
                         </Typography>
                         <SubtitleWithInfo
                           title="points"

diff --git a/src/pages/AutID/AutHub/AutHubList.tsx b/src/pages/AutID/AutHub/AutHubList.tsx
@@ -63,7 +63,6 @@ const { IconContainer } = EditContentElements;
 
 const HubListItem = memo(({ row }: { row: AutOSHub }) => {
   const { data: periodData } = useQueryHubPeriod();
-  const initialScore = 100;
   const theme = useTheme();
   const { address } = useAccount();
   const autID = useSelector(SelectedAutID);
@@ -301,7 +300,7 @@ const HubListItem = memo(({ row }: { row: AutOSHub }) => {
             color="offWhite.main"
             fontWeight="normal"
           >
-            {initialScore}
+            {periodData?.score}
           </Typography>
           <SubtitleWithInfo
             title="score"

diff --git a/src/pages/Tasks/Contributions/Contributions.tsx b/src/pages/Tasks/Contributions/Contributions.tsx
@@ -54,7 +54,6 @@ const Contributions = () => {
   const contributionTemplate = useMemo(() => {
     const contribution = data?.[0];
     if (!contribution) return null;
-    debugger;
     if (contribution instanceof OpenTaskContribution) {
       return <OpenTask contribution={contribution} commit={commit} />;
     } else if (contribution instanceof QuizTaskContribution) {

diff --git a/src/utils/hooks/useQueryContributionCommits.tsx b/src/utils/hooks/useQueryContributionCommits.tsx
@@ -10,10 +10,23 @@ import { environment } from "@api/environment";
 import axios from "axios";
 import { useWalletConnector } from "@aut-labs/connector";
 
+export enum ContributionStatus {
+  Pending = 1,
+  Rejected = 2,
+  Complete = 3
+}
+
+export const ContributionStatusMap = {
+  [ContributionStatus.Pending]: "Pending",
+  [ContributionStatus.Rejected]: "Rejected",
+  [ContributionStatus.Complete]: "Complete"
+};
+
 export interface ContributionCommit {
   id: string;
   hub: Hub;
   data: any;
+  status: ContributionStatus;
   who: string;
   contribution: Partial<TaskContributionProperties>;
   dataDecrypted?: boolean;
@@ -35,6 +48,7 @@ const GET_CONTRIBUTION_COMMITS = gql`
       id
       hub
       data
+      status
       who
       contribution {
         id

diff --git a/src/utils/hooks/useQueryHubPeriod.tsx b/src/utils/hooks/useQueryHubPeriod.tsx
@@ -36,8 +36,8 @@ const fetchHubPeriodData = async (
       taskManager.functions.currentPeriodStart(),
       taskManager.functions.currentPeriodEnd(),
       taskManager.functions.getMemberPointsGiven(who, Number(periodId)),
-      participationScore.functions.memberParticipations(who, Number(periodId)), // {score: number; performance: number}
-      participationScore.functions.calcExpectedPoints(
+      participationScore.functions.memberActivities(who, Number(periodId)), // {participationScore: number; performance: number}
+      participationScore.functions.calcExpectedContributionPoints(
         +selectedHub.commitment,
         Number(periodId)
       )
@@ -50,7 +50,7 @@ const fetchHubPeriodData = async (
     startDate: new Date(Number(startDate) * 1000),
     endDate: new Date(Number(endDate) * 1000),
     pointsGiven: Number(pointsGiven),
-    score: Number(participation.score),
+    score: Number(participation.participationScore) || 100,
     performance: Number(participation.performance),
     expectedPoints: Number(expectedPoints)
   };