Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/Admin/SubscriptionDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext, useState } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import {
Row, Col, Toast, Button,
Button, Col, Row, Toast,
} from '@openedx/paragon';

import { Link } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Admin/licenses/LicenseAllocationDetails.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import LicenseAllocationHeader from './LicenseAllocationHeader';
import LicenseManagementTable from './LicenseManagementTable';
import LicenseAllocationHeader from './LicenseAllocationHeader';

const LicenseAllocationDetails = ({ subscriptionUUID }) => (
<div className="row mb-3" key={subscriptionUUID}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { DataTable, CheckboxFilter } from '@openedx/paragon';
import { CheckboxFilter, DataTable } from '@openedx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
import TableTextFilter from './TableTextFilter';
import CustomDataTableEmptyState from './CustomDataTableEmptyState';
Expand All @@ -10,9 +10,7 @@ import AssignmentAmountTableCell from './AssignmentAmountTableCell';
import AssignmentRowActionTableCell from './AssignmentRowActionTableCell';
import AssignmentTableRemindAction from './AssignmentTableRemind';
import AssignmentTableCancelAction from './AssignmentTableCancel';
import {
DEFAULT_PAGE, PAGE_SIZE,
} from './data';
import { DEFAULT_PAGE, PAGE_SIZE } from './data';
import AssignmentRecentActionTableCell from './AssignmentRecentActionTableCell';
import AssignmentsTableRefreshAction from './AssignmentsTableRefreshAction';
import AssignmentEnrollByDateCell from './AssignmentEnrollByDateCell';
Expand Down Expand Up @@ -91,7 +89,6 @@ const BudgetAssignmentsTable = ({
defaultColumnValues={{ Filter: TableTextFilter }}
manualSelectColumn={selectColumn}
FilterStatusComponent={FilterStatus}
SelectionStatusComponent={DataTable.ControlledSelectionStatus}
columns={[
{
Header: intl.formatMessage({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ import TableTextFilter from './TableTextFilter';
import CustomDataTableEmptyState from './CustomDataTableEmptyState';
import SpendTableEnrollmentDetails from './SpendTableEnrollmentDetails';

import {
PAGE_SIZE,
DEFAULT_PAGE,
formatDate,
} from './data';
import { DEFAULT_PAGE, formatDate, PAGE_SIZE } from './data';
import SpendTableAmountContents from './SpendTableAmountContents';

const FilterStatus = (rest) => <DataTable.FilterStatus showFilteredFields={false} {...rest} />;
Expand Down
1 change: 1 addition & 0 deletions src/components/subscriptions/SubscriptionDetailPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const SubscriptionDetailPage = ({ enterpriseSlug }) => {
<SubscriptionDetailsSkeleton data-testid="skelly" />
);
}

return (
<SubscriptionDetailContextProvider subscription={subscription}>
<SubscriptionExpirationModals />
Expand Down
2 changes: 1 addition & 1 deletion src/components/subscriptions/SubscriptionDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import dayjs from 'dayjs';
import {
Button, Row, Col, Toast, Icon,
Button, Col, Icon, Row, Toast,
} from '@openedx/paragon';
import { ArrowBackIos } from '@openedx/paragon/icons';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Email } from '@openedx/paragon/icons';
import { sendEnterpriseTrackEvent } from '@edx/frontend-enterprise-utils';

import {
useLicenseManagementModalState,
licenseManagementModalZeroState as modalZeroState,
useLicenseManagementModalState,
} from '../../LicenseManagementModals/LicenseManagementModalHook';
import LicenseManagementRemindModal from '../../LicenseManagementModals/LicenseManagementRemindModal';
import { canRemindLicense } from '../../../data/utils';
Expand Down Expand Up @@ -66,7 +66,6 @@ const RemindBulkAction = ({
tableItemCount,
activeFilters,
});

const handleRemindClick = () => {
setRemindModal({
isOpen: true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
import React, {
useCallback, useMemo, useContext, useState,
useCallback, useContext, useMemo, useState,
} from 'react';
import dayjs from 'dayjs';
import debounce from 'lodash.debounce';
import {
DataTable,
TextFilter,
CheckboxFilter,
useWindowSize,
breakpoints,
Toast,
breakpoints, CheckboxFilter, DataTable, TextFilter, Toast, useWindowSize,
} from '@openedx/paragon';
import { sendEnterpriseTrackEvent } from '@edx/frontend-enterprise-utils';

import { useIntl } from '@edx/frontend-platform/i18n';
import { SubscriptionContext } from '../../SubscriptionData';
import { SubscriptionDetailContext, defaultStatusFilter } from '../../SubscriptionDetailContextProvider';
import { defaultStatusFilter, SubscriptionDetailContext } from '../../SubscriptionDetailContextProvider';
import {
PAGE_SIZE, DEFAULT_PAGE, ACTIVATED, REVOKED, ASSIGNED,
ACTIVATED, ASSIGNED, DEFAULT_PAGE, PAGE_SIZE, REVOKED,
} from '../../data/constants';
import { DEBOUNCE_TIME_MILLIS } from '../../../../algoliaUtils';
import { formatTimestamp } from '../../../../utils';
Expand Down Expand Up @@ -230,7 +225,6 @@ const LicenseManagementTable = () => {
manualFilters
isSelectable={!isExpired}
manualSelectColumn={selectColumn}
SelectionStatusComponent={DataTable.ControlledSelectionStatus}
defaultColumnValues={{ Filter: TextFilter }}
isPaginated
manualPagination
Expand Down