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

Introduce configurable maximum subscription limit #520

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Introduce configurable maximum subscription limit #520

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
3 changes: 2 additions & 1 deletion portals/publisher/src/main/webapp/site/public/conf/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
"sa-east-1": "sa-east-1: South America (São Paulo)"
}
}
}
},
"maxSubscriptionLimit": 2000
}
}

122 changes: 10 additions & 112 deletions ...c/main/webapp/source/src/app/components/Apis/Details/Subscriptions/SubscriptionsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,23 @@

import React, { Component } from 'react';
import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
import IconButton from '@material-ui/core/IconButton';
import Button from '@material-ui/core/Button';
import Box from '@material-ui/core/Box';
import FirstPageIcon from '@material-ui/icons/FirstPage';
import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft';
import KeyboardArrowRight from '@material-ui/icons/KeyboardArrowRight';
import LastPageIcon from '@material-ui/icons/LastPage';
import Paper from '@material-ui/core/Paper';
import CircularProgress from '@material-ui/core/CircularProgress';
import Grid from '@material-ui/core/Grid';
import Table from '@material-ui/core/Table';
import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableRow from '@material-ui/core/TableRow';
import TablePagination from '@material-ui/core/TablePagination';
import Tooltip from '@material-ui/core/Tooltip';
import withStyles from '@material-ui/core/styles/withStyles';
import Typography from '@material-ui/core/Typography';
import PropTypes from 'prop-types';
import MUIDataTable from 'mui-datatables';
import InfoIcon from '@material-ui/icons/Info';
import UserIcon from '@material-ui/icons/Person';
import Configurations from 'Config';


import Alert from 'AppComponents/Shared/Alert';
Expand Down Expand Up @@ -155,92 +150,6 @@ const subscriptionStatus = {
PROD_BLOCKED: 'PROD_ONLY_BLOCKED',
};

/**
* Table pagination for subscriptions table
*
* @param props props used for SubscriptionTablePagination
* @returns {*}
*/
function SubscriptionTablePagination(props) {
const {
count, page, rowsPerPage, onChangePage,
} = props;

/**
* handleFirstPageButtonClick loads data of the first page
* */
function handleFirstPageButtonClick() {
if (onChangePage) {
onChangePage(0);
}
}

/**
* handleBackButtonClick load data of the prev page
* */
function handleBackButtonClick() {
if (onChangePage) {
onChangePage(page - 1);
}
}

/**
* handleNextButtonClick load data of the next page
* */
function handleNextButtonClick() {
if (onChangePage) {
onChangePage(page + 1);
}
}

/**
* handleLastPageButtonClick load data of the last page
* */
function handleLastPageButtonClick() {
if (onChangePage) {
onChangePage(Math.max(0, Math.ceil(count / rowsPerPage) - 1));
}
}

return (
<div
style={{ display: 'flex' }}
>
<IconButton
onClick={handleFirstPageButtonClick}
disabled={page === 0}
>
<FirstPageIcon />
</IconButton>
<IconButton
onClick={handleBackButtonClick}
disabled={page === 0}
>
<KeyboardArrowLeft />
</IconButton>
<IconButton
onClick={handleNextButtonClick}
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
>
<KeyboardArrowRight />
</IconButton>
<IconButton
onClick={handleLastPageButtonClick}
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
>
<LastPageIcon />
</IconButton>
</div>
);
}

SubscriptionTablePagination.propTypes = {
count: PropTypes.number.isRequired,
page: PropTypes.number.isRequired,
rowsPerPage: PropTypes.number.isRequired,
onChangePage: PropTypes.func.isRequired,
};

/**
* Lists all subscriptions.
*
Expand All @@ -253,11 +162,9 @@ class SubscriptionsTable extends Component {
this.api = props.api;
this.state = {
subscriptions: null,
totalSubscription: 0,
page: 0,
rowsPerPage: 5,
searchQuery: null,
rowsPerPageOptions: [5, 10, 25, 50, 100],
emptyColumnHeight: 60,
policies: [],
subscriberClaims: null,
Expand Down Expand Up @@ -578,7 +485,13 @@ class SubscriptionsTable extends Component {
const api = new API();
const { page, rowsPerPage, searchQuery } = this.state;
const { intl } = this.props;
const promisedSubscriptions = api.subscriptions(this.api.id, page * rowsPerPage, rowsPerPage, searchQuery);
const { maxSubscriptionLimit } = Configurations.apis;
const promisedSubscriptions = api.subscriptions(
this.api.id,
page * rowsPerPage,
maxSubscriptionLimit,
searchQuery
);
promisedSubscriptions
.then((response) => {
for (let i = 0; i < response.body.list.length; i++) {
Expand All @@ -605,7 +518,6 @@ class SubscriptionsTable extends Component {
}
this.setState({
subscriptions: response.body.list,
totalSubscription: response.body.pagination.total,
});
})
.catch((errorMessage) => {
Expand Down Expand Up @@ -704,8 +616,7 @@ class SubscriptionsTable extends Component {
*/
render() {
const {
subscriptions, page, rowsPerPage, totalSubscription, rowsPerPageOptions, emptyColumnHeight,
subscriberClaims,
subscriptions, rowsPerPage, emptyColumnHeight, subscriberClaims,
} = this.state;
const { classes, api } = this.props;
if (!subscriptions) {
Expand Down Expand Up @@ -908,20 +819,7 @@ class SubscriptionsTable extends Component {
search: false,
selectableRows: 'none',
rowsPerPageOptions: [5, 10, 25, 50, 100],
customFooter: (count, muiPage, muiRowsPerPage, changeRowsPerPage) => {
return (
<TablePagination
rowsPerPageOptions={rowsPerPageOptions}
colSpan={6}
count={totalSubscription}
rowsPerPage={rowsPerPage}
page={page}
onChangePage={this.handleChangePage}
onChangeRowsPerPage={(e) => this.handleChangeRowsPerPage(e, changeRowsPerPage)}
ActionsComponent={SubscriptionTablePagination}
/>
);
},
rowsPerPage,
};
const subMails = {};
const emails = subscriberClaims && Object.entries(subscriberClaims).map(([, v]) => {
Expand Down
Loading