-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(admin-ui): fix maximum actives users page #2
- Loading branch information
Showing
9 changed files
with
310 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
244 changes: 244 additions & 0 deletions
244
admin-ui/plugins/admin/components/ActiveUsers/ActiveUsers.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,244 @@ | ||
| import React, { useState, useEffect } from 'react' | ||
| import { addMonths, subMonths } from 'date-fns' | ||
| import moment from 'moment' | ||
| import CustomPieGraph from './CustomPieGraph' | ||
| import DatePicker from 'react-datepicker' | ||
| import 'react-datepicker/dist/react-datepicker.css' | ||
| import GluuLoader from '../../../../app/routes/Apps/Gluu/GluuLoader' | ||
| import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper' | ||
| import { getMau } from './../../redux/actions/MauActions' | ||
| import applicationstyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle' | ||
| import GluuLabel from '../../../../app/routes/Apps/Gluu/GluuLabel' | ||
| import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon' | ||
| import { | ||
| Button, | ||
| Card, | ||
| CardFooter, | ||
| CardBody, | ||
| FormGroup, | ||
| Col, | ||
| Row, | ||
| } from '../../../../app/components' | ||
| import { | ||
| hasBoth, | ||
| buildPayload, | ||
| STAT_READ, | ||
| STAT_JANS_READ, | ||
| } from '../../../../app/utils/PermChecker' | ||
| import { | ||
| LineChart, | ||
| XAxis, | ||
| YAxis, | ||
| Line, | ||
| CartesianGrid, | ||
| Tooltip, | ||
| Legend, | ||
| ResponsiveContainer, | ||
| } from 'recharts' | ||
| import { useTranslation } from 'react-i18next' | ||
| import { connect } from 'react-redux' | ||
|
|
||
| function ActiveUsers({ statData, permissions, loading, dispatch }) { | ||
| //console.log('=====================>' + JSON.stringify(statData)) | ||
| statData.push({ month: 202201, mau: 5, cc_at: 68, ac_at: 785, ac_id: 567 }) | ||
| const { t } = useTranslation() | ||
| const [startDate, setStartDate] = useState(subMonths(new Date(), 2)) | ||
| const [endDate, setEndDate] = useState(addMonths(new Date(), 2)) | ||
| const userAction = {} | ||
| const options = {} | ||
| useEffect(() => { | ||
| search() | ||
| }, []) | ||
|
|
||
| function search() { | ||
| options['month'] = getFormattedMonth() | ||
| buildPayload(userAction, 'GET MAU', options) | ||
| dispatch(getMau(userAction)) | ||
| } | ||
|
|
||
| function doDataAugmentation(input) { | ||
| let stat = input | ||
| if (stat && stat.length >= 1) { | ||
| let flattendStat = stat.map((entry) => entry['month']) | ||
| let aRange = generateDateRange(moment(startDate), moment(endDate)) | ||
| for (const ele of aRange) { | ||
| const currentMonth = getYearMonth(new Date(ele)) | ||
| if (flattendStat.indexOf(parseInt(currentMonth, 10)) === -1) { | ||
| let newEntry = new Object() | ||
| newEntry['month'] = parseInt(getYearMonth(new Date(ele)), 10) | ||
| newEntry['mau'] = 0 | ||
| newEntry['cc_at'] = 0 | ||
| newEntry['ac_at'] = 0 | ||
| newEntry['ac_id'] = 0 | ||
| stat.push(newEntry) | ||
| } | ||
| } | ||
| return Array.from(new Set(stat)).sort( | ||
| (a, b) => parseInt(a.month, 10) - parseInt(b.month, 10), | ||
| ) | ||
| } | ||
| return stat | ||
| } | ||
| function getYearMonth(date) { | ||
| return date.getFullYear() + getMonth(date) | ||
| } | ||
| function getFormattedMonth() { | ||
| return getYearMonth(startDate) + '%' + getYearMonth(endDate) | ||
| } | ||
| function getMonth(aDate) { | ||
| let value = String(aDate.getMonth() + 1) | ||
| if (value.length > 1) { | ||
| return value | ||
| } else { | ||
| return '0' + value | ||
| } | ||
| } | ||
|
|
||
| function generateDateRange(start, end) { | ||
| var result = [] | ||
| while (start.isBefore(end)) { | ||
| result.push(start.format('YYYY-MM-01')) | ||
| start.add(1, 'month') | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| const CustomButton = React.forwardRef(({ value, onClick }, ref) => ( | ||
| <Button | ||
| color="primary" | ||
| outline | ||
| style={applicationstyle.customButtonStyle} | ||
| className="example-custom-input" | ||
| onClick={onClick} | ||
| ref={ref} | ||
| > | ||
| {value} | ||
| </Button> | ||
| )) | ||
|
|
||
| return ( | ||
| <GluuLoader blocking={loading}> | ||
| <GluuViewWrapper | ||
| canShow={hasBoth(permissions, STAT_READ, STAT_JANS_READ)} | ||
| > | ||
| <Card> | ||
| <GluuRibbon title={t('titles.active_users')} fromLeft /> | ||
| <FormGroup row /> | ||
| <FormGroup row /> | ||
| <FormGroup row /> | ||
| <CardBody> | ||
| <Row> | ||
| <Col sm={2}></Col> | ||
| <Col sm={10}> | ||
| <GluuLabel label="Select a date range" size="4" /> | ||
| <DatePicker | ||
| selected={startDate} | ||
| onChange={(date) => setStartDate(date)} | ||
| selectsStart | ||
| isClearable | ||
| startDate={startDate} | ||
| dateFormat="MM/yyyy" | ||
| showMonthYearPicker | ||
| endDate={endDate} | ||
| customInput={<CustomButton />} | ||
| /> | ||
| | ||
| <DatePicker | ||
| selected={endDate} | ||
| onChange={(date) => setEndDate(date)} | ||
| selectsEnd | ||
| isClearable | ||
| startDate={startDate} | ||
| endDate={endDate} | ||
| dateFormat="MM/yyyy" | ||
| showMonthYearPicker | ||
| minDate={startDate} | ||
| maxDate={new Date()} | ||
| customInput={<CustomButton />} | ||
| /> | ||
| | ||
| <Button | ||
| style={applicationstyle.customButtonStyle} | ||
| color="primary" | ||
| onClick={search} | ||
| > | ||
| <i className="fa fa-search mr-2"></i> | ||
| {t('actions.view')} | ||
| </Button> | ||
| </Col> | ||
| </Row> | ||
| <FormGroup row /> | ||
| <FormGroup row /> | ||
| <FormGroup row> | ||
| <ResponsiveContainer className="mau" width="80%" height={350}> | ||
| <LineChart height={400} data={doDataAugmentation(statData)}> | ||
| <XAxis dataKey="month" /> | ||
| <YAxis /> | ||
| <CartesianGrid stroke="#eee" strokeDasharray="5 5" /> | ||
| <Line | ||
| name={t('fields.monthly_active_users')} | ||
| type="monotone" | ||
| dataKey="mau" | ||
| stroke="#8884d8" | ||
| /> | ||
| <Tooltip /> | ||
| <Legend /> | ||
| </LineChart> | ||
| </ResponsiveContainer> | ||
| </FormGroup> | ||
| <FormGroup row> | ||
| <Col sm={6}> | ||
| <CustomPieGraph data={statData} /> | ||
| </Col> | ||
| <Col sm={6}> | ||
| <ResponsiveContainer className="bar" width="100%" height={400}> | ||
| <LineChart | ||
| width={400} | ||
| height={400} | ||
| data={doDataAugmentation(statData)} | ||
| > | ||
| <XAxis dataKey="month" /> | ||
| <YAxis /> | ||
| <CartesianGrid stroke="#eee" strokeDasharray="5 5" /> | ||
| <Line | ||
| name="Client credentials access token" | ||
| type="monotone" | ||
| dataKey="cc_at" | ||
| stroke="#8884d8" | ||
| /> | ||
| <Line | ||
| name="Authorization code access token" | ||
| type="monotone" | ||
| dataKey="ac_at" | ||
| stroke="#82ca9d" | ||
| /> | ||
| <Line | ||
| name="Authorization code id token" | ||
| type="monotone" | ||
| dataKey="ac_id" | ||
| stroke="#00C9FF" | ||
| /> | ||
| <Legend /> | ||
| </LineChart> | ||
| </ResponsiveContainer> | ||
| </Col> | ||
| </FormGroup> | ||
| <FormGroup row> | ||
| <Col sm={6}></Col> | ||
| <Col sm={6}></Col> | ||
| </FormGroup> | ||
| </CardBody> | ||
| <CardFooter className="p-4 bt-0"></CardFooter> | ||
| </Card> | ||
| </GluuViewWrapper> | ||
| </GluuLoader> | ||
| ) | ||
| } | ||
| const mapStateToProps = (state) => { | ||
| return { | ||
| statData: state.mauReducer.stat, | ||
| loading: state.mauReducer.loading, | ||
| permissions: state.authReducer.permissions, | ||
| } | ||
| } | ||
| export default connect(mapStateToProps)(ActiveUsers) |
36 changes: 36 additions & 0 deletions
36
admin-ui/plugins/admin/components/ActiveUsers/CustomPieGraph.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import React from 'react' | ||
| import { | ||
| BarChart, | ||
| Bar, | ||
| XAxis, | ||
| YAxis, | ||
| Tooltip, | ||
| Legend, | ||
| CartesianGrid, | ||
| ResponsiveContainer, | ||
| } from 'recharts' | ||
|
|
||
| function CustomPieGraph({ data }) { | ||
| return ( | ||
| <ResponsiveContainer width={400} height={400}> | ||
| <BarChart | ||
| width={400} | ||
| height={400} | ||
| data={data.sort( | ||
| (a, b) => parseInt(a.month, 10) - parseInt(b.month, 10), | ||
| )} | ||
| > | ||
| <CartesianGrid strokeDasharray="3 3" /> | ||
| <XAxis dataKey="month" /> | ||
| <YAxis /> | ||
| <Tooltip /> | ||
| <Legend /> | ||
| <Bar dataKey="cc_at" fill="#00C9FF" /> | ||
| <Bar dataKey="ac_at" fill="#82ca9d" /> | ||
| <Bar dataKey="ac_id" fill="#92FE9D" /> | ||
| </BarChart> | ||
| </ResponsiveContainer> | ||
| ) | ||
| } | ||
|
|
||
| export default CustomPieGraph |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.