Skip to content
This repository has been archived by the owner on Mar 28, 2022. It is now read-only.

Ad hoc api and dashboard ui implemented. #269

Merged
merged 16 commits into from
Jan 22, 2021
Merged

Ad hoc api and dashboard ui implemented. #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ef0656b
feat: [] adhoc policy implemented
bhrg3se Dec 28, 2020
d75298a
ref: [server] removed unnecessary code
bhrg3se Dec 28, 2020
523d5da
fix: [server] added missing '%s'
bhrg3se Dec 28, 2020
a14cb5a
fix: [server] dashboard URL fixed
bhrg3se Dec 28, 2020
d4d6ef9
fix: [server] integration test fixed
bhrg3se Dec 28, 2020
4ba193a
merged with master
flyinghermit Jan 21, 2021
a7f1d3f
feat: added adhoc tab to policy tab navigation.
flyinghermit Jan 21, 2021
9a4c11a
ref: [dashboard] ui changes in request access prompt
flyinghermit Jan 21, 2021
349f7cb
ref: [dashboard] added subtitle1 typography. removed unused classes f…
flyinghermit Jan 21, 2021
c8e1ce5
ref: [server] filter out current admin user from admin list
flyinghermit Jan 21, 2021
6a44219
[server, dashboard] policy api path changes
flyinghermit Jan 21, 2021
905adff
feat: [server] added 'policy' to authorization path
flyinghermit Jan 22, 2021
29a5427
feat: [dashboard] changed LogTableV2 name to MuiDataTableTheme.
flyinghermit Jan 22, 2021
dc574c7
feat: [dashboard] adhoc and access policy tab position swapped
flyinghermit Jan 22, 2021
bb3806e
feat: current user check in adhoc req.
flyinghermit Jan 22, 2021
4568ada
feat: [server] adhoc history api to only return expired access requests
flyinghermit Jan 22, 2021
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
14 changes: 7 additions & 7 deletions dashboard/src/Layout/TrasaTheme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ let theme = createMuiTheme({
letterSpacing: 0.5,
padding: 12,
},
// p: {
// fontWeight: 700,
// fontSize: 14,
// letterSpacing: 0.5,
// color: '#404854',
// padding: 12,
// },
subtitle1: {
fontWeight: 600,
fontSize: 16,
letterSpacing: 0.5,
color: '#404854',
},

button: {
textTransform: 'none',
fontFamily: 'Open Sans, Rajdhani',
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/pages/Monitor/Session/LiveSessions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import MUIDataTable, {
} from 'mui-datatables';
import React, { useEffect, useState } from 'react';
import Constants from '../../../Constants';
import { LogtableV2Theme } from '../../../utils/styles/themes';
import { MuiDataTableTheme } from '../../../utils/styles/themes';

const useStyles = makeStyles((theme) => ({
mainContent: {
Expand Down Expand Up @@ -278,7 +278,7 @@ export default function LiveSessionTable() {

return (
<div className={classes.contentWrapper}>
<MuiThemeProvider theme={LogtableV2Theme}>
<MuiThemeProvider theme={MuiDataTableTheme}>
<MUIDataTable
title="Active Sessions ( LIVE feed )"
data={eventData}
Expand Down
47 changes: 20 additions & 27 deletions dashboard/src/pages/Monitor/Session/LogTableV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import MUIDataTable, {
import React, { useEffect, useState } from 'react';
import { Route, Switch, withRouter } from 'react-router-dom';
import Constants from '../../../Constants';
import { LogtableV2Theme } from '../../../utils/styles/themes';
import { MuiDataTableTheme } from '../../../utils/styles/themes';
import HTTPSession from './RecordedSession';

const lightColor = 'rgba(255, 255, 255, 0.7)'; // 'rgba(255, 255, 255, 0.7)'; // '#030417';
Expand Down Expand Up @@ -210,18 +210,18 @@ export function LogTableV2(props: logtableProps) {
// console.log(response.data);
// userDataMain = response.data;
let dataArr = [];
let data =[]
if(!response.data.data){
data=[]
}else {
data = response.data.data[0];
let data = [];
if (!response.data.data) {
data = [];
} else {
data = response.data.data[0];
}

dataArr = data.map(function (n: any) {
return [
n.eventID,
n.email,
n.privilege ,
n.privilege,
!n.serviceName ? 'Dashboard' : n.serviceName,
!n.serviceType ? 'Dashboard' : n.serviceType,
n.userIP,
Expand Down Expand Up @@ -270,20 +270,20 @@ export function LogTableV2(props: logtableProps) {
let dataArr = [];
const { data } = response;

if (!data.data ) {
if (!data.data) {
setEventData([]);
} else {
dataArr = data.data[0].map(function (n: any) {
return [
n.eventID,
n.email,
n.privilege ,
n.privilege,
!n.serviceName ? 'Dashboard' : n.serviceName,
!n.serviceType ? 'Dashboard' : n.serviceType,
n.userIP,
n.userAgent,
n.status,
n.failedReason,
n.failedReason,
n.loginTime,
n.logoutTime,
n.guests,
Expand Down Expand Up @@ -434,13 +434,13 @@ export function LogTableV2(props: logtableProps) {
},
},
},
{
{
name: 'Failed Reason',
options: {
filter: true,
filterOptions: [false, true],
customBodyRender: (value: any) => {
return (value);
return value;
},
},
},
Expand Down Expand Up @@ -503,40 +503,40 @@ export function LogTableV2(props: logtableProps) {
if (tableMeta.rowData[4] === 'ssh') {
window.open(
`/monitor/sessions/view#type=ssh&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (tableMeta.rowData[4] === 'db') {
window.open(
`/monitor/sessions/view#type=db&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (tableMeta.rowData[4] === 'guac-ssh') {
window.open(
`/monitor/sessions/view#type=guac-ssh&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (
tableMeta.rowData[4] === 'guac-rdp' ||
tableMeta.rowData[4] === 'rdp'
) {
window.open(
`/monitor/sessions/view#type=guac&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (tableMeta.rowData[4] === 'guac-vnc') {
window.open(
`/monitor/sessions/view#type=guac&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (tableMeta.rowData[4] === 'guac-vnc') {
window.open(
`/monitor/sessions/view#type=guac&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
} else if (tableMeta.rowData[4] === 'http') {
window.open(
`/monitor/sessions/view#type=http&year=${d.year()}&month=${month}&day=${d.date()}&sessionID=${value}`,
'_blank'
'_blank',
);
}
}}
Expand Down Expand Up @@ -640,7 +640,7 @@ export function LogTableV2(props: logtableProps) {
</Toolbar>
</AppBar>
<div className={classes.contentWrapper}>
<MuiThemeProvider theme={LogtableV2Theme}>
<MuiThemeProvider theme={MuiDataTableTheme}>
<MUIDataTable
title="Authentication Event Logs"
data={eventData}
Expand Down Expand Up @@ -673,13 +673,6 @@ const SessionLog = (props: any) => {
// export default withStyles(styles)(Overview)
export default withRouter(SessionLog);








// {() => {
// // console.log(tableMeta.rowData[4])

Expand Down
Loading