jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change(ui) - siteId

Browse source
This commit is contained in:
Shekar Siri 2022-04-15 15:42:59 +02:00
parent 57c027cf82
commit 509897e582
2 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
frontend/app/components/Client/Sites/NewSiteForm.js
View file

@ -39,12 +39,11 @@ export default class NewSiteForm extends React.PureComponent {
} else {
this.props.save(this.props.site).then(() => {
const { sites } = this.props;
const site = sites.last();
this.props.pushNewSite(site)
if (!pathname.includes('/client')) {
this.props.setSiteId(site.id)
}
const site = sites.last();
this.props.pushNewSite(site)
if (!pathname.includes('/client')) {
this.props.setSiteId(site.id)
}
this.props.onClose(null, site)
});
}
@ -59,17 +58,17 @@ export default class NewSiteForm extends React.PureComponent {
const { site, loading } = this.props;
return (
<form className={ styles.formWrapper } onSubmit={ this.onSubmit }>
<div className={ styles.content }>
<div className={ styles.content }>
<div className={ styles.formGroup }>
<label>{ 'Name' }</label>
<Input
placeholder="Ex. openreplay"
name="name"
value={ site.name }
onChange={ this.edit }
className={ styles.input }
/>
</div>
<label>{ 'Name' }</label>
<Input
placeholder="Ex. openreplay"
name="name"
value={ site.name }
onChange={ this.edit }
className={ styles.input }
/>
</div>
<div className="mt-6">
<Button
primary
@ -79,13 +78,13 @@ export default class NewSiteForm extends React.PureComponent {
content={site.exists() ? 'Update' : 'Add'}
/>
</div>
{ this.state.existsError &&
<div className={ styles.errorMessage }>
{ "Site exists already. Please choose another one." }
</div>
}
</div>
</form>
);
{ this.state.existsError &&
<div className={ styles.errorMessage }>
{ "Site exists already. Please choose another one." }
</div>
}
</div>
</form>
);
}
}

6
frontend/app/duck/site.js
View file

@ -53,12 +53,12 @@ const reducer = (state = initialState, action = {}) => {
return state.setIn([ 'instance', 'gdpr' ], gdpr);
case FETCH_LIST_SUCCESS:
let siteId = state.get("siteId");
if (!siteId) {
siteId = !!action.data.find(s => s.projectId === storedSiteId)
const siteExists = action.data.map(s => s.projectId).includes(siteId);
if (!siteId || !siteExists) {
siteId = !!action.data.find(s => s.projectId === parseInt(storedSiteId))
? storedSiteId
: action.data[0].projectId;
}
console.log('siteId asd', siteId)
return state.set('list', List(action.data.map(Site))).set('siteId', siteId);
case SET_SITE_ID:
localStorage.setItem(SITE_ID_STORAGE_KEY, action.siteId)