10000 fix: issues on org dashboard and wallet creation by pranalidhanavade · Pull Request #975 · credebl/studio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: issues on org dashboard and wallet creation #975

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

Merged
merged 1 commit into from
May 19, 2025
Merged

fix: issues on org dashboard and wallet creation #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions nextjs/src/features/organization/components/CreateOrganizationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ export default function OrganizationOnboarding(): React.JSX.Element {
}

useEffect(() => {
getCountries()
if (orgId) {
setIsEditMode(true)
fetchOrganizationDetails()
getCountries()
}
}, [])

Expand Down Expand Up @@ -179,9 +179,9 @@ export default function OrganizationOnboarding(): React.JSX.Element {
.max(500)
.required('Description is required'),
website: yup.string().url('Enter a valid URL').nullable(),
countryId: yup.number().nullable(),
stateId: yup.number().nullable(),
cityId: yup.number().nullable(),
countryId: yup.number().required('Country is required'),
stateId: yup.number().required('State is required'),
cityId: yup.number().required('City is required'),
})

type ImageProcessCallback = (result: string | null, error?: string) => void
Expand Down
35 changes: 29 additions & 6 deletions nextjs/src/features/organization/components/OrganizationDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import { Card, CardContent } from '@/components/ui/card'
import { Edit, Trash2 } from 'lucide-react'
import { IOrgDashboard, IOrganisation } from './interfaces/organization'
import React, { useEffect, useState } from 'react'
import { getOrgDashboard, getOrganizationById } from '@/app/api/organization'

import { AxiosResponse } from 'axios'
import { Button } from '@/components/ui/button'
import { IOrganisation } from './interfaces/organization'
import OrganizationDetails from './OrganizationDetails'
import PageContainer from '@/components/layout/page-container'
import { apiStatusCodes } from '@/config/CommonConstant'
import { getOrganizationById } from '@/app/api/organization'
import { useAppSelector } from '@/lib/hooks'
import { useRouter } from 'next/navigation'

Expand All @@ -25,6 +25,7 @@ export const OrganizationDashboard = ({
}: OrganizationDashboardProps): React.JSX.Element => {
const router = useRouter()
const [orgData, setOrgData] = useState<IOrganisation | null>(null)
const [orgDashboard, setOrgDashboard] = useState<IOrgDashboard | null>(null)
const [, setLoading] = useState(true)
const [walletStatus, setWalletStatus] = useState<boolean>(false)
const [, setError] = useState<string | null>(null)
Expand All @@ -43,6 +44,7 @@ export const OrganizationDashboard = ({
setLoading(true)
const response = await getOrganizationById(orgIdOfDashboard as string)
const { data } = response as AxiosResponse

setLoading(false)
if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
if (
Expand All @@ -58,6 +60,22 @@ export const OrganizationDashboard = ({
setLoading(false)
}

const fetchOrganizationDashboardDetails = async (): Promise<void> => {
setLoading(true)
if (orgId) {
const response = await getOrgDashboard(orgIdOfDashboard as string)
const { data } = response as AxiosResponse
setLoading(false)

if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
setOrgDashboard(data?.data)
} else {
setError(response as string)
}
}
setLoading(false)
}

const handleEditOrg = (): void => {
router.push(`/organizations/create-organization?orgId=${orgId}`)
}
Expand All @@ -68,6 +86,7 @@ export const OrganizationDashboard = ({

useEffect(() => {
fetchOrganizationDetails()
fetchOrganizationDashboardDetails()
}, [activeOrgId])

return (
Expand Down Expand Up @@ -118,7 +137,9 @@ export const OrganizationDashboard = ({
<CardContent className="flex items-center justify-between p-6">
<div>
<p className="font-medium">Users</p>
<h3 className="mt-2 text-4xl font-bold">1</h3>
<h3 className="mt-2 text-4xl font-bold">
{orgDashboard?.usersCount ?? 0}
</h3>
</div>
<div className="opacity-30">
<svg
Expand All @@ -145,7 +166,7 @@ export const OrganizationDashboard = ({
>
<CardContent className="flex items-center justify-between p-6">
<div>
<p className="font-medium">Schemas</p>
<p className="font-medium">{orgDashboard?.schemasCount ?? 0}</p>
<h3 className="mt-2 text-4xl font-bold">7</h3>
</div>
<div className="opacity-30">
Expand All @@ -171,7 +192,9 @@ export const OrganizationDashboard = ({
<Card className="shadow-md">
<CardContent className="flex items-center justify-between p-6">
<div>
<p className="font-medium">Credentials</p>
<p className="font-medium">
{orgDashboard?.credentialsCount ?? 0}
</p>
<h3 className="mt-2 text-4xl font-bold">35</h3>
</div>
<div className="opacity-20">
Expand Down Expand Up @@ -202,7 +225,7 @@ export const OrganizationDashboard = ({
<Button
=>
router.push(
`/organizations/agent-config?organizationId=${orgIdOfDashboard}`,
`/organizations/agent-config?orgId=${orgIdOfDashboard}`,
)
}
>
Expand Down
7 changes: 7 additions & 0 deletions nextjs/src/features/organization/components/interfaces/organization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export interface IOrganisation {
checked?: boolean | undefined
error?: string
}

export interface IOrgDashboard {
usersCount: number
schemasCount: number
credentialsCount: number
presentationsCount: number
}
export interface OrgRole {
id: string
name: string
Expand Down
0