Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: ecosystem organization mapping changes #464

Merged
merged 2 commits into from
Nov 29, 2023
Merged

refactor: ecosystem organization mapping changes #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d06d59f
refactored create ecosystem, accept reject invitation
nishad-ayanworks Nov 29, 2023
55365ba
Merge branch 'develop' of https://github.com/credebl/studio into refa…
nishad-ayanworks Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/api/invitations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,12 @@ export const getEcosystemInvitations = async (pageNumber: number, pageSize: numb
}

// Accept/ Reject Invitations
export const acceptRejectEcosystemInvitations = async (invitationId: string, orgId: string, status: string, orgName: string, orgDid: string) => {
export const acceptRejectEcosystemInvitations = async (invitationId: string, orgId: string, status: string) => {

const url = `${apiRoutes.Ecosystem.root}/${orgId}${apiRoutes.Ecosystem.invitations}/${invitationId}`

const payload = {
status,
orgName,
orgDid
status
}
const token = await getFromLocalStorage(storageKeys.TOKEN)

Expand Down
2 changes: 0 additions & 2 deletions src/components/CreateEcosystemOrgModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ const CreateEcosystemOrgModal = (props: IProps) => {
logo: (logoImage?.imagePreviewUrl as string) || '',
tags: '',
userId: user_data?.id,
orgName: orgDetails?.orgName,
orgDid: orgDetails?.orgDid,
autoEndorsement: autoEndorse,
};
const resCreateEco = await createEcosystems(ecoData);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Ecosystem/Endorsement/EndorsementCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans
</p>
{isEcosystemLead &&
<p className="truncate text-sm font-medium text-gray-900 dark:text-white">
<span className="font-semibold">Organization:</span> {data?.ecosystemOrgs?.orgName}
<span className="font-semibold">Organization:</span> {data?.ecosystemOrgs?.organisation?.name}
</p>
}
</div>
Expand Down
18 changes: 12 additions & 6 deletions src/components/Ecosystem/MemberList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ interface IMemberList {
orgId: string;
ecosystem: { createDateTime: string };
ecosystemRole: { name: string };
orgName: string;
orgDid: string;
organisation: { name: string; orgSlug: string; org_agents: {orgDid: string}[] };
// orgName: string;
// orgDid: string;
role: string;
createDateTime: any;
status: string;
Expand Down Expand Up @@ -70,10 +71,15 @@ const MemberList = () => {
const sortedMemberList = memberList && memberList.length > 0 && memberList?.sort(compareMembers);
const membersData = sortedMemberList && sortedMemberList.length > 0 && sortedMemberList?.map(
(member: IMemberList) => {
let orgDid ='Not available'
if(member.organisation.org_agents.length > 0){
const orgAgent = member.organisation.org_agents[0];
orgDid = orgAgent.orgDid
}
return {
data: [
{
data: member?.orgName || 'Not available',
data: member?.organisation.name || 'Not available',
},
{
data:
Expand All @@ -84,9 +90,9 @@ const MemberList = () => {
) || 'Not available',
},
{
data: member?.orgDid ? (
data: orgDid? (
<div className='flex items-center'>
<CopyDid className="text-sm mr-2 py-1 font-courier pt-[0.55rem]" value={member?.orgDid} />
<CopyDid className="text-sm mr-2 py-1 font-courier pt-[0.55rem]" value={orgDid} />
</div>
) : (
<span className="text-sm mr-2 px-2.5 py-1 rounded-md">
Expand Down Expand Up @@ -216,4 +222,4 @@ const MemberList = () => {
);
};

export default MemberList;
export default MemberList;
11 changes: 3 additions & 8 deletions src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,10 @@ const ReceivedInvitations = () => {
status: string,
) => {
try {
const orgDid = invite?.orgData?.orgDid || ""
const orgName = invite?.orgData?.orgName || ""
if (orgDid) {
const response = await acceptRejectEcosystemInvitations(
invite.id,
selectedId,
status,
orgName,
orgDid
status
);
setLoading(false)
const { data } = response as AxiosResponse;
Expand All @@ -167,7 +162,7 @@ const ReceivedInvitations = () => {
} else {
setError(response as string);
}
}

setLoading(false)
} catch (err) {
console.log("ERROR - Accept/Reject Ecosystem::", err)
Expand All @@ -179,7 +174,7 @@ const ReceivedInvitations = () => {
const response = await getOrganizationById(orgId);
const { data } = response as AxiosResponse;
const orgData = data?.data
if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
if (orgData.org_agents[0]?.orgDid) {
setGetOrgError(null)
return {
Expand Down