diff --git a/src/commonComponents/datatable/index.tsx b/src/commonComponents/datatable/index.tsx index cb89d899e..e03116289 100644 --- a/src/commonComponents/datatable/index.tsx +++ b/src/commonComponents/datatable/index.tsx @@ -45,10 +45,10 @@ const DataTable: React.FC = ({ header,displaySelect, data, loadi {data.length ? data.map((ele, index) => ( - + - {ele.data.map(subEle => ( - + {ele.data.map((subEle,index) => ( +
{subEle.data}
{subEle.subData && subEle.subData} diff --git a/src/components/Ecosystem/Endorsement/EndorsementCard.tsx b/src/components/Ecosystem/Endorsement/EndorsementCard.tsx index 0773b3a9f..276e1d06b 100644 --- a/src/components/Ecosystem/Endorsement/EndorsementCard.tsx +++ b/src/components/Ecosystem/Endorsement/EndorsementCard.tsx @@ -153,8 +153,7 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans ) })} - {!allAttributes && attributesData.length > 3 && ...} - + {!allAttributes && attributesData.length === 3 && ...} diff --git a/src/components/Ecosystem/MemberList.tsx b/src/components/Ecosystem/MemberList.tsx index b5fd7fe26..43125b5be 100644 --- a/src/components/Ecosystem/MemberList.tsx +++ b/src/components/Ecosystem/MemberList.tsx @@ -23,7 +23,7 @@ const MemberList = () => { const [currentPage, setCurrentPage] = useState(initialPageState); const getEcosystemMembers = async () => { - const userOrgId= await getFromLocalStorage(storageKeys.ORG_ID) + const userOrgId = await getFromLocalStorage(storageKeys.ORG_ID); setLoading(true); const response = await getEcosystemMemberList( currentPage.pageNumber, @@ -31,7 +31,7 @@ const MemberList = () => { '', ); const { data } = response as AxiosResponse; - + if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) { const totalPages = data?.data?.totalPages; @@ -51,13 +51,14 @@ const MemberList = () => { return 0; } }; - const sortedMemberList = data?.data?.members?.sort(compareMembers); + const sortedMemberList = data?.data?.members?.sort(compareMembers); const membersData = sortedMemberList?.map( (member: { orgId: string; - ecosystem: {createDateTime: string}; + ecosystem: { createDateTime: string }; ecosystemRole: { name: string }; orgName: string; + orgDid: string; role: string; createDateTime: any; status: string; @@ -75,16 +76,30 @@ const MemberList = () => { ) || 'Not available', }, + { + data: member.orgDid ? ( + + {member?.orgDid} + + ) : ( + + Not available + + ), + }, { data: member.ecosystemRole.name ? ( - - {member?.orgId === userOrgId ? member?.ecosystemRole?.name + (' (You)') : member?.ecosystemRole?.name} + + + {member?.ecosystemRole?.name} + + {member?.orgId === userOrgId ? '(You)' : ''} ) : ( 'Not available' @@ -99,25 +114,13 @@ const MemberList = () => { : 'bg-green-100 text-green-700 dark:bg-gray-700 dark:text-green-400 rounded border border-green-100 dark:border-green-500' } text-sm font-medium mr-2 px-2.5 py-1 rounded-md`} > - {member.status} + {member.status.charAt(0) + + member.status.slice(1).toLowerCase()} ) : ( 'Not available' ), }, - { - data: ( - - ), - }, ], }; }, @@ -149,9 +152,9 @@ const MemberList = () => { const header = [ { columnName: 'Organization' }, { columnName: 'Member Since' }, - { columnName: 'Role' }, + { columnName: 'Organization Did', width: 'w-1.5 pl-6' }, + { columnName: 'Role', width: 'pl-7' }, { columnName: 'Status' }, - { columnName: 'Action' }, ]; return ( diff --git a/src/components/Resources/Schema/SchemasList.tsx b/src/components/Resources/Schema/SchemasList.tsx index f91ef19fc..f2ac944e2 100644 --- a/src/components/Resources/Schema/SchemasList.tsx +++ b/src/components/Resources/Schema/SchemasList.tsx @@ -151,20 +151,20 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD checkEcosystemData(); }, []) - const createSchemaTitle = isEcosystemData?.isEcosystemMember ? { - title: "Schema Endorsement", svg: - - - } : { - title: "Create", svg:
- - - -
- } + const schemaEndorsement = + + + +const create =
+ + + +
+ + const createSchemaTitle = isEcosystemData?.isEcosystemMember ? { title: "Schema Endorsement", svg: schemaEndorsement } : { title: "Create", svg: create } const emptyListTitle = "No Schemas" const emptyListDesc = "Get started by creating a new Schema" - const emptyListBtn = isEcosystemData?.isEcosystemMember ? "Request Endorsement" : "Create Schema" + const emptyListBtn = isEcosystemData?.isEcosystemMember ? { title: "Schema Endorsement", svg: schemaEndorsement } : { title: "Create Schema", svg: create } return (
@@ -275,10 +275,8 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD - - } + buttonContent={emptyListBtn.title} + svgComponent={emptyListBtn.svg} onClick={() => { window.location.href = `${pathRoutes.organizations.createSchema}?OrgId=${orgId}` }}