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

Jump to bottom

remotecomponent for userpref #2227

Merged
merged 3 commits into from
Jan 9, 2021
Merged

remotecomponent for userpref #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c8f95a
remotecomponent for userpref
vineethvanga18 Jan 7, 2021
f211bdc
Update ui/components/RemoteUserPref.js
vineethvanga18 Jan 9, 2021
d910c9f
update
vineethvanga18 Jan 9, 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
32 changes: 32 additions & 0 deletions ui/components/RemoteUserPref.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from "react";
import { createUseRemoteComponent, getDependencies, createRequires } from "@paciolan/remote-component";
import CircularProgress from "@material-ui/core/CircularProgress";


const requires = createRequires(getDependencies);

const useRemoteComponent = createUseRemoteComponent({
requires
});

const RemoteUserPref = ({ startOnZoom, handleToggle, url }) => {
const [loading, err, RemoteComponent] = useRemoteComponent(url);
if (loading) {
return (
<CircularProgress />
);
}
if (err != null) {
return <div>Unknown Error: {err.toString()}</div>;
}

return (
<div>
<RemoteComponent
injectProps={{ startOnZoom, handleToggle }}
/>
</div>
);
}

export default RemoteUserPref;
221 changes: 171 additions & 50 deletions ui/components/UserPreferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,60 @@ import { IconButton, FormControl, FormLabel, FormGroup, FormControlLabel, Switch
import NoSsr from '@material-ui/core/NoSsr';
import dataFetch from '../lib/data-fetch';
import { updateUser, updateProgress } from '../lib/store';
import Tabs from '@material-ui/core/Tabs';
import Tab from '@material-ui/core/Tab';
import { Paper, Tooltip } from '@material-ui/core';
import SettingsRemoteIcon from '@material-ui/icons/SettingsRemote';
import SettingsCellIcon from '@material-ui/icons/SettingsCell';
import ExtensionSandbox from "./ExtensionSandbox";
import RemoteUserPref from "./RemoteUserPref";
import ExtensionPointSchemaValidator from "../utils/ExtensionPointSchemaValidator";


const styles = () => ({
const styles = (theme) => ({
root: {
maxWidth: "100%",
height: 'auto',
borderTopLeftRadius: 0,
borderTopRightRadius: 0,
borderBottomLeftRadius: 3,
borderBottomRightRadius: 3,
},
paperRoot: {
flexGrow: 1,
maxWidth: "20%",
marginLeft: 0,
borderTopLeftRadius: 3,
borderTopRightRadius: 3,
},
tabs: {
marginLeft: 0
},
tab: {
minWidth: "50%",
margin: 0
},
icon: {
display: 'inline',
verticalAlign: 'text-top',
width: theme.spacing(1.75),
marginLeft: theme.spacing(0.5),
},
iconText: {
display: 'inline',
verticalAlign: 'middle',
},
backToPlay: {
margin: theme.spacing(2),
},
link: {
cursor: 'pointer',
},
formContainer: {
margin: 50,
display: 'flex',
'flex-wrap': 'wrap',
'justify-content': 'space-evenly',
padding: 50
},
formGrp: {
padding: 20,
Expand All @@ -37,21 +86,26 @@ const styles = () => ({
checked: {},
});

class UserPreferences extends React.Component {
class UserPreference extends React.Component {
constructor(props) {
super(props);
this.state = {
anonymousStats: props.anonymousStats,
perfResultStats: props.perfResultStats,
startOnZoom: props.startOnZoom,
tabVal: 0,
userPrefs: ExtensionPointSchemaValidator("user-prefs")()
};
}

handleToggle = (name) => () => {
const self = this;
if (name == 'anonymousUsageStats') {
self.setState((state) => ({ anonymousStats: !state.anonymousStats }));
} else {
} else if (name == 'anonymousPerfResults') {
self.setState((state) => ({ perfResultStats: !state.perfResultStats }));
} else {
self.setState((state) => ({ startOnZoom: !state.startOnZoom }));
}

this.handleChange(name);
Expand All @@ -78,17 +132,21 @@ class UserPreferences extends React.Component {

handleChange = (name) => {
const self = this;
const { anonymousStats, perfResultStats } = this.state;
const { anonymousStats, perfResultStats, startOnZoom } = this.state;
let val, msg;
if (name == 'anonymousUsageStats') {
val = anonymousStats;
msg = !val ? "Sending anonymous usage statistics was enabled"
: "Sending anonymous usage statistics was disabled";

} else {
} else if (name == 'anonymousPerfResults') {
val = perfResultStats;
msg = !val ? "Sending anonymous performance results was enabled"
: "Sending anonymous performance results was disabled";
} else {
val = startOnZoom;
msg = !val ? "Start on Zoom was enabled"
: "Start on Zoom was disabled";
}

const params = `${encodeURIComponent(name)}=${encodeURIComponent(!val)}`;
Expand All @@ -105,7 +163,7 @@ class UserPreferences extends React.Component {
this.props.updateProgress({ showProgress: false });
if (typeof result !== 'undefined') {
this.props.enqueueSnackbar(msg, {
variant: !val ? 'success': 'info',
variant: !val ? 'success' : 'info',
autoHideDuration: 4000,
action: (key) => (
<IconButton
Expand All @@ -122,55 +180,118 @@ class UserPreferences extends React.Component {
}, self.handleError('There was an error sending your preference'));
}

handleTabValChange = (event, newVal) => {
this.setState({ tabVal: newVal });
}

componentDidMount = () => {
dataFetch(
"/api/provider/capabilities",
{
credentials: "same-origin",
method: "GET",
credentials: "include",
},
(result) => {
if (result) {
this.setState({
userPrefs: ExtensionPointSchemaValidator("user-prefs")(result?.extensions?.user_prefs)
})
}
},
err => console.error(err)
)
}

render() {
const { anonymousStats, perfResultStats } = this.state;
const { anonymousStats, perfResultStats, tabVal, startOnZoom, userPrefs } = this.state;
const { classes } = this.props;

const handleToggle = this.handleToggle('startOnZoom');

return (
<NoSsr>
<div className={classes.formContainer}>
<FormControl component="fieldset" className={classes.formGrp}>
<FormLabel component="legend" className={classes.formLegend}>Analytics and Improvement Program</FormLabel>
<FormGroup>
<FormControlLabel
key="UsageStatsPreference"
control={(
<Switch
checked={anonymousStats}
onChange={this.handleToggle('anonymousUsageStats')}
color="primary"
classes={{
switchBase: classes.switchBase,
track: classes.track,
checked: classes.checked,
}}
data-cy="UsageStatsPreference"
/>
)}
labelPlacement="end"
label="Send Anonymous Usage Statistics"
<Paper square className={classes.paperRoot}>
<Tabs
value={tabVal}
onChange={this.handleTabValChange}
variant="fullWidth"
indicatorColor="primary"
textColor="primary"
className={classes.tabs}
>
<Tooltip title="General preferences" placement="top">
<Tab
className={classes.tab}
icon={
<SettingsCellIcon />
}
label="General"
/>
<FormControlLabel
key="PerfResultPreference"
control={(
<Switch
checked={perfResultStats}
onChange={this.handleToggle('anonymousPerfResults')}
color="primary"
classes={{
switchBase: classes.switchBase,
track: classes.track,
checked: classes.checked,
}}
data-cy="PerfResultPreference"
</Tooltip>
{userPrefs &&
<Tooltip title="Remote Provider preferences" placement="top">
<Tab
className={classes.tab}
icon={
<SettingsRemoteIcon />
}
label="Remote Provider"
/>
</Tooltip>
}
</Tabs>
</Paper>
<Paper className={classes.root}>
{tabVal == 0 &&
<div className={classes.formContainer}>
<FormControl component="fieldset" className={classes.formGrp}>
<FormLabel component="legend" className={classes.formLegend}>Analytics and Improvement Program</FormLabel>
<FormGroup>
<FormControlLabel
key="UsageStatsPreference"
control={(
<Switch
checked={anonymousStats}
onChange={this.handleToggle('anonymousUsageStats')}
color="primary"
classes={{
switchBase: classes.switchBase,
track: classes.track,
checked: classes.checked,
}}
data-cy="UsageStatsPreference"
/>
)}
labelPlacement="end"
label="Send Anonymous Usage Statistics"
/>
)}
labelPlacement="end"
label="Send Anonymous Performance Results"
/>
</FormGroup>
</FormControl>
</div>
<FormControlLabel
key="PerfResultPreference"
control={(
<Switch
checked={perfResultStats}
onChange={this.handleToggle('anonymousPerfResults')}
color="primary"
classes={{
switchBase: classes.switchBase,
track: classes.track,
checked: classes.checked,
}}
data-cy="PerfResultPreference"
/>
)}
labelPlacement="end"
label="Send Anonymous Performance Results"
/>
</FormGroup>
</FormControl>
</div>
}
{tabVal == 1 && userPrefs &&
<ExtensionSandbox type="user_prefs" Extension={() => RemoteUserPref({startOnZoom, handleToggle})}/>
}
</Paper>
</NoSsr>
);
}
Expand All @@ -184,4 +305,4 @@ const mapDispatchToProps = (dispatch) => ({
export default withStyles(styles)(connect(
null,
mapDispatchToProps,
)(withRouter(withSnackbar(UserPreferences))));
)(withRouter(withSnackbar(UserPreference))));
Loading