Added loading variable (#590)

* Events Navbar persistent * Relevant messages displayed for empty tables * Prettier * Loading --------- Co-authored-by: Subramani E <[email protected]>
IEDCMEC · Dec 14, 2024 · e60ae91 · e60ae91
1 parent 635439d
commit e60ae91
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/attributes/[attributeId]/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/attributes/[attributeId]/index.jsx
@@ -98,7 +98,7 @@ export default function AttributeById() {
           router.push(`/${orgId}/events/${eventId}/participants/${row.id}`);
         }}
       />
-      {attributeDetails.length === 0 ? (
+      {(!loading && attributeDetails.length === 0 )? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No participants assigned

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/attributes/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/attributes/index.jsx
@@ -167,7 +167,7 @@ export default function Attributes() {
           router.push(`/${orgId}/events/${eventId}/attributes/${row.id}`);
         }}
       />
-      {attributes.length === 0 ? (
+      {(!loading && attributes.length === 0) ? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No attributes created

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/extras/[extraId]/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/extras/[extraId]/index.jsx
@@ -112,7 +112,7 @@ export default function ExtraById() {
           router.push(`/${orgId}/events/${eventId}/participants/${row.id}`);
         }}
       />
-      {extraDetails.length === 0 ? (
+      {(!loading && extraDetails.length === 0 )? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No participants assigned

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/extras/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/extras/index.jsx
@@ -177,7 +177,7 @@ export default function Extras() {
           router.push(`/${orgId}/events/${eventId}/extras/${row.id}`);
         }}
       />
-      {extras.length === 0 ? (
+      {(!loading && extras.length === 0) ? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No extras created

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/[participantId]/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/[participantId]/index.jsx
@@ -95,7 +95,7 @@ export default function ParticipantById() {
         <Text>Extras - {participant.numberOfExtrasCheckedIn} checked in</Text>
         <DataDisplay loading={loading} columns={extraColumns} rows={participantExtras} />
       </Flex>
-      {participant.length === 0 ? (
+      {(!loading && participant.length === 0) ? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No participants created

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/index.jsx
@@ -103,6 +103,7 @@ export default function ParticipantsCheckIn() {
       debugInfo={participantsCheckIn}
     >
       <NavigationMenu orgId={orgId} eventId={eventId} />
+
       <DataDisplay
         loading={loading}
         rows={participantsCheckIn}
@@ -111,7 +112,8 @@ export default function ParticipantsCheckIn() {
           router.push(`/${orgId}/events/${eventId}/participants/${row.id}`);
         }}
       />
-      {participantsCheckIn.length === 0 ? (
+      { 
+        (!loading && participantsCheckIn.length === 0 )? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No participants checked-in

diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/index.jsx
@@ -175,7 +175,7 @@ export default function Participants() {
     >
       <NavigationMenu orgId={orgId} eventId={eventId} />
       <DataDisplay loading={loading} rows={participants} columns={columns} />
-      {participants.length === 0 ? (
+      {(!loading && participants.length === 0 )? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No participants

diff --git a/apps/web-admin/src/pages/[orgId]/events/index.jsx b/apps/web-admin/src/pages/[orgId]/events/index.jsx
@@ -208,7 +208,7 @@ export default function Events() {
           router.push(`/${orgId}/events/${row.id}/participants`);
         }}
       />
-      {events.length === 0 ? (
+      { (!loading && events.length === 0) ? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No events for this organization

diff --git a/apps/web-admin/src/pages/[orgId]/members/index.jsx b/apps/web-admin/src/pages/[orgId]/members/index.jsx
@@ -144,7 +144,7 @@ export default function OrganizationMembers() {
       debugInfo={members}
     >
       <DataDisplay loading={loading} columns={columns} rows={members} />
-      {members.length === 0 ? (
+      {(!loading && members.length === 0 ) ? (
         <div style={{ textAlign: 'center', margin: '20px' }}>
           <Text fontSize="25px" color={'blackAlpha.800'} mb={3}>
             No members for the event