Merge branch 'ref-213-project-kanban-list-view' of https://github.com…

…/refinedev/refine into ref-213-project-kanban-list-view
refinedev · Aug 22, 2023 · 4b5c45e · 4b5c45e
2 parents 58b0f2c + 1979d25
commit 4b5c45e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/examples/app-crm/src/components/deal-kanban-card/index.tsx b/examples/app-crm/src/components/deal-kanban-card/index.tsx
@@ -13,6 +13,7 @@ import { MoreOutlined, EyeOutlined, DeleteOutlined } from "@ant-design/icons";
 import dayjs from "dayjs";
 import { Text } from "../text";
 import { getRandomColorFromString } from "../../utilities";
+import { User } from "../../interfaces/graphql";
 
 type Props = {
     id: string;
@@ -21,7 +22,7 @@ type Props = {
     date: string;
     user: {
         name: string;
-        avatar?: string;
+        avatarUrl?: User["avatarUrl"];
     };
     company: {
         name: string;
@@ -152,7 +153,7 @@ export const DealKanbanCard: FC<Props> = ({
                                     }}
                                     shape="circle"
                                     size="small"
-                                    src={user?.avatar}
+                                    src={user?.avatarUrl}
                                     alt={user?.name}
                                 >
                                     {user?.name[0]}

diff --git a/examples/app-crm/src/components/project-kanban-card/index.tsx b/examples/app-crm/src/components/project-kanban-card/index.tsx
@@ -28,6 +28,7 @@ import {
     getNameInitials,
     getRandomColorFromString,
 } from "../../utilities";
+import { User } from "../../interfaces/graphql";
 
 type ProjectCardProps = {
     id: string;
@@ -39,7 +40,7 @@ type ProjectCardProps = {
     users?: {
         id: string;
         name: string;
-        avatar?: string;
+        avatarUrl?: User["avatarUrl"];
     }[];
     checkList?: {
         title: string;
@@ -278,7 +279,7 @@ export const ProjectCard = ({
                                             key={user.id}
                                             alt={user.name}
                                             size="small"
-                                            src={user.avatar}
+                                            src={user.avatarUrl}
                                             style={{
                                                 backgroundColor:
                                                     getRandomColorFromString(

diff --git a/examples/app-crm/src/routes/scrumboard/kanban/list.tsx b/examples/app-crm/src/routes/scrumboard/kanban/list.tsx
@@ -1,6 +1,5 @@
 import {
     HttpError,
-    useCreate,
     useDelete,
     useList,
     useUpdate,
@@ -32,7 +31,7 @@ const taskFragment = [
         checklist: ["title", "checked"],
     },
     {
-        users: ["id", "name"],
+        users: ["id", "name", "avatarUrl"],
     },
     {
         comments: ["totalCount"],

diff --git a/examples/app-crm/src/routes/scrumboard/sales/list.tsx b/examples/app-crm/src/routes/scrumboard/sales/list.tsx
@@ -35,7 +35,7 @@ const dealsFragment = [
         company: ["id", "name"],
     },
     {
-        dealOwner: ["id", "name"],
+        dealOwner: ["id", "name", "avatarUrl"],
     },
 ];
 
@@ -46,7 +46,17 @@ export const SalesPage = () => {
         },
         meta: {
             operation: "dealStages",
-            fields: ["id", "title"],
+            fields: [
+                "id",
+                "title",
+                {
+                    dealsAggregate: [
+                        {
+                            sum: ["value"],
+                        },
+                    ],
+                },
+            ],
         },
     });
 
@@ -313,7 +323,10 @@ export const SalesPage = () => {
                                         key={deal.id}
                                         title={deal.title}
                                         company={{ name: deal.company.name }}
-                                        user={{ name: deal.dealOwner.name }}
+                                        user={{
+                                            name: deal.dealOwner.name,
+                                            avatarUrl: deal.dealOwner.avatarUrl,
+                                        }}
                                         date={deal.createdAt}
                                         price={currencyNumber(deal.value || 0)}
                                     />
@@ -368,7 +381,10 @@ export const SalesPage = () => {
                                     key={deal.id}
                                     title={deal.title}
                                     company={{ name: deal.company.name }}
-                                    user={{ name: deal.dealOwner.name }}
+                                    user={{
+                                        name: deal.dealOwner.name,
+                                        avatarUrl: deal.dealOwner.avatarUrl,
+                                    }}
                                     date={deal.createdAt}
                                     price={currencyNumber(deal.value || 0)}
                                     variant="won"
@@ -415,7 +431,10 @@ export const SalesPage = () => {
                                     key={deal.id}
                                     title={deal.title}
                                     company={{ name: deal.company.name }}
-                                    user={{ name: deal.dealOwner.name }}
+                                    user={{
+                                        name: deal.dealOwner.name,
+                                        avatarUrl: deal.dealOwner.avatarUrl,
+                                    }}
                                     date={deal.createdAt}
                                     price={currencyNumber(deal.value || 0)}
                                     variant="lost"