richie-education 3.3.2-dev6 → 3.4.1-dev13

package/js/pages/TeacherDashboardOrganizationQuotes/BatchOrderSeatInfoQuote.tsx

@@ -0,0 +1,112 @@
+import { useEffect, useState } from 'react';
+import { FormattedMessage, useIntl } from 'react-intl';
+import { Button, Input } from '@openfun/cunningham-react';
+import { Icon, IconTypeEnum } from 'components/Icon';
+import Banner, { BannerType } from 'components/Banner';
+import { useBatchOrderSeats } from 'hooks/useBatchOrder';
+import { BatchOrderQuote, BatchOrderSeat } from 'types/Joanie';
+import { batchOrderSeatInfoMessages } from 'widgets/Dashboard/components/DashboardItem/BatchOrder/batchOrderSeatInfoMessages';
+
+const ITEMS_PER_PAGE = 10;
+
+export const BatchOrderSeatInfoQuote = ({ batchOrder }: { batchOrder: BatchOrderQuote }) => {
+  const intl = useIntl();
+  const [query, setQuery] = useState('');
+  const [page, setPage] = useState(1);
+  const [allSeats, setAllSeats] = useState<BatchOrderSeat[]>([]);
+
+  const seatsOwnedCount = batchOrder.seats_owned ?? 0;
+
+  const {
+    items: seats,
+    meta,
+    states,
+  } = useBatchOrderSeats(
+    {
+      batch_order_id: batchOrder.id,
+      query: query || undefined,
+      page,
+      page_size: ITEMS_PER_PAGE,
+    },
+    { enabled: !!batchOrder.id },
+  );
+
+  useEffect(() => {
+    if (page === 1) {
+      setAllSeats(seats);
+    } else if (seats.length > 0) {
+      setAllSeats((prev) => [...prev, ...seats]);
+    }
+  }, [seats]);
+
+  useEffect(() => {
+    setPage(1);
+  }, [query]);
+
+  const totalCount = meta?.pagination?.count ?? 0;
+  const remainingCount = Math.min(ITEMS_PER_PAGE, totalCount - allSeats.length);
+
+  if (
+    !batchOrder.nb_seats ||
+    batchOrder.seats_owned === undefined ||
+    batchOrder.seats_to_own === undefined
+  ) {
+    return null;
+  }
+
+  return (
+    <div className="dashboard__quote__enrollment">
+      <div className="content">
+        <div className="enrollment-progress">
+          <span className="dashboard-item__label">
+            {intl.formatMessage(batchOrderSeatInfoMessages.enrolledParticipants, {
+              seats_owned: seatsOwnedCount,
+              nb_seats: batchOrder.nb_seats,
+            })}
+          </span>
+          <div className="enrollment-progress__bar">
+            <div
+              className="enrollment-progress__bar__fill"
+              style={{ width: `${(seatsOwnedCount / batchOrder.nb_seats) * 100}%` }}
+            />
+          </div>
+        </div>
+        {states.error && <Banner message={states.error} type={BannerType.ERROR} />}
+        <div className="enrollment-nested-section__content">
+          <Input
+            className="enrollment-search"
+            label={intl.formatMessage(batchOrderSeatInfoMessages.searchPlaceholder)}
+            value={query}
+            onChange={(e) => setQuery(e.target.value)}
+            rightIcon={<Icon name={IconTypeEnum.MAGNIFYING_GLASS} size="small" />}
+          />
+          {allSeats.length === 0 && query ? (
+            <FormattedMessage {...batchOrderSeatInfoMessages.noResults} />
+          ) : (
+            <>
+              <ul className="enrollment-list">
+                {allSeats.map((seat) => (
+                  <li key={seat.id}>{seat.owner_name ?? seat.voucher}</li>
+                ))}
+              </ul>
+              {remainingCount > 0 && (
+                <Button
+                  className="enrollment-load-more"
+                  color="brand"
+                  variant="secondary"
+                  size="small"
+                  onClick={() => setPage((p) => p + 1)}
+                  disabled={states.fetching}
+                >
+                  {intl.formatMessage(batchOrderSeatInfoMessages.loadMore, {
+                    count: remainingCount,
+                  })}
+                </Button>
+              )}
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

package/js/pages/TeacherDashboardOrganizationQuotes/_styles.scss

@@ -38,3 +38,20 @@
   display: flex;
   justify-content: center;
 }
+
+.dashboard__quote__enrollment {
+  margin-top: 1rem;
+  padding-top: 1rem;
+  border-top: 1px solid r-theme-val(dashboard-card, base-color);
+
+  &__title {
+    margin: 0 0 0.5rem;
+  }
+
+  .content {
+    font-size: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+}

package/js/pages/TeacherDashboardOrganizationQuotes/index.full-process.spec.tsx

@@ -37,7 +37,7 @@ describe('full process for the organization quotes dashboard', () => {
 
     const organization = OrganizationFactory({
       abilities: {
-        can_submit_for_signature_batch_order: true,
+        can_manage_batch_order_agreement: true,
         confirm_bank_transfer: true,
         confirm_quote: true,
         download_quote: true,
@@ -50,7 +50,7 @@ describe('full process for the organization quotes dashboard', () => {
       batch_order: {
         state: BatchOrderState.QUOTED,
         payment_method: PaymentMethod.CARD_PAYMENT,
-        available_actions: { next_action: 'confirm_quote' },
+        available_actions: { next_action: 'confirm_quote', download_quote: true },
       },
       organization_signed_on: undefined,
     }).one();
@@ -206,7 +206,7 @@ describe('full process for the organization quotes dashboard', () => {
     fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/`, []);
     const organization = OrganizationFactory({
       abilities: {
-        can_submit_for_signature_batch_order: true,
+        can_manage_batch_order_agreement: true,
         confirm_bank_transfer: true,
         confirm_quote: true,
         download_quote: true,
@@ -214,7 +214,6 @@ describe('full process for the organization quotes dashboard', () => {
       },
     }).one();
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/1/', organization);
-
     const quoteQuoted = OrganizationQuoteFactory({
       batch_order: {
         state: BatchOrderState.QUOTED,
@@ -272,6 +271,10 @@ describe('full process for the organization quotes dashboard', () => {
       `https://joanie.endpoint/api/v1.0/organizations/1/submit-for-signature-batch-order/`,
       200,
     );
+    fetchMock.get(
+      `https://joanie.endpoint/api/v1.0/batch-orders/${quoteCompleted.batch_order.id}/seats/?page=1&page_size=10`,
+      { results: [], count: 0, previous: null, next: null },
+    );
 
     render(<TeacherDashboardOrganizationQuotes />, {
       routerOptions: {

package/js/pages/TeacherDashboardOrganizationQuotes/index.spec.tsx

@@ -28,7 +28,9 @@ describe('pages/TeacherDashboardOrganizationQuotes', () => {
   });
 
   it('should render a list of quotes for an organization', async () => {
-    const quoteList = OrganizationQuoteFactory().many(1);
+    const quoteList = OrganizationQuoteFactory({
+      batch_order: { state: BatchOrderState.QUOTED },
+    }).many(1);
     fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/`, []);
 
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/1/', []);
@@ -85,7 +87,9 @@ describe('pages/TeacherDashboardOrganizationQuotes', () => {
   });
 
   it('should paginate', async () => {
-    const quoteList = OrganizationQuoteFactory().many(30);
+    const quoteList = OrganizationQuoteFactory({
+      batch_order: { state: BatchOrderState.QUOTED },
+    }).many(30);
     fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/`, []);
 
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/1/', []);
@@ -158,14 +162,14 @@ describe('pages/TeacherDashboardOrganizationQuotes', () => {
     const quoteQuoted = OrganizationQuoteFactory({
       batch_order: {
         state: BatchOrderState.QUOTED,
-        available_actions: { next_action: 'confirm_quote' },
+        available_actions: { next_action: 'confirm_quote', download_quote: true },
       },
     }).one();
     fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/`, []);
 
     const organization = OrganizationFactory({
       abilities: {
-        can_submit_for_signature_batch_order: false,
+        can_manage_batch_order_agreement: false,
         confirm_bank_transfer: false,
         confirm_quote: false,
         download_quote: true,

package/js/pages/TeacherDashboardOrganizationQuotes/index.tsx

@@ -14,6 +14,7 @@ import Badge from 'components/Badge';
 import { Icon, IconTypeEnum } from 'components/Icon';
 import { browserDownloadFromBlob } from 'utils/download';
 import { Spinner } from 'components/Spinner';
+import { BatchOrderSeatInfoQuote } from './BatchOrderSeatInfoQuote';
 
 const messages = defineMessages({
   loading: {
@@ -360,34 +361,40 @@ const TeacherDashboardOrganizationQuotes = () => {
     );
   };
 
+  const renderDownloadButton = (quote: OrganizationQuote) => {
+    const batchOrder = quote.batch_order;
+
+    return (
+      <Button
+        size="small"
+        color="brand"
+        variant="secondary"
+        className="mr-2"
+        onClick={() => handleDownloadQuote(quote.id)}
+        icon={<span className="material-icons">download</span>}
+        disabled={!abilities?.download_quote || !batchOrder.available_actions.download_quote}
+      >
+        {intl.formatMessage(messages.downloadQuote)}
+      </Button>
+    );
+  };
+
   const renderActionButton = (quote: OrganizationQuote) => {
     const batchOrder = quote.batch_order;
     const state = batchOrder?.state;
     const paymentMethod = batchOrder?.payment_method;
 
-    if (!batchOrder || !state || !paymentMethod || state === BatchOrderState.COMPLETED) return null;
-
-    const confirmQuoteButtons = (
-      <div>
-        <Button
-          size="small"
-          color="secondary"
-          className="mr-2"
-          onClick={() => handleDownloadQuote(quote.id)}
-          icon={<span className="material-icons">download</span>}
-          disabled={!abilities?.download_quote}
-        >
-          {intl.formatMessage(messages.downloadQuote)}
-        </Button>
-        <Button
-          size="small"
-          onClick={() => handleOpenConfirm(quote.id)}
-          icon={<span className="material-icons">check_circle</span>}
-          disabled={!abilities?.confirm_quote}
-        >
-          {intl.formatMessage(messages.confirmQuote)}
-        </Button>
-      </div>
+    if (!batchOrder || !state || !paymentMethod) return null;
+
+    const confirmQuoteButton = (
+      <Button
+        size="small"
+        onClick={() => handleOpenConfirm(quote.id)}
+        icon={<span className="material-icons">check_circle</span>}
+        disabled={!abilities?.confirm_quote}
+      >
+        {intl.formatMessage(messages.confirmQuote)}
+      </Button>
     );
 
     const confirmPurchaseOrderButton = (
@@ -415,7 +422,7 @@ const TeacherDashboardOrganizationQuotes = () => {
     const submitForSignatureButton = (
       <Button
         size="small"
-        disabled={batchOrder.contract_submitted || !abilities?.can_submit_for_signature_batch_order}
+        disabled={batchOrder.contract_submitted || !abilities?.can_manage_batch_order_agreement}
         onClick={() =>
           !batchOrder.contract_submitted && handleSubmitForSignature(quote.batch_order.id)
         }
@@ -429,7 +436,7 @@ const TeacherDashboardOrganizationQuotes = () => {
 
     switch (batchOrder.available_actions?.next_action) {
       case 'confirm_quote':
-        return confirmQuoteButtons;
+        return confirmQuoteButton;
       case 'confirm_purchase_order':
         return confirmPurchaseOrderButton;
       case 'confirm_bank_transfer':
@@ -484,7 +491,10 @@ const TeacherDashboardOrganizationQuotes = () => {
                   </Badge>
                 )}
               </div>
-              <div className="dashboard__quote__header__action">{renderActionButton(quote)}</div>
+              <div className="dashboard__quote__header__action">
+                {renderDownloadButton(quote)}
+                {renderActionButton(quote)}
+              </div>
             </div>
           }
           defaultExpanded={false}
@@ -533,6 +543,9 @@ const TeacherDashboardOrganizationQuotes = () => {
               </div>
             )}
           </div>
+          {quote.batch_order.state === BatchOrderState.COMPLETED && (
+            <BatchOrderSeatInfoQuote batchOrder={quote.batch_order} />
+          )}
         </DashboardCard>
       ))}
       <Pagination {...pagination} />